kimiflare 0.77.0 → 0.79.0

package/dist/index.js

@@ -11985,7 +11985,7 @@ var init_supervisor = __esm({
        * Future: the coordinator will call this automatically when intent classification
        * signals a "heavy" task (see docs/plans/multi-agent-standalone-workers-plan.md).
        */
-      async spawnWorkers(workers, onUpdate) {
+      async spawnWorkers(workers, onUpdate, signal) {
         const cfg = await loadConfig().catch(() => null);
         const endpoint = process.env.KIMIFLARE_WORKER_ENDPOINT ?? cfg?.workerEndpoint ?? cfg?.remoteWorkerUrl;
         if (!endpoint) {
@@ -12068,7 +12068,7 @@ var init_supervisor = __esm({
                     prBody: w.prBody
                   } : {}
                 };
-                const timeoutMs = parseInt(process.env.KIMIFLARE_WORKER_TIMEOUT_MS ?? "600000", 10);
+                const timeoutMs = parseInt(process.env.KIMIFLARE_WORKER_TIMEOUT_MS ?? "900000", 10);
                 worker.logs.push(`[coordinator] Sending payload (${JSON.stringify(payload).length} bytes)`);
                 worker.logs.push(`[coordinator] Worker will clone ${repo.owner}/${repo.repo} and run kimiflare inside Cloudflare Sandbox`);
                 worker.logs.push(`[coordinator] Typical runtime: 1\u20134 min. Timeout: ${Math.round(timeoutMs / 1e3)}s`);
@@ -12086,13 +12086,27 @@ var init_supervisor = __esm({
                   throw new Error(`Worker start failed: ${startRes.status} ${text.slice(0, 200)}`);
                 }
                 const { workerId: remoteWorkerId } = await startRes.json();
+                worker.remoteWorkerId = remoteWorkerId;
                 worker.logs.push(`[coordinator] Worker started (id: ${remoteWorkerId}) \u2014 polling for progress\u2026`);
                 onUpdate?.([...activeWorkers.values()]);
                 const pollInterval = 3e3;
                 const startTime = Date.now();
                 let lastLogCount = 0;
+                let lastStep = "";
                 let data;
                 while (Date.now() - startTime < timeoutMs) {
+                  if (signal?.aborted) {
+                    worker.logs.push(`[coordinator] Cancelling worker (id: ${remoteWorkerId})\u2026`);
+                    onUpdate?.([...activeWorkers.values()]);
+                    try {
+                      await fetch(`${endpoint}/worker/${remoteWorkerId}/cancel`, {
+                        method: "POST",
+                        headers: apiKey ? { "X-Worker-Api-Key": apiKey } : {}
+                      });
+                    } catch {
+                    }
+                    throw new Error("Cancelled by user");
+                  }
                   await new Promise((r) => setTimeout(r, pollInterval));
                   let progressRes;
                   let lastPollErr;
@@ -12120,13 +12134,30 @@ var init_supervisor = __esm({
                     continue;
                   }
                   const progress = await progressRes.json();
+                  const allSteps = [];
+                  for (let i = 0; i < progress.totalSteps; i++) {
+                    const isCompleted = i < progress.completedSteps.length;
+                    const isActive = i === progress.stepIndex - 1 && !isCompleted && progress.status === "running";
+                    const isFailed = progress.status === "failed" && i === progress.stepIndex - 1;
+                    allSteps.push({
+                      label: progress.completedSteps[i] ?? progress.step,
+                      status: isFailed ? "failed" : isCompleted ? "completed" : isActive ? "active" : "pending"
+                    });
+                  }
+                  worker.steps = allSteps;
                   const newLogs = progress.logs.slice(lastLogCount);
                   lastLogCount = progress.logs.length;
                   for (const logLine of newLogs) {
                     worker.logs.push(`[worker] ${logLine}`);
                   }
-                  worker.logs.push(`[coordinator] Step ${progress.stepIndex}/${progress.totalSteps}: ${progress.message}`);
-                  onUpdate?.([...activeWorkers.values()]);
+                  const stepKey = `${progress.stepIndex}:${progress.step}`;
+                  if (stepKey !== lastStep) {
+                    lastStep = stepKey;
+                    worker.logs.push(`[coordinator] Step ${progress.stepIndex}/${progress.totalSteps}: ${progress.message}`);
+                    onUpdate?.([...activeWorkers.values()]);
+                  } else if (newLogs.length > 0) {
+                    onUpdate?.([...activeWorkers.values()]);
+                  }
                   if (progress.status === "completed" || progress.status === "failed") {
                     if (progress.result) {
                       data = progress.result;
@@ -12155,6 +12186,13 @@ var init_supervisor = __esm({
                 worker.result = data;
                 worker.rawOutput = data.rawOutput;
                 worker.reasoning = data.reasoning;
+                if (worker.steps && worker.steps.length > 0) {
+                  for (const s of worker.steps) {
+                    if (s.status === "pending" || s.status === "active") {
+                      s.status = worker.status === "completed" ? "completed" : "failed";
+                    }
+                  }
+                }
                 worker.logs.push(`[coordinator] Worker finished with status: ${data.status}`);
                 if (data.phases && data.phases.length > 0) {
                   const timeline = data.phases.map((p) => `${p.name}: ${Math.round(p.ms / 1e3)}s`).join(" \xB7 ");
@@ -12272,11 +12310,21 @@ var init_supervisor = __esm({
        *
        * Returns the synthesized plan after all workers complete.
        */
-      async autoSpawnWorkers(prompt, context, onUpdate, onPhaseChange) {
+      async autoSpawnWorkers(prompt, context, onUpdate, onPhaseChange, signal, onNarration) {
+        if (this._activeWorkers.size > 0) {
+          throw new Error(
+            `Multi-agent already active (${this._activeWorkers.size} worker(s) in flight). Wait for completion or cancel before starting a new heavy task.`
+          );
+        }
         const workers = decomposePrompt(prompt, context);
+        const narrationLines = [
+          `Decomposing your request into ${workers.length} parallel research task${workers.length > 1 ? "s" : ""}:`,
+          ...workers.map((w, i) => `  ${i + 1}. ${w.task.slice(0, 200)}${w.task.length > 200 ? "\u2026" : ""}`)
+        ];
+        onNarration?.(narrationLines.join("\n"));
         onPhaseChange?.("spawning");
         try {
-          const results = await this.spawnWorkers(workers, onUpdate);
+          const results = await this.spawnWorkers(workers, onUpdate, signal);
           onPhaseChange?.("synthesizing");
           const synth = this.synthesizeFindings(results);
           const cfg = await loadConfig().catch(() => null);
@@ -12294,7 +12342,8 @@ var init_supervisor = __esm({
           try {
             const execResults = await this.spawnWorkers(
               [{ mode: "execute", task: executeTask, context }],
-              onUpdate
+              onUpdate,
+              signal
             );
             const exec2 = execResults[0];
             if (!exec2) {
@@ -12719,6 +12768,70 @@ import { mkdtemp, readFile as readFile13, writeFile as writeFile10, rm } from "f
 import { tmpdir as tmpdir3 } from "os";
 import { join as join22 } from "path";
 import { randomBytes as randomBytes2 } from "crypto";
+async function cfApiFetch(accountId, apiToken, path, init) {
+  const url = `${CF_API}/accounts/${encodeURIComponent(accountId)}${path}`;
+  const res = await fetch(url, {
+    ...init,
+    headers: {
+      Authorization: `Bearer ${apiToken}`,
+      "Content-Type": "application/json",
+      "User-Agent": getUserAgent(),
+      ...init?.headers
+    }
+  });
+  const json = await res.json();
+  return json;
+}
+async function listDurableObjectNamespaces(accountId, apiToken) {
+  const json = await cfApiFetch(
+    accountId,
+    apiToken,
+    "/workers/durable_objects/namespaces"
+  );
+  if (!json.success || !json.result) {
+    throw new Error(
+      json.errors?.map((e) => e.message).join(", ") ?? "Failed to list DO namespaces"
+    );
+  }
+  return json.result;
+}
+async function deleteDurableObjectNamespace(accountId, apiToken, namespaceId) {
+  const json = await cfApiFetch(
+    accountId,
+    apiToken,
+    `/workers/durable_objects/namespaces/${encodeURIComponent(namespaceId)}`,
+    { method: "DELETE" }
+  );
+  if (!json.success) {
+    throw new Error(
+      json.errors?.map((e) => e.message).join(", ") ?? "Failed to delete DO namespace"
+    );
+  }
+}
+async function listContainerApplications(accountId, apiToken) {
+  const json = await cfApiFetch(
+    accountId,
+    apiToken,
+    "/containers/applications"
+  );
+  if (!json.success || !json.result) {
+    return [];
+  }
+  return json.result;
+}
+async function deleteContainerApplication(accountId, apiToken, appId) {
+  const json = await cfApiFetch(
+    accountId,
+    apiToken,
+    `/containers/applications/${encodeURIComponent(appId)}`,
+    { method: "DELETE" }
+  );
+  if (!json.success) {
+    throw new Error(
+      json.errors?.map((e) => e.message).join(", ") ?? "Failed to delete container application"
+    );
+  }
+}
 function generateSecret2() {
   return randomBytes2(32).toString("hex");
 }
@@ -12991,21 +13104,23 @@ ${(install.stderr || install.stdout).slice(-1200).trim()}`,
     `$1${finalKvId}$2`
   );
   toml = toml.replace(/\n\[\[artifacts\]\][\s\S]*?(?=\n\[|\n*$)/g, "\n");
-  const existingMigrations = toml.match(/\[\[migrations\]\]/);
-  if (existingMigrations) {
-    toml = toml.replace(
-      /\[\[migrations\]\][\s\S]*?new_sqlite_classes\s*=\s*\[[^\]]*\]/,
-      `[[migrations]]
-tag = "v2"
+  if (!workerExists) {
+    const existingMigrations = toml.match(/\[\[migrations\]\]/);
+    if (existingMigrations) {
+      toml = toml.replace(
+        /\[\[migrations\]\][\s\S]*?new_sqlite_classes\s*=\s*\[[^\]]*\]/,
+        `[[migrations]]
+tag = "v1"
 new_sqlite_classes = ["SessionDO", "WorkerDO", "Sandbox"]`
-    );
-  } else {
-    toml += `
+      );
+    } else {
+      toml += `
 # Auto-added by kimiflare /multi-agent \u2192 Set up (fresh deploy only)
 [[migrations]]
 tag = "v1"
 new_sqlite_classes = ["SessionDO", "WorkerDO", "Sandbox"]
 `;
+    }
   }
   if (!/\[observability\.logs\]/.test(toml)) {
     toml += `
@@ -13061,6 +13176,7 @@ invocation_logs = true
     ...cfg,
     workerEndpoint: workerUrl,
     workerApiKey,
+    workerName,
     multiAgentEnabled: true
   };
   await saveConfig(next);
@@ -13070,12 +13186,13 @@ invocation_logs = true
   yield { message: "Setup complete \u2014 multi-agent is ready to use.", done: true };
   return { workerEndpoint: workerUrl, workerApiKey };
 }
-async function* teardownCommute() {
+async function* teardownCommute(opts2 = {}) {
   const cfg = await loadConfig();
   if (!cfg?.accountId || !cfg?.apiToken) {
     yield { message: "Cloudflare credentials missing \u2014 nothing to tear down.", error: true };
     throw new Error("missing CF creds");
   }
+  const workerName = opts2.workerName ?? cfg.workerName ?? WORKER_NAME;
   const cfEnv = {
     CLOUDFLARE_ACCOUNT_ID: cfg.accountId,
     CLOUDFLARE_API_TOKEN: cfg.apiToken
@@ -13084,25 +13201,72 @@ async function* teardownCommute() {
     yield { message: "wrangler not found. Install: npm install -g wrangler", error: true };
     throw new Error("wrangler missing");
   }
-  yield { message: `Deleting Worker "${WORKER_NAME}"\u2026` };
-  const del = await runCmd("wrangler", ["delete", "--name", WORKER_NAME], {
+  yield { message: `Deleting Worker "${workerName}"\u2026` };
+  const del = await runCmd("wrangler", ["delete", "--name", workerName], {
     env: cfEnv,
     input: "y\n",
     timeoutMs: 6e4
   });
   if (del.code === 0) {
-    yield { message: `Worker "${WORKER_NAME}" deleted`, ok: true };
+    yield { message: `Worker "${workerName}" deleted`, ok: true };
   } else {
     const combined = (del.stdout + del.stderr).toLowerCase();
     if (combined.includes("not found") || combined.includes("does not exist") || combined.includes("10007")) {
       yield { message: "Worker not found (already deleted or never created)", ok: true };
     } else {
       yield {
-        message: explainWranglerFailure(`wrangler delete --name ${WORKER_NAME}`, del.stdout, del.stderr),
+        message: explainWranglerFailure(`wrangler delete --name ${workerName}`, del.stdout, del.stderr),
         error: true
       };
     }
   }
+  yield { message: `Looking up Durable Object namespaces for "${workerName}"\u2026` };
+  try {
+    const namespaces = await listDurableObjectNamespaces(cfg.accountId, cfg.apiToken);
+    const targets = namespaces.filter(
+      (ns) => ns.script === workerName || ns.name.startsWith(`${workerName}_`)
+    );
+    if (targets.length === 0) {
+      yield { message: "No Durable Object namespaces found (nothing to delete)", ok: true };
+    } else {
+      for (const ns of targets) {
+        try {
+          await deleteDurableObjectNamespace(cfg.accountId, cfg.apiToken, ns.id);
+          yield { message: `DO namespace ${ns.name} deleted (${ns.id.slice(0, 8)}\u2026)`, ok: true };
+        } catch (err) {
+          yield {
+            message: `DO namespace ${ns.name} delete warning: ${err instanceof Error ? err.message : String(err)}`
+          };
+        }
+      }
+    }
+  } catch (err) {
+    yield {
+      message: `DO namespace lookup warning: ${err instanceof Error ? err.message : String(err)}`
+    };
+  }
+  yield { message: `Looking up container applications for "${workerName}"\u2026` };
+  try {
+    const apps = await listContainerApplications(cfg.accountId, cfg.apiToken);
+    const appPrefix = `${workerName}-`.toLowerCase();
+    const targets = apps.filter((app) => app.name.toLowerCase().startsWith(appPrefix));
+    if (targets.length === 0) {
+      yield { message: "No container applications found (nothing to delete)", ok: true };
+    } else {
+      for (const app of targets) {
+        try {
+          await deleteContainerApplication(cfg.accountId, cfg.apiToken, app.id);
+          yield { message: `Container application ${app.name} deleted (${app.id.slice(0, 8)}\u2026)`, ok: true };
+        } catch (err) {
+          yield {
+            message: `Container application ${app.name} delete warning: ${err instanceof Error ? err.message : String(err)}`
+          };
+        }
+      }
+    }
+  } catch {
+    yield { message: "(could not list container applications \u2014 skipping container cleanup)" };
+  }
   yield { message: "Listing KV namespaces to find OAUTH_KV\u2026" };
   const kvList = await runCmd("wrangler", ["kv", "namespace", "list"], { env: cfEnv, timeoutMs: 3e4 });
   if (kvList.code === 0) {
@@ -13136,6 +13300,7 @@ async function* teardownCommute() {
     ...cfg,
     workerEndpoint: void 0,
     workerApiKey: void 0,
+    workerName: void 0,
     multiAgentEnabled: false,
     autoExecute: false
   };
@@ -13143,15 +13308,17 @@ async function* teardownCommute() {
   yield { message: "Local multi-agent config cleared", ok: true };
   yield { message: "Tear-down complete \u2014 multi-agent is fully removed.", done: true };
 }
-var COMMUTE_REPO, COMMUTE_BRANCH, WORKER_NAME, KV_TITLE, TOKEN_TEMPLATE_URL;
+var COMMUTE_REPO, COMMUTE_BRANCH, WORKER_NAME, KV_TITLE, CF_API, TOKEN_TEMPLATE_URL;
 var init_deploy_commute = __esm({
   "src/remote/deploy-commute.ts"() {
     "use strict";
     init_config();
+    init_version();
     COMMUTE_REPO = "https://github.com/sinameraji/kimiflare-commute.git";
     COMMUTE_BRANCH = "main";
     WORKER_NAME = "kimiflare-multi-agent";
     KV_TITLE = "kimiflare-multi-agent-OAUTH_KV";
+    CF_API = "https://api.cloudflare.com/client/v4";
     TOKEN_TEMPLATE_URL = "https://dash.cloudflare.com/profile/api-tokens";
   }
 });
@@ -15588,7 +15755,7 @@ ${err instanceof Error ? err.message : err}`);
         cam.send("AssistantStreamStarted", { stream_id: sid });
         cam.send("AssistantTokenDelta", { stream_id: sid, token: "# Tearing down multi-agent\n\n" });
         try {
-          for await (const step of teardownCommute()) {
+          for await (const step of teardownCommute({ workerName: cfg.workerName })) {
             const prefix = step.error ? "\u2717 " : step.done || step.ok ? "\u2713 " : "\xB7 ";
             cam.send("AssistantTokenDelta", { stream_id: sid, token: `${prefix}${step.message}
 ` });
@@ -20531,15 +20698,19 @@ import { useEffect as useEffect5, useState as useState9 } from "react";
 import { Box as Box11, Text as Text12 } from "ink";
 import Spinner5 from "ink-spinner";
 import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
-function WorkerList({ workers, isSynthesizing }) {
+function WorkerList({ workers, isSynthesizing, narration }) {
   const theme = useTheme();
-  if (workers.length === 0) return null;
+  if (workers.length === 0 && !narration) return null;
   const running = workers.filter((w) => w.status === "running").length;
   const completed = workers.filter((w) => w.status === "completed").length;
   const failed = workers.filter((w) => w.status === "failed").length;
   const pending = workers.filter((w) => w.status === "pending").length;
   const showSynthesis = isSynthesizing && running === 0;
   return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", marginBottom: 1, children: [
+    narration && /* @__PURE__ */ jsx13(Box11, { marginBottom: 1, children: /* @__PURE__ */ jsx13(Text12, { color: theme.info.color, italic: true, children: narration.split("\n").map((line, i) => /* @__PURE__ */ jsxs11(Text12, { children: [
+      line,
+      "\n"
+    ] }, `narration-${i}`)) }) }),
     /* @__PURE__ */ jsx13(Box11, { children: /* @__PURE__ */ jsxs11(Text12, { color: theme.accent, bold: true, children: [
       "Workers: ",
       pending > 0 ? `${pending} todo \xB7 ` : "",
@@ -20569,7 +20740,7 @@ function WorkerRow({ worker }) {
   const statusIcon = worker.status === "pending" ? /* @__PURE__ */ jsx13(Text12, { color: theme.muted?.color ?? theme.info.color, children: "\u2610" }) : worker.status === "running" ? /* @__PURE__ */ jsx13(Text12, { color: theme.info.color, children: /* @__PURE__ */ jsx13(Spinner5, { type: "line" }) }) : worker.status === "completed" ? /* @__PURE__ */ jsx13(Text12, { color: theme.palette.success, children: "\u2611" }) : /* @__PURE__ */ jsx13(Text12, { color: theme.palette.error, children: "\u2612" });
   const statusLabel = worker.status === "pending" ? "todo" : worker.status === "running" ? "ongoing" : worker.status === "completed" ? "done" : "failed";
   const isDone = worker.status === "completed" || worker.status === "failed";
-  const visibleLogs = worker.status === "running" ? worker.logs.slice(-5) : worker.status === "pending" ? [] : worker.logs.slice(-8);
+  const hasSteps = worker.steps && worker.steps.length > 0;
   return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", marginLeft: 2, children: [
     /* @__PURE__ */ jsx13(Box11, { children: /* @__PURE__ */ jsxs11(Text12, { children: [
       statusIcon,
@@ -20602,7 +20773,37 @@ function WorkerRow({ worker }) {
         worker.error.slice(0, 60)
       ] }) : null
     ] }) }),
-    visibleLogs.length > 0 && /* @__PURE__ */ jsx13(Box11, { flexDirection: "column", marginLeft: 4, children: visibleLogs.map((line, i) => /* @__PURE__ */ jsx13(Text12, { color: theme.muted?.color ?? theme.info.color, dimColor: true, children: line.slice(0, 120) }, `${worker.id}-log-${i}`)) })
+    hasSteps && /* @__PURE__ */ jsx13(Box11, { flexDirection: "column", marginLeft: 4, children: worker.steps.map((step, i) => /* @__PURE__ */ jsx13(StepRow, { step, theme }, `${worker.id}-step-${i}`)) }),
+    worker.logs.length > 0 && /* @__PURE__ */ jsx13(Box11, { flexDirection: "column", marginLeft: 4, children: worker.logs.slice(-3).map((line, i) => /* @__PURE__ */ jsx13(Text12, { color: theme.muted?.color ?? theme.info.color, dimColor: true, children: line.slice(0, 120) }, `${worker.id}-log-${i}`)) })
+  ] });
+}
+function StepRow({ step, theme }) {
+  if (step.status === "completed") {
+    return /* @__PURE__ */ jsxs11(Text12, { color: theme.palette.success, children: [
+      "  ",
+      "\u2713 ",
+      /* @__PURE__ */ jsx13(Text12, { strikethrough: true, children: step.label })
+    ] });
+  }
+  if (step.status === "active") {
+    return /* @__PURE__ */ jsxs11(Text12, { color: theme.accent, bold: true, children: [
+      "  ",
+      /* @__PURE__ */ jsx13(Spinner5, { type: "line" }),
+      " ",
+      step.label
+    ] });
+  }
+  if (step.status === "failed") {
+    return /* @__PURE__ */ jsxs11(Text12, { color: theme.palette.error, children: [
+      "  ",
+      "\u2612 ",
+      step.label
+    ] });
+  }
+  return /* @__PURE__ */ jsxs11(Text12, { color: theme.muted?.color ?? theme.info.color, dimColor: true, children: [
+    "  ",
+    "\u2610 ",
+    step.label
   ] });
 }
 function formatElapsed6(ms) {
@@ -21222,14 +21423,14 @@ async function cfFetch(url, init) {
 }
 async function ensureStore(accountId, apiToken) {
   const listed = await cfFetch(
-    `${CF_API}/accounts/${encodeURIComponent(accountId)}/secrets_store/stores`,
+    `${CF_API2}/accounts/${encodeURIComponent(accountId)}/secrets_store/stores`,
     { method: "GET", apiToken }
   );
   if (!listed.ok) return listed;
   const existing = listed.value.find((s) => s.name === STORE_NAME);
   if (existing) return { ok: true, value: existing.id };
   const created = await cfFetch(
-    `${CF_API}/accounts/${encodeURIComponent(accountId)}/secrets_store/stores`,
+    `${CF_API2}/accounts/${encodeURIComponent(accountId)}/secrets_store/stores`,
     { method: "POST", apiToken, body: { name: STORE_NAME } }
   );
   if (!created.ok) return created;
@@ -21237,7 +21438,7 @@ async function ensureStore(accountId, apiToken) {
 }
 async function pushProviderKey(accountId, apiToken, storeId, name, value, comment = "kimi-code BYOK") {
   const res = await cfFetch(
-    `${CF_API}/accounts/${encodeURIComponent(accountId)}/secrets_store/stores/${encodeURIComponent(
+    `${CF_API2}/accounts/${encodeURIComponent(accountId)}/secrets_store/stores/${encodeURIComponent(
       storeId
     )}/secrets`,
     {
@@ -21256,12 +21457,12 @@ async function pushProviderKey(accountId, apiToken, storeId, name, value, commen
 function aliasFor(provider) {
   return `kimi-code-${provider}`;
 }
-var CF_API, STORE_NAME;
+var CF_API2, STORE_NAME;
 var init_secrets_store = __esm({
   "src/agent/secrets-store.ts"() {
     "use strict";
     init_version();
-    CF_API = "https://api.cloudflare.com/client/v4";
+    CF_API2 = "https://api.cloudflare.com/client/v4";
     STORE_NAME = "kimi-code";
   }
 });
@@ -25241,13 +25442,14 @@ function MultiAgentModal({ initial, onSave, onDone, remoteWorkerUrl, remoteAuthS
     setDeploying(true);
     setDeployLog(["Starting tear-down\u2026"]);
     try {
-      for await (const step of teardownCommute()) {
+      for await (const step of teardownCommute({ workerName: state.workerName })) {
         const prefix = step.error ? "\u2717 " : step.done || step.ok ? "\u2713 " : "\xB7 ";
         setDeployLog((l) => [...l, `${prefix}${step.message}`]);
         if (step.done) {
           persist({
             workerEndpoint: void 0,
             workerApiKey: void 0,
+            workerName: void 0,
             multiAgentEnabled: false,
             autoExecute: false
           });
@@ -25259,7 +25461,7 @@ function MultiAgentModal({ initial, onSave, onDone, remoteWorkerUrl, remoteAuthS
     } finally {
       setDeploying(false);
     }
-  }, [persist]);
+  }, [persist, state.workerName]);
   const beginEdit = useCallback7((f) => {
     if (f === "deploy") {
       void runDeploy2();
@@ -29772,6 +29974,7 @@ function App({
   const [lastSessionTopic, setLastSessionTopic] = useState27(null);
   const [activeWorkers, setActiveWorkers] = useState27([]);
   const [isSynthesizing, setIsSynthesizing] = useState27(false);
+  const [coordinatorNarration, setCoordinatorNarration] = useState27("");
   useEffect11(() => {
     setGitBranch(detectGitBranch());
   }, []);
@@ -29851,6 +30054,7 @@ ${wcagWarnings.join("\n")}` }
   const mcpInitRef = useRef7(false);
   const submitRef = useRef7(() => {
   });
+  const multiAgentAbortRef = useRef7(null);
   const lspManagerRef = useRef7(new LspManager());
   const lspToolsRef = useRef7([]);
   const lspInitRef = useRef7(false);
@@ -30234,6 +30438,11 @@ ${wcagWarnings.join("\n")}` }
         hasPerm: hasPendingPermission(),
         hasLimit: limitResolveRef.current !== null
       });
+      if (multiAgentAbortRef.current) {
+        multiAgentAbortRef.current.abort();
+        setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "cancelling multi-agent workers\u2026" }]);
+        return;
+      }
       const outcome = interruptOrExit(interruptDepsRef.current);
       if (!outcome.didInterruptTurn && !outcome.hadPermission && !outcome.hadLimit && !outcome.hadLoop) {
         logger.info("input:ctrl+c:exiting");
@@ -30243,10 +30452,18 @@ ${wcagWarnings.join("\n")}` }
     if (key.escape) {
       const now2 = Date.now();
       const modalOpen = perm !== null || limitModal !== null || loopModal !== null || showLspWizard || showCommandList || commandWizard !== null || commandToDelete !== null || resumeSessions !== null || checkpointSession !== null || showThemePicker;
-      if (!modalOpen && (busyRef.current || supervisorRef.current.isRunning) && activeScopeRef.current && !isAbortingRef.current && now2 - lastEscapeAtRef.current > 500) {
-        lastEscapeAtRef.current = now2;
-        interruptTurn(interruptDepsRef.current);
-        return;
+      if (!modalOpen && !isAbortingRef.current && now2 - lastEscapeAtRef.current > 500) {
+        if (multiAgentAbortRef.current) {
+          lastEscapeAtRef.current = now2;
+          multiAgentAbortRef.current.abort();
+          setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "cancelling multi-agent workers\u2026" }]);
+          return;
+        }
+        if ((busyRef.current || supervisorRef.current.isRunning) && activeScopeRef.current) {
+          lastEscapeAtRef.current = now2;
+          interruptTurn(interruptDepsRef.current);
+          return;
+        }
       }
     }
     if (key.ctrl && inputChar === "r") {
@@ -30277,6 +30494,11 @@ ${wcagWarnings.join("\n")}` }
       hasLimit: limitResolveRef.current !== null,
       hasLoop: loopResolveRef.current !== null
     });
+    if (multiAgentAbortRef.current) {
+      multiAgentAbortRef.current.abort();
+      setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "cancelling multi-agent workers\u2026" }]);
+      return;
+    }
     const outcome = interruptOrExit({
       ...interruptDepsRef.current,
       skipPendingToolCleanup: true
@@ -30928,23 +31150,46 @@ ${wcagWarnings.join("\n")}` }
             ...e,
             { kind: "info", key: mkKey(), text: `multi-agent mode active, but task is ${classification.tier} \u2014 running locally` }
           ]);
+        } else if (activeWorkers.length > 0) {
+          setEvents((e) => [
+            ...e,
+            { kind: "info", key: mkKey(), text: `multi-agent workers already active (${activeWorkers.length}) \u2014 routing to coordinator` }
+          ]);
         } else {
           setEvents((e) => [
             ...e,
             { kind: "info", key: mkKey(), text: "multi-agent mode: spawning parallel research workers..." }
           ]);
+          setCoordinatorNarration("");
+          const controller = new AbortController();
+          multiAgentAbortRef.current = controller;
           try {
             const { plan, conflicts, recommendations, prUrl, executor } = await supervisorRef.current.autoSpawnWorkers(
               trimmed,
               `Current project: ${process.cwd()}`,
               (workers) => setActiveWorkers(workers),
-              (phase) => setIsSynthesizing(phase === "synthesizing")
+              (phase) => setIsSynthesizing(phase === "synthesizing"),
+              controller.signal,
+              (text2) => setCoordinatorNarration(text2)
             );
+            setCoordinatorNarration("");
             setEvents((e) => [
               ...e,
               { kind: "info", key: mkKey(), text: "workers completed \u2014 synthesizing findings" }
             ]);
-            messagesRef.current.push({ role: "system", content: plan });
+            const asstId = mkAssistantId();
+            setEvents((e) => [
+              ...e,
+              {
+                kind: "assistant",
+                key: `asst_${asstId}`,
+                id: asstId,
+                text: plan,
+                reasoning: "",
+                streaming: false
+              }
+            ]);
+            messagesRef.current.push({ role: "assistant", content: plan });
             if (conflicts.length > 0) {
               setEvents((e) => [
                 ...e,
@@ -30967,13 +31212,23 @@ ${conflicts.join("\n")}` }
             return;
           } catch (e) {
             setIsSynthesizing(false);
+            setCoordinatorNarration("");
             const err = e;
-            setEvents((e2) => [
-              ...e2,
-              { kind: "error", key: mkKey(), text: `multi-agent spawn failed: ${err.message}` }
-            ]);
+            if (err.message === "Cancelled by user") {
+              setEvents((e2) => [
+                ...e2,
+                { kind: "info", key: mkKey(), text: "multi-agent cancelled" }
+              ]);
+            } else {
+              setEvents((e2) => [
+                ...e2,
+                { kind: "error", key: mkKey(), text: `multi-agent spawn failed: ${err.message}` }
+              ]);
+            }
             endTurn();
             return;
+          } finally {
+            multiAgentAbortRef.current = null;
           }
         }
       }
@@ -31465,6 +31720,7 @@ ${conflicts.join("\n")}` }
           multiAgentEnabled: cfg.multiAgentEnabled,
           workerEndpoint: cfg.workerEndpoint,
           workerApiKey: cfg.workerApiKey,
+          workerName: cfg.workerName,
           autoExecute: cfg.autoExecute
         } : void 0,
         onMultiAgentSave: async (patch) => {
@@ -31588,7 +31844,7 @@ ${conflicts.join("\n")}` }
         }
       }
     ) : /* @__PURE__ */ jsxs39(Box39, { flexDirection: "column", marginTop: 1, children: [
-      activeWorkers.length > 0 && /* @__PURE__ */ jsx41(WorkerList, { workers: activeWorkers, isSynthesizing }),
+      (activeWorkers.length > 0 || coordinatorNarration) && /* @__PURE__ */ jsx41(WorkerList, { workers: activeWorkers, isSynthesizing, narration: coordinatorNarration }),
       tasks.length > 0 && /* @__PURE__ */ jsx41(
         TaskList,
         {