36dd5c91ee
ComfyUI's "edit attention" (wrap selection in (token:weight)) is a global window keydown listener that acts when a <textarea> is focused. The text gate editor is a textarea, but its keydown handler called stopPropagation on EVERY key, so the event never bubbled to window and weighting never fired — notably when using the node as a prompt text node in protected mode. Now stopPropagation is skipped for the weighting shortcut (Ctrl/Cmd + ↑/↓) so it reaches the global handler; all other keys are still stopped so typing/space can't trigger litegraph canvas shortcuts. The weighting edit goes through execCommand, which fires our oninput -> stored_text stays synced. Verified against the verbatim editAttention from the shipped frontend: whole-word weighting, existing-weight decrement, and no-selection word expansion all round-trip; plain keys stay stopped. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
304 lines
12 KiB
JavaScript
304 lines
12 KiB
JavaScript
import { app } from "../../scripts/app.js";
|
|
import { api } from "../../scripts/api.js";
|
|
|
|
// Text Gate (Manual Pass) — pauses a running prompt, shows the incoming text in
|
|
// an editable textarea, and on Pass emits the (edited) text. The Python node
|
|
// blocks in run() on GateBus.wait_payload(); this extension renders the editor
|
|
// the server pushes via the "datasete-textgate-show" socket event and POSTs the
|
|
// edited text back. Outputs are static (text, signal) — no dynamic slots.
|
|
//
|
|
// After Pass, a "▶ Run from here" button re-queues the prompt (Image Gate
|
|
// parity): the gate re-arms every run and IS_CHANGED is NaN, so it re-pauses
|
|
// each run. The edited text is sticky by INTENT: a Run-from-here re-queue keeps
|
|
// YOUR edited text (even if a non-deterministic upstream regenerates it), while
|
|
// a normal toolbar Queue shows whatever the upstream produced. Keying off which
|
|
// button ran — not a text comparison — means a random/seeded upstream can't
|
|
// clobber the edit on re-run. (Re-queuing still recomputes non-cacheable
|
|
// upstream, as in any ComfyUI run; that regenerated text is simply ignored.)
|
|
//
|
|
// Sizing follows the Image Pool node: the editor is always present and FILLS the
|
|
// node, with only a min-height floor (no max) so the node stays freely resizable
|
|
// and the textarea grows with it.
|
|
|
|
const NODE = "TextGate";
|
|
const R = "/datasete_text_gate";
|
|
|
|
const MIN_W = 320; // default node width (freely resizable)
|
|
const MIN_EDITOR_H = 140; // textarea floor
|
|
const BTN_ROW_H = 34; // Pass button row
|
|
const MARGIN = 10; // ComfyUI DOM-widget inset, matches the other nodes
|
|
|
|
// ---- protected-mode widgets -------------------------------------------------
|
|
// `protected` (BOOLEAN toggle) + `stored_text` (hidden STRING) are real backend
|
|
// widgets. When protected, the node acts as a plain text node: it outputs
|
|
// stored_text and ignores upstream (no pause). The DOM textarea is the visible
|
|
// editor and mirrors its value into stored_text on EVERY change (typing, upstream
|
|
// arrival, Pass) — so the editor content survives refresh / workflow reload in
|
|
// BOTH modes (stored_text also reaches run() when protected).
|
|
|
|
function widgetByName(node, name) {
|
|
return node.widgets?.find((w) => w.name === name);
|
|
}
|
|
|
|
function isProtected(node) {
|
|
return !!widgetByName(node, "protected")?.value;
|
|
}
|
|
|
|
// mirror the editor text into the hidden stored_text widget (persist + backend)
|
|
function syncStored(node) {
|
|
const w = widgetByName(node, "stored_text");
|
|
if (w) w.value = node._tg?.area?.value ?? "";
|
|
}
|
|
|
|
// fully hide the auto-created stored_text widget (same as the pool node's
|
|
// pool_id): getVisibleWidgets() filters on `hidden`, so it's dropped from both
|
|
// draw and layout — computeSize alone (or type="hidden") does NOT hide it.
|
|
// Serialization still iterates all widgets, so stored_text is saved/sent.
|
|
function hideStoredWidget(node) {
|
|
const w = widgetByName(node, "stored_text");
|
|
if (!w) return;
|
|
w.hidden = true;
|
|
w.computeSize = () => [0, -4];
|
|
}
|
|
|
|
// reflect the persisted stored_text + mode into the editor + UI. The editor text
|
|
// is restored in BOTH modes so it survives a refresh / workflow reload; the mode
|
|
// only selects the UI state (protected vs idle waiting-for-a-run).
|
|
function applyPersistedMode(node) {
|
|
if (!node._tg) return;
|
|
node._tg.area.value = widgetByName(node, "stored_text")?.value ?? "";
|
|
setState(node, isProtected(node) ? "protected" : "idle");
|
|
}
|
|
|
|
// ---- server call ------------------------------------------------------------
|
|
|
|
async function postPass(node, text) {
|
|
const fd = new FormData();
|
|
fd.append("id", String(node.id));
|
|
fd.append("text", text);
|
|
await api.fetchApi(`${R}/pass`, { method: "POST", body: fd });
|
|
}
|
|
|
|
// ---- run-from-here + state --------------------------------------------------
|
|
// States: "idle" (pre-run), "paused" (waiting for Pass), "passed" (Run-from-here
|
|
// shown). Re-queuing the whole prompt is enough to "resume" — cached upstream
|
|
// re-pauses the gate, matching the Image Gate's queueFromHere.
|
|
|
|
async function queueFromHere(node) {
|
|
// Fire the same command the Run button / Ctrl+Enter use, so the prompt
|
|
// actually EXECUTES. A bare app.queuePrompt(...) enqueues but skips the
|
|
// command's run setup, so the 1.47 frontend doesn't kick off the run (you'd
|
|
// have to press Run yourself). Fall back to app.queuePrompt on older
|
|
// frontends without the command registry.
|
|
const cmd = app.extensionManager?.command;
|
|
if (cmd?.execute) {
|
|
try { await cmd.execute("Comfy.QueuePrompt"); return; }
|
|
catch (e) { /* fall through to the legacy path */ }
|
|
}
|
|
try {
|
|
await app.queuePrompt(0, 1);
|
|
} catch (e) {
|
|
try { await app.queuePrompt(0); } catch (e2) { console.error("[tgate] queue failed", e2); }
|
|
}
|
|
}
|
|
|
|
function setState(node, s) {
|
|
node._tgState = s;
|
|
const tg = node._tg;
|
|
if (!tg) return;
|
|
// Pass is hidden once passed AND in protected mode (no pause there);
|
|
// Run-from-here only in the passed state.
|
|
tg.pass.style.display = (s === "passed" || s === "protected") ? "none" : "";
|
|
tg.runHere.style.display = s === "passed" ? "" : "none";
|
|
if (s === "paused") tg.status.textContent = "edit, then Pass";
|
|
else if (s === "passed") tg.status.textContent = "passed — Run from here to re-run";
|
|
else if (s === "protected") tg.status.textContent = "🔒 protected — outputs this text (upstream ignored)";
|
|
else tg.status.textContent = "";
|
|
tg.area.placeholder = s === "protected"
|
|
? "type text (used as a text node)…"
|
|
: "waiting for a run…";
|
|
node.setDirtyCanvas?.(true, true);
|
|
}
|
|
|
|
// ---- sizing (Image Pool pattern) --------------------------------------------
|
|
|
|
// Only a min-height FLOOR — no max — so the DOM widget fills the node and grows
|
|
// when the user resizes it. (A fixed height, or forcing node height on every
|
|
// interaction, would lock the node and leave dead grey space below the editor.)
|
|
function widgetFloor() {
|
|
return 2 * MARGIN + MIN_EDITOR_H + BTN_ROW_H;
|
|
}
|
|
|
|
// DomWidgets sizes the editor container from the widget width, which can lag
|
|
// node.size[0] on this frontend — pin it so the textarea reflows to fill.
|
|
function syncWidgetWidth(node) {
|
|
if (node._tgWidget) node._tgWidget.width = node.size?.[0] || MIN_W;
|
|
}
|
|
|
|
// ---- styles + node setup ----------------------------------------------------
|
|
|
|
function injectStyles() {
|
|
if (document.getElementById("tgate-styles")) return;
|
|
const css = `
|
|
.tgate-wrap { display:flex; flex-direction:column; gap:6px; box-sizing:border-box;
|
|
height:100%; min-height:0; }
|
|
.tgate-area { flex:1 1 auto; min-height:0; width:100%; box-sizing:border-box; resize:none;
|
|
font-size:12px; line-height:1.4; padding:6px; border-radius:4px;
|
|
border:1px solid #555; background:rgba(0,0,0,0.25); color:#fff;
|
|
font-family:ui-monospace, monospace; overflow:auto; }
|
|
.tgate-btns { display:flex; gap:6px; align-items:center; flex:0 0 auto; }
|
|
.tgate-btns button { font-size:12px; padding:3px 14px; cursor:pointer; border-radius:3px;
|
|
border:1px solid #555; color:#fff; }
|
|
.tgate-pass { background:rgba(40,130,70,0.95); }
|
|
.tgate-pass:hover { background:rgba(55,160,90,0.98); }
|
|
.tgate-run { background:rgba(40,90,140,0.95); }
|
|
.tgate-run:hover { background:rgba(60,120,180,0.98); }
|
|
.tgate-status { font-size:11px; opacity:0.6; margin-left:auto; }
|
|
`;
|
|
const style = document.createElement("style");
|
|
style.id = "tgate-styles";
|
|
style.textContent = css;
|
|
document.head.appendChild(style);
|
|
}
|
|
|
|
function setupTextGateNode(node) {
|
|
injectStyles();
|
|
|
|
const wrap = document.createElement("div");
|
|
wrap.className = "tgate-wrap";
|
|
|
|
const area = document.createElement("textarea");
|
|
area.className = "tgate-area";
|
|
area.placeholder = "waiting for a run…";
|
|
// Stop keys from reaching litegraph (so typing/space can't toggle node
|
|
// selection or fire canvas shortcuts) — EXCEPT ComfyUI's prompt-weighting
|
|
// shortcut (Ctrl/Cmd+↑/↓). That handler is a global `window` keydown listener
|
|
// that wraps the selection in (token:weight); a blanket stopPropagation here
|
|
// kept it from ever bubbling up, so weighting didn't work in this editor.
|
|
// Its execCommand edit fires our oninput, so the weighted text still syncs.
|
|
area.onkeydown = (e) => {
|
|
const isWeight = (e.ctrlKey || e.metaKey) &&
|
|
(e.key === "ArrowUp" || e.key === "ArrowDown");
|
|
if (!isWeight) e.stopPropagation();
|
|
};
|
|
// keep the hidden stored_text widget mirrored so edits persist + reach run()
|
|
area.oninput = () => syncStored(node);
|
|
|
|
const btns = document.createElement("div");
|
|
btns.className = "tgate-btns";
|
|
|
|
const pass = document.createElement("button");
|
|
pass.className = "tgate-pass";
|
|
pass.textContent = "▶ Pass";
|
|
pass.onclick = async () => {
|
|
syncStored(node); // persist the passed text so a reload keeps it
|
|
await postPass(node, area.value);
|
|
setState(node, "passed");
|
|
};
|
|
|
|
// Re-queue the prompt; cached upstream re-pauses the gate so you can run your
|
|
// edited text downstream again without recomputing the graph above it.
|
|
const runHere = document.createElement("button");
|
|
runHere.className = "tgate-run";
|
|
runHere.textContent = "▶ Run from here";
|
|
runHere.style.display = "none";
|
|
runHere.onclick = async () => {
|
|
node._tgKeepEdit = true; // tell the next re-pause to preserve this edit
|
|
node._tg.status.textContent = "re-running…";
|
|
await queueFromHere(node);
|
|
};
|
|
|
|
const status = document.createElement("span");
|
|
status.className = "tgate-status";
|
|
|
|
btns.appendChild(pass);
|
|
btns.appendChild(runHere);
|
|
btns.appendChild(status);
|
|
|
|
wrap.appendChild(area);
|
|
wrap.appendChild(btns);
|
|
node._tg = { wrap, area, status, pass, runHere };
|
|
node._tgState = "idle";
|
|
|
|
// FILLS the node: floor-only min height, no max (Image Pool pattern).
|
|
node._tgWidget = node.addDOMWidget("textgate_editor", "div", wrap, {
|
|
serialize: false,
|
|
getMinHeight: () => widgetFloor(),
|
|
});
|
|
|
|
// keep the editor width synced on manual resize so the textarea reflows
|
|
const onResize = node.onResize;
|
|
node.onResize = function () {
|
|
const r = onResize?.apply(this, arguments);
|
|
syncWidgetWidth(node);
|
|
return r;
|
|
};
|
|
|
|
// protected-mode wiring: hide the stored_text widget, label + react to the
|
|
// toggle, and reflect the persisted mode/text into the editor.
|
|
hideStoredWidget(node);
|
|
const pw = widgetByName(node, "protected");
|
|
if (pw) {
|
|
pw.label = "🔒 Protected (text node)";
|
|
const prev = pw.callback;
|
|
pw.callback = function () {
|
|
const r = prev?.apply(this, arguments);
|
|
if (isProtected(node)) { syncStored(node); setState(node, "protected"); }
|
|
else setState(node, "idle");
|
|
return r;
|
|
};
|
|
}
|
|
applyPersistedMode(node);
|
|
|
|
// sensible default size; the node stays freely resizable (no width floor lock)
|
|
node.setSize([Math.max(node.size?.[0] || 0, MIN_W), node.computeSize()[1]]);
|
|
syncWidgetWidth(node);
|
|
}
|
|
|
|
app.registerExtension({
|
|
name: "datasete.gates.textgate",
|
|
|
|
// one global socket listener: route the server's pause event to the node
|
|
setup() {
|
|
api.addEventListener("datasete-textgate-show", (e) => {
|
|
const d = e.detail || {};
|
|
const node = app.graph?.getNodeById?.(parseInt(d.id, 10));
|
|
if (!node || node.type !== NODE || !node._tg) return;
|
|
if (isProtected(node)) return; // protected = no pause; ignore stray events
|
|
// Sticky edit by intent: a Run-from-here re-queue (the _tgKeepEdit flag)
|
|
// keeps YOUR edited text so the gate re-emits it downstream; a normal
|
|
// Queue shows whatever the upstream produced. Keying off the button —
|
|
// not a text comparison — means a non-deterministic upstream can't
|
|
// clobber the edit on re-run.
|
|
if (node._tgKeepEdit) {
|
|
node._tgKeepEdit = false;
|
|
} else {
|
|
node._tg.area.value = d.text || "";
|
|
}
|
|
syncStored(node); // persist the shown text so a refresh/reload keeps it
|
|
setState(node, "paused");
|
|
try { node._tg.area.focus(); } catch (err) { /* ignore */ }
|
|
});
|
|
},
|
|
|
|
async beforeRegisterNodeDef(nodeType, nodeData) {
|
|
if (nodeData.name !== NODE) return;
|
|
|
|
const onNodeCreated = nodeType.prototype.onNodeCreated;
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
const r = onNodeCreated?.apply(this, arguments);
|
|
setupTextGateNode(this);
|
|
return r;
|
|
};
|
|
|
|
// loaded workflows restore protected + stored_text after create — re-apply
|
|
// the mode so the editor + UI match the saved state.
|
|
const onConfigure = nodeType.prototype.onConfigure;
|
|
nodeType.prototype.onConfigure = function () {
|
|
const r = onConfigure?.apply(this, arguments);
|
|
if (this._tg) applyPersistedMode(this);
|
|
return r;
|
|
};
|
|
},
|
|
});
|