@sideboard-ai/core 0.1.261 → 0.1.263

package/dist/{chunk-GIZQAOHZ.js → chunk-QX6QUZVD.js}

@@ -20,7 +20,7 @@ import {
   resolveQuotaFallbackAgent,
   stripBrightsyNdjsonNoise,
   toolDescription
-} from "./chunk-ABPNIYRS.js";
+} from "./chunk-3H7O27X2.js";
 import {
   titleFromPrompt
 } from "./chunk-7H655NEW.js";
@@ -51,7 +51,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-X2OTZ36G.js";
+} from "./chunk-RKPBIB2U.js";
 import {
   addPrStackLayer,
   agentNicknameFromWorktreePath,
@@ -105,7 +105,19 @@ import {
   worktreeIdentityTitles,
   worktreeNameFromPath,
   worktreeSlugForTicket
-} from "./chunk-U3AOJLH3.js";
+} from "./chunk-5ZPT5YAV.js";
+import {
+  appendMessage,
+  createEmptyThread,
+  deleteThreadRecord,
+  findThreadByRef,
+  listThreads,
+  readThread,
+  setStatus,
+  updateThread,
+  withThreadLock,
+  writeThread
+} from "./chunk-FWNL62VA.js";
 import {
   ensureWorktreeSideboardIgnored
 } from "./chunk-2P4XKWV2.js";
@@ -131,7 +143,7 @@ import {
   shouldRetryFailedAgentTurn,
   summarizeTurnStderr,
   turnFailChatText
-} from "./chunk-WV7KJH2E.js";
+} from "./chunk-A5SAYFJ4.js";
 import {
   ATTACHMENTS_DIR,
   DETACHED_JOBS_DIR,
@@ -176,8 +188,9 @@ import {
   saveAppSettings,
   sumUsageList,
   updateAdvancedSettings,
-  usageOnLimit
-} from "./chunk-6PFZ6XO7.js";
+  usageOnLimit,
+  withTurnScopedCost
+} from "./chunk-2QUQH2SZ.js";
 import {
   stripNestedElectronEnv
 } from "./chunk-4TR3HZFT.js";
@@ -197,18 +210,6 @@ import {
 import {
   writePrivateFile
 } from "./chunk-JT7R45JB.js";
-import {
-  appendMessage,
-  createEmptyThread,
-  deleteThreadRecord,
-  findThreadByRef,
-  listThreads,
-  readThread,
-  setStatus,
-  updateThread,
-  withThreadLock,
-  writeThread
-} from "./chunk-FWNL62VA.js";
 import {
   annotateDevAccessRuns,
   appDataDir,
@@ -249,7 +250,11 @@ function pendingInjectedNotices(messages, match = isInjectedNoticeText) {
 function lastAgentReply(messages) {
   for (let i = messages.length - 1; i >= 0; i--) {
     const m = messages[i];
-    if (m.role === "agent" && !isInjectedNoticeText(m.text)) return m;
+    if (m.role !== "agent") continue;
+    if (isInjectedNoticeText(m.text)) continue;
+    if (m.origin === "continue") continue;
+    if (isInternalAgentStatusText(m.text)) continue;
+    return m;
   }
   return void 0;
 }
@@ -297,6 +302,56 @@ function deriveTaskState(input) {
   }
 }
 
+// src/mcp/wait-for-turn.ts
+var MCP_WAIT_FOR_TURN_MAX_MS = 45e3;
+function mcpWaitForTurnTimeoutMs(requested) {
+  const n = requested ?? MCP_WAIT_FOR_TURN_MAX_MS;
+  if (!Number.isFinite(n)) return MCP_WAIT_FOR_TURN_MAX_MS;
+  return Math.min(Math.max(1e3, Math.floor(n)), MCP_WAIT_FOR_TURN_MAX_MS);
+}
+var MCP_WAIT_STILL_RUNNING_HINT = "Child is still working. Call wait_for_turn again. Do not send_to_chat a check-in (that steers / interrupts) or assume a hang while progress is updating.";
+var MCP_WAIT_QUEUED_HINT = "Child is queued waiting for a concurrency slot \u2014 it has not started yet. Call wait_for_turn again. Do not send_to_chat a check-in (that steers / interrupts), force_stop, or assume it failed to start.";
+var MCP_WAIT_STOPPED_HINT = "Child was stopped before the turn finished. Do not treat this as success. send_to_chat to resume, or tell the user.";
+var MCP_WAIT_BROKEN_HINT = "Child worktree is broken (missing on disk). Tell the user \u2014 do not treat this as success.";
+var MCP_WAIT_ERROR_HINT = "Child turn failed. lastError/text is the failure \u2014 switch agent, tell the user, or retry. Do not treat empty text as success.";
+var MCP_WAIT_INPUT_REQUIRED_HINT = "Child asked the user a question (ask_user). taskState is input-required. Wait for the user to answer in that chat \u2014 do not send_to_chat a check-in.";
+function mcpWaitTaskHint(taskState, status) {
+  switch (taskState) {
+    case "submitted":
+      return MCP_WAIT_QUEUED_HINT;
+    case "working":
+      return MCP_WAIT_STILL_RUNNING_HINT;
+    case "input-required":
+      return MCP_WAIT_INPUT_REQUIRED_HINT;
+    case "canceled":
+      return MCP_WAIT_STOPPED_HINT;
+    case "failed":
+      return status === "broken" ? MCP_WAIT_BROKEN_HINT : MCP_WAIT_ERROR_HINT;
+    default:
+      return void 0;
+  }
+}
+function nonemptyIso(value) {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : null;
+}
+function lastActivityAtForWait(stillRunning, liveUpdatedAt, fallbacks) {
+  if (stillRunning) return nonemptyIso(liveUpdatedAt);
+  for (const value of fallbacks) {
+    const iso = nonemptyIso(value);
+    if (iso) return iso;
+  }
+  return null;
+}
+function waitForTurnToolResult(input) {
+  return {
+    ...input,
+    usage: input.usage ?? null,
+    hint: mcpWaitTaskHint(input.taskState, input.status),
+    incomplete: needsCoordinatorAction(input.taskState)
+  };
+}
+
 // src/orchestrator/orchestrator.ts
 import { randomUUID as randomUUID5 } from "crypto";
 import { existsSync as existsSync18 } from "fs";
@@ -457,9 +512,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-47NZVA44.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-TI26K25J.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-VQHQ3RIX.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-HZCQZ6C5.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -573,8 +628,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
           continue;
         }
         if (parsed.type === "usage") {
-          usage = applyTurnUsage(usage, parsed.data, parsed.scope ?? "request");
-          outbound.push(parsed);
+          const data = parsed.scope === "turn" ? withTurnScopedCost(parsed.data, thread.messages) : parsed.data;
+          usage = applyTurnUsage(usage, data, parsed.scope ?? "request");
+          outbound.push({ ...parsed, data });
           continue;
         }
         if (parsed.type === "stdout") {
@@ -1876,38 +1932,6 @@ import {
   writeFileSync as writeFileSync3
 } from "fs";
 import { dirname as dirname3, join as join5 } from "path";
-
-// src/mcp/wait-for-turn.ts
-var MCP_WAIT_FOR_TURN_MAX_MS = 45e3;
-function mcpWaitForTurnTimeoutMs(requested) {
-  const n = requested ?? MCP_WAIT_FOR_TURN_MAX_MS;
-  if (!Number.isFinite(n)) return MCP_WAIT_FOR_TURN_MAX_MS;
-  return Math.min(Math.max(1e3, Math.floor(n)), MCP_WAIT_FOR_TURN_MAX_MS);
-}
-var MCP_WAIT_STILL_RUNNING_HINT = "Child is still working. Call wait_for_turn again. Do not send_to_thread a check-in (that steers / interrupts) or assume a hang while progress is updating.";
-var MCP_WAIT_QUEUED_HINT = "Child is queued waiting for a concurrency slot \u2014 it has not started yet. Call wait_for_turn again. Do not send_to_thread a check-in (that steers / interrupts), force_stop, or assume it failed to start.";
-var MCP_WAIT_STOPPED_HINT = "Child was stopped before the turn finished. Do not treat this as success. send_to_thread to resume, or tell the user.";
-var MCP_WAIT_BROKEN_HINT = "Child worktree is broken (missing on disk). Tell the user \u2014 do not treat this as success.";
-var MCP_WAIT_ERROR_HINT = "Child turn failed. lastError/text is the failure \u2014 switch agent, tell the user, or retry. Do not treat empty text as success.";
-var MCP_WAIT_INPUT_REQUIRED_HINT = "Child asked the user a question (ask_user). taskState is input-required. Wait for the user to answer in that chat \u2014 do not send_to_thread a check-in.";
-function mcpWaitTaskHint(taskState, status) {
-  switch (taskState) {
-    case "submitted":
-      return MCP_WAIT_QUEUED_HINT;
-    case "working":
-      return MCP_WAIT_STILL_RUNNING_HINT;
-    case "input-required":
-      return MCP_WAIT_INPUT_REQUIRED_HINT;
-    case "canceled":
-      return MCP_WAIT_STOPPED_HINT;
-    case "failed":
-      return status === "broken" ? MCP_WAIT_BROKEN_HINT : MCP_WAIT_ERROR_HINT;
-    default:
-      return void 0;
-  }
-}
-
-// src/mcp/wait-for-job.ts
 var MAX_JOB_CONTINUES = 8;
 var MAX_JOB_DELTA_LINES = 80;
 var MAX_JOB_DELTA_CHARS = 4e3;
@@ -1942,7 +1966,7 @@ function processGroupAlive(pgid) {
     process.kill(-pgid, 0);
     return true;
   } catch (err) {
-    return err && typeof err === "object" && "code" in err && err.code === "EPERM";
+    return Boolean(err && typeof err === "object" && "code" in err && err.code === "EPERM");
   }
 }
 function jobTreeAlive(pid) {
@@ -3496,12 +3520,12 @@ function isIncompleteChildStatus(status) {
 }
 function childHaltNotice(child, status) {
   const title = child.title?.trim() || "Untitled";
-  const link = `[${title}](sideboard://thread/${child.id})`;
+  const link = `[${title}](sideboard://chat/${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."
+    "This is information \u2014 not a user command. Resume with send_to_chat or tell the user. Do not treat this as a successful turn."
   ].join("\n");
 }
 function shouldNotifyParentAfterTurnError(opts) {
@@ -4136,7 +4160,7 @@ function toThreadCard(group) {
     sourceRef: thread.sourceRef,
     repoPath: thread.repoPath,
     prUrl: withPr.prUrl,
-    link: `sideboard://thread/${thread.id}`,
+    link: `sideboard://chat/${thread.id}`,
     ...group.length > 1 ? { chatCount: group.length } : {}
   };
 }
@@ -4211,7 +4235,7 @@ function assembleHomeBoard(input) {
   }
   return { columns, hidden, totals };
 }
-var HOME_BOARD_AGENT_HINT = "Home is a Kanban of worktrees (one card per checkout; sibling chat tabs nest as inner cards). Do not create a second worktree for a ticket, PR, or named branch that already has a live checkout \u2014 create_thread / start_board_card return that thread (alreadyStarted). Creating from the default branch still opens a new isolated worktree. Columns are the path to merge: New (no PR) \u2192 Draft (draft PR) \u2192 Review (open PR) \u2192 Merged. ownership=mine is PRs you authored (or WIP with no PR); ownership=reviewing is someone else's PR (or a review-requested checkout). Viewer login comes from gh, not a setting. 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.";
+var HOME_BOARD_AGENT_HINT = "Home is a Kanban of workspaces (one card per checkout; sibling chat tabs nest as inner cards). Do not create a second workspace for a ticket, PR, or named branch that already has a live checkout \u2014 create_workspace / start_board_card return that chat (alreadyStarted). Creating from the default branch still opens a new isolated workspace. Columns are the path to merge: New (no PR) \u2192 Draft (draft PR) \u2192 Review (open PR) \u2192 Merged. ownership=mine is PRs you authored (or WIP with no PR); ownership=reviewing is someone else's PR (or a review-requested checkout). Viewer login comes from gh, not a setting. 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) {
@@ -4266,7 +4290,7 @@ async function createThread(input, _onSetupLine) {
   });
   await requireAgent(resolved.agent);
   if (input.cowboy) {
-    const { cowboyModeEnabled } = await import("./app-settings-VQEUCONM.js");
+    const { cowboyModeEnabled } = await import("./app-settings-RKFFUIFQ.js");
     if (!cowboyModeEnabled()) {
       throw new Error(
         "Cowboy mode is off. Enable it in Settings \u2192 Advanced."
@@ -4324,7 +4348,7 @@ async function createThread(input, _onSetupLine) {
   let sourceIsFork = false;
   if (!input.cowboy && sourceType === "branch" && (!sourceRef || sourceRef === "HEAD" || sourceRef === "default")) {
     if (isAbleTimeConnected() && getIssueSource() === "abletime") {
-      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-CDGINDXG.js");
+      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-U75ZGDIX.js");
       const task = await ensureAbleTimeTask({
         title: title?.trim() || "Untitled work",
         description: input.prompt?.trim() || void 0
@@ -4434,7 +4458,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-J2P4KNEY.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-3TUMFSMH.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -4647,7 +4671,7 @@ async function forkThreadWorktree(input, onSetupLine) {
   const from = requireThread2(input.threadId);
   if (isOrchestratorThread(from)) {
     throw new Error(
-      "fork_worktree targets a worktree agent thread (not the orchestrator). Pass a child/worktree thread ref."
+      "fork_workspace targets a worktree agent thread (not the orchestrator). Pass a child/worktree thread ref."
     );
   }
   if (!from.branchName?.trim() || !from.repoPath?.trim()) {
@@ -4763,7 +4787,7 @@ function planOrchestrationQuotaFailover(thread, limitText, opts) {
 }
 function buildQuotaHandoffAttachment(from, limitText, fallbackAgent) {
   const children = listThreads({ includeArchived: false }).filter((t) => t.parentThreadId === from.id && t.status !== "archived").slice(0, 40).map(
-    (t) => `- ${t.title} \xB7 ${t.status} \xB7 ${t.agent} \xB7 sideboard://thread/${t.id}`
+    (t) => `- ${t.title} \xB7 ${t.status} \xB7 ${t.agent} \xB7 sideboard://chat/${t.id}`
   );
   const recent = from.messages.slice(-8).map((m) => {
     const role = m.role === "user" ? "User" : m.role === "agent" ? "Agent" : "Summary";
@@ -4773,7 +4797,7 @@ function buildQuotaHandoffAttachment(from, limitText, fallbackAgent) {
   const orch = isOrchestratorThread(from);
   const instructions = orch ? [
     "- Continue fleet orchestration from this handoff.",
-    "- Prefer Sideboard MCP (list_board, list_threads, get_thread, send_to_thread, \u2026) for live status.",
+    "- Prefer Sideboard MCP (list_board, list_chats, get_chat, send_to_chat, \u2026) for live status.",
     "- Leave model Auto unless there is a specific reason to pin one.",
     `- Do not wait on the limited ${from.agent} account; keep going on ${fallbackAgent}.`
   ] : [
@@ -4792,7 +4816,7 @@ function buildQuotaHandoffAttachment(from, limitText, fallbackAgent) {
     from.sourceRef?.trim() || "(none)",
     "",
     `## Child threads`,
-    children.length ? children.join("\n") : "(none listed \u2014 call list_threads)",
+    children.length ? children.join("\n") : "(none listed \u2014 call list_chats)",
     "",
     `## Recent turns (truncated)`,
     recent.length ? recent.join("\n") : "(none)",
@@ -4941,7 +4965,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-I7TWFTJM.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QJ3XIPUJ.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-RXZPTCNH.js");
   await ensureWorktreeSideboardIgnored2(input.worktreePath);
@@ -6897,18 +6921,18 @@ function formatWorktreeDirective(thread, opts) {
   const dir = worktreeNameFromPath(thread.worktreePath);
   const lines = [
     "Sideboard workspace (mandatory):",
-    `- Worktree (your only working directory): ${worktree}`,
+    `- Workspace cwd (git worktree; your only working directory): ${worktree}`,
     `- Branch: ${thread.branchName}`,
     `- Worktree folder nickname (stable, do not rename): ${dir}`
   ];
   if (worktree && repo && worktree !== repo) {
     lines.push(`- Main repo checkout (do NOT edit application code here): ${repo}`);
     lines.push(
-      "Stay inside the worktree for all Reads, Edits, Writes, installs, tests, and git commands. The main repo is a separate checkout used as the git base/remote \u2014 changing files there breaks isolation for this thread and other worktrees."
+      "Stay inside this workspace for all Reads, Edits, Writes, installs, tests, and git commands. The main repo is a separate checkout used as the git base/remote \u2014 changing files there breaks isolation for this workspace and other checkouts."
     );
   } else {
     lines.push(
-      "All file operations and shell commands must use this worktree as cwd. Do not switch to another checkout."
+      "All file operations and shell commands must use this workspace as cwd. Do not switch to another checkout."
     );
   }
   lines.push("");
@@ -6921,7 +6945,7 @@ function formatWorktreeDirective(thread, opts) {
     "- PR title/body and commit messages state what the change does and why (inspect the diff/commits and the user request) \u2014 never the worktree nickname or placeholder branch. Concise imperative title (Conventional Commits when it fits: feat:/fix:/chore:/docs:); body = intent, key changes, test notes."
   );
   lines.push(
-    "- Stay on this thread branch. Never push to main/master or merge locally into the main checkout. Merge the PR only when this turn is a Merge PR request or the user explicitly asked \u2014 via GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
+    "- Stay on this workspace branch. Never push to main/master or merge locally into the main checkout. Merge the PR only when this turn is a Merge PR request or the user explicitly asked \u2014 via GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
   );
   if (thread.prUrl) {
     lines.push(
@@ -6941,14 +6965,14 @@ function formatWorktreeDirective(thread, opts) {
   lines.push(formatDevAccessHint(opts?.activeRuns));
   lines.push("");
   lines.push(
-    "Schedules: `create_schedule` / `list_schedules` (`at` / `every` / `cron`). `threadId=self` continues this chat; omit threadId for a new Global chat. Fires only while Sideboard.app is running. A future job turns on Settings \u2192 Advanced \u2192 Caffeinate while schedules are enabled."
+    "Schedules: `create_schedule` / `list_schedules` (`at` / `every` / `cron`). `chatId=self` continues this chat; omit chatId for a new Global chat. Fires only while Sideboard.app is running. A future job turns on Settings \u2192 Advanced \u2192 Caffeinate while schedules are enabled."
   );
   lines.push("");
   lines.push(formatProcessGuideDirective({ worktreePath: thread.worktreePath }));
   return lines.join("\n");
 }
 function formatWorktreeReminder() {
-  return "Sideboard worktree: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout. If a goal is given (Greptile 5/5, CI green), watch-fix-push until it lands \u2014 do not watch after every push. Schedules: create_schedule (at / every / cron; threadId=self for this chat).";
+  return "Sideboard workspace: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout. If a goal is given (Greptile 5/5, CI green), watch-fix-push until it lands \u2014 do not watch after every push. Schedules: create_schedule (at / every / cron; chatId=self for this chat).";
 }
 var PR_GOAL_RE = /greptile|\bci\b.*\b(green|pass)|checks?\s+(pass|green)|until\s+.*\b(pass|green|merge|clean)|\bfix ci\b|watch[- ]fix[- ]push/i;
 function mentionsPrGoal(prompt) {
@@ -7634,7 +7658,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-OCG4QVA5.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-5YU46YNS.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7952,7 +7976,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("./app-settings-VQEUCONM.js");
+      const { autoCleanupOrphansEnabled } = await import("./app-settings-RKFFUIFQ.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -8167,7 +8191,7 @@ var Orchestrator = class {
       try {
         appendMessage(threadId, {
           role: "agent",
-          text: `Session limit on ${thread.agent}. Sideboard continued on account \u201C${plan.fallbackAccountLabel}\u201D in [${next.title}](sideboard://thread/${next.id}).`,
+          text: `Session limit on ${thread.agent}. Sideboard continued on account \u201C${plan.fallbackAccountLabel}\u201D in [${next.title}](sideboard://chat/${next.id}).`,
           ts: (/* @__PURE__ */ new Date()).toISOString()
         });
         this.emit({
@@ -8210,7 +8234,7 @@ var Orchestrator = class {
       try {
         appendMessage(threadId, {
           role: "agent",
-          text: `Session limit on ${thread.agent}. Sideboard continued on ${plan.fallbackAgent} (Auto) in [${next.title}](sideboard://thread/${next.id}).`,
+          text: `Session limit on ${thread.agent}. Sideboard continued on ${plan.fallbackAgent} (Auto) in [${next.title}](sideboard://chat/${next.id}).`,
           ts: (/* @__PURE__ */ new Date()).toISOString()
         });
         this.emit({
@@ -8341,7 +8365,7 @@ var Orchestrator = class {
     }
     await setup;
     if (skipSetup) return;
-    const { autoRunAfterSetupEnabled } = await import("./app-settings-VQEUCONM.js");
+    const { autoRunAfterSetupEnabled } = await import("./app-settings-RKFFUIFQ.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -8720,7 +8744,7 @@ var Orchestrator = class {
       }
       const isBrightsy = fresh.agent === "brightsy";
       const isOrchestration = isOrchestratorThread(fresh);
-      const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-VQEUCONM.js");
+      const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-RKFFUIFQ.js");
       const gitAuthMode = getGithubGitAuthMode();
       const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
         githubSlug: await withTimeout(
@@ -9769,9 +9793,10 @@ var Orchestrator = class {
     const thread = this.healStaleReportedActivity(this.requireThread(threadRef));
     const lastAgent = lastAgentReply(thread.messages);
     const lastError = thread.lastError ?? null;
-    const rawText = (lastAgent?.text ?? "").trim();
-    const text = (rawText && !isInternalAgentStatusText(rawText) ? rawText : "") || (thread.status === "error" || thread.status === "stopped" || thread.status === "broken" ? lastError ?? "" : "");
     const stillRunning = this.threadLooksLive(thread);
+    const rawText = (lastAgent?.text ?? "").trim();
+    const finishedText = (rawText && !isInternalAgentStatusText(rawText) ? rawText : "") || (thread.status === "error" || thread.status === "stopped" || thread.status === "broken" ? lastError ?? "" : "");
+    const text = stillRunning ? "" : finishedText;
     const live = stillRunning ? readTurnLive(thread.id) : null;
     const liveSummary = live?.summary && !isInternalAgentStatusText(live.summary) ? live.summary : null;
     const queuedHint = stillRunning && thread.status === "queued" && !liveSummary ? "Queued \u2014 waiting for a concurrency slot" : null;
@@ -9788,8 +9813,12 @@ var Orchestrator = class {
       lastError,
       stillRunning,
       progress: liveSummary ?? queuedHint,
-      lastActivityAt: live?.updatedAt ?? null,
-      usage: lastAgent?.usage ?? null
+      lastActivityAt: lastActivityAtForWait(stillRunning, live?.updatedAt, [
+        thread.messages.at(-1)?.ts,
+        lastAgent?.ts,
+        thread.updatedAt
+      ]),
+      usage: stillRunning ? null : lastAgent?.usage ?? null
     };
   }
   assertNotGlobal(thread, action) {
@@ -10025,7 +10054,7 @@ var Orchestrator = class {
       if (Object.keys(patch).length === 0) continue;
       updateThread(t.id, patch);
     }
-    const { autoArchiveOnMergeEnabled } = await import("./app-settings-VQEUCONM.js");
+    const { autoArchiveOnMergeEnabled } = await import("./app-settings-RKFFUIFQ.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -10316,7 +10345,7 @@ var Orchestrator = class {
     this.enforceHistoryRetention();
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-I7TWFTJM.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QJ3XIPUJ.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -10343,7 +10372,7 @@ var Orchestrator = class {
           await runArchiveScript(thread.repoPath, thread.worktreePath);
         } catch {
         }
-        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-VQEUCONM.js");
+        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-RKFFUIFQ.js");
         const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
         await removeWorktree(thread.repoPath, thread.worktreePath, {
           deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -10370,7 +10399,7 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-YASFE65H.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-KQA4ON2G.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -10480,7 +10509,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-YASFE65H.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-KQA4ON2G.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -10566,6 +10595,9 @@ export {
   needsCoordinatorAction,
   endedOnAskUser,
   deriveTaskState,
+  mcpWaitForTurnTimeoutMs,
+  mcpWaitTaskHint,
+  waitForTurnToolResult,
   applyPromptCacheTtlEnv,
   spawnAgentTurn,
   AGENT_GIT_ACTIONS,
@@ -10637,8 +10669,6 @@ export {
   worktreeRunPortsPath,
   loadWorktreeRunPorts,
   saveWorktreeRunPorts,
-  mcpWaitForTurnTimeoutMs,
-  mcpWaitTaskHint,
   mcpWaitForJobTimeoutMs,
   waitForDetachedJob,
   stopDetachedJob,