@sideboard-ai/core 0.1.109 → 0.1.111

package/dist/index.cjs

@@ -820,6 +820,7 @@ __export(app_settings_exports, {
   childEnvWithAppSettings: () => childEnvWithAppSettings,
   claudeChromeEnabled: () => claudeChromeEnabled,
   claudeUserSettingsPath: () => claudeUserSettingsPath,
+  cowboyModeEnabled: () => cowboyModeEnabled,
   deleteBranchOnPurgeEnabled: () => deleteBranchOnPurgeEnabled,
   disconnectLinearConnection: () => disconnectLinearConnection,
   ensureSlackDeviceIdentity: () => ensureSlackDeviceIdentity,
@@ -1058,6 +1059,9 @@ function normalizeAdvanced(raw) {
   if (typeof source.deleteBranchOnPurge === "boolean") {
     out.deleteBranchOnPurge = source.deleteBranchOnPurge;
   }
+  if (typeof source.cowboyMode === "boolean") {
+    out.cowboyMode = source.cowboyMode;
+  }
   if (typeof source.autoArchiveOnMerge === "boolean") {
     out.autoArchiveOnMerge = source.autoArchiveOnMerge;
   }
@@ -1582,6 +1586,9 @@ function updateAdvancedSettings(patch) {
   if (typeof patch.deleteBranchOnPurge === "boolean") {
     advanced.deleteBranchOnPurge = patch.deleteBranchOnPurge;
   }
+  if (typeof patch.cowboyMode === "boolean") {
+    advanced.cowboyMode = patch.cowboyMode;
+  }
   if (typeof patch.autoArchiveOnMerge === "boolean") {
     advanced.autoArchiveOnMerge = patch.autoArchiveOnMerge;
   }
@@ -1632,6 +1639,9 @@ function caffeinateWhileCloudConnectEnabled(settings = loadAppSettings()) {
 function deleteBranchOnPurgeEnabled(settings = loadAppSettings()) {
   return Boolean(settings.advanced.deleteBranchOnPurge);
 }
+function cowboyModeEnabled(settings = loadAppSettings()) {
+  return Boolean(settings.advanced.cowboyMode);
+}
 function autoArchiveOnMergeEnabled(settings = loadAppSettings()) {
   return Boolean(settings.advanced.autoArchiveOnMerge);
 }
@@ -1977,6 +1987,7 @@ function normalizeThread(raw) {
     prTitle: raw.prTitle ?? null,
     prState: raw.prState ?? null,
     skipAutoArchiveOnMerge: Boolean(raw.skipAutoArchiveOnMerge),
+    cowboy: Boolean(raw.cowboy),
     stackId: raw.stackId ?? null,
     stackLayer: raw.stackLayer ?? null,
     userSetTitle: Boolean(raw.userSetTitle),
@@ -2005,6 +2016,7 @@ function createEmptyThread(partial) {
     prTitle: partial.prTitle ?? null,
     prState: partial.prState ?? null,
     skipAutoArchiveOnMerge: partial.skipAutoArchiveOnMerge ?? false,
+    cowboy: Boolean(partial.cowboy),
     stackId: partial.stackId ?? null,
     stackLayer: partial.stackLayer ?? null,
     userSetTitle: partial.userSetTitle ?? false,
@@ -6535,7 +6547,7 @@ function extractJsonErrorMessage(obj) {
 }
 function isPinnedStderrLine(line) {
   if (/^\s*at\s/.test(line)) return false;
-  return /cannot find (?:package|module)|ERR_MODULE_NOT_FOUND|cursor startup failed:/i.test(
+  return /cannot find (?:package|module)|ERR_MODULE_NOT_FOUND|cursor startup failed:|FATAL ERROR|heap out of memory|javascript heap|OOMErrorHandler|FatalProcessOutOfMemory/i.test(
     line
   );
 }
@@ -6558,12 +6570,17 @@ function looksLikeMinifiedJsDump(line) {
 function looksLikeNestedElectronCrash(line) {
   return /HasCustomHostObject|ElectronInitializeICUandStartNode/i.test(line);
 }
-function looksLikeHomebrewLibuvCrash(line) {
-  const uvRun = /uv_run/i.test(line);
-  const spin = /SpinEventLoopInternal/i.test(line);
-  const homebrewUv = /Cellar\/libuv|libuv\.\d\.dylib/i.test(line);
-  const homebrewNode = /Cellar\/node\//i.test(line);
-  return uvRun && (homebrewUv || spin || homebrewNode) || spin && (homebrewUv || homebrewNode);
+function looksLikeNativeEventLoopCrash(text4) {
+  return /uv_run|uv__io_poll|SpinEventLoopInternal/i.test(text4);
+}
+function looksLikeV8Oom(text4) {
+  return /javascript heap|reached heap limit|OOMErrorHandler|FatalProcessOutOfMemory|Allocation failed - JavaScript heap/i.test(
+    text4
+  );
+}
+function looksLikeHomebrewLibuvCrash(text4) {
+  if (!looksLikeNativeEventLoopCrash(text4)) return false;
+  return /Cellar\/(?:libuv|node)|libuv\.\d+\.dylib/i.test(text4);
 }
 function clipStderr(text4, maxChars) {
   const trimmed = text4.trim();
@@ -6577,7 +6594,12 @@ function summarizeTurnStderr(tail, maxChars = 500) {
   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;
+  const blob = tail.join("\n");
+  if (looksLikeV8Oom(blob)) return V8_OOM_SUMMARY;
+  if (looksLikeHomebrewLibuvCrash(blob)) return HOMEBREW_LIBUV_SUMMARY;
+  if (looksLikeNativeEventLoopCrash(blob)) {
+    return BUNDLED_NODE_CRASH_SUMMARY;
+  }
   if (tail.some(
     (line) => /\[resource_exhausted\]|resource_exhausted/i.test(line) || /findFilesWithRipgrep/.test(line)
   )) {
@@ -6603,10 +6625,11 @@ function looksLikeInvalidAgentSession(text4) {
 function looksLikeRetryableRunnerCrash(text4) {
   if (looksLikeAgentFailureMessage(text4)) return false;
   if (looksLikeInvalidAgentSession(text4)) return false;
+  if (looksLikeV8Oom(text4)) return false;
   const lower = text4.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|connection stalled|sig(?:segv|abrt|ill)|segmentation fault|illegal instruction|fatal error/.test(
+  return /uv_run|spineventloopinternal|libuv|homebrew node \+ shared libuv|cursor runner crashed in node|hascustomhostobject|electroninitializeicuandstartnode|nested chromium|truncated crash dump|connection stalled|sig(?:segv|abrt|ill)|segmentation fault|illegal instruction|fatal error/.test(
     lower
   );
 }
@@ -6658,9 +6681,15 @@ function humanizeAgentFailDetail(detail) {
   if (/hascustomhostobject|electroninitializeicuandstartnode|nested chromium/i.test(lower)) {
     return `${raw} \u2014 retry the turn; if it keeps failing, pick another agent.`;
   }
-  if (/homebrew node \+ shared libuv|uv_run|spineventloopinternal/i.test(lower)) {
+  if (looksLikeV8Oom(raw) || /javascript heap out of memory/i.test(lower)) {
+    return /ran out of memory/i.test(raw) ? raw : V8_OOM_SUMMARY;
+  }
+  if (/homebrew node \+ shared libuv|Cellar\/(?:libuv|node)|libuv\.\d+\.dylib/i.test(raw)) {
     return /brew install node@22/i.test(raw) ? raw : `${raw} \u2014 install Node 22 LTS (\`brew install node@22\`) and retry.`;
   }
+  if (/uv_run|spineventloopinternal|uv__io_poll|cursor runner crashed in node/i.test(lower)) {
+    return /retry the turn/i.test(raw) ? raw : BUNDLED_NODE_CRASH_SUMMARY;
+  }
   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).`;
   }
@@ -6690,13 +6719,15 @@ function formatTurnExitError(exitCode, stderrSummary) {
   if (looksLikeAgentFailureMessage(raw)) return detail;
   return `exit ${code}: ${detail}`;
 }
-var NODE_VERSION_FOOTER, NESTED_ELECTRON_SUMMARY, HOMEBREW_LIBUV_SUMMARY, MINIFIED_DUMP_SUMMARY;
+var NODE_VERSION_FOOTER, NESTED_ELECTRON_SUMMARY, HOMEBREW_LIBUV_SUMMARY, BUNDLED_NODE_CRASH_SUMMARY, V8_OOM_SUMMARY, MINIFIED_DUMP_SUMMARY;
 var init_error_detail = __esm({
   "src/agents/error-detail.ts"() {
     "use strict";
     NODE_VERSION_FOOTER = /^Node\.js v\d+/i;
     NESTED_ELECTRON_SUMMARY = "Cursor local agent crashed at Electron startup (nested Chromium / HasCustomHostObject)";
     HOMEBREW_LIBUV_SUMMARY = "Cursor runner crashed in Node (Homebrew Node + shared libuv). Install Node 22 LTS (`brew install node@22`) and retry.";
+    BUNDLED_NODE_CRASH_SUMMARY = "Cursor runner crashed in Node. Retry the turn.";
+    V8_OOM_SUMMARY = "Cursor runner ran out of memory (JavaScript heap). Retry; if it keeps happening, exclude large files from the project folder or start a new chat.";
     MINIFIED_DUMP_SUMMARY = "Cursor local agent crashed during startup (truncated crash dump)";
   }
 });
@@ -7531,6 +7562,300 @@ var init_claude_mcp = __esm({
   }
 });
 
+// src/agents/message-parts.ts
+function asRecord(input) {
+  if (input && typeof input === "object" && !Array.isArray(input)) {
+    return input;
+  }
+  return void 0;
+}
+function str2(v) {
+  return typeof v === "string" && v.trim() ? v : void 0;
+}
+function toolDetail(name, input) {
+  if (!input) return void 0;
+  const command = str2(input.command) ?? str2(input.cmd);
+  if (command) return command;
+  const path2 = str2(input.file_path) ?? str2(input.path) ?? str2(input.filePath) ?? str2(input.filename);
+  if (path2) return path2;
+  const pattern = str2(input.pattern) ?? str2(input.glob) ?? str2(input.glob_pattern);
+  if (pattern) return pattern;
+  const query = str2(input.query) ?? str2(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 str2(input?.agent_id) ? `Ask connected agent` : "Ask connected agent";
+  }
+  if (/present_artifact$/i.test(name)) {
+    return str2(input?.title) ? `Present ${str2(input?.title)}` : "Present artifact";
+  }
+  if (/present_plan$/i.test(name)) {
+    return str2(input?.title) ? `Plan ${str2(input?.title)}` : "Present plan";
+  }
+  if (/present_schema$/i.test(name)) {
+    return str2(input?.title) ? `Schema ${str2(input?.title)}` : "Present schema";
+  }
+  if (/present_files$/i.test(name)) {
+    return str2(input?.title) ? `Files ${str2(input?.title)}` : "Present files";
+  }
+  if (isSubagentToolName(name)) {
+    const desc = str2(input?.description);
+    const sub = asRecord(input?.subagentType);
+    const kind = str2(sub?.name) ?? str2(sub?.kind) ?? str2(input?.subagent_type) ?? str2(input?.subagentType);
+    if (/^spawn_agent$/i.test(name)) {
+      return str2(input?.prompt) ?? desc ?? "Subagent";
+    }
+    if (/connectedAgentRequest/i.test(name)) {
+      return str2(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 str2(input?.title) ? `Artifact ${str2(input?.title)}` : "Artifact";
+  }
+  if (!input) return n;
+  if (/bash|shell|terminal/i.test(name) && str2(input.command)) {
+    const cmd = str2(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 path2 = str2(input.file_path) ?? str2(input.path);
+    return path2 ? `Edit ${path2.split("/").pop()}` : "Edit file";
+  }
+  if (/read/i.test(name)) {
+    const path2 = str2(input.file_path) ?? str2(input.path);
+    return path2 ? `Read ${path2.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 withEventsParentId(events, parentId) {
+  if (!parentId) return events;
+  return events.map((event) => withEventParentId(event, parentId));
+}
+function toolFilePath(input) {
+  if (!input) return void 0;
+  return str2(input.file_path) ?? str2(input.path) ?? str2(input.filePath) ?? str2(input.filename);
+}
+function countLines(text4) {
+  if (!text4) return 0;
+  return text4.split("\n").length;
+}
+function diffFromInput(input) {
+  if (!input) return {};
+  const oldS = str2(input.old_string) ?? str2(input.oldString);
+  const newS = str2(input.new_string) ?? str2(input.newString) ?? str2(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(text4) {
+  if (!text4 || !text4.includes('"type"')) return text4;
+  let out = text4;
+  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];
+}
+var init_message_parts = __esm({
+  "src/agents/message-parts.ts"() {
+    "use strict";
+  }
+});
+
 // src/mcp/profile.ts
 function sideboardMcpProfile(env = process.env) {
   return env[SIDEBOARD_MCP_PROFILE_ENV]?.trim().toLowerCase() === "worktree" ? "worktree" : "orchestration";
@@ -8170,42 +8495,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;
+}
 function parseIssuesJson(raw) {
   const text4 = raw.trim();
   const candidates = [text4];
@@ -8240,6 +8582,7 @@ var init_claude = __esm({
     init_app_settings();
     init_claude_mcp();
     init_error_detail();
+    init_message_parts();
     init_injected_mcp();
     init_turn_input();
     init_types();
@@ -8251,7 +8594,10 @@ var init_claude = __esm({
       "Glob",
       "Grep",
       "WebFetch",
-      "WebSearch"
+      "WebSearch",
+      // Subagents (Claude Code v2.1.63 renamed Task → Agent; allow both).
+      "Task",
+      "Agent"
     ];
     CLAUDE_CHROME_ALLOWED_TOOLS = [
       "mcp__claude-in-chrome",
@@ -8379,7 +8725,9 @@ var init_claude = __esm({
           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) {
@@ -8396,8 +8744,9 @@ var init_claude = __esm({
             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" });
@@ -8406,34 +8755,45 @@ var init_claude = __esm({
             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") {
@@ -8566,7 +8926,7 @@ function unwrapCodexMcpResult(result) {
     return String(result);
   }
 }
-function asRecord(value) {
+function asRecord2(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -8731,7 +9091,7 @@ var init_codex = __esm({
             }
             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 }
               ];
@@ -8762,6 +9122,36 @@ var init_codex = __esm({
               }
               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 text4 of nested) {
+                  events.push({ type: "stdout", data: text4, 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 };
@@ -8850,20 +9240,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 }
@@ -8874,7 +9264,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);
@@ -8885,18 +9275,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");
@@ -8913,10 +9303,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) {
@@ -9058,24 +9448,24 @@ function resolveCursorRipgrepPath(opts) {
     packagedCursorRipgrepCandidate(platformRipgrepPackage(), rgBinaryName())
   );
   if (fromPackaged) return fromPackaged;
-  const start = opts?.startFile?.trim() || process.argv[1] || (0, import_node_url2.fileURLToPath)(import_meta2.url);
+  const start = opts?.startFile?.trim() || process.argv[1] || // CJS bundle only — ESM has no __filename; argv[1] is the running script.
+  // eslint-disable-next-line camelcase
+  (typeof __filename !== "undefined" ? __filename : "");
   return walkForBundledRipgrep(start) ?? requireResolveBundledRipgrep(start);
 }
 function cursorRipgrepEnv(opts) {
   const path2 = resolveCursorRipgrepPath(opts);
   return path2 ? { [RIPGREP_ENV]: path2 } : {};
 }
-var import_node_fs26, import_node_module2, import_node_path26, import_node_url2, import_meta2, RIPGREP_ENV;
+var import_node_fs26, import_node_module2, import_node_path26, RIPGREP_ENV;
 var init_cursor_ripgrep = __esm({
   "src/agents/cursor-ripgrep.ts"() {
     "use strict";
     import_node_fs26 = require("fs");
     import_node_module2 = require("module");
     import_node_path26 = require("path");
-    import_node_url2 = require("url");
     init_node_launch();
     init_packaged_runtime();
-    import_meta2 = {};
     RIPGREP_ENV = "CURSOR_RIPGREP_PATH";
   }
 });
@@ -9119,7 +9509,7 @@ function entryDir() {
   const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
   if (cjsDir) return cjsDir;
   try {
-    return (0, import_node_path27.dirname)((0, import_node_url3.fileURLToPath)(import_meta3.url));
+    return (0, import_node_path27.dirname)((0, import_node_url2.fileURLToPath)(import_meta2.url));
   } catch {
     try {
       const req = (0, import_node_module3.createRequire)(process.cwd() + "/");
@@ -9148,14 +9538,14 @@ function cursorRunnerPath() {
   }
   return candidates[0];
 }
-var import_node_fs27, import_node_module3, import_node_path27, import_node_url3, import_sdk, import_meta3, FALLBACK_CURSOR_MODELS, cachedModels, MODEL_CACHE_MS, cursorAdapter;
+var import_node_fs27, import_node_module3, import_node_path27, import_node_url2, import_sdk, import_meta2, FALLBACK_CURSOR_MODELS, cachedModels, MODEL_CACHE_MS, cursorAdapter;
 var init_cursor = __esm({
   "src/agents/cursor.ts"() {
     "use strict";
     import_node_fs27 = require("fs");
     import_node_module3 = require("module");
     import_node_path27 = require("path");
-    import_node_url3 = require("url");
+    import_node_url2 = require("url");
     import_sdk = require("@cursor/sdk");
     init_run();
     init_app_settings();
@@ -9167,7 +9557,7 @@ var init_cursor = __esm({
     init_packaged_runtime();
     init_turn_input();
     init_cursor_events();
-    import_meta3 = {};
+    import_meta2 = {};
     FALLBACK_CURSOR_MODELS = [
       { id: "default", displayName: "Auto" },
       { id: "composer-2.5", displayName: "Composer 2.5" },
@@ -9259,6 +9649,24 @@ var init_cursor = __esm({
 });
 
 // src/agents/opencode.ts
+function asRecord4(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return void 0;
+}
+function str3(v) {
+  return typeof v === "string" && v.trim() ? v.trim() : void 0;
+}
+function opencodeToolId(name, callId, metadata) {
+  const sessionId = str3(metadata?.sessionId) ?? str3(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;
@@ -9325,6 +9733,7 @@ var init_opencode = __esm({
     init_app_settings();
     init_global_workspace();
     init_error_detail();
+    init_message_parts();
     init_injected_mcp();
     init_turn_input();
     init_types();
@@ -9441,10 +9850,15 @@ var init_opencode = __esm({
           }
           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") {
@@ -9458,6 +9872,53 @@ var init_opencode = __esm({
             }
             return events.length === 1 ? events[0] : events;
           }
+          if (obj.type === "subtask_delta") {
+            const parentId = str3(obj.childSessionID) ?? str3(obj.childSessionId);
+            const delta = str3(obj.delta);
+            if (parentId && delta) {
+              return withTaskParent(
+                parentId,
+                withEventParentId({ type: "thinking", data: delta }, parentId)
+              );
+            }
+            return null;
+          }
+          if (obj.type === "subtask_event") {
+            const parentId = str3(obj.childSessionID) ?? str3(obj.childSessionId);
+            const part = asRecord4(obj.part);
+            if (!parentId || !part) return null;
+            if (part.type === "text" && str3(part.text)) {
+              return withTaskParent(
+                parentId,
+                withEventParentId({ type: "stdout", data: str3(part.text) }, parentId)
+              );
+            }
+            if (part.type === "tool" || str3(part.tool)) {
+              const name = str3(part.tool) ?? str3(part.name) ?? "tool";
+              const id = str3(part.callID) ?? str3(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;
@@ -9887,422 +10348,189 @@ async function installAgent(agent) {
       };
     }
   }
-  enrichPathWithNpmGlobalBin();
-  let binPath = null;
-  if (cliBin) {
-    binPath = await whichCli(cliBin);
-  }
-  return {
-    ok: true,
-    command: info.installCommand,
-    exitCode: 0,
-    stdout: result.stdout,
-    stderr: result.stderr,
-    message: binPath ? `Installed ${info.npmPackage} \u2192 ${binPath}` : `Installed ${info.npmPackage} (CLI not yet on PATH \u2014 Log in still exports Electron\u2019s PATH into Terminal)`
-  };
-}
-async function loginAgent(agent) {
-  const info = getAgentSetupInfo(agent);
-  const loginCommand = resolveLoginCommand(agent);
-  if (!loginCommand) {
-    return {
-      ok: true,
-      message: info.kind === "bundled-sdk" || info.kind === "api-key" ? info.summary : `No login command for ${agent}`
-    };
-  }
-  const prepared = await prepareTerminalCommand(loginCommand);
-  await openInSystemTerminal(prepared);
-  return {
-    ok: true,
-    openedTerminal: true,
-    command: prepared,
-    message: `Opened Terminal to run: ${prepared}`
-  };
-}
-var SETUP, CLI_BIN, CLI_LOGIN_AGENTS;
-var init_install = __esm({
-  "src/agents/install.ts"() {
-    "use strict";
-    init_run();
-    init_app_settings();
-    init_path();
-    SETUP = {
-      claude: {
-        agent: "claude",
-        kind: "cli",
-        summary: "Install the Claude Code CLI, then complete login in a terminal.",
-        docsUrl: "https://code.claude.com/docs/en/install",
-        installCommand: "npm install -g @anthropic-ai/claude-code",
-        loginCommand: "claude auth login",
-        npmPackage: "@anthropic-ai/claude-code"
-      },
-      codex: {
-        agent: "codex",
-        kind: "cli",
-        summary: "Install the Codex CLI, then run login in a terminal.",
-        docsUrl: "https://github.com/openai/codex",
-        installCommand: "npm install -g @openai/codex",
-        loginCommand: "codex login",
-        npmPackage: "@openai/codex"
-      },
-      opencode: {
-        agent: "opencode",
-        kind: "cli",
-        summary: "Install OpenCode (curl installer or npm), then authenticate providers.",
-        docsUrl: "https://opencode.ai/docs",
-        // Prefer the official installer; npm package name is opencode-ai.
-        installCommand: "curl -fsSL https://opencode.ai/install | bash",
-        loginCommand: "opencode auth login",
-        npmPackage: "opencode-ai@latest"
-      },
-      cursor: {
-        agent: "cursor",
-        kind: "bundled-sdk",
-        summary: "No CLI install \u2014 Sideboard ships the Cursor SDK. Add a CURSOR_API_KEY from the Cursor dashboard.",
-        docsUrl: "https://cursor.com/dashboard/integrations",
-        installCommand: null,
-        loginCommand: null
-      },
-      brightsy: {
-        agent: "brightsy",
-        kind: "cli",
-        summary: "Install the Brightsy CLI, then run `brightsy login`.",
-        docsUrl: "https://www.npmjs.com/package/@brightsy/cli",
-        installCommand: "npm install -g @brightsy/cli",
-        loginCommand: "brightsy login",
-        npmPackage: "@brightsy/cli"
-      }
-    };
-    CLI_BIN = {
-      claude: "claude",
-      codex: "codex",
-      opencode: "opencode",
-      brightsy: "brightsy"
-    };
-    CLI_LOGIN_AGENTS = /* @__PURE__ */ new Set([
-      "claude",
-      "codex",
-      "opencode",
-      "brightsy"
-    ]);
-  }
-});
-
-// src/agents/index.ts
-var agents_exports = {};
-__export(agents_exports, {
-  CLAUDE_MODEL_CATALOG: () => CLAUDE_MODEL_CATALOG,
-  ORCHESTRATOR_AGENT_KINDS: () => ORCHESTRATOR_AGENT_KINDS,
-  PLAN_MODE_INSTRUCTION: () => PLAN_MODE_INSTRUCTION,
-  allAdapters: () => allAdapters,
-  assertOrchestratorCapableAgent: () => assertOrchestratorCapableAgent,
-  brightsyAdapter: () => brightsyAdapter,
-  claudeAdapter: () => claudeAdapter,
-  codexAdapter: () => codexAdapter,
-  coerceOrchestratorAgent: () => coerceOrchestratorAgent,
-  conductorBundledBinDir: () => conductorBundledBinDir,
-  cursorAdapter: () => cursorAdapter,
-  cursorSdkMessageToEvents: () => cursorSdkMessageToEvents,
-  decodeBrightsyTarget: () => decodeBrightsyTarget,
-  encodeBrightsyTarget: () => encodeBrightsyTarget,
-  enrichPathWithNpmGlobalBin: () => enrichPathWithNpmGlobalBin,
-  ensureAgentPath: () => ensureAgentPath,
-  getAdapter: () => getAdapter,
-  getAgentSetupInfo: () => getAgentSetupInfo,
-  installAgent: () => installAgent,
-  isConductorBundledCli: () => isConductorBundledCli,
-  isCursorAutoModel: () => isCursorAutoModel,
-  isOrchestratorCapableAgent: () => isOrchestratorCapableAgent,
-  isSessionQuotaLimit: () => isSessionQuotaLimit,
-  listAgentSetupInfo: () => listAgentSetupInfo,
-  listBrightsyChatTargets: () => listBrightsyChatTargets,
-  listCodexModels: () => listCodexModels,
-  listCursorModels: () => listCursorModels,
-  listModelsForAgent: () => listModelsForAgent,
-  listOpencodeModels: () => listOpencodeModels,
-  loginAgent: () => loginAgent,
-  openInSystemTerminal: () => openInSystemTerminal,
-  opencodeAdapter: () => opencodeAdapter,
-  parseCursorRunnerLine: () => parseCursorRunnerLine,
-  parseSessionQuotaResetAt: () => parseSessionQuotaResetAt,
-  permissionMode: () => permissionMode,
-  posixShellSingleQuote: () => posixShellSingleQuote,
-  prepareTerminalCommand: () => prepareTerminalCommand,
-  resolveCommandBinarySync: () => resolveCommandBinarySync,
-  resolveCursorModelId: () => resolveCursorModelId,
-  resolveLoginCommand: () => resolveLoginCommand,
-  resolveQuotaFallbackAgent: () => resolveQuotaFallbackAgent,
-  withExportedPath: () => withExportedPath
-});
-function getAdapter(kind) {
-  return adapters[kind];
-}
-function allAdapters() {
-  return Object.values(adapters);
-}
-var adapters;
-var init_agents = __esm({
-  "src/agents/index.ts"() {
-    "use strict";
-    init_brightsy();
-    init_claude();
-    init_codex();
-    init_cursor();
-    init_opencode();
-    init_types();
-    init_brightsy();
-    init_brightsy_targets();
-    init_claude();
-    init_codex();
-    init_cursor();
-    init_cursor_events();
-    init_cursor();
-    init_opencode();
-    init_list_models();
-    init_session_quota();
-    init_orchestrator_capable();
-    init_path();
-    init_install();
-    adapters = {
-      claude: claudeAdapter,
-      codex: codexAdapter,
-      opencode: opencodeAdapter,
-      brightsy: brightsyAdapter,
-      cursor: cursorAdapter
-    };
-  }
-});
-
-// src/agents/message-parts.ts
-function asRecord3(input) {
-  if (input && typeof input === "object" && !Array.isArray(input)) {
-    return input;
-  }
-  return void 0;
-}
-function str2(v) {
-  return typeof v === "string" && v.trim() ? v : void 0;
-}
-function toolDetail(name, input) {
-  if (!input) return void 0;
-  const command = str2(input.command) ?? str2(input.cmd);
-  if (command) return command;
-  const path2 = str2(input.file_path) ?? str2(input.path) ?? str2(input.filePath) ?? str2(input.filename);
-  if (path2) return path2;
-  const pattern = str2(input.pattern) ?? str2(input.glob) ?? str2(input.glob_pattern);
-  if (pattern) return pattern;
-  const query = str2(input.query) ?? str2(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 str2(input?.agent_id) ? `Ask connected agent` : "Ask connected agent";
-  }
-  if (/present_artifact$/i.test(name)) {
-    return str2(input?.title) ? `Present ${str2(input?.title)}` : "Present artifact";
-  }
-  if (/present_plan$/i.test(name)) {
-    return str2(input?.title) ? `Plan ${str2(input?.title)}` : "Present plan";
-  }
-  if (/present_schema$/i.test(name)) {
-    return str2(input?.title) ? `Schema ${str2(input?.title)}` : "Present schema";
-  }
-  if (/present_files$/i.test(name)) {
-    return str2(input?.title) ? `Files ${str2(input?.title)}` : "Present files";
-  }
-  if (/^(create|update)_artifact$/i.test(name.replace(/^mcp__[^_]+__/, ""))) {
-    return str2(input?.title) ? `Artifact ${str2(input?.title)}` : "Artifact";
-  }
-  if (!input) return n;
-  if (/bash|shell|terminal/i.test(name) && str2(input.command)) {
-    const cmd = str2(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 path2 = str2(input.file_path) ?? str2(input.path);
-    return path2 ? `Edit ${path2.split("/").pop()}` : "Edit file";
-  }
-  if (/read/i.test(name)) {
-    const path2 = str2(input.file_path) ?? str2(input.path);
-    return path2 ? `Read ${path2.split("/").pop()}` : "Read file";
-  }
-  if (/grep/i.test(name)) return "Search files";
-  if (/glob/i.test(name)) return "Find files";
-  return n;
-}
-function toolFilePath(input) {
-  if (!input) return void 0;
-  return str2(input.file_path) ?? str2(input.path) ?? str2(input.filePath) ?? str2(input.filename);
-}
-function countLines(text4) {
-  if (!text4) return 0;
-  return text4.split("\n").length;
-}
-function diffFromInput(input) {
-  if (!input) return {};
-  const oldS = str2(input.old_string) ?? str2(input.oldString);
-  const newS = str2(input.new_string) ?? str2(input.newString) ?? str2(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") {
-      next[next.length - 1] = { type: "text", text: last.text + data };
-    } else {
-      next.push({ type: "text", text: data });
-    }
-    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") {
-      next[next.length - 1] = { type: "thinking", text: last.text + data };
-    } else {
-      next.push({ type: "thinking", text: data });
-    }
-    return next;
-  }
-  if (event.type === "tool_use") {
-    const input = asRecord3(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];
-      next[existing] = {
-        ...prev,
-        name: event.name || prev.name,
-        input: input ?? prev.input,
-        description: toolDescription(event.name || prev.name, input ?? prev.input),
-        detail: toolDetail(event.name || prev.name, input ?? prev.input) ?? prev.detail,
-        filePath: toolFilePath(input) ?? prev.filePath,
-        additions: diff.additions ?? prev.additions,
-        deletions: diff.deletions ?? prev.deletions
-      };
-      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),
-        ...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,
-          ...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 } : {}
-      };
-    });
+  enrichPathWithNpmGlobalBin();
+  let binPath = null;
+  if (cliBin) {
+    binPath = await whichCli(cliBin);
   }
-  return parts;
-}
-function partsToAssistantText(parts) {
-  return parts.filter((p) => p.type === "text").map((p) => p.text).join("").trim();
-}
-function stripBrightsyNdjsonNoise(text4) {
-  if (!text4 || !text4.includes('"type"')) return text4;
-  let out = text4;
-  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();
+  return {
+    ok: true,
+    command: info.installCommand,
+    exitCode: 0,
+    stdout: result.stdout,
+    stderr: result.stderr,
+    message: binPath ? `Installed ${info.npmPackage} \u2192 ${binPath}` : `Installed ${info.npmPackage} (CLI not yet on PATH \u2014 Log in still exports Electron\u2019s PATH into Terminal)`
+  };
 }
-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);
+async function loginAgent(agent) {
+  const info = getAgentSetupInfo(agent);
+  const loginCommand = resolveLoginCommand(agent);
+  if (!loginCommand) {
+    return {
+      ok: true,
+      message: info.kind === "bundled-sdk" || info.kind === "api-key" ? info.summary : `No login command for ${agent}`
+    };
+  }
+  const prepared = await prepareTerminalCommand(loginCommand);
+  await openInSystemTerminal(prepared);
+  return {
+    ok: true,
+    openedTerminal: true,
+    command: prepared,
+    message: `Opened Terminal to run: ${prepared}`
+  };
 }
-function finalizeParts(parts) {
-  return parts.map(
-    (p) => p.type === "tool" && p.status === "running" ? { ...p, status: "done" } : p
-  );
+var SETUP, CLI_BIN, CLI_LOGIN_AGENTS;
+var init_install = __esm({
+  "src/agents/install.ts"() {
+    "use strict";
+    init_run();
+    init_app_settings();
+    init_path();
+    SETUP = {
+      claude: {
+        agent: "claude",
+        kind: "cli",
+        summary: "Install the Claude Code CLI, then complete login in a terminal.",
+        docsUrl: "https://code.claude.com/docs/en/install",
+        installCommand: "npm install -g @anthropic-ai/claude-code",
+        loginCommand: "claude auth login",
+        npmPackage: "@anthropic-ai/claude-code"
+      },
+      codex: {
+        agent: "codex",
+        kind: "cli",
+        summary: "Install the Codex CLI, then run login in a terminal.",
+        docsUrl: "https://github.com/openai/codex",
+        installCommand: "npm install -g @openai/codex",
+        loginCommand: "codex login",
+        npmPackage: "@openai/codex"
+      },
+      opencode: {
+        agent: "opencode",
+        kind: "cli",
+        summary: "Install OpenCode (curl installer or npm), then authenticate providers.",
+        docsUrl: "https://opencode.ai/docs",
+        // Prefer the official installer; npm package name is opencode-ai.
+        installCommand: "curl -fsSL https://opencode.ai/install | bash",
+        loginCommand: "opencode auth login",
+        npmPackage: "opencode-ai@latest"
+      },
+      cursor: {
+        agent: "cursor",
+        kind: "bundled-sdk",
+        summary: "No CLI install \u2014 Sideboard ships the Cursor SDK. Add a CURSOR_API_KEY from the Cursor dashboard.",
+        docsUrl: "https://cursor.com/dashboard/integrations",
+        installCommand: null,
+        loginCommand: null
+      },
+      brightsy: {
+        agent: "brightsy",
+        kind: "cli",
+        summary: "Install the Brightsy CLI, then run `brightsy login`.",
+        docsUrl: "https://www.npmjs.com/package/@brightsy/cli",
+        installCommand: "npm install -g @brightsy/cli",
+        loginCommand: "brightsy login",
+        npmPackage: "@brightsy/cli"
+      }
+    };
+    CLI_BIN = {
+      claude: "claude",
+      codex: "codex",
+      opencode: "opencode",
+      brightsy: "brightsy"
+    };
+    CLI_LOGIN_AGENTS = /* @__PURE__ */ new Set([
+      "claude",
+      "codex",
+      "opencode",
+      "brightsy"
+    ]);
+  }
+});
+
+// src/agents/index.ts
+var agents_exports = {};
+__export(agents_exports, {
+  CLAUDE_MODEL_CATALOG: () => CLAUDE_MODEL_CATALOG,
+  ORCHESTRATOR_AGENT_KINDS: () => ORCHESTRATOR_AGENT_KINDS,
+  PLAN_MODE_INSTRUCTION: () => PLAN_MODE_INSTRUCTION,
+  allAdapters: () => allAdapters,
+  assertOrchestratorCapableAgent: () => assertOrchestratorCapableAgent,
+  brightsyAdapter: () => brightsyAdapter,
+  claudeAdapter: () => claudeAdapter,
+  codexAdapter: () => codexAdapter,
+  coerceOrchestratorAgent: () => coerceOrchestratorAgent,
+  conductorBundledBinDir: () => conductorBundledBinDir,
+  cursorAdapter: () => cursorAdapter,
+  cursorSdkMessageToEvents: () => cursorSdkMessageToEvents,
+  decodeBrightsyTarget: () => decodeBrightsyTarget,
+  encodeBrightsyTarget: () => encodeBrightsyTarget,
+  enrichPathWithNpmGlobalBin: () => enrichPathWithNpmGlobalBin,
+  ensureAgentPath: () => ensureAgentPath,
+  getAdapter: () => getAdapter,
+  getAgentSetupInfo: () => getAgentSetupInfo,
+  installAgent: () => installAgent,
+  isConductorBundledCli: () => isConductorBundledCli,
+  isCursorAutoModel: () => isCursorAutoModel,
+  isOrchestratorCapableAgent: () => isOrchestratorCapableAgent,
+  isSessionQuotaLimit: () => isSessionQuotaLimit,
+  listAgentSetupInfo: () => listAgentSetupInfo,
+  listBrightsyChatTargets: () => listBrightsyChatTargets,
+  listCodexModels: () => listCodexModels,
+  listCursorModels: () => listCursorModels,
+  listModelsForAgent: () => listModelsForAgent,
+  listOpencodeModels: () => listOpencodeModels,
+  loginAgent: () => loginAgent,
+  openInSystemTerminal: () => openInSystemTerminal,
+  opencodeAdapter: () => opencodeAdapter,
+  parseCursorRunnerLine: () => parseCursorRunnerLine,
+  parseSessionQuotaResetAt: () => parseSessionQuotaResetAt,
+  permissionMode: () => permissionMode,
+  posixShellSingleQuote: () => posixShellSingleQuote,
+  prepareTerminalCommand: () => prepareTerminalCommand,
+  resolveCommandBinarySync: () => resolveCommandBinarySync,
+  resolveCursorModelId: () => resolveCursorModelId,
+  resolveLoginCommand: () => resolveLoginCommand,
+  resolveQuotaFallbackAgent: () => resolveQuotaFallbackAgent,
+  withExportedPath: () => withExportedPath
+});
+function getAdapter(kind) {
+  return adapters[kind];
 }
-function normalizeParseResult(parsed) {
-  if (!parsed) return [];
-  return Array.isArray(parsed) ? parsed : [parsed];
+function allAdapters() {
+  return Object.values(adapters);
 }
-var init_message_parts = __esm({
-  "src/agents/message-parts.ts"() {
+var adapters;
+var init_agents = __esm({
+  "src/agents/index.ts"() {
     "use strict";
+    init_brightsy();
+    init_claude();
+    init_codex();
+    init_cursor();
+    init_opencode();
+    init_types();
+    init_brightsy();
+    init_brightsy_targets();
+    init_claude();
+    init_codex();
+    init_cursor();
+    init_cursor_events();
+    init_cursor();
+    init_opencode();
+    init_list_models();
+    init_session_quota();
+    init_orchestrator_capable();
+    init_path();
+    init_install();
+    adapters = {
+      claude: claudeAdapter,
+      codex: codexAdapter,
+      opencode: opencodeAdapter,
+      brightsy: brightsyAdapter,
+      cursor: cursorAdapter
+    };
   }
 });
 
@@ -10310,6 +10538,9 @@ var init_message_parts = __esm({
 function isTextEvent(event) {
   return event.type === "stdout" || event.type === "thinking";
 }
+function parentKey(event) {
+  return event.parentId ?? "";
+}
 function createAgentStreamCoalescer(emit, opts) {
   const intervalMs = opts?.intervalMs ?? 32;
   let pending = null;
@@ -10322,7 +10553,11 @@ function createAgentStreamCoalescer(emit, opts) {
     if (!pending) return;
     const event = pending;
     pending = null;
-    emit({ type: event.type, data: event.data });
+    emit({
+      type: event.type,
+      data: event.data,
+      ...event.parentId ? { parentId: event.parentId } : {}
+    });
   };
   const schedule = () => {
     if (timer) return;
@@ -10337,11 +10572,15 @@ function createAgentStreamCoalescer(emit, opts) {
         return;
       }
       if (!event.data) return;
-      if (pending && pending.type === event.type) {
+      if (pending && pending.type === event.type && parentKey(pending) === parentKey(event)) {
         pending.data += event.data;
       } else {
         flush2();
-        pending = { type: event.type, data: event.data };
+        pending = {
+          type: event.type,
+          data: event.data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        };
       }
       schedule();
     },
@@ -10971,7 +11210,8 @@ function worktreeBindingFrom(from) {
     prState: from.prState,
     skipAutoArchiveOnMerge: from.skipAutoArchiveOnMerge,
     stackId: from.stackId,
-    stackLayer: from.stackLayer
+    stackLayer: from.stackLayer,
+    cowboy: from.cowboy
   };
 }
 function threadsSharingWorktree(worktreePath) {
@@ -12143,6 +12383,55 @@ async function createThread(input, _onSetupLine) {
   if (!(0, import_node_fs34.existsSync)(repoPath)) {
     throw new Error(`Repo not found: ${repoPath}`);
   }
+  if (input.cowboy) {
+    const { cowboyModeEnabled: cowboyModeEnabled2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
+    if (!cowboyModeEnabled2()) {
+      throw new Error(
+        "Cowboy mode is off. Enable it in Settings \u2192 Advanced."
+      );
+    }
+    if (input.sourceType === "pr" || input.sourceType === "ticket" || input.sourceType === "adopt") {
+      throw new Error(
+        "Cowboy mode works on the project folder (default branch), not a PR, ticket, or adopt."
+      );
+    }
+    const defaultBranch = await resolveDefaultBranch(repoPath, { network: false });
+    const head = await currentBranch(repoPath);
+    if (head === "HEAD") {
+      throw new Error(
+        "Cowboy mode needs a named branch in the project folder (not a detached HEAD)."
+      );
+    }
+    if (head !== defaultBranch) {
+      throw new Error(
+        `Cowboy mode uses ${defaultBranch} in the project folder. Switch that checkout to ${defaultBranch} first (currently ${head}).`
+      );
+    }
+    const explicitTitle2 = input.title?.trim();
+    const thread2 = createEmptyThread({
+      title: explicitTitle2 || `Cowboy \xB7 ${head}`,
+      userSetTitle: Boolean(explicitTitle2),
+      sourceType: "branch",
+      sourceRef: head,
+      branchName: head,
+      worktreePath: repoPath,
+      repoPath,
+      agent: resolved.agent,
+      autonomy: input.autonomy ?? "default",
+      model: resolved.model,
+      effort: resolved.effort,
+      fast: resolved.fast,
+      planMode: Boolean(input.planMode),
+      attachments: input.attachments ?? [],
+      sourceIsFork: false,
+      parentThreadId: input.parentThreadId ?? null,
+      status: "idle",
+      cowboy: true
+    });
+    writeThread(thread2);
+    await ensureWorkspace(repoPath);
+    return readThread(thread2.id) ?? thread2;
+  }
   let sourceRef = input.sourceRef;
   let sourceIsFork = false;
   let prUrl = null;
@@ -12228,6 +12517,24 @@ var init_create = __esm({
   }
 });
 
+// src/threads/cowboy.ts
+function isCowboyThread(thread) {
+  return Boolean(thread?.cowboy);
+}
+function isPrimaryCheckoutThread(thread) {
+  if (!thread?.worktreePath || !thread.repoPath) return false;
+  return normalizeWorktreePath(thread.worktreePath) === normalizeWorktreePath(thread.repoPath);
+}
+function shouldRemoveWorktreeOnTeardown(thread) {
+  return !isCowboyThread(thread) && !isPrimaryCheckoutThread(thread);
+}
+var init_cowboy = __esm({
+  "src/threads/cowboy.ts"() {
+    "use strict";
+    init_worktree_labels();
+  }
+});
+
 // src/store/turn-live.ts
 function trimParts(parts) {
   if (parts.length <= MAX_PARTS) return parts;
@@ -12521,8 +12828,12 @@ var init_quota_failover = __esm({
 });
 
 // src/threads/adopt.ts
+function thisModuleFile() {
+  const cjsFile = typeof __filename !== "undefined" ? __filename : "";
+  return cjsFile || process.argv[1] || (0, import_node_path33.join)(process.cwd(), "package.json");
+}
 function openReadonlySqlite(file) {
-  const req = (0, import_node_module4.createRequire)(import_meta4.url);
+  const req = (0, import_node_module4.createRequire)(thisModuleFile());
   const Database = req("better-sqlite3");
   return new Database(file, { readonly: true, fileMustExist: true });
 }
@@ -12791,7 +13102,7 @@ function importConductorWorkspace(workspaceId) {
 async function importConductorWorkspaceAsync(workspaceId) {
   return importConductorWorkspace(workspaceId);
 }
-var import_node_child_process4, import_node_fs36, import_node_os10, import_node_path33, import_node_module4, import_meta4, CONDUCTOR_APP_SUPPORT, CONDUCTOR_DB, CURSOR_SDK_STORE;
+var import_node_child_process4, import_node_fs36, import_node_os10, import_node_path33, import_node_module4, CONDUCTOR_APP_SUPPORT, CONDUCTOR_DB, CURSOR_SDK_STORE;
 var init_adopt = __esm({
   "src/threads/adopt.ts"() {
     "use strict";
@@ -12802,7 +13113,6 @@ var init_adopt = __esm({
     import_node_module4 = require("module");
     init_worktree();
     init_thread_store();
-    import_meta4 = {};
     CONDUCTOR_APP_SUPPORT = (0, import_node_path33.join)(
       process.env.HOME ?? "",
       "Library",
@@ -13883,13 +14193,22 @@ async function previewLand(thread) {
       isFork: true
     };
   }
-  const target = await resolveDefaultBranch(thread.repoPath);
-  if (thread.branchName === target || thread.branchName === "main" || thread.branchName === "master") {
+  if (isCowboyThread(thread)) {
+    const current2 = await currentBranch(thread.worktreePath);
+    const dirty = await isDirty(thread.worktreePath);
+    const diff2 = await getDiff(thread.worktreePath, thread.repoPath, { base: current2 });
+    return {
+      branch: current2,
+      target: current2,
+      diffStat: diff2.stat,
+      dirty,
+      blocked: false,
+      isFork: false,
+      cowboy: true
+    };
   }
-  const { stdout: head } = await Promise.resolve().then(() => (init_run(), run_exports)).then(
-    ({ git: git2 }) => git2(["rev-parse", "--abbrev-ref", "HEAD"], thread.worktreePath)
-  );
-  const current = head.trim();
+  const target = await resolveDefaultBranch(thread.repoPath);
+  const current = await currentBranch(thread.worktreePath);
   if (current === target) {
     return {
       branch: current,
@@ -13916,6 +14235,19 @@ async function confirmLand(thread, opts) {
   if (preview.blocked) {
     throw new Error(preview.blockReason ?? "Land blocked");
   }
+  if (preview.cowboy) {
+    const meta2 = await suggestPrMetadata(thread.worktreePath, {
+      base: preview.branch,
+      fallbackTitle: thread.title,
+      sourceLabel: `${thread.sourceType}:${thread.sourceRef}`
+    });
+    let committed2 = false;
+    if (preview.dirty) {
+      committed2 = await commitAll(thread.worktreePath, meta2.commitMessage);
+    }
+    await pushBranch(thread.worktreePath, preview.branch);
+    return { prUrl: null, pushed: true, committed: committed2 };
+  }
   const meta = await suggestPrMetadata(thread.worktreePath, {
     base: preview.target,
     fallbackTitle: thread.title,
@@ -13960,6 +14292,7 @@ var init_land = __esm({
     init_diff();
     init_pr_metadata();
     init_gh_errors();
+    init_cowboy();
   }
 });
 
@@ -14649,7 +14982,7 @@ var init_instructions = __esm({
 });
 
 // src/plan/plan-present.ts
-function asRecord4(v) {
+function asRecord5(v) {
   return v != null && typeof v === "object" && !Array.isArray(v) ? v : null;
 }
 function isPresentPlanToolName(name) {
@@ -14661,7 +14994,7 @@ function extractPresentedPlan(parts) {
   for (let i = parts.length - 1; i >= 0; i--) {
     const p = parts[i];
     if (p.type !== "tool" || !isPresentPlanToolName(p.name)) continue;
-    const input = asRecord4(p.input) ?? {};
+    const input = asRecord5(p.input) ?? {};
     const content = typeof input.content === "string" ? input.content : typeof input.plan === "string" ? input.plan : typeof input.markdown === "string" ? input.markdown : "";
     if (!content.trim()) continue;
     const title = typeof input.title === "string" && input.title.trim() ? input.title.trim() : "Plan";
@@ -14992,6 +15325,7 @@ var init_orchestrator = __esm({
     init_thread_store();
     init_desktop_host();
     init_create();
+    init_cowboy();
     init_orchestrator_capable();
     init_chat_tabs();
     init_enqueue_by_key();
@@ -15268,7 +15602,9 @@ var init_orchestrator = __esm({
         return thread;
       }
       async finishCreateThread(threadId, prompt) {
-        const setup = this.runSetupAfterCreate(threadId);
+        const created = this.getThread(threadId);
+        const skipSetup = isCowboyThread(created);
+        const setup = skipSetup ? Promise.resolve() : this.runSetupAfterCreate(threadId);
         if (prompt) {
           try {
             await this.send(threadId, prompt);
@@ -15280,6 +15616,7 @@ var init_orchestrator = __esm({
           }
         }
         await setup;
+        if (skipSetup) return;
         const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
         if (autoRunAfterSetupEnabled2()) {
           try {
@@ -16611,17 +16948,19 @@ var init_orchestrator = __esm({
         const siblings = threadsSharingWorktree(thread.worktreePath).filter((t) => t.id !== thread.id);
         if (siblings.length === 0) {
           this.stopDev(thread.id);
-          try {
-            await runArchiveScript(thread.repoPath, thread.worktreePath, (line) => {
-              this.emit({
-                type: "turn_output",
-                threadId: thread.id,
-                event: { type: "stdout", data: `[archive] ${line}` }
+          if (shouldRemoveWorktreeOnTeardown(thread)) {
+            try {
+              await runArchiveScript(thread.repoPath, thread.worktreePath, (line) => {
+                this.emit({
+                  type: "turn_output",
+                  threadId: thread.id,
+                  event: { type: "stdout", data: `[archive] ${line}` }
+                });
               });
-            });
-          } catch {
+            } catch {
+            }
+            await removeWorktree(thread.repoPath, thread.worktreePath);
           }
-          await removeWorktree(thread.repoPath, thread.worktreePath);
         }
         const archived = setStatus(thread.id, "archived");
         this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
@@ -16649,15 +16988,17 @@ var init_orchestrator = __esm({
         const siblings = threadsSharingWorktree(thread.worktreePath).filter((t) => t.id !== thread.id);
         if (siblings.length === 0) {
           this.stopDev(thread.id);
-          try {
-            await runArchiveScript(thread.repoPath, thread.worktreePath);
-          } catch {
+          if (shouldRemoveWorktreeOnTeardown(thread)) {
+            try {
+              await runArchiveScript(thread.repoPath, thread.worktreePath);
+            } catch {
+            }
+            const { deleteBranchOnPurgeEnabled: deleteBranchOnPurgeEnabled2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
+            const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled2();
+            await removeWorktree(thread.repoPath, thread.worktreePath, {
+              deleteBranch: deleteBranch ? thread.branchName : void 0
+            });
           }
-          const { deleteBranchOnPurgeEnabled: deleteBranchOnPurgeEnabled2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
-          const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled2();
-          await removeWorktree(thread.repoPath, thread.worktreePath, {
-            deleteBranch: deleteBranch ? thread.branchName : void 0
-          });
         }
         deleteThreadRecord(thread.id);
       }
@@ -16674,6 +17015,11 @@ var init_orchestrator = __esm({
           return restored2;
         }
         if (!(0, import_node_fs44.existsSync)(thread.worktreePath)) {
+          if (isCowboyThread(thread) || isPrimaryCheckoutThread(thread)) {
+            throw new Error(
+              `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
+            );
+          }
           const { createThreadWorktree: createThreadWorktree2 } = await Promise.resolve().then(() => (init_worktree(), worktree_exports));
           const slug = thread.worktreePath.split("/").pop();
           const dest = thread.worktreePath;
@@ -17010,6 +17356,7 @@ __export(index_exports, {
   coordinatorTurnReminder: () => coordinatorTurnReminder,
   copyConfiguredFiles: () => copyConfiguredFiles,
   countCacheControlBlocks: () => countCacheControlBlocks,
+  cowboyModeEnabled: () => cowboyModeEnabled,
   createChatTab: () => createChatTab,
   createEmptyThread: () => createEmptyThread,
   createExistingBranchWorktree: () => createExistingBranchWorktree,
@@ -17160,6 +17507,7 @@ __export(index_exports, {
   isBrightsyNdjsonLine: () => isBrightsyNdjsonLine,
   isCloudCoordinatorThread: () => isCloudCoordinatorThread,
   isConductorBundledCli: () => isConductorBundledCli,
+  isCowboyThread: () => isCowboyThread,
   isCursorAutoModel: () => isCursorAutoModel,
   isDefaultishSourceRef: () => isDefaultishSourceRef,
   isDesktopHostAlive: () => isDesktopHostAlive,
@@ -17178,11 +17526,13 @@ __export(index_exports, {
   isPlaceholderBranch: () => isPlaceholderBranch,
   isPrNotMergeableError: () => isPrNotMergeableError,
   isPresentPlanToolName: () => isPresentPlanToolName,
+  isPrimaryCheckoutThread: () => isPrimaryCheckoutThread,
   isSessionQuotaLimit: () => isSessionQuotaLimit,
   isSideboardScratchPath: () => isSideboardScratchPath,
   isSlackCoordinatorThread: () => isSlackCoordinatorThread,
   isSlackExternalReplyPrompt: () => isSlackExternalReplyPrompt,
   isSlackOAuthCancelled: () => isSlackOAuthCancelled,
+  isSubagentToolName: () => isSubagentToolName,
   isThinkingEffort: () => isThinkingEffort,
   isThisProcessDesktopHost: () => isThisProcessDesktopHost,
   isThreadCaffeinated: () => isThreadCaffeinated,
@@ -17237,6 +17587,7 @@ __export(index_exports, {
   mergePrStack: () => mergePrStack,
   mergeSideboardIntoMcpServersJson: () => mergeSideboardIntoMcpServersJson,
   mergeUsage: () => mergeUsage,
+  messagePartParentId: () => messagePartParentId,
   nextPastedTextName: () => nextPastedTextName,
   nextThinkingEffort: () => nextThinkingEffort,
   nonInteractiveGitProcessEnv: () => nonInteractiveGitProcessEnv,
@@ -17355,6 +17706,7 @@ __export(index_exports, {
   shouldCompactContext: () => shouldCompactContext,
   shouldInjectBrightsyMcp: () => shouldInjectBrightsyMcp,
   shouldRefreshReviewRequestTemplate: () => shouldRefreshReviewRequestTemplate,
+  shouldRemoveWorktreeOnTeardown: () => shouldRemoveWorktreeOnTeardown,
   shouldResetSessionForOccupancy: () => shouldResetSessionForOccupancy,
   shouldRunWorktreeCleanup: () => shouldRunWorktreeCleanup,
   sideboardHomeDir: () => sideboardHomeDir,
@@ -17425,6 +17777,8 @@ __export(index_exports, {
   waitForPidExit: () => waitForPidExit,
   warmGithubAgentAuth: () => warmGithubAgentAuth,
   withAgentInstructions: () => withAgentInstructions,
+  withEventParentId: () => withEventParentId,
+  withEventsParentId: () => withEventsParentId,
   withExportedPath: () => withExportedPath,
   withThreadLock: () => withThreadLock,
   workspaceSettingsSourceLabel: () => workspaceSettingsSourceLabel,
@@ -18278,6 +18632,7 @@ init_context_compact();
 init_summarize();
 init_land();
 init_create();
+init_cowboy();
 init_chat_tabs();
 init_fork_worktree();
 init_stack_layers();
@@ -18287,7 +18642,7 @@ init_request_review();
 init_workspace_scratch();
 
 // src/plan/ask-user.ts
-function asRecord5(v) {
+function asRecord6(v) {
   return v != null && typeof v === "object" && !Array.isArray(v) ? v : null;
 }
 function parseOptions(raw) {
@@ -18298,7 +18653,7 @@ function parseOptions(raw) {
       out.push({ label: item.trim() });
       continue;
     }
-    const o = asRecord5(item);
+    const o = asRecord6(item);
     if (!o) continue;
     const label = typeof o.label === "string" ? o.label.trim() : typeof o.text === "string" ? o.text.trim() : typeof o.title === "string" ? o.title.trim() : "";
     if (!label) continue;
@@ -18308,7 +18663,7 @@ function parseOptions(raw) {
   return out;
 }
 function parseOneQuestion(raw) {
-  const o = asRecord5(raw);
+  const o = asRecord6(raw);
   if (!o) return null;
   const question = typeof o.question === "string" ? o.question.trim() : typeof o.text === "string" ? o.text.trim() : typeof o.prompt === "string" ? o.prompt.trim() : "";
   if (!question) return null;
@@ -18319,7 +18674,7 @@ function parseOneQuestion(raw) {
   return { question, header, multiSelect, options };
 }
 function parsePlanQuestionsInput(input) {
-  const root = asRecord5(input);
+  const root = asRecord6(input);
   if (!root) return [];
   const list = Array.isArray(root.questions) ? root.questions : Array.isArray(root.question) ? root.question : root.question || root.prompt ? [root] : [];
   const out = [];
@@ -19488,7 +19843,7 @@ async function startMcpServer() {
     );
     server.tool(
       "create_thread",
-      `Create a new worktree thread (chat) from branch, pr, or ticket. Pass repoPath from list_workspaces. From an orchestration chat, omit parentThreadId (Sideboard binds the child to this chat) or pass the exact id from the turn reminder \u2014 never invent a uuid. Prefer omitting agent/model so Sideboard applies ${accountDefaultsHint}. Setup (settings.toml, .cursor/worktrees.json, or script/setup) runs in the background in parallel with the first turn. Then use send_to_thread to chat.`,
+      `Create a new worktree thread (chat) from branch, pr, or ticket. Pass repoPath from list_workspaces. cowboy=true uses the project folder on the default branch (no isolated worktree; land is commit+push). From an orchestration chat, omit parentThreadId (Sideboard binds the child to this chat) or pass the exact id from the turn reminder \u2014 never invent a uuid. Prefer omitting agent/model so Sideboard applies ${accountDefaultsHint}. Setup (settings.toml, .cursor/worktrees.json, or script/setup) runs in the background in parallel with the first turn (skipped for cowboy). Then use send_to_thread to chat.`,
       {
         sourceType: import_zod4.z.enum(["branch", "pr", "ticket"]),
         sourceRef: import_zod4.z.string(),
@@ -19498,6 +19853,9 @@ async function startMcpServer() {
         ),
         repoPath: import_zod4.z.string(),
         title: import_zod4.z.string().optional(),
+        cowboy: import_zod4.z.boolean().optional().describe(
+          "If true, work in the project folder on the default branch (no thread/* worktree). Requires Settings \u2192 Advanced \u2192 Cowboy mode. Land is commit+push to that branch. Archive does not delete the folder."
+        ),
         parentThreadId: import_zod4.z.string().optional().describe(
           "Orchestration: omit (preferred) or pass YOUR chat id from the turn reminder / AGENTS.md. Do not invent uuids."
         )
@@ -19558,7 +19916,8 @@ async function startMcpServer() {
               fast: opts.fast,
               repoPath: args.repoPath,
               title: args.title,
-              parentThreadId: parentId || null
+              parentThreadId: parentId || null,
+              cowboy: args.cowboy || void 0
             }),
             CREATE_THREAD_TIMEOUT_MS,
             "create_thread"
@@ -19576,6 +19935,7 @@ async function startMcpServer() {
                   agent: thread.agent,
                   model: thread.model,
                   status: thread.status,
+                  cowboy: Boolean(thread.cowboy),
                   link: `sideboard://thread/${thread.id}`,
                   parentThreadId: thread.parentThreadId,
                   ...agentCoercedFrom ? {
@@ -22741,6 +23101,7 @@ init_outbound_watch();
   coordinatorTurnReminder,
   copyConfiguredFiles,
   countCacheControlBlocks,
+  cowboyModeEnabled,
   createChatTab,
   createEmptyThread,
   createExistingBranchWorktree,
@@ -22891,6 +23252,7 @@ init_outbound_watch();
   isBrightsyNdjsonLine,
   isCloudCoordinatorThread,
   isConductorBundledCli,
+  isCowboyThread,
   isCursorAutoModel,
   isDefaultishSourceRef,
   isDesktopHostAlive,
@@ -22909,11 +23271,13 @@ init_outbound_watch();
   isPlaceholderBranch,
   isPrNotMergeableError,
   isPresentPlanToolName,
+  isPrimaryCheckoutThread,
   isSessionQuotaLimit,
   isSideboardScratchPath,
   isSlackCoordinatorThread,
   isSlackExternalReplyPrompt,
   isSlackOAuthCancelled,
+  isSubagentToolName,
   isThinkingEffort,
   isThisProcessDesktopHost,
   isThreadCaffeinated,
@@ -22968,6 +23332,7 @@ init_outbound_watch();
   mergePrStack,
   mergeSideboardIntoMcpServersJson,
   mergeUsage,
+  messagePartParentId,
   nextPastedTextName,
   nextThinkingEffort,
   nonInteractiveGitProcessEnv,
@@ -23086,6 +23451,7 @@ init_outbound_watch();
   shouldCompactContext,
   shouldInjectBrightsyMcp,
   shouldRefreshReviewRequestTemplate,
+  shouldRemoveWorktreeOnTeardown,
   shouldResetSessionForOccupancy,
   shouldRunWorktreeCleanup,
   sideboardHomeDir,
@@ -23156,6 +23522,8 @@ init_outbound_watch();
   waitForPidExit,
   warmGithubAgentAuth,
   withAgentInstructions,
+  withEventParentId,
+  withEventsParentId,
   withExportedPath,
   withThreadLock,
   workspaceSettingsSourceLabel,