@sideboard-ai/core 0.1.110 → 0.1.115

package/dist/{chunk-RSIWPLRG.js → chunk-C6OBY6IC.js}

@@ -4,11 +4,12 @@ import {
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens,
   loadBrightsyConfig
-} from "./chunk-2GO3YKBA.js";
+} from "./chunk-EKIDHL2T.js";
 import {
   isOrchestratorThread
-} from "./chunk-4EWPKYOU.js";
+} from "./chunk-4OJMZ6P2.js";
 import {
+  applyAgentRunnerHeapEnv,
   applyNodeLaunch,
   cursorRipgrepEnv,
   extractJsonErrorMessage,
@@ -19,13 +20,13 @@ import {
   packagedMcpStdioPath,
   parseCursorRunnerLine,
   resolveNodeLaunch
-} from "./chunk-3UOKB6VQ.js";
+} from "./chunk-SLU5JVKD.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-C4KHDW3U.js";
+} from "./chunk-FZCIQYNQ.js";
 import {
   claudeChromeEnabled,
   loadAppSettings,
@@ -45,7 +46,7 @@ import {
   resolveCommandBinarySync,
   run,
   withExportedPath
-} from "./chunk-LGXBYZZA.js";
+} from "./chunk-DVM4ID64.js";
 
 // src/agents/brightsy.ts
 import { existsSync } from "fs";
@@ -582,9 +583,9 @@ function toolDescription(name, input) {
     if (/connectedAgentRequest/i.test(name)) {
       return str(input?.agent_id) ? `Ask connected agent` : "Ask connected agent";
     }
-    if (desc && kind) return `${kind}: ${desc}`;
-    if (desc) return desc;
-    return "Subagent";
+    if (desc && kind) return `${kind}: ${desc}${subagentLiveSuffix(input)}`;
+    if (desc) return `${desc}${subagentLiveSuffix(input)}`;
+    return `Subagent${subagentLiveSuffix(input)}`;
   }
   if (/^(create|update)_artifact$/i.test(name.replace(/^mcp__[^_]+__/, ""))) {
     return str(input?.title) ? `Artifact ${str(input?.title)}` : "Artifact";
@@ -609,13 +610,148 @@ function toolDescription(name, input) {
   }
   if (/grep/i.test(name)) return "Search files";
   if (/glob/i.test(name)) return "Find files";
+  const compact = n.replace(/[_-]/g, "");
+  if (/^taskoutput$/i.test(compact)) {
+    return str(input.task_id) ? `Wait for ${str(input.task_id)}` : "Wait for background task";
+  }
+  if (/^taskstop$/i.test(compact)) {
+    return str(input.task_id) ? `Stop ${str(input.task_id)}` : "Stop background task";
+  }
+  if (/^monitor$/i.test(compact)) {
+    const command = str(input.command);
+    return command ? `Watch ${command.length > 48 ? `${command.slice(0, 45)}\u2026` : command}` : "Watch command";
+  }
   return n;
 }
+function subagentLiveSuffix(input) {
+  if (!input) return "";
+  const bits = [];
+  const status = str(input.live_status);
+  if (status && !/^runn(ing)?$|^working$/i.test(status)) bits.push(status);
+  if (typeof input.live_tool_uses === "number") bits.push(`${input.live_tool_uses} tools`);
+  if (typeof input.live_duration_ms === "number") {
+    bits.push(`${Math.max(0, Math.round(Number(input.live_duration_ms) / 1e3))}s`);
+  }
+  const last = str(input.live_last_tool);
+  if (last) bits.push(last);
+  return bits.length ? ` \xB7 ${bits.join(" \xB7 ")}` : "";
+}
 function isSubagentToolName(name) {
   const n = (name ?? "").trim();
   if (/^(task|agent|spawn_agent)$/i.test(n)) return true;
   return /connectedAgentRequest/i.test(n);
 }
+function isPollWrapperToolName(name) {
+  const n = (name ?? "").replace(/[_-]/g, "");
+  return /^(taskoutput|taskstop|sleep)$/i.test(n);
+}
+function lastTextPart(parts, type) {
+  for (let i = parts.length - 1; i >= 0; i--) {
+    const p = parts[i];
+    if (p.type === type && p.text.trim()) return p.text.trim();
+  }
+  return "";
+}
+function toolLabel(tool) {
+  return tool.description || toolDescription(tool.name, tool.input) || tool.name;
+}
+function fileBasename(path) {
+  const parts = path.replace(/\/$/, "").split(/[/\\]/);
+  return parts[parts.length - 1] || path;
+}
+function classifyTool(name) {
+  const compact = name.replace(/^mcp__[^_]+__/, "").replace(/[_-]/g, "");
+  if (/bash|shell|terminal|^zsh$|^sh$/i.test(compact)) return "shell";
+  if (/grep|glob|search|ripgrep|findfiles|semsearch/i.test(compact)) return "search";
+  if (/^(read|cat)$/i.test(compact) || /^read/i.test(compact)) return "read";
+  if (/edit|write|apply|strreplace|multiedit|updatefile|createfile/i.test(compact)) {
+    return "edit";
+  }
+  return "other";
+}
+function toolActivityLine(parts) {
+  const tools = parts.filter((p) => {
+    if (p.type !== "tool" || p.parentId) return false;
+    if (isPollWrapperToolName(p.name)) return false;
+    if (/present_plan$/i.test(p.name ?? "")) return false;
+    if (/ask_user|AskUserQuestion/i.test(p.name ?? "")) return false;
+    return true;
+  });
+  if (tools.length === 0) return null;
+  const edited = [];
+  let reads = 0;
+  let searches = 0;
+  let shells = 0;
+  let others = 0;
+  let additions = 0;
+  let deletions = 0;
+  for (const tool of tools) {
+    const kind = classifyTool(tool.name);
+    if (kind === "edit") {
+      const path = tool.filePath ?? toolFilePath(tool.input);
+      edited.push({
+        name: path ? fileBasename(path) : tool.name,
+        running: tool.status === "running"
+      });
+    } else if (kind === "read") reads += 1;
+    else if (kind === "search") searches += 1;
+    else if (kind === "shell") shells += 1;
+    else others += 1;
+    if (typeof tool.additions === "number") additions += tool.additions;
+    if (typeof tool.deletions === "number") deletions += tool.deletions;
+  }
+  const bits = [];
+  const editing = edited.filter((e) => e.running);
+  const editedDone = edited.filter((e) => !e.running);
+  if (editing.length === 1) bits.push(`Editing ${editing[0].name}`);
+  else if (editing.length > 1) bits.push(`Editing ${editing.length} files`);
+  if (editedDone.length === 1) bits.push(`${editing.length ? "edited" : "Edited"} ${editedDone[0].name}`);
+  else if (editedDone.length > 1) {
+    bits.push(`${editing.length ? "edited" : "Edited"} ${editedDone.length} files`);
+  }
+  if (reads === 1) bits.push("explored 1 file");
+  else if (reads > 1) bits.push(`explored ${reads} files`);
+  if (searches === 1) bits.push("1 search");
+  else if (searches > 1) bits.push(`${searches} searches`);
+  if (shells === 1) bits.push("ran 1 command");
+  else if (shells > 1) bits.push(`ran ${shells} commands`);
+  if (others === 1) bits.push("1 tool");
+  else if (others > 1) bits.push(`${others} tools`);
+  if (bits.length === 0) return null;
+  return { text: bits.join(", "), additions, deletions };
+}
+function liveActivitySummary(parts, opts) {
+  if (opts?.queued && parts.length === 0) {
+    return "Queued \u2014 waiting for a slot";
+  }
+  const tools = parts.filter((p) => p.type === "tool");
+  const runningSubs = tools.filter(
+    (t) => t.status === "running" && !t.parentId && isSubagentToolName(t.name)
+  );
+  const runningNested = [...tools].reverse().find((t) => t.status === "running" && t.parentId && !isPollWrapperToolName(t.name));
+  const runningTop = [...tools].reverse().find(
+    (t) => t.status === "running" && !t.parentId && !isPollWrapperToolName(t.name) && !isSubagentToolName(t.name)
+  );
+  const runningPoll = [...tools].reverse().find((t) => t.status === "running" && isPollWrapperToolName(t.name));
+  const thinking = lastTextPart(parts, "thinking");
+  const text = lastTextPart(parts, "text");
+  if (runningSubs.length > 0) {
+    const heads = runningSubs.map(toolLabel);
+    const head = runningSubs.length === 1 ? heads[0] : `${runningSubs.length} subagents \xB7 ${heads.slice(0, 2).join(" \xB7 ")}`;
+    if (runningNested) return `${head} \xB7 ${toolLabel(runningNested)}`;
+    return head;
+  }
+  if (runningTop) return toolLabel(runningTop);
+  if (runningPoll) return toolLabel(runningPoll);
+  if (thinking) return thinking.length > 96 ? `\u2026${thinking.slice(-96)}` : thinking;
+  if (text) return "Writing reply\u2026";
+  const last = [...tools].reverse().find((t) => !isPollWrapperToolName(t.name)) ?? tools.at(-1);
+  if (last) {
+    const label = toolLabel(last);
+    return last.status === "running" ? label : `Finished ${label}`;
+  }
+  return "Working\u2026";
+}
 function messagePartParentId(part) {
   if ("parentId" in part && typeof part.parentId === "string" && part.parentId.trim()) {
     return part.parentId;
@@ -701,6 +837,25 @@ function applyAgentEvent(parts, event) {
     const data = event.data;
     if (!data) return parts;
     const next = [...parts];
+    if (event.replace) {
+      for (let i = next.length - 1; i >= 0; i--) {
+        const prev = next[i];
+        if (prev?.type === "thinking" && sameParentId(prev.parentId, event.parentId)) {
+          next[i] = {
+            type: "thinking",
+            text: data,
+            ...event.parentId ? { parentId: event.parentId } : {}
+          };
+          return next;
+        }
+      }
+      next.push({
+        type: "thinking",
+        text: data,
+        ...event.parentId ? { parentId: event.parentId } : {}
+      });
+      return next;
+    }
     const last = next[next.length - 1];
     if (last?.type === "thinking" && sameParentId(last.parentId, event.parentId)) {
       next[next.length - 1] = {
@@ -724,14 +879,18 @@ function applyAgentEvent(parts, event) {
     if (existing >= 0) {
       const prev = parts[existing];
       const next = [...parts];
-      const mergedInput = input && Object.keys(input).length > 0 ? input : prev.input ?? input;
+      const mergedInput = {
+        ...prev.input ?? {},
+        ...input ?? {}
+      };
+      const mergedRecord = Object.keys(mergedInput).length > 0 ? mergedInput : void 0;
       next[existing] = {
         ...prev,
         name: event.name || prev.name,
-        input: mergedInput,
-        description: toolDescription(event.name || prev.name, mergedInput),
-        detail: toolDetail(event.name || prev.name, mergedInput) ?? prev.detail,
-        filePath: toolFilePath(mergedInput) ?? prev.filePath,
+        input: mergedRecord,
+        description: toolDescription(event.name || prev.name, mergedRecord),
+        detail: toolDetail(event.name || prev.name, mergedRecord) ?? prev.detail,
+        filePath: toolFilePath(mergedRecord) ?? prev.filePath,
         additions: diff.additions ?? prev.additions,
         deletions: diff.deletions ?? prev.deletions,
         parentId: event.parentId ?? prev.parentId
@@ -1014,6 +1173,7 @@ async function buildInjectedMcpServers(opts) {
       );
     } catch {
     }
+    applyAgentRunnerHeapEnv(sideboard.env);
     servers.push(sideboard);
   }
   if (opts.includeBrightsy && isBrightsyConnected()) {
@@ -1169,8 +1329,14 @@ var BASE_ALLOWED_TOOLS = [
   "WebSearch",
   // Subagents (Claude Code v2.1.63 renamed Task → Agent; allow both).
   "Task",
-  "Agent"
+  "Agent",
+  "TaskOutput",
+  "TaskStop",
+  "EnterWorktree",
+  "ExitWorktree",
+  "Skill"
 ];
+var CLAUDE_PRINT_BG_WAIT_CEILING_MS = 72e5;
 var CLAUDE_CHROME_ALLOWED_TOOLS = [
   "mcp__claude-in-chrome",
   "mcp__claude-in-chrome__*",
@@ -1274,6 +1440,80 @@ function claudeParentToolUseId(obj) {
   }
   return void 0;
 }
+function claudeString(obj, key) {
+  const v = obj[key];
+  return typeof v === "string" && v.trim() ? v.trim() : void 0;
+}
+function eventsFromClaudeSystem(obj) {
+  const subtype = claudeString(obj, "subtype") ?? "";
+  const parentId = claudeParentToolUseId(obj);
+  if (subtype === "init") {
+    if (parentId) return null;
+    const sid = claudeString(obj, "session_id");
+    return sid ? { type: "session_id", data: sid } : null;
+  }
+  if (subtype === "task_started") {
+    const id = claudeString(obj, "tool_use_id") ?? claudeString(obj, "task_id");
+    if (!id) return null;
+    const description = claudeString(obj, "description");
+    const taskType = claudeString(obj, "task_type");
+    const prompt = claudeString(obj, "prompt");
+    return withEventParentId(
+      {
+        type: "tool_use",
+        id,
+        name: taskType || "Agent",
+        input: {
+          ...description ? { description } : {},
+          ...prompt ? { prompt } : {},
+          ...claudeString(obj, "task_id") ? { task_id: claudeString(obj, "task_id") } : {}
+        }
+      },
+      parentId
+    );
+  }
+  if (subtype === "task_notification") {
+    const id = claudeString(obj, "tool_use_id") ?? claudeString(obj, "task_id") ?? parentId;
+    if (!id) return null;
+    const status = claudeString(obj, "status") ?? "working";
+    const tools = typeof obj.tool_uses === "number" ? obj.tool_uses : void 0;
+    const durationMs = typeof obj.duration_ms === "number" ? obj.duration_ms : void 0;
+    const lastTool = claudeString(obj, "last_tool") ?? claudeString(obj, "current_tool") ?? claudeString(obj, "tool");
+    const snapshot = [
+      status,
+      tools != null ? `${tools} tools` : null,
+      durationMs != null ? `${Math.round(durationMs / 1e3)}s` : null,
+      lastTool
+    ].filter((bit) => Boolean(bit)).join(" \xB7 ");
+    return [
+      {
+        type: "tool_use",
+        id,
+        name: claudeString(obj, "task_type") || "Agent",
+        input: {
+          live_status: status,
+          ...tools != null ? { live_tool_uses: tools } : {},
+          ...durationMs != null ? { live_duration_ms: durationMs } : {},
+          ...lastTool ? { live_last_tool: lastTool } : {}
+        }
+      },
+      withEventParentId(
+        { type: "thinking", data: snapshot, replace: true },
+        id
+      )
+    ];
+  }
+  if (subtype === "api_retry") {
+    const attempt = obj.attempt;
+    const max = obj.max_retries;
+    const delay = obj.retry_delay_ms;
+    return {
+      type: "thinking",
+      data: `API retry ${attempt ?? "?"}/${max ?? "?"}${typeof delay === "number" ? ` (wait ${delay}ms)` : ""}`
+    };
+  }
+  return null;
+}
 var claudeAdapter = {
   kind: "claude",
   async detect() {
@@ -1328,7 +1568,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-XSUFEIAQ.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-CSWABOG5.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1396,7 +1636,12 @@ var claudeAdapter = {
       stdin: useStdin ? `${promptText}
 ` : void 0,
       // Nested Task/Agent thinking+text in stream-json (Claude Code 2.1.211+).
-      env: { CLAUDE_CODE_FORWARD_SUBAGENT_TEXT: "1" }
+      // Raise the -p background-agent wait so long TaskOutput polls are not
+      // abandoned at Claude Code’s 10-minute default.
+      env: {
+        CLAUDE_CODE_FORWARD_SUBAGENT_TEXT: "1",
+        CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS: process.env.CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS ?? String(CLAUDE_PRINT_BG_WAIT_CEILING_MS)
+      }
     };
   },
   parseEvent(line) {
@@ -1404,13 +1649,8 @@ var claudeAdapter = {
     if (!trimmed) return null;
     try {
       const obj = JSON.parse(trimmed);
-      if (obj.type === "system" && obj.subtype === "init") {
-        const sid = obj.session_id;
-        if (typeof sid === "string") return { type: "session_id", data: sid };
-        return null;
-      }
-      if (obj.type === "system" && typeof obj.session_id === "string") {
-        return { type: "session_id", data: obj.session_id };
+      if (obj.type === "system") {
+        return eventsFromClaudeSystem(obj);
       }
       if (obj.type === "assistant" || obj.type === "user") {
         const parentId = claudeParentToolUseId(obj);
@@ -1840,9 +2080,6 @@ var codexAdapter = {
       if (sid && (type === "thread.started" || type === "session" || !type)) {
         return { type: "session_id", data: sid };
       }
-      if (sid && type.endsWith(".started")) {
-        return { type: "session_id", data: sid };
-      }
       if (type === "turn.completed" || type === "turn_completed") {
         const usage = usageFromCodex(obj.usage);
         return usage ? { type: "usage", data: usage, scope: "turn" } : null;
@@ -2246,7 +2483,8 @@ var opencodeAdapter = {
         return { type: "stderr", data: detail };
       }
       const sid = typeof obj.sessionID === "string" && obj.sessionID || typeof obj.sessionId === "string" && obj.sessionId || typeof obj.session_id === "string" && obj.session_id;
-      if (sid && (!obj.type || obj.type === "step_start" || obj.type === "session")) {
+      const childSid = str2(obj.childSessionID) ?? str2(obj.childSessionId) ?? str2(obj.parentID) ?? str2(obj.parentId);
+      if (sid && !childSid && (!obj.type || obj.type === "step_start" || obj.type === "session")) {
         return { type: "session_id", data: sid };
       }
       if (obj.type === "text") {
@@ -2868,6 +3106,9 @@ export {
   toolDetail,
   toolDescription,
   isSubagentToolName,
+  isPollWrapperToolName,
+  toolActivityLine,
+  liveActivitySummary,
   messagePartParentId,
   withEventParentId,
   withEventsParentId,

package/dist/{chunk-EAAB4EK5.js → chunk-DCNR7NAL.js}

@@ -7,7 +7,9 @@ import {
   finalizeParts,
   getAdapter,
   isBrightsyNdjsonLine,
+  isPollWrapperToolName,
   isSessionQuotaLimit,
+  liveActivitySummary,
   normalizeParseResult,
   parseBrightsyCliLine,
   parseSessionQuotaResetAt,
@@ -15,13 +17,13 @@ import {
   resolveQuotaFallbackAgent,
   stripBrightsyNdjsonNoise,
   toolDescription
-} from "./chunk-RSIWPLRG.js";
+} from "./chunk-C6OBY6IC.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-7KWYXGIU.js";
+} from "./chunk-K3TIQXOH.js";
 import {
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
@@ -34,14 +36,14 @@ import {
   isOrchestratorThread,
   isSlackCoordinatorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "./chunk-4EWPKYOU.js";
+} from "./chunk-4OJMZ6P2.js";
 import {
   SLACK_REPLY_FORMATTING,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "./chunk-KQBI5HNT.js";
+} from "./chunk-7WC5UWEB.js";
 import {
   extractPresentedPlan,
   readPlanFile,
@@ -49,17 +51,19 @@ import {
 } from "./chunk-QTUESPAW.js";
 import {
   createAgentStreamCoalescer
-} from "./chunk-WIHKHR5R.js";
+} from "./chunk-AXQ4ZWHK.js";
 import {
+  applyAgentRunnerHeapEnv,
   fallbackTurnFailDetail,
   formatTurnExitError,
   looksLikeAgentFailureMessage,
   looksLikeInvalidAgentSession,
+  looksLikeV8Oom,
   pushTurnStderr,
   shouldRetryFailedAgentTurn,
   summarizeTurnStderr,
   turnFailChatText
-} from "./chunk-3UOKB6VQ.js";
+} from "./chunk-SLU5JVKD.js";
 import {
   releaseCaffeinateHoldForThread
 } from "./chunk-DCOZABNT.js";
@@ -105,7 +109,7 @@ import {
   threadDisplayLabel,
   withRepoGitLock,
   worktreeNameFromPath
-} from "./chunk-C4KHDW3U.js";
+} from "./chunk-FZCIQYNQ.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
@@ -155,11 +159,13 @@ import {
   worktreesRoot
 } from "./chunk-QZQEXME2.js";
 import {
+  clearStaleIndexLocks,
   enrichPathWithNpmGlobalBin,
   ensureAgentPath,
   git,
+  resolveGitDirsForLockRecovery,
   run
-} from "./chunk-LGXBYZZA.js";
+} from "./chunk-DVM4ID64.js";
 
 // src/orchestrator/orchestrator.ts
 import { EventEmitter } from "events";
@@ -749,9 +755,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-XSUFEIAQ.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-CSWABOG5.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-AR66L3N4.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-4KCALEKD.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -768,6 +774,7 @@ async function spawnAgentTurn(thread, input, onEvent) {
   }
   const env = childEnvWithAppSettings(cmd.env);
   applyPromptCacheTtlEnv(thread.agent, env);
+  applyAgentRunnerHeapEnv(env);
   try {
     if (isOrchestratorThread(thread)) {
       mergeAgentGitAuthEnv(env, await resolveAgentGitAuthEnv(env));
@@ -2448,7 +2455,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-WK54VP7J.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-3X3EFCQY.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2496,21 +2503,13 @@ function summarizeTurnLive(parts) {
     (p) => p.type === "tool"
   );
   const lastTool = tools[tools.length - 1];
-  const lastToolLabel = lastTool ? lastTool.description || toolDescription(lastTool.name, lastTool.input) || lastTool.name : void 0;
-  const running = lastTool?.status === "running";
+  const interesting = [...tools].reverse().find((t) => !isPollWrapperToolName(t.name)) ?? lastTool;
+  const lastToolLabel = interesting ? interesting.description || toolDescription(interesting.name, interesting.input) || interesting.name : void 0;
   const thinking = lastText(parts, "thinking");
   const text = lastText(parts, "text");
   const excerptRaw = thinking || text;
   const excerpt = excerptRaw.length > 280 ? `${excerptRaw.slice(-280)}` : excerptRaw || void 0;
-  let summary = "Working\u2026";
-  if (lastToolLabel) {
-    const verb = running ? lastToolLabel : `Finished ${lastToolLabel}`;
-    summary = tools.length > 1 ? `${verb} (${tools.length} tools)` : verb;
-  } else if (thinking) {
-    summary = "Thinking\u2026";
-  } else if (text) {
-    summary = "Writing reply\u2026";
-  }
+  const summary = liveActivitySummary(parts);
   return {
     updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
     summary,
@@ -2760,8 +2759,12 @@ var CONDUCTOR_APP_SUPPORT = join9(
 );
 var CONDUCTOR_DB = join9(CONDUCTOR_APP_SUPPORT, "conductor.db");
 var CURSOR_SDK_STORE = join9(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
+function thisModuleFile() {
+  const cjsFile = typeof __filename !== "undefined" ? __filename : "";
+  return cjsFile || process.argv[1] || join9(process.cwd(), "package.json");
+}
 function openReadonlySqlite(file) {
-  const req = createRequire(import.meta.url);
+  const req = createRequire(thisModuleFile());
   const Database = req("better-sqlite3");
   return new Database(file, { readonly: true, fileMustExist: true });
 }
@@ -2818,7 +2821,7 @@ async function adoptThread(input) {
     throw new Error(`Worktree not found: ${input.worktreePath}`);
   }
   const repoPath = await resolveRepoRoot(input.worktreePath);
-  const { stdout: branch } = await import("./run-CFKZPY7F.js").then(
+  const { stdout: branch } = await import("./run-XQKGHQZ2.js").then(
     ({ git: git2 }) => git2(["rev-parse", "--abbrev-ref", "HEAD"], input.worktreePath)
   );
   const thread = createEmptyThread({
@@ -2833,7 +2836,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-HV3J4TTW.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QG6PGFQR.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -4143,7 +4146,7 @@ async function confirmLand(thread, opts) {
   if (preview.dirty) {
     committed = await commitAll(thread.worktreePath, meta.commitMessage);
   }
-  const { git: git2 } = await import("./run-CFKZPY7F.js");
+  const { git: git2 } = await import("./run-XQKGHQZ2.js");
   const { stdout: headOut } = await git2(
     ["rev-parse", "--abbrev-ref", "HEAD"],
     thread.worktreePath,
@@ -5105,7 +5108,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-FCZVCKBK.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-TXASYNHT.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -5897,7 +5900,15 @@ var Orchestrator = class {
         hasSession: Boolean(this.requireThread(threadId).sessionId)
       })) {
         updateThread(threadId, { sessionId: null });
-        const retryNote = looksLikeInvalidAgentSession(detail) ? "Agent session missing \u2014 starting a fresh session" : "Agent runner crashed \u2014 restarting Node once";
+        try {
+          const gitDirs = await resolveGitDirsForLockRecovery(thread.worktreePath);
+          const clearedLocks = clearStaleIndexLocks(gitDirs, 2e3);
+          if (clearedLocks.length > 0) {
+            pushTurnStderr(stderrTail, "Cleared a stale git lock left by the crashed agent process");
+          }
+        } catch {
+        }
+        const retryNote = looksLikeInvalidAgentSession(detail) ? "Agent session missing \u2014 starting a fresh session" : looksLikeV8Oom(detail) ? "Agent ran out of memory \u2014 starting a fresh session" : "Agent runner crashed \u2014 restarting Node once";
         pushTurnStderr(stderrTail, retryNote);
         this.emit({
           type: "turn_output",
@@ -6369,13 +6380,14 @@ var Orchestrator = class {
     const text = (lastAgent?.text ?? "").trim() || (thread.status === "error" ? 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;
     return {
       text,
       status: thread.status,
       sessionId: thread.sessionId,
       lastError,
       stillRunning,
-      progress: live?.summary ?? null,
+      progress: live?.summary ?? queuedHint,
       lastActivityAt: live?.updatedAt ?? null
     };
   }
@@ -6844,7 +6856,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-HV3J4TTW.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QG6PGFQR.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -6898,7 +6910,7 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-XFJED3VU.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-IW3BX26B.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -7006,7 +7018,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-XFJED3VU.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-IW3BX26B.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({