comfyui-mcp 0.52.2 → 0.52.4

package/dist/services/trainer-bootstrap.js

@@ -9,7 +9,7 @@
 import childProcess from "node:child_process";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { delimiter, join } from "node:path";
 import { AI_TOOLKIT_REF, AI_TOOLKIT_REPO, nativeToolkitReady, resolveAiToolkitDir, resolveAiToolkitPython, TRAINER_COMMAND, } from "./ai-toolkit.js";
 const TORCH_PACKAGES = ["torch==2.9.1", "torchvision==0.24.1", "torchaudio==2.9.1"];
 const TORCH_INDEX = "https://download.pytorch.org/whl/cu128";
@@ -61,6 +61,48 @@ function stream(cmd, args, cwd, onLog) {
 function basePython() {
     return process.platform === "win32" ? "python" : "python3";
 }
+/**
+ * Resolve the git executable to spawn. PATH first, then — on Windows — the
+ * standard Git for Windows install roots. The fallback exists because a
+ * long-lived orchestrator started BEFORE Git was installed keeps its
+ * pre-install PATH: panel_reload rebuilds the server but the parent's
+ * environment is inherited, so `spawn("git")` dies with ENOENT even though
+ * Git is on the machine (issue #1640). Returns the ABSOLUTE path so the
+ * spawn below never depends on the stale PATH again.
+ */
+export function resolveGitExecutable(env = process.env, platform = process.platform) {
+    const name = platform === "win32" ? "git.exe" : "git";
+    for (const dir of (env.PATH ?? "").split(delimiter).filter(Boolean)) {
+        const candidate = join(dir.replace(/^"|"$/g, ""), name);
+        if (existsSync(candidate))
+            return candidate;
+    }
+    if (platform !== "win32")
+        return undefined;
+    const roots = [
+        env["ProgramFiles"] ?? "C:\\Program Files",
+        env["ProgramFiles(x86)"],
+        env.LOCALAPPDATA ? join(env.LOCALAPPDATA, "Programs") : undefined,
+    ];
+    for (const root of roots) {
+        if (!root)
+            continue;
+        const candidate = join(root, "Git", "cmd", "git.exe");
+        if (existsSync(candidate))
+            return candidate;
+    }
+    return undefined;
+}
+/** Why no git could be found — spelled out with the remedy (issue #1640). */
+function gitNotFoundMessage() {
+    return process.platform === "win32"
+        ? "git is not on this process's PATH and was not found under the standard Git for Windows roots " +
+            "(Program Files\\Git, %LOCALAPPDATA%\\Programs\\Git). If Git was installed AFTER the orchestrator " +
+            "started, panel_reload is not enough — the long-lived parent keeps its pre-install PATH. Fully " +
+            "restart the orchestrator (or reboot), then re-run bootstrap."
+        : "git is not on this process's PATH. If git was installed after the orchestrator started, restart " +
+            "the orchestrator so it inherits the new PATH, then re-run bootstrap.";
+}
 /**
  * Bootstrap the native trainer. Steps (each idempotent):
  *  1. clone ai-toolkit @ AI_TOOLKIT_REF (or `git fetch + checkout` an existing clone)
@@ -74,12 +116,16 @@ export async function bootstrapToolkit(opts = {}) {
     const dir = resolveAiToolkitDir();
     const log = opts.onLog;
     try {
+        const git = resolveGitExecutable();
+        if (!git) {
+            return fail(TRAINER_COMMAND.bootstrap, "git_not_found", gitNotFoundMessage());
+        }
         mkdirSync(dir, { recursive: true });
         if (!existsSync(join(dir, ".git"))) {
             // Clone into a temp sibling then move in, so a failed clone doesn't leave
             // a half repo at the real path.
             const tmp = `${dir}.clone-${process.pid}`;
-            const r = await stream("git", ["clone", "--recurse-submodules", AI_TOOLKIT_REPO, tmp], undefined, log);
+            const r = await stream(git, ["clone", "--recurse-submodules", AI_TOOLKIT_REPO, tmp], undefined, log);
             if (r.code !== 0) {
                 // Clean the failed clone so a retry isn't blocked by its leftovers
                 // (codex finding: the stale temp dir made every retry fail instantly).
@@ -91,13 +137,13 @@ export async function bootstrapToolkit(opts = {}) {
             rmSync(dir, { recursive: true, force: true });
             renameSync(tmp, dir);
         }
-        let r = await stream("git", ["fetch", "--all"], dir, log);
+        let r = await stream(git, ["fetch", "--all"], dir, log);
         if (r.code !== 0)
             return fail(TRAINER_COMMAND.bootstrap, "fetch_failed", `git fetch exited ${r.code}`, r.tail);
-        r = await stream("git", ["checkout", AI_TOOLKIT_REF], dir, log);
+        r = await stream(git, ["checkout", AI_TOOLKIT_REF], dir, log);
         if (r.code !== 0)
             return fail(TRAINER_COMMAND.bootstrap, "checkout_failed", `git checkout ${AI_TOOLKIT_REF} exited ${r.code}`, r.tail);
-        r = await stream("git", ["submodule", "update", "--init", "--recursive"], dir, log);
+        r = await stream(git, ["submodule", "update", "--init", "--recursive"], dir, log);
         if (r.code !== 0)
             return fail(TRAINER_COMMAND.bootstrap, "submodule_failed", `submodule update exited ${r.code}`, r.tail);
         // Invalidate any previous completion marker BEFORE the install steps: a

package/dist/services/trainer-bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"trainer-bootstrap.js","sourceRoot":"","sources":["../../src/services/trainer-bootstrap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trainer-bootstrap.js","sourceRoot":"","sources":["../../src/services/trainer-bootstrap.ts"],"names":[],"mappings":"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"}

package/dist/services/ui-bridge.js

@@ -1138,6 +1138,14 @@ export class UiBridge {
      *  panel_set_workflow_target({mode:"current"}) consent). Returns the tab it
      *  repinned to, or undefined when nothing is resolvable. */
     scopeRepinHandler = null;
+    /**
+     * panel#1292 — an in-flight `mode:"current"` bind that is recovering a null
+     * turn pin. Same-batch siblings (`panel_graph_outline`, `panel_set_todo`)
+     * start while the pin is still ambiguous; `send()` waits here instead of
+     * minting the #884 refusal the bind is about to clear. Ref-counted so two
+     * overlapping binds on one scope do not drop the wait early.
+     */
+    scopeRecovery = new Map();
     /** #884 — orchestrator-injected: normalize a hello's raw `backend` value the
      *  same way the orchestrator does (unknown/absent → the default backend), so
      *  the backend-qualified scope-buffer replay matches the conversation the
@@ -2777,6 +2785,54 @@ export class UiBridge {
     repinScopeToWorkflow(scopeId, workflowPath) {
         return this.scopeRepinHandler?.(scopeId, workflowPath);
     }
+    /**
+     * panel#1292 — mark that this scope's turn pin is being recovered. `send()`
+     * waits for {@link endScopeRecovery} before minting the mixed-origin refusal
+     * so a same-batch sibling can ride the bind rather than lose the race.
+     */
+    beginScopeRecovery(scopeId) {
+        const rec = this.scopeRecovery.get(scopeId);
+        if (rec) {
+            rec.count += 1;
+            return;
+        }
+        let finish;
+        const done = new Promise((resolve) => {
+            finish = resolve;
+        });
+        this.scopeRecovery.set(scopeId, { count: 1, done, finish });
+    }
+    /** panel#1292 — the matching close for {@link beginScopeRecovery}. */
+    endScopeRecovery(scopeId) {
+        const rec = this.scopeRecovery.get(scopeId);
+        if (!rec)
+            return;
+        rec.count -= 1;
+        if (rec.count > 0)
+            return;
+        rec.finish();
+        this.scopeRecovery.delete(scopeId);
+    }
+    /**
+     * Wait for an in-flight scope recovery, or (if none is registered yet) yield
+     * once so a same-tick bind can register. Always returns: the caller retries
+     * `resolveTarget` and throws the original refusal if the pin is still null.
+     */
+    awaitScopePinRecovery(scopeId) {
+        const rec = this.scopeRecovery.get(scopeId);
+        if (rec)
+            return rec.done;
+        return Promise.resolve().then(() => {
+            const rec2 = this.scopeRecovery.get(scopeId);
+            if (rec2)
+                return rec2.done;
+            return new Promise((resolve) => setTimeout(resolve, 0)).then(() => {
+                const rec3 = this.scopeRecovery.get(scopeId);
+                if (rec3)
+                    return rec3.done;
+            });
+        });
+    }
     /** #884 — inject the hello-backend normalizer (see the field doc). */
     setHelloBackendNormalizer(fn) {
         this.helloBackendNormalizer = fn;
@@ -3670,29 +3726,45 @@ export class UiBridge {
             logger.info(`[ui-bridge] flushed ${fresh.length} mailboxed frame(s) to reconnected tab ${tabId.slice(0, 8)}`);
         }
     }
-    send(cmd, opts = {}) {
+    async send(cmd, opts = {}) {
         // #357: read (idempotent) ops get a more tolerant default so a busy-but-alive
         // panel main thread (e.g. Preview3D loading a large FBX) isn't declared frozen;
         // mutating ops keep the tight default. An explicit opts.timeoutMs always wins.
         const timeoutMs = opts.timeoutMs ?? defaultBridgeTimeoutMs(cmd.cmd);
         let conn;
-        try {
-            conn = this.resolveTarget(opts.tabId);
-        }
-        catch (err) {
-            // Offline target: buffer a finished-render delivery for reconnect instead of
-            // failing, so the agent's "here's your image" isn't lost while the phone is away.
-            if (opts.tabId && UiBridge.isMailboxable(cmd)) {
-                this.storeMailbox(opts.tabId, cmd);
-                return Promise.resolve({ ok: true, mailboxed: true });
+        // panel#1292 — a mixed-origin pin is decided once per batch, but
+        // `mode:"current"` is the advertised recovery and may be running in THIS
+        // same batch. Wait for that recovery once before minting the refusal;
+        // `canReach` stays sync (it swallows the throw) so the wait is send-only.
+        let waitedForScopeRecovery = false;
+        for (;;) {
+            try {
+                conn = this.resolveTarget(opts.tabId);
+                break;
+            }
+            catch (err) {
+                if (!waitedForScopeRecovery &&
+                    isRoutingAmbiguity(err) &&
+                    opts.tabId &&
+                    isScopeAddress(opts.tabId)) {
+                    await this.awaitScopePinRecovery(opts.tabId);
+                    waitedForScopeRecovery = true;
+                    continue;
+                }
+                // Offline target: buffer a finished-render delivery for reconnect instead of
+                // failing, so the agent's "here's your image" isn't lost while the phone is away.
+                if (opts.tabId && UiBridge.isMailboxable(cmd)) {
+                    this.storeMailbox(opts.tabId, cmd);
+                    return { ok: true, mailboxed: true };
+                }
+                // resolveTarget threw BEFORE any socket write — no tab could be routed to (no
+                // connected tab / ambiguous / multiple / not reachable), so nothing was
+                // transmitted. Tag the rejection with the AUTHORITATIVE typed flag
+                // dispatched:false so a caller classifies "nothing applied" categorically (reboot
+                // readiness; the mutating-command rebind hint, panel #442) — never by
+                // string-matching a message whose text a post-dispatch executor error could quote.
+                throw markDispatched(err instanceof Error ? err : new Error(String(err)), false);
             }
-            // resolveTarget threw BEFORE any socket write — no tab could be routed to (no
-            // connected tab / ambiguous / multiple / not reachable), so nothing was
-            // transmitted. Tag the rejection with the AUTHORITATIVE typed flag
-            // dispatched:false so a caller classifies "nothing applied" categorically (reboot
-            // readiness; the mutating-command rebind hint, panel #442) — never by
-            // string-matching a message whose text a post-dispatch executor error could quote.
-            return Promise.reject(markDispatched(err instanceof Error ? err : new Error(String(err)), false));
         }
         // #236 — proactively gate a command this exact connection has already proven
         // unsupported (see Conn.unsupportedCmds), instead of dispatching it again just