@sideboard-ai/core 0.1.107 → 0.1.110

package/dist/{chunk-XOYH3OMI.js → chunk-VOJSO3RM.js}

@@ -9,13 +9,13 @@ import {
 } from "./chunk-7YKXHBIW.js";
 import {
   isOrchestratorThread
-} from "./chunk-THXSFETX.js";
+} from "./chunk-VOD3HFLP.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-6JJTMI7G.js";
+} from "./chunk-YXDR43ZC.js";
 import {
   claudeChromeEnabled,
   isElectronLikeCommand,
@@ -24,7 +24,7 @@ import {
   resolveClaudeExecutable,
   unwrapStrippedElectronLaunch,
   wrapElectronAsNodeLaunch
-} from "./chunk-EX4NZN3O.js";
+} from "./chunk-SGEVS5SY.js";
 import {
   appDataDir
 } from "./chunk-BD2ICC4D.js";
@@ -78,6 +78,10 @@ function applyTurnUsage(current, incoming, scope = "request") {
   const merged = mergeUsage(current, incoming);
   return { ...merged, lastRequestTokens: requestOccupancy(incoming) };
 }
+function contextTokens(u) {
+  if (u.lastRequestTokens != null && u.lastRequestTokens > 0) return u.lastRequestTokens;
+  return requestOccupancy(u);
+}
 
 // src/agents/brightsy-targets.ts
 function encodeBrightsyTarget(type, id, accountId) {
@@ -197,6 +201,8 @@ function summarizeTurnStderr(tail, maxChars = 500) {
   if (tail.length === 0) return "";
   const cursorStartup = [...tail].reverse().find((line) => /cursor startup failed:/i.test(line));
   if (cursorStartup) return clipStderr(cursorStartup, maxChars);
+  const cursorRunFailed = [...tail].reverse().find((line) => /^cursor run failed\b/i.test(line.trim()));
+  if (cursorRunFailed) return clipStderr(cursorRunFailed, maxChars);
   if (tail.some(looksLikeNestedElectronCrash)) return NESTED_ELECTRON_SUMMARY;
   if (tail.some(looksLikeHomebrewLibuvCrash)) return HOMEBREW_LIBUV_SUMMARY;
   if (tail.some(
@@ -227,7 +233,7 @@ function looksLikeRetryableRunnerCrash(text) {
   const lower = text.trim().toLowerCase();
   if (/cannot find (?:package|module)|err_module_not_found/.test(lower)) return false;
   if (!lower) return true;
-  return /uv_run|spineventloopinternal|libuv|homebrew node \+ shared libuv|hascustomhostobject|electroninitializeicuandstartnode|nested chromium|truncated crash dump|sig(?:segv|abrt|ill)|segmentation fault|illegal instruction|fatal error/.test(
+  return /uv_run|spineventloopinternal|libuv|homebrew node \+ shared libuv|hascustomhostobject|electroninitializeicuandstartnode|nested chromium|truncated crash dump|connection stalled|sig(?:segv|abrt|ill)|segmentation fault|illegal instruction|fatal error/.test(
     lower
   );
 }
@@ -285,6 +291,9 @@ function humanizeAgentFailDetail(detail) {
   if (/corrupt local agent checkpoint|missing root blob|truncated crash dump/.test(lower)) {
     return `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
   }
+  if (/connection stalled/.test(lower)) {
+    return /retry the turn/i.test(raw) ? raw : `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
+  }
   return raw;
 }
 function turnFailChatText(opts) {
@@ -659,6 +668,291 @@ function mcpAllowTools(servers) {
   return out;
 }
 
+// src/agents/message-parts.ts
+function asRecord(input) {
+  if (input && typeof input === "object" && !Array.isArray(input)) {
+    return input;
+  }
+  return void 0;
+}
+function str(v) {
+  return typeof v === "string" && v.trim() ? v : void 0;
+}
+function toolDetail(name, input) {
+  if (!input) return void 0;
+  const command = str(input.command) ?? str(input.cmd);
+  if (command) return command;
+  const path = str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
+  if (path) return path;
+  const pattern = str(input.pattern) ?? str(input.glob) ?? str(input.glob_pattern);
+  if (pattern) return pattern;
+  const query = str(input.query) ?? str(input.prompt);
+  if (query) return query.length > 80 ? `${query.slice(0, 77)}\u2026` : query;
+  try {
+    const raw = JSON.stringify(input);
+    return raw.length > 80 ? `${raw.slice(0, 77)}\u2026` : raw;
+  } catch {
+    return name;
+  }
+}
+function toolDescription(name, input) {
+  const n = name.replace(/^mcp__/, "").replace(/__/g, " \xB7 ");
+  if (/^get_record_types$|recordTypes/i.test(name)) return "List record types";
+  if (/connectedAgentRequest/i.test(name)) {
+    return str(input?.agent_id) ? `Ask connected agent` : "Ask connected agent";
+  }
+  if (/present_artifact$/i.test(name)) {
+    return str(input?.title) ? `Present ${str(input?.title)}` : "Present artifact";
+  }
+  if (/present_plan$/i.test(name)) {
+    return str(input?.title) ? `Plan ${str(input?.title)}` : "Present plan";
+  }
+  if (/present_schema$/i.test(name)) {
+    return str(input?.title) ? `Schema ${str(input?.title)}` : "Present schema";
+  }
+  if (/present_files$/i.test(name)) {
+    return str(input?.title) ? `Files ${str(input?.title)}` : "Present files";
+  }
+  if (isSubagentToolName(name)) {
+    const desc = str(input?.description);
+    const sub = asRecord(input?.subagentType);
+    const kind = str(sub?.name) ?? str(sub?.kind) ?? str(input?.subagent_type) ?? str(input?.subagentType);
+    if (/^spawn_agent$/i.test(name)) {
+      return str(input?.prompt) ?? desc ?? "Subagent";
+    }
+    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 (/^(create|update)_artifact$/i.test(name.replace(/^mcp__[^_]+__/, ""))) {
+    return str(input?.title) ? `Artifact ${str(input?.title)}` : "Artifact";
+  }
+  if (!input) return n;
+  if (/bash|shell|terminal/i.test(name) && str(input.command)) {
+    const cmd = str(input.command);
+    if (/git\s+fetch/i.test(cmd)) return "Fetch latest from origin and check status";
+    if (/git\s+status/i.test(cmd)) return "Check git status";
+    if (/git\s+log/i.test(cmd)) return "Inspect recent commits";
+    if (/git\s+branch/i.test(cmd)) return "List branches";
+    if (/grep|rg\b/i.test(cmd)) return "Search repository";
+    return "Run shell command";
+  }
+  if (/edit|write|apply/i.test(name)) {
+    const path = str(input.file_path) ?? str(input.path);
+    return path ? `Edit ${path.split("/").pop()}` : "Edit file";
+  }
+  if (/read/i.test(name)) {
+    const path = str(input.file_path) ?? str(input.path);
+    return path ? `Read ${path.split("/").pop()}` : "Read file";
+  }
+  if (/grep/i.test(name)) return "Search files";
+  if (/glob/i.test(name)) return "Find files";
+  return n;
+}
+function isSubagentToolName(name) {
+  const n = (name ?? "").trim();
+  if (/^(task|agent|spawn_agent)$/i.test(n)) return true;
+  return /connectedAgentRequest/i.test(n);
+}
+function messagePartParentId(part) {
+  if ("parentId" in part && typeof part.parentId === "string" && part.parentId.trim()) {
+    return part.parentId;
+  }
+  return void 0;
+}
+function sameParentId(a, b) {
+  return (a ?? "") === (b ?? "");
+}
+function withEventParentId(event, parentId) {
+  if (!parentId) return event;
+  if (event.type === "stdout" || event.type === "thinking" || event.type === "tool_use" || event.type === "tool_result") {
+    return { ...event, parentId: event.parentId ?? parentId };
+  }
+  return event;
+}
+function toolFilePath(input) {
+  if (!input) return void 0;
+  return str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
+}
+function countLines(text) {
+  if (!text) return 0;
+  return text.split("\n").length;
+}
+function diffFromInput(input) {
+  if (!input) return {};
+  const oldS = str(input.old_string) ?? str(input.oldString);
+  const newS = str(input.new_string) ?? str(input.newString) ?? str(input.content);
+  if (oldS != null || newS != null) {
+    return {
+      additions: countLines(newS),
+      deletions: countLines(oldS)
+    };
+  }
+  return {};
+}
+function parseDiffStat(result) {
+  if (!result) return {};
+  const paired = result.match(/\+(\d+)\s+-(\d+)/);
+  if (paired) {
+    return {
+      additions: Number(paired[1]),
+      deletions: Number(paired[2])
+    };
+  }
+  const verbose = result.match(
+    /(\d+)\s+insertions?(?:,\s*(\d+)\s+deletions?)?/i
+  );
+  if (verbose) {
+    return {
+      additions: Number(verbose[1]),
+      deletions: verbose[2] != null ? Number(verbose[2]) : void 0
+    };
+  }
+  return {};
+}
+function applyAgentEvent(parts, event) {
+  if (event.type === "stdout") {
+    const data = event.data;
+    if (!data) return parts;
+    const next = [...parts];
+    const last = next[next.length - 1];
+    if (last?.type === "text" && sameParentId(last.parentId, event.parentId)) {
+      next[next.length - 1] = {
+        type: "text",
+        text: last.text + data,
+        ...event.parentId ? { parentId: event.parentId } : {}
+      };
+    } else {
+      next.push({
+        type: "text",
+        text: data,
+        ...event.parentId ? { parentId: event.parentId } : {}
+      });
+    }
+    return next;
+  }
+  if (event.type === "thinking") {
+    const data = event.data;
+    if (!data) return parts;
+    const next = [...parts];
+    const last = next[next.length - 1];
+    if (last?.type === "thinking" && sameParentId(last.parentId, event.parentId)) {
+      next[next.length - 1] = {
+        type: "thinking",
+        text: last.text + data,
+        ...event.parentId ? { parentId: event.parentId } : {}
+      };
+    } else {
+      next.push({
+        type: "thinking",
+        text: data,
+        ...event.parentId ? { parentId: event.parentId } : {}
+      });
+    }
+    return next;
+  }
+  if (event.type === "tool_use") {
+    const input = asRecord(event.input);
+    const diff = diffFromInput(input);
+    const existing = parts.findIndex((p) => p.type === "tool" && p.id === event.id);
+    if (existing >= 0) {
+      const prev = parts[existing];
+      const next = [...parts];
+      const mergedInput = input && Object.keys(input).length > 0 ? input : prev.input ?? input;
+      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,
+        additions: diff.additions ?? prev.additions,
+        deletions: diff.deletions ?? prev.deletions,
+        parentId: event.parentId ?? prev.parentId
+      };
+      return next;
+    }
+    return [
+      ...parts,
+      {
+        type: "tool",
+        id: event.id,
+        name: event.name,
+        input,
+        description: toolDescription(event.name, input),
+        detail: toolDetail(event.name, input),
+        status: "running",
+        filePath: toolFilePath(input),
+        ...event.parentId ? { parentId: event.parentId } : {},
+        ...diff
+      }
+    ];
+  }
+  if (event.type === "tool_result") {
+    const existing = parts.findIndex((p) => p.type === "tool" && p.id === event.id);
+    const fromResult = parseDiffStat(event.content);
+    if (existing < 0) {
+      return [
+        ...parts,
+        {
+          type: "tool",
+          id: event.id,
+          name: "tool",
+          description: "tool",
+          status: event.isError ? "error" : "done",
+          result: event.content,
+          ...event.parentId ? { parentId: event.parentId } : {},
+          ...fromResult.additions != null ? { additions: fromResult.additions } : {},
+          ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
+        }
+      ];
+    }
+    return parts.map((p, i) => {
+      if (i !== existing || p.type !== "tool") return p;
+      return {
+        ...p,
+        status: event.isError ? "error" : "done",
+        result: event.content,
+        ...fromResult.additions != null ? { additions: fromResult.additions } : {},
+        ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
+      };
+    });
+  }
+  return parts;
+}
+function partsToAssistantText(parts) {
+  return parts.filter(
+    (p) => p.type === "text" && !messagePartParentId(p)
+  ).map((p) => p.text).join("").trim();
+}
+function stripBrightsyNdjsonNoise(text) {
+  if (!text || !text.includes('"type"')) return text;
+  let out = text;
+  out = out.replace(
+    /\{"type":"(?:tool_use|tool_result|tool|thinking|usage|done|error)"[\s\S]*?\}\s*(?=\{"type":"|$|(?=[A-Za-z*#]))/g,
+    ""
+  );
+  out = out.replace(/\{"type":"(?:tool_use|tool_result|tool)"[\s\S]*$/g, "");
+  return out.trim();
+}
+function isBrightsyNdjsonLine(line) {
+  const t = line.trim();
+  if (!t.startsWith("{")) return false;
+  return /"type"\s*:\s*"(tool_use|tool_result|tool|thinking|usage|done|error|text)"/.test(t);
+}
+function finalizeParts(parts) {
+  return parts.map(
+    (p) => p.type === "tool" && p.status === "running" ? { ...p, status: "done" } : p
+  );
+}
+function normalizeParseResult(parsed) {
+  if (!parsed) return [];
+  return Array.isArray(parsed) ? parsed : [parsed];
+}
+
 // src/agents/injected-mcp.ts
 import { existsSync as existsSync4, mkdtempSync, writeFileSync } from "fs";
 import { createRequire } from "module";
@@ -895,14 +1189,7 @@ var SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS = [
   "mcp__sideboard__present_schema",
   "mcp__sideboard__present_files",
   "mcp__sideboard__ask_user",
-  "mcp__sideboard__present_plan",
-  "mcp__sideboard__list_teams",
-  "mcp__sideboard__slack_list_channels",
-  "mcp__sideboard__slack_list_users",
-  "mcp__sideboard__slack_search",
-  "mcp__sideboard__slack_read",
-  "mcp__sideboard__slack_post",
-  "mcp__sideboard__slack_replies"
+  "mcp__sideboard__present_plan"
 ];
 var brightsyMcpCommandCache = null;
 async function resolveBrightsyMcpCommand() {
@@ -1215,7 +1502,10 @@ var BASE_ALLOWED_TOOLS = [
   "Glob",
   "Grep",
   "WebFetch",
-  "WebSearch"
+  "WebSearch",
+  // Subagents (Claude Code v2.1.63 renamed Task → Agent; allow both).
+  "Task",
+  "Agent"
 ];
 var CLAUDE_CHROME_ALLOWED_TOOLS = [
   "mcp__claude-in-chrome",
@@ -1267,42 +1557,59 @@ function claudeResultErrorDetail(obj) {
   }
   return "Claude turn failed";
 }
-function eventsFromContentBlocks(blocks) {
+function eventsFromContentBlocks(blocks, parentId) {
   if (!blocks?.length) return [];
   const out = [];
   for (const block of blocks) {
     if (!block?.type) continue;
     if (block.type === "text" && block.text) {
-      out.push({ type: "stdout", data: block.text });
+      out.push(withEventParentId({ type: "stdout", data: block.text }, parentId));
       continue;
     }
     if ((block.type === "thinking" || block.type === "redacted_thinking") && block.thinking) {
-      out.push({ type: "thinking", data: block.thinking });
+      out.push(withEventParentId({ type: "thinking", data: block.thinking }, parentId));
       continue;
     }
     if (block.type === "tool_use" && block.id && block.name) {
-      out.push({
-        type: "tool_use",
-        id: block.id,
-        name: block.name,
-        input: block.input
-      });
+      out.push(
+        withEventParentId(
+          {
+            type: "tool_use",
+            id: block.id,
+            name: block.name,
+            input: block.input
+          },
+          parentId
+        )
+      );
       continue;
     }
     if (block.type === "tool_result" && block.tool_use_id) {
       const content = typeof block.content === "string" ? block.content : Array.isArray(block.content) ? block.content.map(
         (c) => typeof c === "string" ? c : c && typeof c === "object" && "text" in c ? String(c.text ?? "") : ""
       ).join("") : block.content != null ? JSON.stringify(block.content) : void 0;
-      out.push({
-        type: "tool_result",
-        id: block.tool_use_id,
-        content,
-        isError: Boolean(block.is_error)
-      });
+      out.push(
+        withEventParentId(
+          {
+            type: "tool_result",
+            id: block.tool_use_id,
+            content,
+            isError: Boolean(block.is_error)
+          },
+          parentId
+        )
+      );
     }
   }
   return out;
 }
+function claudeParentToolUseId(obj) {
+  const nested = obj.event && typeof obj.event === "object" && !Array.isArray(obj.event) ? obj.event : void 0;
+  for (const id of [obj.parent_tool_use_id, nested?.parent_tool_use_id]) {
+    if (typeof id === "string" && id.trim()) return id.trim();
+  }
+  return void 0;
+}
 var claudeAdapter = {
   kind: "claude",
   async detect() {
@@ -1357,7 +1664,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-H37LFFXI.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-SKFODUQQ.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1423,7 +1730,9 @@ var claudeAdapter = {
       args,
       cwd: thread.worktreePath,
       stdin: useStdin ? `${promptText}
-` : void 0
+` : void 0,
+      // Nested Task/Agent thinking+text in stream-json (Claude Code 2.1.211+).
+      env: { CLAUDE_CODE_FORWARD_SUBAGENT_TEXT: "1" }
     };
   },
   parseEvent(line) {
@@ -1440,8 +1749,9 @@ var claudeAdapter = {
         return { type: "session_id", data: obj.session_id };
       }
       if (obj.type === "assistant" || obj.type === "user") {
+        const parentId = claudeParentToolUseId(obj);
         const message = obj.message;
-        const events = eventsFromContentBlocks(message?.content);
+        const events = eventsFromContentBlocks(message?.content, parentId);
         if (obj.type === "assistant") {
           const usage = usageFromClaude(message?.usage);
           if (usage) events.push({ type: "usage", data: usage, scope: "request" });
@@ -1450,34 +1760,45 @@ var claudeAdapter = {
         return events.length === 1 ? events[0] : events;
       }
       if (obj.type === "stream_event") {
+        const parentId = claudeParentToolUseId(obj);
         const event = obj.event;
         if (!event) return null;
         if (event.type === "content_block_start" && event.content_block) {
           const block = event.content_block;
           if (block.type === "tool_use" && block.id && block.name) {
-            return {
-              type: "tool_use",
-              id: block.id,
-              name: block.name,
-              input: block.input
-            };
+            return withEventParentId(
+              {
+                type: "tool_use",
+                id: block.id,
+                name: block.name,
+                input: block.input
+              },
+              parentId
+            );
           }
           if (block.type === "thinking" && block.thinking) {
-            return { type: "thinking", data: block.thinking };
+            return withEventParentId({ type: "thinking", data: block.thinking }, parentId);
           }
           return null;
         }
         if (event.type === "content_block_delta" && event.delta) {
-          if (event.delta.text) return { type: "stdout", data: event.delta.text };
-          if (event.delta.thinking) return { type: "thinking", data: event.delta.thinking };
+          if (event.delta.text) {
+            return withEventParentId({ type: "stdout", data: event.delta.text }, parentId);
+          }
+          if (event.delta.thinking) {
+            return withEventParentId({ type: "thinking", data: event.delta.thinking }, parentId);
+          }
           return null;
         }
         return null;
       }
       if (obj.type === "content_block_delta") {
+        const parentId = claudeParentToolUseId(obj);
         const delta = obj.delta;
-        if (delta?.text) return { type: "stdout", data: delta.text };
-        if (delta?.thinking) return { type: "thinking", data: delta.thinking };
+        if (delta?.text) return withEventParentId({ type: "stdout", data: delta.text }, parentId);
+        if (delta?.thinking) {
+          return withEventParentId({ type: "thinking", data: delta.thinking }, parentId);
+        }
         return null;
       }
       if (obj.type === "result") {
@@ -1646,7 +1967,7 @@ function unwrapCodexMcpResult(result) {
     return String(result);
   }
 }
-function asRecord(value) {
+function asRecord2(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -1785,7 +2106,7 @@ var codexAdapter = {
         }
         if (itemType === "mcp_tool_call" && item.id && item.server && item.tool) {
           const name = `mcp__${item.server}__${item.tool}`;
-          const input = asRecord(item.arguments);
+          const input = asRecord2(item.arguments);
           const events = [
             { type: "tool_use", id: item.id, name, input }
           ];
@@ -1816,6 +2137,36 @@ var codexAdapter = {
           }
           return events.length === 1 ? events[0] : events;
         }
+        if (itemType === "collab_tool_call" && item.id) {
+          const rawTool = typeof item.tool === "string" ? item.tool : "spawn_agent";
+          const name = /spawn/i.test(rawTool) ? "spawn_agent" : rawTool;
+          const input = {};
+          if (item.prompt) input.prompt = item.prompt;
+          if (Array.isArray(item.receiver_thread_ids)) {
+            input.receiver_thread_ids = item.receiver_thread_ids;
+          }
+          const events = [{ type: "tool_use", id: item.id, name, input }];
+          const finished = type === "item.completed" || item.status === "completed" || item.status === "failed";
+          if (finished) {
+            const nested = [];
+            if (item.agents_states && typeof item.agents_states === "object") {
+              for (const value of Object.values(item.agents_states)) {
+                const msg = value && typeof value === "object" && typeof value.message === "string" ? value.message.trim() : "";
+                if (msg) nested.push(msg);
+              }
+            }
+            for (const text of nested) {
+              events.push({ type: "stdout", data: text, parentId: item.id });
+            }
+            events.push({
+              type: "tool_result",
+              id: item.id,
+              content: nested.join("\n") || void 0,
+              isError: item.status === "failed"
+            });
+          }
+          return events.length === 1 ? events[0] : events;
+        }
         if (item.status === "failed") {
           const detail = item.message?.trim() || extractJsonErrorMessage(item) || `Codex ${itemType ?? "item"} failed`;
           return { type: "stderr", data: detail };
@@ -1909,20 +2260,20 @@ function usageFromCursor(usage) {
     cacheWriteTokens: usage.cacheWriteTokens ? Number(usage.cacheWriteTokens) : void 0
   };
 }
-function asRecord2(value) {
+function asRecord3(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
   return void 0;
 }
 function normalizeCursorToolCall(name, args) {
-  const raw = asRecord2(args);
+  const raw = asRecord3(args);
   const toolName = typeof raw?.toolName === "string" && raw.toolName.trim() ? raw.toolName.trim() : null;
-  const looksLikeMcp = name === "mcp" || toolName != null && (typeof raw?.providerIdentifier === "string" || asRecord2(raw?.args) != null);
+  const looksLikeMcp = name === "mcp" || toolName != null && (typeof raw?.providerIdentifier === "string" || asRecord3(raw?.args) != null);
   if (looksLikeMcp && toolName) {
     const providerRaw = typeof raw.providerIdentifier === "string" && raw.providerIdentifier.trim() ? raw.providerIdentifier.trim() : "sideboard";
     const provider = providerRaw.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const nested = asRecord2(raw.args);
+    const nested = asRecord3(raw.args);
     return {
       name: `mcp__${provider}__${toolName}`,
       input: nested ?? { toolName }
@@ -1933,7 +2284,7 @@ function normalizeCursorToolCall(name, args) {
 function unwrapCursorToolResult(result) {
   if (result == null) return void 0;
   if (typeof result === "string") return result;
-  const rec = asRecord2(result);
+  const rec = asRecord3(result);
   if (!rec) {
     try {
       return JSON.stringify(result);
@@ -1944,18 +2295,18 @@ function unwrapCursorToolResult(result) {
   const collectTexts = (items) => {
     const texts = [];
     for (const item of items) {
-      const row = asRecord2(item);
+      const row = asRecord3(item);
       if (!row) continue;
       if (typeof row.text === "string") {
         texts.push(row.text);
         continue;
       }
-      const nested = asRecord2(row.text);
+      const nested = asRecord3(row.text);
       if (typeof nested?.text === "string") texts.push(nested.text);
     }
     return texts;
   };
-  const value = asRecord2(rec.value);
+  const value = asRecord3(rec.value);
   if (value && Array.isArray(value.content)) {
     const texts = collectTexts(value.content);
     if (texts.length) return texts.join("\n");
@@ -1972,10 +2323,10 @@ function unwrapCursorToolResult(result) {
 }
 function cursorToolResultIsError(status, result) {
   if (status === "error") return true;
-  const rec = asRecord2(result);
+  const rec = asRecord3(result);
   if (!rec) return false;
   if (rec.status === "error") return true;
-  const value = asRecord2(rec.value);
+  const value = asRecord3(rec.value);
   return value?.isError === true;
 }
 function cursorSdkMessageToEvents(msg) {
@@ -2295,6 +2646,24 @@ var FALLBACK_OPENCODE_MODELS = [
 ];
 var cachedOpencodeModels = null;
 var OPENCODE_MODEL_CACHE_MS = 5 * 60 * 1e3;
+function asRecord4(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return void 0;
+}
+function str2(v) {
+  return typeof v === "string" && v.trim() ? v.trim() : void 0;
+}
+function opencodeToolId(name, callId, metadata) {
+  const sessionId = str2(metadata?.sessionId) ?? str2(metadata?.sessionID);
+  if (name === "task" && sessionId) return sessionId;
+  return callId || `tool-${Date.now()}`;
+}
+function withTaskParent(parentId, nested) {
+  const events = Array.isArray(nested) ? nested : [nested];
+  return [{ type: "tool_use", id: parentId, name: "task" }, ...events];
+}
 function displayNameFromOpencodeId(id) {
   const slash = id.indexOf("/");
   if (slash <= 0) return id;
@@ -2452,10 +2821,15 @@ var opencodeAdapter = {
       }
       if (obj.type === "tool_use") {
         const part = obj.part;
-        const id = part?.callID ?? part?.id ?? obj.id ?? `tool-${Date.now()}`;
         const name = part?.tool ?? part?.name ?? obj.tool ?? obj.name ?? "tool";
         const state = part?.state;
         const input = (state?.input && typeof state.input === "object" ? state.input : void 0) ?? part?.input ?? obj.input;
+        const metadata = asRecord4(state?.metadata);
+        const id = opencodeToolId(
+          name,
+          part?.callID ?? part?.id ?? obj.id,
+          metadata
+        );
         const events = [{ type: "tool_use", id, name, input }];
         const output = state?.output;
         if (output != null || state?.status === "completed" || state?.status === "error") {
@@ -2469,6 +2843,53 @@ var opencodeAdapter = {
         }
         return events.length === 1 ? events[0] : events;
       }
+      if (obj.type === "subtask_delta") {
+        const parentId = str2(obj.childSessionID) ?? str2(obj.childSessionId);
+        const delta = str2(obj.delta);
+        if (parentId && delta) {
+          return withTaskParent(
+            parentId,
+            withEventParentId({ type: "thinking", data: delta }, parentId)
+          );
+        }
+        return null;
+      }
+      if (obj.type === "subtask_event") {
+        const parentId = str2(obj.childSessionID) ?? str2(obj.childSessionId);
+        const part = asRecord4(obj.part);
+        if (!parentId || !part) return null;
+        if (part.type === "text" && str2(part.text)) {
+          return withTaskParent(
+            parentId,
+            withEventParentId({ type: "stdout", data: str2(part.text) }, parentId)
+          );
+        }
+        if (part.type === "tool" || str2(part.tool)) {
+          const name = str2(part.tool) ?? str2(part.name) ?? "tool";
+          const id = str2(part.callID) ?? str2(part.id) ?? `${parentId}-${name}`;
+          const state = asRecord4(part.state);
+          const input = asRecord4(state?.input) ?? asRecord4(part.input);
+          const nested = [
+            withEventParentId({ type: "tool_use", id, name, input }, parentId)
+          ];
+          const output = state?.output ?? part.output;
+          if (output != null || state?.status === "completed" || state?.status === "error") {
+            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"
+                },
+                parentId
+              )
+            );
+          }
+          return withTaskParent(parentId, nested);
+        }
+        return null;
+      }
       if (obj.type === "tool_result") {
         const part = obj.part;
         const id = part?.tool_use_id ?? part?.id ?? obj.tool_use_id ?? obj.id;
@@ -2996,11 +3417,19 @@ export {
   turnFailChatText,
   formatTurnExitError,
   applyTurnUsage,
+  contextTokens,
   encodeBrightsyTarget,
   decodeBrightsyTarget,
   parseBrightsyCliLine,
   listBrightsyChatTargets,
   brightsyAdapter,
+  toolDescription,
+  applyAgentEvent,
+  partsToAssistantText,
+  stripBrightsyNdjsonNoise,
+  isBrightsyNdjsonLine,
+  finalizeParts,
+  normalizeParseResult,
   sideboardMcpProfile,
   PLAN_MODE_INSTRUCTION,
   permissionMode,