@sideboard-ai/core 0.1.111 → 0.1.116

package/dist/{chunk-NC3U42ZP.js → chunk-5KSLD4MU.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-363Z34PY.js";
+} from "./chunk-GBY7OOMB.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,151 @@ 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 isShellToolName(name) {
+  return classifyTool(name ?? "") === "shell";
+}
+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 +840,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 +882,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
@@ -757,6 +919,30 @@ function applyAgentEvent(parts, event) {
   if (event.type === "tool_result") {
     const existing = parts.findIndex((p) => p.type === "tool" && p.id === event.id);
     const fromResult = parseDiffStat(event.content);
+    if (event.partial) {
+      if (existing < 0) {
+        return [
+          ...parts,
+          {
+            type: "tool",
+            id: event.id,
+            name: "tool",
+            description: "tool",
+            status: event.isError ? "error" : "running",
+            result: event.content,
+            ...event.parentId ? { parentId: event.parentId } : {}
+          }
+        ];
+      }
+      return parts.map((p, i) => {
+        if (i !== existing || p.type !== "tool") return p;
+        if (p.status === "done" || p.status === "error") return p;
+        return {
+          ...p,
+          result: event.content ?? p.result
+        };
+      });
+    }
     if (existing < 0) {
       return [
         ...parts,
@@ -1014,6 +1200,7 @@ async function buildInjectedMcpServers(opts) {
       );
     } catch {
     }
+    applyAgentRunnerHeapEnv(sideboard.env);
     servers.push(sideboard);
   }
   if (opts.includeBrightsy && isBrightsyConnected()) {
@@ -1169,8 +1356,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 +1467,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 +1595,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 +1663,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 +1676,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);
@@ -1791,13 +2058,22 @@ var codexAdapter = {
           const events = [
             { type: "tool_use", id: item.id, name: "Bash", input }
           ];
-          if (type === "item.completed" || item.status === "completed" || item.status === "failed") {
+          const finished = type === "item.completed" || item.status === "completed" || item.status === "failed";
+          const output = typeof item.aggregated_output === "string" && item.aggregated_output ? item.aggregated_output : void 0;
+          if (finished) {
             events.push({
               type: "tool_result",
               id: item.id,
-              content: item.aggregated_output,
+              content: output,
               isError: item.status === "failed"
             });
+          } else if (output) {
+            events.push({
+              type: "tool_result",
+              id: item.id,
+              content: output,
+              partial: true
+            });
           }
           return events.length === 1 ? events[0] : events;
         }
@@ -1840,9 +2116,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 +2519,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") {
@@ -2266,13 +2540,16 @@ var opencodeAdapter = {
         );
         const events = [{ type: "tool_use", id, name, input }];
         const output = state?.output;
-        if (output != null || state?.status === "completed" || state?.status === "error") {
+        const finished = state?.status === "completed" || state?.status === "error" || state?.status === "failed";
+        const running = state?.status === "running" || state?.status === "in_progress" || state?.status === "pending";
+        if (output != null || finished) {
           const content = typeof output === "string" ? output : output != null ? JSON.stringify(output) : formatUnknownDetail(state?.error) || void 0;
           events.push({
             type: "tool_result",
             id,
             content,
-            isError: state?.status === "error" || state?.status === "failed"
+            isError: state?.status === "error" || state?.status === "failed",
+            ...running && !finished ? { partial: true } : {}
           });
         }
         return events.length === 1 ? events[0] : events;
@@ -2307,14 +2584,17 @@ var opencodeAdapter = {
             withEventParentId({ type: "tool_use", id, name, input }, parentId)
           ];
           const output = state?.output ?? part.output;
-          if (output != null || state?.status === "completed" || state?.status === "error") {
+          const finished = state?.status === "completed" || state?.status === "error" || state?.status === "failed";
+          const running = state?.status === "running" || state?.status === "in_progress" || state?.status === "pending";
+          if (output != null || finished) {
             nested.push(
               withEventParentId(
                 {
                   type: "tool_result",
                   id,
                   content: typeof output === "string" ? output : output != null ? JSON.stringify(output) : void 0,
-                  isError: state?.status === "error" || state?.status === "failed"
+                  isError: state?.status === "error" || state?.status === "failed",
+                  ...running && !finished ? { partial: true } : {}
                 },
                 parentId
               )
@@ -2868,6 +3148,10 @@ export {
   toolDetail,
   toolDescription,
   isSubagentToolName,
+  isPollWrapperToolName,
+  isShellToolName,
+  toolActivityLine,
+  liveActivitySummary,
   messagePartParentId,
   withEventParentId,
   withEventsParentId,

package/dist/{chunk-KQBI5HNT.js → chunk-7WC5UWEB.js}

@@ -1,6 +1,6 @@
 import {
   resolveGithubRepoSlug
-} from "./chunk-C4KHDW3U.js";
+} from "./chunk-FZCIQYNQ.js";
 import {
   resolveThreadDefaults
 } from "./chunk-4NR5FL46.js";
@@ -61,7 +61,7 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   "- fork_worktree \u2014 fork a worktree chat into a NEW git worktree + chat (transcript attached); optional agent; leave model unset (Auto) unless you have a reason. Not for orchestration chats.",
   "- fork_chat \u2014 fork a worktree chat (same worktree tab) OR a Global orchestration chat (new orchestration tab); optional agent; leave model unset (Auto) unless you have a reason. Remote coordinators: use this to continue another orchestration chat on a different agent after session limits.",
   "- send_to_thread \u2014 queue a prompt (start/continue a chat turn); pass force_stop: true to interrupt mid-turn / clear stale queued prompts before replacing with a new request",
-  "- wait_for_turn / get_turn_result \u2014 wait for and read the agent reply. wait_for_turn returns within ~45s even if the child is still working (MCP clients kill longer tool calls). If stillRunning is true, progress is a live snapshot of tools/thinking \u2014 call wait_for_turn again. Do not send \u201Care you stuck?\u201D or assume a hang while lastActivityAt is recent. On status error, lastError (and text) is the failure \u2014 switch agent, tell the user, or retry; do not treat empty text as success.",
+  "- wait_for_turn / get_turn_result \u2014 wait for and read the agent reply. wait_for_turn returns within ~45s even if the child is still working (MCP clients kill longer tool calls). If stillRunning is true, progress is a live snapshot of tools/thinking \u2014 call wait_for_turn again. status=queued with no lastActivityAt means the child has not started yet (concurrency cap) \u2014 keep waiting; do not force_stop or send a check-in. Do not send \u201Care you stuck?\u201D or assume a hang while lastActivityAt is recent. On status error, lastError (and text) is the failure \u2014 switch agent, tell the user, or retry; do not treat empty text as success.",
   "- stop_thread \u2014 force-stop: kill in-flight turn AND clear queued prompts (do not leave stale queue after an interrupt)",
   "- archive_thread / restore_thread \u2014 archive (tears down worktree when last tab) or restore",
   "Setup / run:",

package/dist/{chunk-WIHKHR5R.js → chunk-AXQ4ZWHK.js}

@@ -36,6 +36,11 @@ function createAgentStreamCoalescer(emit, opts) {
         return;
       }
       if (!event.data) return;
+      if (event.type === "thinking" && event.replace) {
+        flush();
+        emit(event);
+        return;
+      }
       if (pending && pending.type === event.type && parentKey(pending) === parentKey(event)) {
         pending.data += event.data;
       } else {

package/dist/{chunk-LGXBYZZA.js → chunk-DVM4ID64.js}

@@ -96,6 +96,34 @@ function withExportedPath(command, pathValue) {
   return `export PATH=${posixShellSingleQuote(pathValue)} && ${trimmed}`;
 }
 
+// src/git/stale-lock.ts
+import { existsSync as existsSync2, statSync, unlinkSync } from "fs";
+import { join as join2 } from "path";
+var STALE_INDEX_LOCK_MS = 2e4;
+function isIndexLockError(text) {
+  return /Unable to create ['"][^'"]*index\.lock['"]: File exists/i.test(text);
+}
+function clearStaleIndexLock(gitDir, maxAgeMs = STALE_INDEX_LOCK_MS, now = Date.now()) {
+  const lockPath = join2(gitDir, "index.lock");
+  try {
+    if (!existsSync2(lockPath)) return null;
+    if (now - statSync(lockPath).mtimeMs < maxAgeMs) return null;
+    unlinkSync(lockPath);
+    return lockPath;
+  } catch {
+    return null;
+  }
+}
+function clearStaleIndexLocks(gitDirs, maxAgeMs = STALE_INDEX_LOCK_MS) {
+  const now = Date.now();
+  const removed = [];
+  for (const dir of new Set(gitDirs)) {
+    const cleared = clearStaleIndexLock(dir, maxAgeMs, now);
+    if (cleared) removed.push(cleared);
+  }
+  return removed;
+}
+
 // src/git/run.ts
 async function run(file, args, opts) {
   ensureAgentPath();
@@ -123,6 +151,21 @@ async function run(file, args, opts) {
     throw err;
   }
 }
+async function resolveGitDirsForLockRecovery(cwd, env = {}) {
+  const dirs = /* @__PURE__ */ new Set();
+  const [gitDir, commonDir] = await Promise.all([
+    run("git", ["rev-parse", "--absolute-git-dir"], { cwd, reject: false, env, timeoutMs: 5e3 }),
+    run("git", ["rev-parse", "--path-format=absolute", "--git-common-dir"], {
+      cwd,
+      reject: false,
+      env,
+      timeoutMs: 5e3
+    })
+  ]);
+  if (gitDir.exitCode === 0 && gitDir.stdout.trim()) dirs.add(gitDir.stdout.trim());
+  if (commonDir.exitCode === 0 && commonDir.stdout.trim()) dirs.add(commonDir.stdout.trim());
+  return [...dirs];
+}
 async function git(args, cwd, opts) {
   const prefix = [];
   if (opts?.config) {
@@ -131,21 +174,32 @@ async function git(args, cwd, opts) {
       prefix.push("-c", `${key}=${value}`);
     }
   }
-  return run("git", ["--no-pager", ...prefix, ...args], {
-    cwd,
-    reject: opts?.reject,
-    timeoutMs: opts?.timeoutMs,
+  const gitArgs = ["--no-pager", ...prefix, ...args];
+  const env = {
     // Never block forever on a credential/SSH prompt inside MCP / Electron.
-    env: {
-      GIT_TERMINAL_PROMPT: "0",
-      GIT_ASKPASS: process.env.GIT_ASKPASS || "echo",
-      SSH_ASKPASS: process.env.SSH_ASKPASS || "echo",
-      GIT_SSH_COMMAND: process.env.GIT_SSH_COMMAND || "ssh -o BatchMode=yes -o ConnectTimeout=15",
-      GCM_INTERACTIVE: "never",
-      GH_PROMPT_DISABLED: "1",
-      ...opts?.env
+    GIT_TERMINAL_PROMPT: "0",
+    GIT_ASKPASS: process.env.GIT_ASKPASS || "echo",
+    SSH_ASKPASS: process.env.SSH_ASKPASS || "echo",
+    GIT_SSH_COMMAND: process.env.GIT_SSH_COMMAND || "ssh -o BatchMode=yes -o ConnectTimeout=15",
+    GCM_INTERACTIVE: "never",
+    GH_PROMPT_DISABLED: "1",
+    ...opts?.env
+  };
+  let result = await run("git", gitArgs, { cwd, reject: false, timeoutMs: opts?.timeoutMs, env });
+  if (result.exitCode !== 0 && isIndexLockError(result.stderr)) {
+    const gitDirs = await resolveGitDirsForLockRecovery(cwd, env);
+    const cleared = clearStaleIndexLocks(gitDirs);
+    if (cleared.length > 0) {
+      result = await run("git", gitArgs, { cwd, reject: false, timeoutMs: opts?.timeoutMs, env });
     }
-  });
+  }
+  if ((opts?.reject ?? true) && result.exitCode !== 0) {
+    throw new Error(
+      `Command failed with exit code ${result.exitCode}: git ${gitArgs.join(" ")}
+${result.stderr}`
+    );
+  }
+  return result;
 }
 async function gh(args, cwd, opts) {
   return run("gh", args, {
@@ -173,7 +227,9 @@ export {
   posixShellSingleQuote,
   resolveCommandBinarySync,
   withExportedPath,
+  clearStaleIndexLocks,
   run,
+  resolveGitDirsForLockRecovery,
   git,
   gh,
   resolveGhAuthToken