@sideboard-ai/core 0.1.133 → 0.1.136

package/dist/{chunk-TG7YU2KG.js → chunk-TIGKDMIA.js}

@@ -18,15 +18,16 @@ import {
   stripBrightsyNdjsonNoise,
   sumUsageList,
   toolDescription
-} from "./chunk-4YAVXWFR.js";
+} from "./chunk-CYM5DCHI.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-3UVVWNHF.js";
+} from "./chunk-MDCKV2NF.js";
 import {
   assertOrchestratorCapableAgent,
+  attachmentsFromWorktreePaths,
   coerceOrchestratorAgent,
   createGlobalChat,
   healOrchestrationSoccerTitles,
@@ -36,15 +37,18 @@ import {
   isOrchestratorCapableAgent,
   isOrchestratorThread,
   isSlackCoordinatorThread,
-  orchestratorSessionPoisonedByBuiltins
-} from "./chunk-LTP7GHIF.js";
+  orchestratorSessionPoisonedByBuiltins,
+  persistPendingFileAttachments,
+  stageAbsolutePathsAsAttachments,
+  stageBuffersAsAttachments
+} from "./chunk-GSKRGF7B.js";
 import {
   SLACK_REPLY_FORMATTING,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "./chunk-IM36S4HZ.js";
+} from "./chunk-IFZ4MOTN.js";
 import {
   extractPresentedPlan,
   readPlanFile,
@@ -114,11 +118,10 @@ import {
   withRepoGitLock,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-WEU5M7BW.js";
+} from "./chunk-HQQNLDVC.js";
 import {
   ATTACHMENTS_DIR,
-  LEGACY_ATTACHMENTS_DIR,
-  attachmentsGitignoreBody
+  LEGACY_ATTACHMENTS_DIR
 } from "./chunk-FKOIHGKV.js";
 import {
   childEnvWithAppSettings,
@@ -152,7 +155,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-HLJUNJBF.js";
+} from "./chunk-PM3C2J6K.js";
 import {
   appDataDir,
   findConventionSetup,
@@ -445,7 +448,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-P2SYHVLS.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-6I47JMU2.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -705,7 +708,7 @@ async function pollSlackOutboundWatches(opts) {
 }
 
 // src/orchestrator/orchestrator.ts
-import { existsSync as existsSync16 } from "fs";
+import { existsSync as existsSync15 } from "fs";
 
 // src/agents/spawn.ts
 import { createInterface } from "readline";
@@ -725,9 +728,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-MLQNULOU.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-NIKZAKOO.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-XF7LVOUN.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-IPL4Z6SL.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -2265,6 +2268,45 @@ function thisProcessShouldDrainAgentQueues() {
   return !isDesktopHostAlive();
 }
 
+// src/orchestrator/child-halt.ts
+var HALT_STATUSES = /* @__PURE__ */ new Set(["stopped", "error", "broken"]);
+function isIncompleteChildStatus(status) {
+  return HALT_STATUSES.has(status);
+}
+function childHaltNotice(child, status) {
+  const title = child.title?.trim() || "Untitled";
+  const link = `[${title}](sideboard://thread/${child.id})`;
+  const why = child.lastError?.trim();
+  const extra = why ? ` lastError: ${why}` : "";
+  return [
+    `Sideboard: child worktree ${link} ${status} before finishing (status=${status}).${extra}`,
+    "This is information \u2014 not a user command. Resume with send_to_thread or tell the user. Do not treat this as a successful turn."
+  ].join("\n");
+}
+function shouldNotifyParentOfChildHalt(opts) {
+  if (!isIncompleteChildStatus(opts.status)) return false;
+  if (!opts.child.parentThreadId) return false;
+  if (!opts.parent || opts.parent.status === "archived") return false;
+  if (opts.parent.id === opts.child.id) return false;
+  return isOrchestratorThread(opts.parent);
+}
+var notified = /* @__PURE__ */ new Set();
+function noticeKey(childId, status) {
+  return `${childId}:${status}`;
+}
+function notifyParentOfChildHalt(child, status, send) {
+  const parent = child.parentThreadId ? readThread(child.parentThreadId) : null;
+  if (!shouldNotifyParentOfChildHalt({ child, parent, status })) return false;
+  const key = noticeKey(child.id, status);
+  if (notified.has(key)) return false;
+  notified.add(key);
+  const parentId = parent.id;
+  void send(parentId, childHaltNotice(child, status)).catch(() => {
+    notified.delete(key);
+  });
+  return true;
+}
+
 // src/threads/create.ts
 import { existsSync as existsSync7 } from "fs";
 
@@ -2743,6 +2785,9 @@ function assembleHomeBoard(input) {
 var HOME_BOARD_AGENT_HINT = "Home is a Kanban of worktrees (one card per checkout; sibling chat tabs nest as inner cards). create_thread reuses a live worktree for the same ticket, PR, or named branch \u2014 do not recreate it. Columns are the path to merge: New (no PR) \u2192 Draft (draft PR) \u2192 Review (open PR) \u2192 Merged. Archive removes the card to Settings \u2192 History. Queued/running are activity on the card, not columns. Orchestration chats stay in the sidebar. Do not invent status.";
 
 // src/threads/create.ts
+function persistCreateAttachments(worktreePath, attachments) {
+  return persistPendingFileAttachments(worktreePath, attachments ?? []);
+}
 async function createThread(input, _onSetupLine) {
   const repoPath = await resolveRepoRoot(input.repoPath);
   if (!existsSync7(repoPath)) {
@@ -2762,7 +2807,16 @@ async function createThread(input, _onSetupLine) {
         repoPath: canonicalizeRepoPath(t.repoPath)
       }))
     );
-    if (existing) return readThread(existing.id) ?? existing;
+    if (existing) {
+      const thread2 = readThread(existing.id) ?? existing;
+      if (!input.attachments?.length) return thread2;
+      return updateThread(thread2.id, {
+        attachments: persistCreateAttachments(thread2.worktreePath, [
+          ...thread2.attachments,
+          ...input.attachments
+        ])
+      });
+    }
   }
   const resolved = resolveNewThreadOptions({
     agent: input.agent,
@@ -2810,7 +2864,7 @@ async function createThread(input, _onSetupLine) {
       effort: resolved.effort,
       fast: resolved.fast,
       planMode: Boolean(input.planMode),
-      attachments: input.attachments ?? [],
+      attachments: persistCreateAttachments(repoPath, input.attachments),
       sourceIsFork: false,
       parentThreadId: input.parentThreadId ?? null,
       status: "idle",
@@ -2889,7 +2943,7 @@ async function createThread(input, _onSetupLine) {
     effort: resolved.effort,
     fast: resolved.fast,
     planMode: Boolean(input.planMode),
-    attachments,
+    attachments: persistCreateAttachments(worktreePath, attachments),
     sourceIsFork,
     parentThreadId: input.parentThreadId ?? null,
     status: "idle",
@@ -2901,7 +2955,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-SOU5GPWI.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-QNTTLMG2.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -3298,7 +3352,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-ARWPZG6F.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-KZA3TCEE.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -4861,232 +4915,9 @@ function expandComposerPrompt(worktreePath, prompt, opts) {
   };
 }
 
-// src/composer/stage-files.ts
-import { copyFileSync as copyFileSync3, existsSync as existsSync13, mkdirSync as mkdirSync4, readFileSync as readFileSync10, statSync as statSync4, writeFileSync as writeFileSync5 } from "fs";
-import { basename as basename3, extname, join as join12 } from "path";
-import { randomUUID as randomUUID4 } from "crypto";
-var IMAGE_EXTENSIONS2 = /* @__PURE__ */ new Set([
-  "png",
-  "jpg",
-  "jpeg",
-  "gif",
-  "webp",
-  "svg",
-  "bmp",
-  "ico"
-]);
-var IMAGE_MIME_BY_EXT = {
-  png: "image/png",
-  jpg: "image/jpeg",
-  jpeg: "image/jpeg",
-  gif: "image/gif",
-  webp: "image/webp",
-  svg: "image/svg+xml",
-  bmp: "image/bmp",
-  ico: "image/x-icon"
-};
-var MAX_INLINE_BYTES = 4e5;
-var MAX_PREVIEW_BYTES = 5e6;
-function fileExtension(filePath) {
-  const base = basename3(filePath).toLowerCase();
-  return base.includes(".") ? base.split(".").pop() || "" : "";
-}
-function isImageFilePath(filePath) {
-  return IMAGE_EXTENSIONS2.has(fileExtension(filePath));
-}
-function imageMimeType(filePath) {
-  return IMAGE_MIME_BY_EXT[fileExtension(filePath)] || "image/png";
-}
-function ensureAttachmentsDir(worktreePath) {
-  const dir = join12(worktreePath, ATTACHMENTS_DIR);
-  mkdirSync4(dir, { recursive: true });
-  const gi = join12(dir, ".gitignore");
-  if (!existsSync13(gi)) {
-    writeFileSync5(gi, attachmentsGitignoreBody(), "utf8");
-  }
-  return dir;
-}
-function uniqueAttachmentName(dir, originalName) {
-  const safe = originalName.replace(/[/\\]/g, "_") || "file";
-  if (!existsSync13(join12(dir, safe))) return safe;
-  const ext = extname(safe);
-  const stem = ext ? safe.slice(0, -ext.length) : safe;
-  for (let i = 1; i < 1e4; i++) {
-    const candidate = `${stem}-${i}${ext}`;
-    if (!existsSync13(join12(dir, candidate))) return candidate;
-  }
-  return `${stem}-${randomUUID4()}${ext}`;
-}
-function previewDataUrlFromBuf(filePath, buf) {
-  if (!isImageFilePath(filePath)) return void 0;
-  if (buf.length > MAX_PREVIEW_BYTES) return void 0;
-  return `data:${imageMimeType(filePath)};base64,${buf.toString("base64")}`;
-}
-function attachmentFromBuffer(name, buf, opts) {
-  const previewDataUrl = previewDataUrlFromBuf(name, buf);
-  if (isImageFilePath(name)) {
-    const pathHint = opts.path ? `\`${opts.path}\`` : opts.sourceLabel || name;
-    return {
-      id: randomUUID4(),
-      name,
-      kind: "file",
-      path: opts.path,
-      previewDataUrl,
-      content: [
-        `Image attached: ${pathHint}`,
-        opts.path ? `Use the Read tool on \`${opts.path}\` to view this image.` : "The image is shown in the composer; copy it into the worktree if you need to inspect pixels."
-      ].join("\n")
-    };
-  }
-  if (buf.length > MAX_INLINE_BYTES) {
-    return {
-      id: randomUUID4(),
-      name,
-      kind: "file",
-      path: opts.path,
-      content: opts.path ? `(file too large to attach inline: \`${opts.path}\`, ${buf.length} bytes \u2014 use the Read tool)` : `(file too large to attach inline: ${opts.sourceLabel || name}, ${buf.length} bytes)`
-    };
-  }
-  if (buf.includes(0)) {
-    return {
-      id: randomUUID4(),
-      name,
-      kind: "file",
-      path: opts.path,
-      content: opts.path ? `(binary file at \`${opts.path}\` \u2014 use tools to inspect)` : `(binary file attached by path only: ${opts.sourceLabel || name})`
-    };
-  }
-  return {
-    id: randomUUID4(),
-    name,
-    kind: "file",
-    path: opts.path,
-    content: buf.toString("utf8")
-  };
-}
-function attachmentFromAbsolutePath(absolutePath) {
-  const name = basename3(absolutePath);
-  try {
-    const st = statSync4(absolutePath);
-    if (!st.isFile()) {
-      return {
-        id: randomUUID4(),
-        name,
-        kind: "file",
-        content: `(not a file: ${absolutePath})`
-      };
-    }
-    const buf = readFileSync10(absolutePath);
-    return attachmentFromBuffer(name, buf, { sourceLabel: absolutePath });
-  } catch (err) {
-    return {
-      id: randomUUID4(),
-      name,
-      kind: "file",
-      content: `(could not read ${absolutePath}: ${err instanceof Error ? err.message : String(err)})`
-    };
-  }
-}
-function stageAbsolutePathsAsAttachments(worktreePath, absolutePaths) {
-  if (absolutePaths.length === 0) return [];
-  const dir = ensureAttachmentsDir(worktreePath);
-  const out = [];
-  for (const abs of absolutePaths) {
-    const originalName = basename3(abs);
-    try {
-      const st = statSync4(abs);
-      if (!st.isFile()) continue;
-      const name = uniqueAttachmentName(dir, originalName);
-      const destAbs = join12(dir, name);
-      copyFileSync3(abs, destAbs);
-      const rel = `${ATTACHMENTS_DIR}/${name}`;
-      const buf = readFileSync10(destAbs);
-      out.push(attachmentFromBuffer(name, buf, { path: rel, sourceLabel: abs }));
-    } catch (err) {
-      out.push({
-        id: randomUUID4(),
-        name: originalName,
-        kind: "file",
-        content: `(could not attach ${abs}: ${err instanceof Error ? err.message : String(err)})`
-      });
-    }
-  }
-  return out;
-}
-function stageBuffersAsAttachments(worktreePath, buffers2) {
-  if (buffers2.length === 0) return [];
-  const dir = ensureAttachmentsDir(worktreePath);
-  const out = [];
-  for (const item of buffers2) {
-    const originalName = (item.name || "file").replace(/[/\\]/g, "_") || "file";
-    try {
-      const buf = Buffer.from(item.dataBase64, "base64");
-      const name = uniqueAttachmentName(dir, originalName);
-      const destAbs = join12(dir, name);
-      writeFileSync5(destAbs, buf);
-      const rel = `${ATTACHMENTS_DIR}/${name}`;
-      out.push(attachmentFromBuffer(name, buf, { path: rel }));
-    } catch (err) {
-      out.push({
-        id: randomUUID4(),
-        name: originalName,
-        kind: "file",
-        content: `(could not attach ${originalName}: ${err instanceof Error ? err.message : String(err)})`
-      });
-    }
-  }
-  return out;
-}
-function attachmentsFromBuffers(buffers2) {
-  return buffers2.map((item) => {
-    const name = (item.name || "file").replace(/[/\\]/g, "_") || "file";
-    try {
-      const buf = Buffer.from(item.dataBase64, "base64");
-      return attachmentFromBuffer(name, buf, { sourceLabel: name });
-    } catch (err) {
-      return {
-        id: randomUUID4(),
-        name,
-        kind: "file",
-        content: `(could not attach ${name}: ${err instanceof Error ? err.message : String(err)})`
-      };
-    }
-  });
-}
-function attachmentsFromWorktreePaths(worktreePath, relativePaths) {
-  const out = [];
-  for (const rel of relativePaths) {
-    if (!rel || rel.includes("..") || rel.startsWith("/")) {
-      out.push({
-        id: randomUUID4(),
-        name: basename3(rel) || "file",
-        kind: "file",
-        content: `(invalid path: ${rel})`
-      });
-      continue;
-    }
-    const name = basename3(rel);
-    try {
-      const abs = join12(worktreePath, rel);
-      const st = statSync4(abs);
-      if (!st.isFile()) continue;
-      const buf = readFileSync10(abs);
-      out.push(attachmentFromBuffer(name, buf, { path: rel, sourceLabel: abs }));
-    } catch (err) {
-      out.push({
-        id: randomUUID4(),
-        name,
-        kind: "file",
-        content: `(could not read ${rel}: ${err instanceof Error ? err.message : String(err)})`
-      });
-    }
-  }
-  return out;
-}
-
 // src/agents/instructions.ts
-import { existsSync as existsSync14, readFileSync as readFileSync11, statSync as statSync5 } from "fs";
-import { join as join13 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync10, statSync as statSync4 } from "fs";
+import { join as join12 } from "path";
 function normPath(p) {
   return p.replace(/\/+$/, "");
 }
@@ -5250,11 +5081,11 @@ function loadAgentInstructions(worktreePath, agent) {
   const out = [];
   for (const rel of candidates) {
     if (seenPaths.has(rel)) continue;
-    const abs = join13(worktreePath, rel);
-    if (!existsSync14(abs)) continue;
+    const abs = join12(worktreePath, rel);
+    if (!existsSync13(abs)) continue;
     try {
-      if (!statSync5(abs).isFile()) continue;
-      let content = readFileSync11(abs, "utf8");
+      if (!statSync4(abs).isFile()) continue;
+      let content = readFileSync10(abs, "utf8");
       if (!content.trim()) continue;
       if (content.length > MAX_CHARS_PER_FILE) {
         content = `${content.slice(0, MAX_CHARS_PER_FILE)}
@@ -5326,9 +5157,9 @@ async function syncThreadBranchFromGit(threadId) {
 }
 
 // src/store/schedules.ts
-import { randomUUID as randomUUID5 } from "crypto";
-import { existsSync as existsSync15, readFileSync as readFileSync12 } from "fs";
-import { join as join14 } from "path";
+import { randomUUID as randomUUID4 } from "crypto";
+import { existsSync as existsSync14, readFileSync as readFileSync11 } from "fs";
+import { join as join13 } from "path";
 import { Cron } from "croner";
 var DURATION_RE = /^(\d+)(s|m|h|d)$/i;
 var UNIT_MS = {
@@ -5338,7 +5169,7 @@ var UNIT_MS = {
   d: 864e5
 };
 function schedulesPath() {
-  return join14(appDataDir(), "schedules.json");
+  return join13(appDataDir(), "schedules.json");
 }
 function parseDurationMs(every) {
   const m = every.trim().match(DURATION_RE);
@@ -5444,9 +5275,9 @@ function normalizeTask(raw) {
 }
 function readAll() {
   const path = schedulesPath();
-  if (!existsSync15(path)) return [];
+  if (!existsSync14(path)) return [];
   try {
-    const parsed = JSON.parse(readFileSync12(path, "utf8"));
+    const parsed = JSON.parse(readFileSync11(path, "utf8"));
     if (!Array.isArray(parsed)) return [];
     return parsed.map((row) => {
       try {
@@ -5471,7 +5302,7 @@ function buildTask(input, now) {
   const ts = nowIso(now);
   const agent = input.agent ? coerceOrchestratorAgent(input.agent) : null;
   return {
-    id: randomUUID5(),
+    id: randomUUID4(),
     name: input.name?.trim() || defaultScheduleName(prompt),
     prompt,
     enabled: input.enabled !== false,
@@ -5572,7 +5403,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-P2SYHVLS.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-6I47JMU2.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -5778,7 +5609,7 @@ var Orchestrator = class {
         }
         continue;
       }
-      if (!existsSync16(thread.worktreePath)) {
+      if (!existsSync15(thread.worktreePath)) {
         setStatus(thread.id, "broken", "Worktree missing on disk");
         this.emit({ type: "status_changed", threadId: thread.id, status: "broken" });
         continue;
@@ -5815,6 +5646,9 @@ var Orchestrator = class {
    * MCP-created review threads don't stay `queued` after the MCP child exits.
    */
   adoptPersistedQueues() {
+    if (thisProcessShouldDrainAgentQueues()) {
+      this.healStaleRunningTurns();
+    }
     for (const thread of listThreads()) {
       if (thread.status === "stopped" || thread.status === "archived") continue;
       const pid = thread.agentPid;
@@ -5835,6 +5669,32 @@ var Orchestrator = class {
       }
     }
   }
+  /**
+   * Mid-session: a worktree can sit at `running` after the agent process dies
+   * (Cursor/CLI crash, OOM) while wait_for_turn still reports stillRunning.
+   * Reclaim those and wake the parent orchestration chat.
+   */
+  healStaleRunningTurns() {
+    for (const thread of listThreads()) {
+      if (thread.status === "archived") continue;
+      const handle = this.activeTurns.get(thread.id);
+      if (handle) {
+        const pid = thread.agentPid;
+        if (typeof pid === "number" && pid > 0 && !isPidAlive(pid)) {
+          handle.kill();
+        }
+        continue;
+      }
+      if (!this.shouldReclaimRunningThread(thread)) continue;
+      setStatus(thread.id, "stopped", "Process died (agent exited)");
+      this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
+      this.emit({ type: "turn_finished", threadId: thread.id, exitCode: 1 });
+      const latest = readThread(thread.id);
+      if (latest) {
+        notifyParentOfChildHalt(latest, "stopped", (id, prompt) => this.send(id, prompt));
+      }
+    }
+  }
   clearQuotaResumeTimer(threadId) {
     const timer = this.quotaResumeTimers.get(threadId);
     if (timer) clearTimeout(timer);
@@ -6552,6 +6412,12 @@ var Orchestrator = class {
             assistantText: chatText,
             partsCount: parts.length
           });
+          if (!this.crashContinued.has(threadId)) {
+            const failed = readThread(threadId);
+            if (failed) {
+              notifyParentOfChildHalt(failed, "error", (id, prompt2) => this.send(id, prompt2));
+            }
+          }
         }
       }
     } catch (err) {
@@ -6576,6 +6442,12 @@ var Orchestrator = class {
           assistantText: "",
           partsCount: 0
         });
+        if (!this.crashContinued.has(threadId)) {
+          const failed = readThread(threadId);
+          if (failed) {
+            notifyParentOfChildHalt(failed, "error", (id, prompt2) => this.send(id, prompt2));
+          }
+        }
       }
     } finally {
       this.startingTurns.delete(threadId);
@@ -6631,6 +6503,9 @@ var Orchestrator = class {
     const stopped = writeLiveStatus(thread.id, "stopped") ?? readThread(thread.id) ?? thread;
     if (stopped.status === "stopped") {
       this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
+      if (opts?.notifyParent !== false) {
+        notifyParentOfChildHalt(stopped, "stopped", (id, prompt) => this.send(id, prompt));
+      }
     }
     return stopped;
   }
@@ -6875,21 +6750,25 @@ var Orchestrator = class {
         fn();
       };
       const off = this.on((event) => {
-        if (event.type === "turn_finished" && event.threadId === thread.id) {
+        if (!("threadId" in event) || event.threadId !== thread.id) return;
+        if (event.type === "turn_finished" || event.type === "error") {
           const latest = readThread(thread.id);
           if (!latest) {
             finish(() => reject(new Error(`Thread not found: ${thread.id}`)));
             return;
           }
           finish(() => resolve(latest));
+          return;
         }
-        if (event.type === "error" && event.threadId === thread.id) {
+        if (event.type === "status_changed") {
           const latest = readThread(thread.id);
           if (!latest) {
             finish(() => reject(new Error(`Thread not found: ${thread.id}`)));
             return;
           }
-          finish(() => resolve(latest));
+          if (!["running", "queued"].includes(latest.status)) {
+            finish(() => resolve(latest));
+          }
         }
       });
       timer = setInterval(() => {
@@ -6924,7 +6803,7 @@ var Orchestrator = class {
     const thread = this.requireThread(threadRef);
     const lastAgent = [...thread.messages].reverse().find((m) => m.role === "agent");
     const lastError = thread.lastError ?? null;
-    const text = (lastAgent?.text ?? "").trim() || (thread.status === "error" ? lastError ?? "" : "");
+    const text = (lastAgent?.text ?? "").trim() || (thread.status === "error" || thread.status === "stopped" || thread.status === "broken" ? lastError ?? "" : "");
     const stillRunning = thread.status === "running" || thread.status === "queued";
     const live = stillRunning ? readTurnLive(thread.id) : null;
     const queuedHint = thread.status === "queued" && !live?.summary ? "Queued \u2014 waiting for a concurrency slot" : null;
@@ -7411,7 +7290,7 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-ARWPZG6F.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-KZA3TCEE.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -7459,13 +7338,13 @@ var Orchestrator = class {
       this.emit({ type: "status_changed", threadId: restored2.id, status: restored2.status });
       return restored2;
     }
-    if (!existsSync16(thread.worktreePath)) {
+    if (!existsSync15(thread.worktreePath)) {
       if (isCowboyThread(thread) || isPrimaryCheckoutThread(thread)) {
         throw new Error(
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-S7MKMYAT.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-MX7XBX6Z.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -7573,7 +7452,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-S7MKMYAT.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-MX7XBX6Z.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -7583,7 +7462,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-5MLYY35S.js");
+  const { updateThread: upd } = await import("./thread-store-CRLQJ2HM.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal
@@ -7760,12 +7639,6 @@ export {
   discoverSkills,
   readSkillBody,
   expandComposerPrompt,
-  isImageFilePath,
-  attachmentFromAbsolutePath,
-  stageAbsolutePathsAsAttachments,
-  stageBuffersAsAttachments,
-  attachmentsFromBuffers,
-  attachmentsFromWorktreePaths,
   formatRenameBranchDirective,
   formatWorktreeDirective,
   formatWorktreeReminder,