@sideboard-ai/core 0.1.153 → 0.1.156

package/dist/index.cjs

@@ -7524,7 +7524,7 @@ function ensureGlobalCoordinatorCwd(opts) {
     "Never pass `agent=codex` when you yourself are Codex \u2014 nested Codex deadlocks on shared ~/.codex locks. Omit agent (Account default) or use cursor/claude.",
     "Typical flow (Home board): list_board \u2192 create_thread (sourceType=ticket|pr|branch) \u2192 send_to_thread \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft \u2192 wait_for_turn. Merge only if the user explicitly asked (`ask_git` merge).",
     "Typical flow (branch / explicit source): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft.",
-    "Typical flow (find work): list_workspaces \u2192 pick repo(s) matching viewer roles/notes \u2192 list_issues (tickets) or list_prs(queue=review) (reviews) \u2192 show the options. Only create_thread + send_to_thread when they asked to start (e.g. \u201Cfind me work and start it\u201D) \u2014 then wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft.",
+    "Typical flow (find work): list_workspaces \u2192 pick repo(s) matching viewer roles/notes \u2192 Sideboard list_issues / linear_* (tickets) or list_prs(queue=review) (reviews) \u2192 show the options. Never wait on Claude Linear MCP. Only create_thread + send_to_thread when they asked to start (e.g. \u201Cfind me work and start it\u201D) \u2014 then wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft.",
     'Typical flow (review inbox): list_workspaces \u2192 list_prs(queue=review, limit=N) \u2192 show those PRs (ticket ids in the title when present). create_thread sourceType=pr only when they asked to start / do the work. Do not list_issues for "tickets to review".',
     "Typical flow (new app): Bash create/clone under repos dir \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft.",
     "Always ask worktree agents to commit, push, and open draft PRs (`ask_git` / `send_to_thread`). If the user gave a goal (Greptile 5/5, CI green), pass that goal through so they watch-fix-push until it lands \u2014 do not start that loop on a plain push, and do not tell the human to poll. Tell them to merge only when the user explicitly asked. The worktree agent runs git/gh; never merge from this orchestration cwd."
@@ -7581,8 +7581,8 @@ var init_coordinator_prompt = __esm({
       "- list_workspaces \u2014 registered repos (path + github slug + roles/notes when set). Use that profile to pick the right repo for tickets or reviews.",
       "- list_board \u2014 Home Kanban of worktrees (New / Draft / Review / Merged; one card per checkout). Path to merge: no PR \u2192 draft PR \u2192 open PR \u2192 merged. Archive removes the card to Settings \u2192 History. Queued/running are activity on the card, not columns. Orchestration chats are not on the board. Filters: query, repoPath, kind, column, limit.",
       '- list_branches / list_prs / list_issues \u2014 pass repoPath from list_workspaces. Review is PRs (the surface for assigned ticket work), not the tickets: "Get me N tickets to review" \u2192 list_prs(queue=review, limit=N) then create_thread sourceType=pr. That is open non-draft PRs labeled eng-review with no individual user reviewer yet. A team request (engineering-team) is not a claim \u2014 the viewer is on that team and can pick it up; claimed means an individual account is the reviewer. Bots ignored. Prefer teams that match Settings \u2192 Agents / Projects roles (check one or more of Engineering, Design, Product, or extras they added \u2014 never a combined both value; project roles override account for that repo). queue=mine is review-requested:@me; queue=approved|changes uses those labels. Also: state, label, reviewer=me|unassigned|login, query, limit default 40 max 250; raise limit or tighten when truncated. list_issues (query, assignee=me|unassigned|all|user, limit default 40 max 250) lists Linear, AbleTime, or GitHub tickets \u2014 do not use it for that review-inbox ask. When they ask for tickets to work on, use their notes (assignee=me or unassigned as the notes say) and prefer ones that match their roles.',
-      "- Find work: when they ask to find work, pick up tickets, or list reviews, use Settings \u2192 Agents (account) plus Settings \u2192 Projects (per-repo) roles and notes. Tickets \u2192 list_issues. Reviews \u2192 list_prs(queue=review). Show the options \u2014 do not create_thread or start unless they also asked to start (e.g. \u201Cfind me work and start it\u201D). Do not start this unprompted.",
-      "- linear_* (when Linear is connected) \u2014 list_teams for team key/states; get/create/update/comment with ENG-123. Scope errors: reconnect Linear in Account settings.",
+      "- Find work: when they ask to find work, pick up tickets, or list reviews, use Settings \u2192 Agents (account) plus Settings \u2192 Projects (per-repo) roles and notes. Tickets \u2192 Sideboard list_issues / linear_* (Account Linear). Reviews \u2192 list_prs(queue=review). Do not call Claude Linear MCP or any other vendor Linear MCP \u2014 those HTTP connectors hang or flap on the first turn. If a vendor MCP is down or reconnecting, ignore it and keep going with Sideboard tools. Show the options \u2014 do not create_thread or start unless they also asked to start (e.g. \u201Cfind me work and start it\u201D). Do not start this unprompted.",
+      "- linear_* (when Linear is connected) \u2014 list_teams for team key/states; get/create/update/comment with ENG-123. Scope errors: reconnect Linear in Account settings. Prefer these over any Linear MCP the CLI may still list.",
       "- abletime_* (when AbleTime is connected) \u2014 orientation first; ensure_task when work has no ticket (or create_thread from the default branch auto-creates one).",
       "- list_teams / slack_list_channels / slack_list_users / slack_search / slack_read / slack_post / slack_replies \u2014 Slack workspaces from Settings \u2192 Remote; pass team_id from list_teams",
       "- Optional connectors (Vercel, Supabase, PostHog, Sentry) in Settings \u2192 Connectors inject tokens into worktree agent env when connected. Prefer official CLIs (`vercel`, `supabase`, `sentry-cli`) with those env vars. PostHog has no first-class CLI \u2014 use the HTTP API (`POSTHOG_PERSONAL_API_KEY`). If a CLI is missing, the user can Install CLI on that row (not auto-installed on Connect). Do not add vendor MCPs or ask the user to paste tokens again. Git (`gh`) stays Settings \u2192 Git; issue tracking stays Settings \u2192 Issues; Slack stays Settings \u2192 Remote (Sideboard MCP).",
@@ -10743,7 +10743,7 @@ function toCodexMcpConfigArgs(servers) {
   }
   return args;
 }
-function toOpencodeMcpConfigContent(servers) {
+function toOpencodeMcpConfigContent(servers, opts) {
   const mcp = {};
   for (const s of servers) {
     const env = mcpSpawnEnv(s.env);
@@ -10754,6 +10754,11 @@ function toOpencodeMcpConfigContent(servers) {
       ...env ? { environment: env } : {}
     };
   }
+  for (const name of opts?.disableNames ?? []) {
+    const key = name.trim();
+    if (!key || mcp[key]?.enabled === true) continue;
+    mcp[key] = { ...mcp[key], enabled: false };
+  }
   return JSON.stringify({ mcp });
 }
 function writeMcpServersConfig(servers) {
@@ -10991,13 +10996,50 @@ function claudeString(obj, key) {
   const v = obj[key];
   return typeof v === "string" && v.trim() ? v.trim() : void 0;
 }
+function mcpStatusThinkingFromClaudeInit(obj) {
+  const raw = obj.mcp_servers ?? obj.mcpServers;
+  const servers = [];
+  if (Array.isArray(raw)) {
+    for (const item of raw) {
+      if (!item || typeof item !== "object" || Array.isArray(item)) continue;
+      const rec = item;
+      const name = typeof rec.name === "string" && rec.name.trim() || typeof rec.server === "string" && rec.server.trim() || "";
+      const status = typeof rec.status === "string" && rec.status.trim() || typeof rec.state === "string" && rec.state.trim() || "";
+      if (name) servers.push({ name, status: status || "unknown" });
+    }
+  } else if (raw && typeof raw === "object") {
+    for (const [name, value] of Object.entries(raw)) {
+      if (!name.trim()) continue;
+      if (typeof value === "string" && value.trim()) {
+        servers.push({ name, status: value.trim() });
+        continue;
+      }
+      if (value && typeof value === "object" && !Array.isArray(value)) {
+        const rec = value;
+        const status = typeof rec.status === "string" && rec.status.trim() || typeof rec.state === "string" && rec.state.trim() || "unknown";
+        servers.push({ name, status });
+      }
+    }
+  }
+  const notable = servers.filter((s) => !isCleanMcpConnect(s.status));
+  if (notable.length === 0) return null;
+  return `MCP: ${notable.map((s) => `${s.name} ${s.status}`).join(", ")}`;
+}
+function isCleanMcpConnect(status) {
+  return /^(connected|ok|ready|success)$/i.test(status.trim());
+}
 function eventsFromClaudeSystem(obj) {
   const subtype = claudeString(obj, "subtype") ?? "";
   const parentId = claudeParentToolUseId(obj);
   if (subtype === "init") {
     if (parentId) return null;
     const sid = claudeString(obj, "session_id");
-    return sid ? { type: "session_id", data: sid } : null;
+    const mcpNote = mcpStatusThinkingFromClaudeInit(obj);
+    const events = [];
+    if (sid) events.push({ type: "session_id", data: sid });
+    if (mcpNote) events.push({ type: "thinking", data: mcpNote, replace: true });
+    if (events.length === 0) return null;
+    return events.length === 1 ? events[0] : events;
   }
   if (subtype === "task_started") {
     const id = claudeString(obj, "tool_use_id") ?? claudeString(obj, "task_id");
@@ -11261,6 +11303,9 @@ var init_claude = __esm({
         const mcpConfigPath = writeMcpServersConfig(injectedServers);
         if (mcpConfigPath) {
           args.push("--mcp-config", mcpConfigPath);
+          if (isOrchestrator) {
+            args.push("--strict-mcp-config");
+          }
         }
         if (chromeOn) {
           args.push("--chrome");
@@ -11290,7 +11335,10 @@ var init_claude = __esm({
           // abandoned at Claude Code’s 10-minute default.
           env: {
             CLAUDE_CODE_FORWARD_SUBAGENT_TEXT: "1",
-            CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS: process.env.CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS ?? String(CLAUDE_PRINT_BG_WAIT_CEILING_MS)
+            CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS: process.env.CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS ?? String(CLAUDE_PRINT_BG_WAIT_CEILING_MS),
+            // `--strict-mcp-config` still fetches claude.ai connectors on some CLI
+            // builds (anthropics/claude-code#60252). Coordinators do not need them.
+            ...isOrchestrator ? { ENABLE_CLAUDEAI_MCP_SERVERS: "false" } : {}
           }
         };
       },
@@ -11414,6 +11462,178 @@ var init_claude = __esm({
   }
 });
 
+// src/agents/user-mcp-config.ts
+function userCursorMcpConfigPath() {
+  return (0, import_node_path31.join)((0, import_node_os10.homedir)(), ".cursor", "mcp.json");
+}
+function userClaudeMcpConfigPath() {
+  return (0, import_node_path31.join)((0, import_node_os10.homedir)(), ".claude.json");
+}
+function asObject(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  return { ...value };
+}
+function stripElectronSpawnEnv(env) {
+  if (!env) return void 0;
+  const next = { ...env };
+  delete next.ELECTRON_RUN_AS_NODE;
+  delete next.ELECTRON_RUN_AS_NODE;
+  return Object.keys(next).length > 0 ? next : void 0;
+}
+function mergeSideboardIntoMcpServersJson(existing, sideboard) {
+  const root = asObject(existing);
+  const servers = asObject(root.mcpServers);
+  const env = stripElectronSpawnEnv(sideboard.env);
+  servers.sideboard = {
+    type: "stdio",
+    command: sideboard.command,
+    ...sideboard.args && sideboard.args.length > 0 ? { args: sideboard.args } : {},
+    ...env ? { env } : {}
+  };
+  return { ...root, mcpServers: servers };
+}
+function writeMergedMcpServersJson(configPath, sideboard) {
+  let existing = {};
+  if ((0, import_node_fs30.existsSync)(configPath)) {
+    try {
+      existing = JSON.parse((0, import_node_fs30.readFileSync)(configPath, "utf8"));
+    } catch {
+      existing = {};
+    }
+  }
+  const next = mergeSideboardIntoMcpServersJson(existing, sideboard);
+  (0, import_node_fs30.mkdirSync)((0, import_node_path31.dirname)(configPath), { recursive: true });
+  (0, import_node_fs30.writeFileSync)(configPath, `${JSON.stringify(next, null, 2)}
+`);
+}
+function launchFromResolved(server) {
+  return {
+    command: server.command,
+    args: server.args,
+    env: {
+      ...server.env ?? {},
+      SIDEBOARD_APP_DATA: appDataDir()
+    }
+  };
+}
+async function registerPackagedUserMcpClients() {
+  const launch = launchFromResolved(await resolveSideboardMcpServer());
+  const cursor = userCursorMcpConfigPath();
+  writeMergedMcpServersJson(cursor, launch);
+  const claude = userClaudeMcpConfigPath();
+  if ((0, import_node_fs30.existsSync)(claude)) {
+    writeMergedMcpServersJson(claude, launch);
+    return { cursor, claude };
+  }
+  return { cursor };
+}
+var import_node_fs30, import_node_os10, import_node_path31;
+var init_user_mcp_config = __esm({
+  "src/agents/user-mcp-config.ts"() {
+    "use strict";
+    import_node_fs30 = require("fs");
+    import_node_os10 = require("os");
+    import_node_path31 = require("path");
+    init_paths();
+    init_injected_mcp();
+  }
+});
+
+// src/agents/orch-mcp-isolation.ts
+function isInjectedOrchMcpName(name) {
+  const n = name.trim().toLowerCase();
+  return n === "sideboard" || n === "brightsy" || n.startsWith("brightsy_");
+}
+function asObject2(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  return value;
+}
+function listMcpNamesFromJsonMap(raw, key) {
+  return Object.keys(asObject2(asObject2(raw)[key])).filter((n) => n.trim());
+}
+function listMcpNamesFromCodexToml(text5) {
+  try {
+    const parsed = (0, import_smol_toml2.parse)(text5);
+    return Object.keys(asObject2(parsed.mcp_servers)).filter((n) => n.trim());
+  } catch {
+    return [];
+  }
+}
+function readJsonObject(path2) {
+  try {
+    return JSON.parse((0, import_node_fs31.readFileSync)(path2, "utf8"));
+  } catch {
+    return {};
+  }
+}
+function readText(path2) {
+  try {
+    return (0, import_node_fs31.readFileSync)(path2, "utf8");
+  } catch {
+    return "";
+  }
+}
+function userCodexConfigPaths(home = (0, import_node_os11.homedir)()) {
+  return [(0, import_node_path32.join)(home, ".codex", "config.toml"), (0, import_node_path32.join)(home, ".config", "codex", "config.toml")];
+}
+function userOpencodeConfigPaths(home = (0, import_node_os11.homedir)()) {
+  return [
+    (0, import_node_path32.join)(home, ".config", "opencode", "opencode.json"),
+    (0, import_node_path32.join)(home, ".config", "opencode", "opencode.jsonc")
+  ];
+}
+function userMcpNamesToDisable(opts) {
+  const keep = new Set(
+    [...opts.injectedNames ?? []].map((n) => n.trim().toLowerCase()).filter(Boolean)
+  );
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const raw of opts.names) {
+    const name = raw.trim();
+    if (!name) continue;
+    const key = name.toLowerCase();
+    if (seen.has(key) || keep.has(key) || isInjectedOrchMcpName(name)) continue;
+    seen.add(key);
+    out.push(name);
+  }
+  return out;
+}
+function listUserCodexMcpNames(home = (0, import_node_os11.homedir)()) {
+  const names = [];
+  for (const path2 of userCodexConfigPaths(home)) {
+    if (!(0, import_node_fs31.existsSync)(path2)) continue;
+    names.push(...listMcpNamesFromCodexToml(readText(path2)));
+  }
+  return names;
+}
+function listUserOpencodeMcpNames(home = (0, import_node_os11.homedir)()) {
+  const names = [];
+  for (const path2 of userOpencodeConfigPaths(home)) {
+    if (!(0, import_node_fs31.existsSync)(path2)) continue;
+    names.push(...listMcpNamesFromJsonMap(readJsonObject(path2), "mcp"));
+  }
+  return names;
+}
+function toCodexDisableUserMcpArgs(names) {
+  const args = [];
+  for (const name of names) {
+    if (!/^[A-Za-z0-9_-]+$/.test(name)) continue;
+    args.push("-c", `mcp_servers.${name}.enabled=false`);
+  }
+  return args;
+}
+var import_node_fs31, import_node_os11, import_node_path32, import_smol_toml2;
+var init_orch_mcp_isolation = __esm({
+  "src/agents/orch-mcp-isolation.ts"() {
+    "use strict";
+    import_node_fs31 = require("fs");
+    import_node_os11 = require("os");
+    import_node_path32 = require("path");
+    import_smol_toml2 = require("smol-toml");
+    init_user_mcp_config();
+  }
+});
+
 // src/agents/codex.ts
 async function listCodexModels() {
   const now = Date.now();
@@ -11424,7 +11644,7 @@ async function listCodexModels() {
   if (codex === "codex") {
     const which = await run("which", ["codex"], { reject: false });
     if (which.exitCode !== 0) return FALLBACK_CODEX_MODELS;
-  } else if (!(0, import_node_fs30.existsSync)(codex)) {
+  } else if (!(0, import_node_fs32.existsSync)(codex)) {
     return FALLBACK_CODEX_MODELS;
   }
   const listed = await run(codex, ["debug", "models"], { reject: false });
@@ -11459,12 +11679,12 @@ function usageFromCodex(usage) {
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
-    (0, import_node_path31.join)((0, import_node_os10.homedir)(), ".codex", "config.toml"),
-    (0, import_node_path31.join)((0, import_node_os10.homedir)(), ".config", "codex", "config.toml")
+    (0, import_node_path33.join)((0, import_node_os12.homedir)(), ".codex", "config.toml"),
+    (0, import_node_path33.join)((0, import_node_os12.homedir)(), ".config", "codex", "config.toml")
   ];
   for (const path2 of candidates) {
-    if (!(0, import_node_fs30.existsSync)(path2)) continue;
-    const text5 = (0, import_node_fs30.readFileSync)(path2, "utf8");
+    if (!(0, import_node_fs32.existsSync)(path2)) continue;
+    const text5 = (0, import_node_fs32.readFileSync)(path2, "utf8");
     if (/network_access\s*=\s*true/.test(text5)) return true;
   }
   return false;
@@ -11496,21 +11716,21 @@ function asRecord2(value) {
   return void 0;
 }
 function codexLooksAuthenticated() {
-  const authPath = (0, import_node_path31.join)((0, import_node_os10.homedir)(), ".codex", "auth.json");
-  if (!(0, import_node_fs30.existsSync)(authPath)) return false;
+  const authPath = (0, import_node_path33.join)((0, import_node_os12.homedir)(), ".codex", "auth.json");
+  if (!(0, import_node_fs32.existsSync)(authPath)) return false;
   try {
-    return (0, import_node_fs30.statSync)(authPath).size > 2;
+    return (0, import_node_fs32.statSync)(authPath).size > 2;
   } catch {
     return false;
   }
 }
-var import_node_fs30, import_node_os10, import_node_path31, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
+var import_node_fs32, import_node_os12, import_node_path33, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
 var init_codex = __esm({
   "src/agents/codex.ts"() {
     "use strict";
-    import_node_fs30 = require("fs");
-    import_node_os10 = require("os");
-    import_node_path31 = require("path");
+    import_node_fs32 = require("fs");
+    import_node_os12 = require("os");
+    import_node_path33 = require("path");
     init_run();
     init_app_settings();
     init_global_workspace();
@@ -11518,6 +11738,7 @@ var init_codex = __esm({
     init_usage();
     init_git_auth_mode();
     init_injected_mcp();
+    init_orch_mcp_isolation();
     init_turn_input();
     init_types();
     CODEX_PROMPT_ARG_MAX = 2e5;
@@ -11535,7 +11756,7 @@ var init_codex = __esm({
       async detect() {
         const codex = resolveAgentExecutable("codex");
         if (codex !== "codex") {
-          if (!(0, import_node_fs30.existsSync)(codex)) {
+          if (!(0, import_node_fs32.existsSync)(codex)) {
             return {
               agent: "codex",
               installed: false,
@@ -11595,7 +11816,15 @@ var init_codex = __esm({
           }),
           orchestratorThreadId: isOrchestrator ? thread.id : null
         });
-        const mcpOverrides = toCodexMcpConfigArgs(injected2);
+        const mcpOverrides = [
+          ...toCodexMcpConfigArgs(injected2),
+          ...isOrchestrator ? toCodexDisableUserMcpArgs(
+            userMcpNamesToDisable({
+              injectedNames: injected2.map((s) => s.name),
+              names: listUserCodexMcpNames()
+            })
+          ) : []
+        ];
         const execOpts = [
           // Global orchestration cwd is not a git repo; without this Codex ≥0.147
           // refuses to start ("Not inside a trusted directory").
@@ -12022,21 +12251,21 @@ function platformRipgrepPackage() {
 }
 function usableRipgrepPath(candidate) {
   const raw = candidate?.trim();
-  if (!raw || !(0, import_node_path32.isAbsolute)(raw)) return null;
+  if (!raw || !(0, import_node_path34.isAbsolute)(raw)) return null;
   const readable = nodeReadableScriptPath(raw);
-  if (!(0, import_node_fs31.existsSync)(readable) || isAsarPath(readable)) return null;
+  if (!(0, import_node_fs33.existsSync)(readable) || isAsarPath(readable)) return null;
   return readable;
 }
 function walkForBundledRipgrep(startFile) {
   if (!startFile) return null;
   const pkg = platformRipgrepPackage();
   const name = rgBinaryName();
-  let dir = (0, import_node_path32.dirname)((0, import_node_path32.resolve)(startFile));
-  const root = (0, import_node_path32.parse)(dir).root;
+  let dir = (0, import_node_path34.dirname)((0, import_node_path34.resolve)(startFile));
+  const root = (0, import_node_path34.parse)(dir).root;
   while (dir !== root) {
-    const hit = usableRipgrepPath((0, import_node_path32.join)(dir, "node_modules", pkg, "bin", name));
+    const hit = usableRipgrepPath((0, import_node_path34.join)(dir, "node_modules", pkg, "bin", name));
     if (hit) return hit;
-    const next = (0, import_node_path32.dirname)(dir);
+    const next = (0, import_node_path34.dirname)(dir);
     if (next === dir) break;
     dir = next;
   }
@@ -12046,7 +12275,7 @@ function requireResolveBundledRipgrep(fromFile) {
   try {
     const req = (0, import_node_module2.createRequire)(fromFile);
     const pkgJson = req.resolve(`${platformRipgrepPackage()}/package.json`);
-    return usableRipgrepPath((0, import_node_path32.join)((0, import_node_path32.dirname)(pkgJson), "bin", rgBinaryName()));
+    return usableRipgrepPath((0, import_node_path34.join)((0, import_node_path34.dirname)(pkgJson), "bin", rgBinaryName()));
   } catch {
     return null;
   }
@@ -12068,13 +12297,13 @@ function cursorRipgrepEnv(opts) {
   const path2 = resolveCursorRipgrepPath(opts);
   return path2 ? { [RIPGREP_ENV]: path2 } : {};
 }
-var import_node_fs31, import_node_module2, import_node_path32, RIPGREP_ENV;
+var import_node_fs33, import_node_module2, import_node_path34, RIPGREP_ENV;
 var init_cursor_ripgrep = __esm({
   "src/agents/cursor-ripgrep.ts"() {
     "use strict";
-    import_node_fs31 = require("fs");
+    import_node_fs33 = require("fs");
     import_node_module2 = require("module");
-    import_node_path32 = require("path");
+    import_node_path34 = require("path");
     init_node_launch();
     init_packaged_runtime();
     RIPGREP_ENV = "CURSOR_RIPGREP_PATH";
@@ -12120,11 +12349,11 @@ function entryDir() {
   const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
   if (cjsDir) return cjsDir;
   try {
-    return (0, import_node_path33.dirname)((0, import_node_url2.fileURLToPath)(import_meta2.url));
+    return (0, import_node_path35.dirname)((0, import_node_url2.fileURLToPath)(import_meta2.url));
   } catch {
     try {
       const req = (0, import_node_module3.createRequire)(process.cwd() + "/");
-      return (0, import_node_path33.dirname)(req.resolve("@sideboard-ai/core"));
+      return (0, import_node_path35.dirname)(req.resolve("@sideboard-ai/core"));
     } catch {
       return process.cwd();
     }
@@ -12135,27 +12364,27 @@ function cursorRunnerPath() {
   if (packaged) return packaged;
   const root = entryDir();
   const candidates = [
-    (0, import_node_path33.join)(root, "agents", "cursor-runner.js"),
-    (0, import_node_path33.join)(root, "agents", "cursor-runner.cjs"),
+    (0, import_node_path35.join)(root, "agents", "cursor-runner.js"),
+    (0, import_node_path35.join)(root, "agents", "cursor-runner.cjs"),
     // If somehow resolved from package root instead of dist/
-    (0, import_node_path33.join)(root, "dist", "agents", "cursor-runner.js"),
-    (0, import_node_path33.join)(root, "dist", "agents", "cursor-runner.cjs"),
+    (0, import_node_path35.join)(root, "dist", "agents", "cursor-runner.js"),
+    (0, import_node_path35.join)(root, "dist", "agents", "cursor-runner.cjs"),
     // Source tree (dev): packages/core/src/agents/cursor-runner.ts
-    (0, import_node_path33.join)(root, "cursor-runner.ts"),
-    (0, import_node_path33.join)(root, "src", "agents", "cursor-runner.ts")
+    (0, import_node_path35.join)(root, "cursor-runner.ts"),
+    (0, import_node_path35.join)(root, "src", "agents", "cursor-runner.ts")
   ];
   for (const candidate of candidates) {
-    if ((0, import_node_fs32.existsSync)(candidate)) return candidate;
+    if ((0, import_node_fs34.existsSync)(candidate)) return candidate;
   }
   return candidates[0];
 }
-var import_node_fs32, import_node_module3, import_node_path33, import_node_url2, import_sdk, import_meta2, FALLBACK_CURSOR_MODELS, cachedModels, MODEL_CACHE_MS, cursorAdapter;
+var import_node_fs34, import_node_module3, import_node_path35, 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_fs32 = require("fs");
+    import_node_fs34 = require("fs");
     import_node_module3 = require("module");
-    import_node_path33 = require("path");
+    import_node_path35 = require("path");
     import_node_url2 = require("url");
     import_sdk = require("@cursor/sdk");
     init_run();
@@ -12221,6 +12450,7 @@ var init_cursor = __esm({
           fast: thread.fast,
           planMode: thread.planMode,
           apiKey,
+          ...isOrchestrator ? { isolateAmbientMcp: true } : {},
           ...Object.keys(mcpServers).length > 0 ? { mcpServers } : {}
         };
         const runner = cursorRunnerPath();
@@ -12306,7 +12536,7 @@ async function listOpencodeModels() {
   if (opencode === "opencode") {
     const which = await run("which", ["opencode"], { reject: false });
     if (which.exitCode !== 0) return FALLBACK_OPENCODE_MODELS;
-  } else if (!(0, import_node_fs33.existsSync)(opencode)) {
+  } else if (!(0, import_node_fs35.existsSync)(opencode)) {
     return FALLBACK_OPENCODE_MODELS;
   }
   const listed = await run(opencode, ["models"], { reject: false });
@@ -12336,17 +12566,18 @@ function usageFromOpencode(tokens) {
     cacheWriteTokens: tokens.cache?.write ? Number(tokens.cache.write) : void 0
   };
 }
-var import_node_fs33, FALLBACK_OPENCODE_MODELS, cachedOpencodeModels, OPENCODE_MODEL_CACHE_MS, opencodeAdapter;
+var import_node_fs35, FALLBACK_OPENCODE_MODELS, cachedOpencodeModels, OPENCODE_MODEL_CACHE_MS, opencodeAdapter;
 var init_opencode = __esm({
   "src/agents/opencode.ts"() {
     "use strict";
-    import_node_fs33 = require("fs");
+    import_node_fs35 = require("fs");
     init_run();
     init_app_settings();
     init_global_workspace();
     init_error_detail();
     init_message_parts();
     init_injected_mcp();
+    init_orch_mcp_isolation();
     init_turn_input();
     init_types();
     FALLBACK_OPENCODE_MODELS = [
@@ -12367,7 +12598,7 @@ var init_opencode = __esm({
       async detect() {
         const opencode = resolveAgentExecutable("opencode");
         if (opencode !== "opencode") {
-          if (!(0, import_node_fs33.existsSync)(opencode)) {
+          if (!(0, import_node_fs35.existsSync)(opencode)) {
             return {
               agent: "opencode",
               installed: false,
@@ -12429,7 +12660,11 @@ var init_opencode = __esm({
           }),
           orchestratorThreadId: isOrchestrator ? thread.id : null
         });
-        const mcpContent = injected2.length > 0 ? toOpencodeMcpConfigContent(injected2) : null;
+        const disableNames = isOrchestrator ? userMcpNamesToDisable({
+          injectedNames: injected2.map((s) => s.name),
+          names: listUserOpencodeMcpNames()
+        }) : [];
+        const mcpContent = injected2.length > 0 || disableNames.length > 0 ? toOpencodeMcpConfigContent(injected2, { disableNames }) : null;
         return {
           file: resolveAgentExecutable("opencode"),
           args,
@@ -13114,6 +13349,7 @@ __export(agents_exports, {
   listModelsForAgent: () => listModelsForAgent,
   listOpencodeModels: () => listOpencodeModels,
   loginAgent: () => loginAgent,
+  mcpStatusThinkingFromClaudeInit: () => mcpStatusThinkingFromClaudeInit,
   openInSystemTerminal: () => openInSystemTerminal,
   opencodeAdapter: () => opencodeAdapter,
   parseCursorRunnerLine: () => parseCursorRunnerLine,
@@ -14224,21 +14460,21 @@ function shouldRefreshReviewRequestTemplate(content) {
   return LEGACY_REVIEW_TEMPLATE_MARKERS.every((m) => trimmed.includes(m));
 }
 function readTextIfPresent(abs) {
-  if (!(0, import_node_fs34.existsSync)(abs)) return null;
+  if (!(0, import_node_fs36.existsSync)(abs)) return null;
   try {
-    const content = (0, import_node_fs34.readFileSync)(abs, "utf8");
+    const content = (0, import_node_fs36.readFileSync)(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
   }
 }
 function readLocalGuidelines(worktreePath) {
-  const localAbs = (0, import_node_path34.join)(worktreePath, REVIEW_REQUEST_PATH);
+  const localAbs = (0, import_node_path36.join)(worktreePath, REVIEW_REQUEST_PATH);
   const localContent = readTextIfPresent(localAbs);
   if (localContent && !shouldRefreshReviewRequestTemplate(localContent)) {
     return { path: REVIEW_REQUEST_PATH, content: localContent };
   }
-  const legacyAbs = (0, import_node_path34.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
+  const legacyAbs = (0, import_node_path36.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH);
   const legacyContent = readTextIfPresent(legacyAbs);
   if (legacyContent && !shouldRefreshReviewRequestTemplate(legacyContent)) {
     return { path: LEGACY_REVIEW_REQUEST_PATH, content: legacyContent };
@@ -14262,27 +14498,27 @@ function contextGuidelines(content, source) {
   };
 }
 function writeContextGuidelines(worktreePath, content) {
-  const abs = (0, import_node_path34.join)(worktreePath, CONTEXT_REVIEW_PATH);
-  (0, import_node_fs34.mkdirSync)((0, import_node_path34.dirname)(abs), { recursive: true });
+  const abs = (0, import_node_path36.join)(worktreePath, CONTEXT_REVIEW_PATH);
+  (0, import_node_fs36.mkdirSync)((0, import_node_path36.dirname)(abs), { recursive: true });
   const body = content.endsWith("\n") ? content : `${content}
 `;
-  (0, import_node_fs34.writeFileSync)(abs, body, "utf8");
+  (0, import_node_fs36.writeFileSync)(abs, body, "utf8");
   return body;
 }
 function readSideboardReview(worktreePath, repoPath) {
-  const fromWorktree = readTextIfPresent((0, import_node_path34.join)(worktreePath, REPO_REVIEW_PATH));
+  const fromWorktree = readTextIfPresent((0, import_node_path36.join)(worktreePath, REPO_REVIEW_PATH));
   if (fromWorktree) return fromWorktree;
   const repo = repoPath?.replace(/\/+$/, "");
   const wt = worktreePath.replace(/\/+$/, "");
   if (!repo || repo === wt) return null;
-  return readTextIfPresent((0, import_node_path34.join)(repo, REPO_REVIEW_PATH));
+  return readTextIfPresent((0, import_node_path36.join)(repo, REPO_REVIEW_PATH));
 }
 function ensureReviewGuidelinesFile(worktreePath, repoPath) {
-  const skillContent = readTextIfPresent((0, import_node_path34.join)(worktreePath, REVIEW_SKILL_PATH));
+  const skillContent = readTextIfPresent((0, import_node_path36.join)(worktreePath, REVIEW_SKILL_PATH));
   if (skillContent) {
     return { ...skillGuidelines(skillContent, "skill"), wrote: false };
   }
-  const contextContent = readTextIfPresent((0, import_node_path34.join)(worktreePath, CONTEXT_REVIEW_PATH));
+  const contextContent = readTextIfPresent((0, import_node_path36.join)(worktreePath, CONTEXT_REVIEW_PATH));
   if (contextContent && !shouldRefreshReviewRequestTemplate(contextContent)) {
     return { ...contextGuidelines(contextContent, "local"), wrote: false };
   }
@@ -14320,7 +14556,7 @@ function buildReviewRequestAttachment(content, opts) {
   };
 }
 function readExistingReviewRequestFile(worktreePath) {
-  return readTextIfPresent((0, import_node_path34.join)(worktreePath, REVIEW_SKILL_PATH)) ?? readTextIfPresent((0, import_node_path34.join)(worktreePath, CONTEXT_REVIEW_PATH)) ?? readTextIfPresent((0, import_node_path34.join)(worktreePath, REPO_REVIEW_PATH)) ?? readTextIfPresent((0, import_node_path34.join)(worktreePath, REVIEW_REQUEST_PATH)) ?? readTextIfPresent((0, import_node_path34.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH));
+  return readTextIfPresent((0, import_node_path36.join)(worktreePath, REVIEW_SKILL_PATH)) ?? readTextIfPresent((0, import_node_path36.join)(worktreePath, CONTEXT_REVIEW_PATH)) ?? readTextIfPresent((0, import_node_path36.join)(worktreePath, REPO_REVIEW_PATH)) ?? readTextIfPresent((0, import_node_path36.join)(worktreePath, REVIEW_REQUEST_PATH)) ?? readTextIfPresent((0, import_node_path36.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH));
 }
 async function requestReview(threadRef, send2) {
   const from = findThreadByRef(threadRef);
@@ -14347,13 +14583,13 @@ async function requestReview(threadRef, send2) {
   const started = await send2(tab.id, REVIEW_REQUEST_PREFILL);
   return { tab: started, from };
 }
-var import_node_crypto8, import_node_fs34, import_node_path34, REPO_REVIEW_PATH, REPO_REVIEW_NAME, CONTEXT_REVIEW_PATH, REVIEW_REQUEST_PATH, LEGACY_REVIEW_REQUEST_PATH, REVIEW_REQUEST_NAME, REVIEW_REQUEST_PREFILL, LEGACY_REVIEW_TEMPLATE_MARKERS;
+var import_node_crypto8, import_node_fs36, import_node_path36, REPO_REVIEW_PATH, REPO_REVIEW_NAME, CONTEXT_REVIEW_PATH, REVIEW_REQUEST_PATH, LEGACY_REVIEW_REQUEST_PATH, REVIEW_REQUEST_NAME, REVIEW_REQUEST_PREFILL, LEGACY_REVIEW_TEMPLATE_MARKERS;
 var init_request_review = __esm({
   "src/review/request-review.ts"() {
     "use strict";
     import_node_crypto8 = require("crypto");
-    import_node_fs34 = require("fs");
-    import_node_path34 = require("path");
+    import_node_fs36 = require("fs");
+    import_node_path36 = require("path");
     init_global_workspace();
     init_chat_tabs();
     init_thread_store();
@@ -14379,9 +14615,9 @@ function matchSimpleGlob(pattern, name) {
   return new RegExp(`^${escaped}$`).test(name);
 }
 function readWorktreeInclude(repoPath) {
-  const path2 = (0, import_node_path35.join)(repoPath, ".worktreeinclude");
-  if (!(0, import_node_fs35.existsSync)(path2)) return [];
-  return (0, import_node_fs35.readFileSync)(path2, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
+  const path2 = (0, import_node_path37.join)(repoPath, ".worktreeinclude");
+  if (!(0, import_node_fs37.existsSync)(path2)) return [];
+  return (0, import_node_fs37.readFileSync)(path2, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
 }
 function resolveFilesToCopy(repoPath) {
   const fromInclude = readWorktreeInclude(repoPath);
@@ -14391,10 +14627,10 @@ function resolveFilesToCopy(repoPath) {
   if (settings?.fileIncludeGlobs?.length) {
     const matched = [];
     try {
-      for (const entry of (0, import_node_fs35.readdirSync)(repoPath, { withFileTypes: true })) {
+      for (const entry of (0, import_node_fs37.readdirSync)(repoPath, { withFileTypes: true })) {
         if (!entry.isFile()) continue;
         for (const glob of settings.fileIncludeGlobs) {
-          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob((0, import_node_path35.basename)(glob), entry.name)) {
+          if (matchSimpleGlob(glob, entry.name) || matchSimpleGlob((0, import_node_path37.basename)(glob), entry.name)) {
             matched.push(entry.name);
             break;
           }
@@ -14406,7 +14642,7 @@ function resolveFilesToCopy(repoPath) {
   }
   const defaults = [];
   try {
-    for (const entry of (0, import_node_fs35.readdirSync)(repoPath, { withFileTypes: true })) {
+    for (const entry of (0, import_node_fs37.readdirSync)(repoPath, { withFileTypes: true })) {
       if (entry.isFile() && entry.name.startsWith(".env")) {
         defaults.push(entry.name);
       }
@@ -14420,11 +14656,11 @@ function copyConfiguredFiles(repoPath, worktreePath) {
   const patterns = resolveFilesToCopy(repoPath);
   const copied = [];
   for (const rel of patterns) {
-    const src = (0, import_node_path35.join)(repoPath, rel);
-    if (!(0, import_node_fs35.existsSync)(src)) continue;
-    const dest = (0, import_node_path35.join)(worktreePath, rel);
-    (0, import_node_fs35.mkdirSync)((0, import_node_path35.dirname)(dest), { recursive: true });
-    (0, import_node_fs35.copyFileSync)(src, dest);
+    const src = (0, import_node_path37.join)(repoPath, rel);
+    if (!(0, import_node_fs37.existsSync)(src)) continue;
+    const dest = (0, import_node_path37.join)(worktreePath, rel);
+    (0, import_node_fs37.mkdirSync)((0, import_node_path37.dirname)(dest), { recursive: true });
+    (0, import_node_fs37.copyFileSync)(src, dest);
     copied.push(rel);
   }
   return copied;
@@ -14459,7 +14695,7 @@ function buildWorkspaceScriptEnv(opts, baseEnv) {
   const env = stripNestedElectronEnv({
     ...baseEnv ?? process.env
   });
-  const name = opts.workspaceName ?? (0, import_node_path35.basename)(opts.worktreePath);
+  const name = opts.workspaceName ?? (0, import_node_path37.basename)(opts.worktreePath);
   const ports = opts.ports ?? [];
   const primary = ports[0];
   env.SIDEBOARD_WORKSPACE_NAME = name;
@@ -14721,13 +14957,13 @@ async function startDevServer(repoPath, worktreePath, onLine, opts) {
     done: handle.done
   };
 }
-var import_node_fs35, import_node_net, import_node_path35, import_execa4, import_node_readline3, PORT_RANGE_SIZE, cachedLoginEnv;
+var import_node_fs37, import_node_net, import_node_path37, import_execa4, import_node_readline3, PORT_RANGE_SIZE, cachedLoginEnv;
 var init_conductor = __esm({
   "src/hook/conductor.ts"() {
     "use strict";
-    import_node_fs35 = require("fs");
+    import_node_fs37 = require("fs");
     import_node_net = require("net");
-    import_node_path35 = require("path");
+    import_node_path37 = require("path");
     import_execa4 = require("execa");
     import_node_readline3 = require("readline");
     init_settings();
@@ -14754,9 +14990,9 @@ async function findOrphanWorktrees(repoPaths) {
     repoPaths?.length ? repoPaths : threads.map((t) => t.repoPath).filter(Boolean)
   );
   const homeRoot = sideboardWorkspacesDir();
-  if ((0, import_node_fs36.existsSync)(homeRoot)) {
+  if ((0, import_node_fs38.existsSync)(homeRoot)) {
     try {
-      for (const entry of (0, import_node_fs36.readdirSync)(homeRoot, { withFileTypes: true })) {
+      for (const entry of (0, import_node_fs38.readdirSync)(homeRoot, { withFileTypes: true })) {
         if (!entry.isDirectory()) continue;
         void entry;
       }
@@ -14766,7 +15002,7 @@ async function findOrphanWorktrees(repoPaths) {
   const orphans = [];
   const seen = /* @__PURE__ */ new Set();
   for (const repoPath of repos) {
-    if (!repoPath || !(0, import_node_fs36.existsSync)(repoPath)) continue;
+    if (!repoPath || !(0, import_node_fs38.existsSync)(repoPath)) continue;
     try {
       const wts = await listWorktrees(repoPath);
       for (const wt of wts) {
@@ -14777,7 +15013,7 @@ async function findOrphanWorktrees(repoPaths) {
         seen.add(path2);
         let mtimeMs = 0;
         try {
-          mtimeMs = (0, import_node_fs36.statSync)(path2).mtimeMs;
+          mtimeMs = (0, import_node_fs38.statSync)(path2).mtimeMs;
         } catch {
           mtimeMs = 0;
         }
@@ -14787,16 +15023,16 @@ async function findOrphanWorktrees(repoPaths) {
     }
     try {
       const root = worktreesRoot(repoPath);
-      if ((0, import_node_fs36.existsSync)(root)) {
-        for (const entry of (0, import_node_fs36.readdirSync)(root, { withFileTypes: true })) {
+      if ((0, import_node_fs38.existsSync)(root)) {
+        for (const entry of (0, import_node_fs38.readdirSync)(root, { withFileTypes: true })) {
           if (!entry.isDirectory()) continue;
-          const path2 = (0, import_node_path36.join)(root, entry.name).replace(/\/$/, "");
+          const path2 = (0, import_node_path38.join)(root, entry.name).replace(/\/$/, "");
           if (known.has(path2) || seen.has(path2)) continue;
-          if (!(0, import_node_fs36.existsSync)((0, import_node_path36.join)(path2, ".git"))) continue;
+          if (!(0, import_node_fs38.existsSync)((0, import_node_path38.join)(path2, ".git"))) continue;
           seen.add(path2);
           let mtimeMs = 0;
           try {
-            mtimeMs = (0, import_node_fs36.statSync)(path2).mtimeMs;
+            mtimeMs = (0, import_node_fs38.statSync)(path2).mtimeMs;
           } catch {
             mtimeMs = Date.now();
           }
@@ -14857,12 +15093,12 @@ function worktreeCleanupSettings() {
     autoCleanupOrphans: a.autoCleanupOrphans
   };
 }
-var import_node_fs36, import_node_path36;
+var import_node_fs38, import_node_path38;
 var init_orphan_cleanup = __esm({
   "src/git/orphan-cleanup.ts"() {
     "use strict";
-    import_node_fs36 = require("fs");
-    import_node_path36 = require("path");
+    import_node_fs38 = require("fs");
+    import_node_path38 = require("path");
     init_worktree();
     init_thread_store();
     init_paths();
@@ -14965,12 +15201,12 @@ async function cloneRepoIntoSideboard(opts) {
   if (!url) throw new Error("Clone URL is required");
   let name = opts.name?.trim();
   if (!name) {
-    const leaf = (0, import_node_path37.basename)(url.replace(/\/$/, "").replace(/\.git$/, ""));
+    const leaf = (0, import_node_path39.basename)(url.replace(/\/$/, "").replace(/\.git$/, ""));
     name = leaf || "repo";
   }
   name = name.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
-  const dest = (0, import_node_path37.join)(sideboardReposDir(), name);
-  if ((0, import_node_fs37.existsSync)(dest)) {
+  const dest = (0, import_node_path39.join)(sideboardReposDir(), name);
+  if ((0, import_node_fs39.existsSync)(dest)) {
     const repoPath2 = await resolveRepoRoot(dest);
     const workspace2 = await ensureWorkspace(repoPath2);
     return { repoPath: repoPath2, workspace: workspace2 };
@@ -14985,12 +15221,12 @@ async function cloneRepoIntoSideboard(opts) {
   const workspace = await ensureWorkspace(repoPath);
   return { repoPath, workspace };
 }
-var import_node_fs37, import_node_path37, import_execa6;
+var import_node_fs39, import_node_path39, import_execa6;
 var init_clone_repo = __esm({
   "src/git/clone-repo.ts"() {
     "use strict";
-    import_node_fs37 = require("fs");
-    import_node_path37 = require("path");
+    import_node_fs39 = require("fs");
+    import_node_path39 = require("path");
     import_execa6 = require("execa");
     init_paths();
     init_workspaces();
@@ -16087,7 +16323,7 @@ function reuseLiveThread(input, repoPath, match) {
 }
 async function createThread(input, _onSetupLine) {
   const repoPath = await resolveRepoRoot(input.repoPath);
-  if (!(0, import_node_fs38.existsSync)(repoPath)) {
+  if (!(0, import_node_fs40.existsSync)(repoPath)) {
     throw new Error(`Repo not found: ${repoPath}`);
   }
   const reused = reuseLiveThread(input, repoPath, {
@@ -16267,11 +16503,11 @@ async function listLinearIssues(agent, repoPath) {
   }
   return adapter.listLinearIssues(repoPath);
 }
-var import_node_fs38;
+var import_node_fs40;
 var init_create = __esm({
   "src/threads/create.ts"() {
     "use strict";
-    import_node_fs38 = require("fs");
+    import_node_fs40 = require("fs");
     init_detect();
     init_worktree();
     init_home_board();
@@ -16374,20 +16610,20 @@ function writeTurnLive(threadId, progress) {
   const path2 = threadLivePath(threadId);
   const tmp = `${path2}.${process.pid}.tmp`;
   try {
-    (0, import_node_fs39.writeFileSync)(tmp, JSON.stringify(progress), "utf8");
-    (0, import_node_fs39.renameSync)(tmp, path2);
+    (0, import_node_fs41.writeFileSync)(tmp, JSON.stringify(progress), "utf8");
+    (0, import_node_fs41.renameSync)(tmp, path2);
   } catch {
     try {
-      (0, import_node_fs39.unlinkSync)(tmp);
+      (0, import_node_fs41.unlinkSync)(tmp);
     } catch {
     }
   }
 }
 function readTurnLive(threadId) {
   const path2 = threadLivePath(threadId);
-  if (!(0, import_node_fs39.existsSync)(path2)) return null;
+  if (!(0, import_node_fs41.existsSync)(path2)) return null;
   try {
-    const raw = JSON.parse((0, import_node_fs39.readFileSync)(path2, "utf8"));
+    const raw = JSON.parse((0, import_node_fs41.readFileSync)(path2, "utf8"));
     if (!raw || typeof raw.summary !== "string") return null;
     return raw;
   } catch {
@@ -16399,17 +16635,17 @@ function clearTurnLive(threadId) {
   if (buf?.timer) clearTimeout(buf.timer);
   buffers.delete(threadId);
   const path2 = threadLivePath(threadId);
-  if (!(0, import_node_fs39.existsSync)(path2)) return;
+  if (!(0, import_node_fs41.existsSync)(path2)) return;
   try {
-    (0, import_node_fs39.unlinkSync)(path2);
+    (0, import_node_fs41.unlinkSync)(path2);
   } catch {
   }
 }
-var import_node_fs39, buffers, FLUSH_MS, MAX_PARTS;
+var import_node_fs41, buffers, FLUSH_MS, MAX_PARTS;
 var init_turn_live = __esm({
   "src/store/turn-live.ts"() {
     "use strict";
-    import_node_fs39 = require("fs");
+    import_node_fs41 = require("fs");
     init_message_parts();
     init_paths();
     buffers = /* @__PURE__ */ new Map();
@@ -16442,9 +16678,13 @@ var init_reconcile_heal = __esm({
 // src/orchestrator/setup-last-error.ts
 function shouldStampSetupLastError(opts) {
   if (opts.turnInFlight) return false;
-  if (opts.status === "running") return false;
+  if (opts.status === "running" || opts.status === "queued") return false;
+  if (opts.hasQueuedPrompt) return false;
   return true;
 }
+function isSetupLastError(err) {
+  return /^Setup (exited|failed)\b/i.test(err?.trim() ?? "");
+}
 function isStaleLastErrorDuringTurn(err) {
   return Boolean(err?.trim());
 }
@@ -16625,7 +16865,7 @@ 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_path38.join)(process.cwd(), "package.json");
+  return cjsFile || process.argv[1] || (0, import_node_path40.join)(process.cwd(), "package.json");
 }
 function openReadonlySqlite(file) {
   const req = (0, import_node_module4.createRequire)(thisModuleFile());
@@ -16643,21 +16883,21 @@ function mapAgentType(raw) {
   return null;
 }
 function resolveConductorCursorAgentId(workspacePath) {
-  if (!workspacePath || !(0, import_node_fs40.existsSync)(CURSOR_SDK_STORE)) return null;
+  if (!workspacePath || !(0, import_node_fs42.existsSync)(CURSOR_SDK_STORE)) return null;
   const normalized = workspacePath.replace(/\/$/, "");
   let best = null;
   let hashes;
   try {
-    hashes = (0, import_node_fs40.readdirSync)(CURSOR_SDK_STORE);
+    hashes = (0, import_node_fs42.readdirSync)(CURSOR_SDK_STORE);
   } catch {
     return null;
   }
   for (const hash of hashes) {
-    const agentsFile = (0, import_node_path38.join)(CURSOR_SDK_STORE, hash, "agents.ndjson");
-    if (!(0, import_node_fs40.existsSync)(agentsFile)) continue;
+    const agentsFile = (0, import_node_path40.join)(CURSOR_SDK_STORE, hash, "agents.ndjson");
+    if (!(0, import_node_fs42.existsSync)(agentsFile)) continue;
     let text5;
     try {
-      text5 = (0, import_node_fs40.readFileSync)(agentsFile, "utf8");
+      text5 = (0, import_node_fs42.readFileSync)(agentsFile, "utf8");
     } catch {
       continue;
     }
@@ -16681,7 +16921,7 @@ function resolveConductorCursorAgentId(workspacePath) {
   return best?.agentId ?? null;
 }
 async function adoptThread(input) {
-  if (!(0, import_node_fs40.existsSync)(input.worktreePath)) {
+  if (!(0, import_node_fs42.existsSync)(input.worktreePath)) {
     throw new Error(`Worktree not found: ${input.worktreePath}`);
   }
   const repoPath = await resolveRepoRoot(input.worktreePath);
@@ -16710,18 +16950,18 @@ function conductorDbPath() {
   return CONDUCTOR_DB;
 }
 function listConductorWorkspaces() {
-  if (!(0, import_node_fs40.existsSync)(CONDUCTOR_DB)) {
+  if (!(0, import_node_fs42.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs40.mkdtempSync)((0, import_node_path38.join)((0, import_node_os11.tmpdir)(), "sideboard-conductor-"));
-  const snapshot = (0, import_node_path38.join)(tmp, "conductor.db");
+  const tmp = (0, import_node_fs42.mkdtempSync)((0, import_node_path40.join)((0, import_node_os13.tmpdir)(), "sideboard-conductor-"));
+  const snapshot = (0, import_node_path40.join)(tmp, "conductor.db");
   try {
-    (0, import_node_fs40.copyFileSync)(CONDUCTOR_DB, snapshot);
+    (0, import_node_fs42.copyFileSync)(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
       const src = `${CONDUCTOR_DB}${suffix}`;
-      if ((0, import_node_fs40.existsSync)(src)) {
+      if ((0, import_node_fs42.existsSync)(src)) {
         try {
-          (0, import_node_fs40.copyFileSync)(src, `${snapshot}${suffix}`);
+          (0, import_node_fs42.copyFileSync)(src, `${snapshot}${suffix}`);
         } catch {
         }
       }
@@ -16797,22 +17037,22 @@ function listConductorWorkspaces() {
       db.close();
     }
   } finally {
-    (0, import_node_fs40.rmSync)(tmp, { recursive: true, force: true });
+    (0, import_node_fs42.rmSync)(tmp, { recursive: true, force: true });
   }
 }
 function importConductorWorkspace(workspaceId) {
-  if (!(0, import_node_fs40.existsSync)(CONDUCTOR_DB)) {
+  if (!(0, import_node_fs42.existsSync)(CONDUCTOR_DB)) {
     throw new Error(`Conductor DB not found at ${CONDUCTOR_DB}`);
   }
-  const tmp = (0, import_node_fs40.mkdtempSync)((0, import_node_path38.join)((0, import_node_os11.tmpdir)(), "sideboard-conductor-"));
-  const snapshot = (0, import_node_path38.join)(tmp, "conductor.db");
+  const tmp = (0, import_node_fs42.mkdtempSync)((0, import_node_path40.join)((0, import_node_os13.tmpdir)(), "sideboard-conductor-"));
+  const snapshot = (0, import_node_path40.join)(tmp, "conductor.db");
   try {
-    (0, import_node_fs40.copyFileSync)(CONDUCTOR_DB, snapshot);
+    (0, import_node_fs42.copyFileSync)(CONDUCTOR_DB, snapshot);
     for (const suffix of ["-wal", "-shm"]) {
       const src = `${CONDUCTOR_DB}${suffix}`;
-      if ((0, import_node_fs40.existsSync)(src)) {
+      if ((0, import_node_fs42.existsSync)(src)) {
         try {
-          (0, import_node_fs40.copyFileSync)(src, `${snapshot}${suffix}`);
+          (0, import_node_fs42.copyFileSync)(src, `${snapshot}${suffix}`);
         } catch {
         }
       }
@@ -16830,7 +17070,7 @@ function importConductorWorkspace(workspaceId) {
       ).get(workspaceId);
       if (!row) throw new Error(`Conductor workspace not found: ${workspaceId}`);
       const worktreePath = String(row.workspacePath);
-      if (!(0, import_node_fs40.existsSync)(worktreePath)) {
+      if (!(0, import_node_fs42.existsSync)(worktreePath)) {
         throw new Error(`Conductor worktree missing on disk: ${worktreePath}`);
       }
       let sessionId = null;
@@ -16893,31 +17133,31 @@ function importConductorWorkspace(workspaceId) {
       db.close();
     }
   } finally {
-    (0, import_node_fs40.rmSync)(tmp, { recursive: true, force: true });
+    (0, import_node_fs42.rmSync)(tmp, { recursive: true, force: true });
   }
 }
 async function importConductorWorkspaceAsync(workspaceId) {
   return importConductorWorkspace(workspaceId);
 }
-var import_node_child_process4, import_node_fs40, import_node_os11, import_node_path38, import_node_module4, CONDUCTOR_APP_SUPPORT, CONDUCTOR_DB, CURSOR_SDK_STORE;
+var import_node_child_process4, import_node_fs42, import_node_os13, import_node_path40, import_node_module4, CONDUCTOR_APP_SUPPORT, CONDUCTOR_DB, CURSOR_SDK_STORE;
 var init_adopt = __esm({
   "src/threads/adopt.ts"() {
     "use strict";
     import_node_child_process4 = require("child_process");
-    import_node_fs40 = require("fs");
-    import_node_os11 = require("os");
-    import_node_path38 = require("path");
+    import_node_fs42 = require("fs");
+    import_node_os13 = require("os");
+    import_node_path40 = require("path");
     import_node_module4 = require("module");
     init_worktree();
     init_thread_store();
-    CONDUCTOR_APP_SUPPORT = (0, import_node_path38.join)(
+    CONDUCTOR_APP_SUPPORT = (0, import_node_path40.join)(
       process.env.HOME ?? "",
       "Library",
       "Application Support",
       "com.conductor.app"
     );
-    CONDUCTOR_DB = (0, import_node_path38.join)(CONDUCTOR_APP_SUPPORT, "conductor.db");
-    CURSOR_SDK_STORE = (0, import_node_path38.join)(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
+    CONDUCTOR_DB = (0, import_node_path40.join)(CONDUCTOR_APP_SUPPORT, "conductor.db");
+    CURSOR_SDK_STORE = (0, import_node_path40.join)(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
   }
 });
 
@@ -16984,7 +17224,7 @@ async function openStackLayer(input, _onSetupLine) {
   let createdWorktree = false;
   const trees = await listWorktrees(repoPath);
   const checkedOut = trees.find((w) => w.branch === branchName);
-  if (checkedOut?.path && (0, import_node_fs41.existsSync)(checkedOut.path)) {
+  if (checkedOut?.path && (0, import_node_fs43.existsSync)(checkedOut.path)) {
     if (input.reuseExistingWorktree !== false) {
       worktreePath = checkedOut.path;
     } else {
@@ -17126,7 +17366,7 @@ async function initStackFromThread(input, onSetupLine) {
 async function createPrStack(input, onSetupLine) {
   await requireAgent(input.agent);
   const repoPath = await resolveRepoRoot(input.repoPath);
-  if (!(0, import_node_fs41.existsSync)(repoPath)) throw new Error(`Repo not found: ${repoPath}`);
+  if (!(0, import_node_fs43.existsSync)(repoPath)) throw new Error(`Repo not found: ${repoPath}`);
   if (!input.branches.length) throw new Error("At least one branch name required");
   const status = await detectGhStack(repoPath);
   if (!status.available) throw new Error(status.reason);
@@ -17193,7 +17433,7 @@ async function createPrStack(input, onSetupLine) {
     }
   }
   const claimed = new Set(threads.map((t) => t.worktreePath));
-  if (!claimed.has(bootstrap.worktreePath) && (0, import_node_fs41.existsSync)(bootstrap.worktreePath)) {
+  if (!claimed.has(bootstrap.worktreePath) && (0, import_node_fs43.existsSync)(bootstrap.worktreePath)) {
     try {
       await removeWorktree(repoPath, bootstrap.worktreePath, {
         deleteBranch: bootstrap.branchName
@@ -17213,11 +17453,11 @@ function stackAgentDefaultsFrom(input) {
     planMode: input.planMode
   };
 }
-var import_node_fs41;
+var import_node_fs43;
 var init_stack_layers = __esm({
   "src/threads/stack-layers.ts"() {
     "use strict";
-    import_node_fs41 = require("fs");
+    import_node_fs43 = require("fs");
     init_detect();
     init_run();
     init_stack();
@@ -17230,7 +17470,7 @@ var init_stack_layers = __esm({
 
 // src/diff/diff.ts
 async function inspectGitWorktree(worktreePath) {
-  if (!worktreePath || !(0, import_node_fs42.existsSync)(worktreePath)) return "missing_worktree";
+  if (!worktreePath || !(0, import_node_fs44.existsSync)(worktreePath)) return "missing_worktree";
   const check = await git(["rev-parse", "--is-inside-work-tree"], worktreePath, {
     reject: false
   });
@@ -17238,7 +17478,7 @@ async function inspectGitWorktree(worktreePath) {
   return "ok";
 }
 async function initializeGitRepository(worktreePath) {
-  if (!worktreePath || !(0, import_node_fs42.existsSync)(worktreePath)) {
+  if (!worktreePath || !(0, import_node_fs44.existsSync)(worktreePath)) {
     throw new Error("Worktree not found");
   }
   const status = await inspectGitWorktree(worktreePath);
@@ -17372,11 +17612,11 @@ new file mode 100644
   };
 }
 async function untrackedPatch(worktreePath, path2, maxHunk) {
-  const abs = (0, import_node_path39.join)(worktreePath, path2);
+  const abs = (0, import_node_path41.join)(worktreePath, path2);
   try {
-    const st = (0, import_node_fs42.statSync)(abs);
+    const st = (0, import_node_fs44.statSync)(abs);
     if (st.isFile() && st.size > maxHunk) {
-      const buf = (0, import_node_fs42.readFileSync)(abs).subarray(0, maxHunk);
+      const buf = (0, import_node_fs44.readFileSync)(abs).subarray(0, maxHunk);
       return syntheticAddPatch(path2, buf.toString("utf8"), maxHunk);
     }
   } catch {
@@ -17865,8 +18105,8 @@ function isImageRelativePath(relativePath) {
 function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? DEFAULT_UPLOAD_MAX_BYTES;
-  const abs = (0, import_node_path39.join)(worktreePath, relativePath);
-  const st = (0, import_node_fs42.statSync)(abs);
+  const abs = (0, import_node_path41.join)(worktreePath, relativePath);
+  const st = (0, import_node_fs44.statSync)(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
   }
@@ -17875,7 +18115,7 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
       `File too large to upload (${st.size} bytes; max ${maxBytes})`
     );
   }
-  const buf = (0, import_node_fs42.readFileSync)(abs);
+  const buf = (0, import_node_fs44.readFileSync)(abs);
   return {
     path: relativePath,
     contentBase64: buf.toString("base64"),
@@ -17885,12 +18125,12 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
 function readWorktreeFile(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? 2e5;
-  const abs = (0, import_node_path39.join)(worktreePath, relativePath);
-  const st = (0, import_node_fs42.statSync)(abs);
+  const abs = (0, import_node_path41.join)(worktreePath, relativePath);
+  const st = (0, import_node_fs44.statSync)(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
   }
-  const buf = (0, import_node_fs42.readFileSync)(abs);
+  const buf = (0, import_node_fs44.readFileSync)(abs);
   if (isImageRelativePath(relativePath)) {
     const maxImageBytes = Math.max(maxBytes, 15e6);
     const truncated2 = buf.length > maxImageBytes;
@@ -17933,9 +18173,9 @@ function assertSafeRelativePath(relativePath) {
 }
 function writeWorktreeFile(worktreePath, relativePath, content) {
   assertSafeRelativePath(relativePath);
-  const abs = (0, import_node_path39.join)(worktreePath, relativePath);
-  (0, import_node_fs42.mkdirSync)((0, import_node_path39.dirname)(abs), { recursive: true });
-  (0, import_node_fs42.writeFileSync)(abs, content, "utf8");
+  const abs = (0, import_node_path41.join)(worktreePath, relativePath);
+  (0, import_node_fs44.mkdirSync)((0, import_node_path41.dirname)(abs), { recursive: true });
+  (0, import_node_fs44.writeFileSync)(abs, content, "utf8");
   return { path: relativePath };
 }
 async function getDiffSummary(worktreePath, repoPath, opts) {
@@ -17952,12 +18192,12 @@ async function getDiffSummary(worktreePath, repoPath, opts) {
     truncated: full.files.length > maxFiles
   };
 }
-var import_node_fs42, import_node_path39, mergeBaseCache, MERGE_BASE_TTL_MS, SHA_RE, IMAGE_EXTENSIONS2, DEFAULT_UPLOAD_MAX_BYTES;
+var import_node_fs44, import_node_path41, mergeBaseCache, MERGE_BASE_TTL_MS, SHA_RE, IMAGE_EXTENSIONS2, DEFAULT_UPLOAD_MAX_BYTES;
 var init_diff = __esm({
   "src/diff/diff.ts"() {
     "use strict";
-    import_node_fs42 = require("fs");
-    import_node_path39 = require("path");
+    import_node_fs44 = require("fs");
+    import_node_path41 = require("path");
     init_run();
     init_worktree();
     mergeBaseCache = /* @__PURE__ */ new Map();
@@ -18225,7 +18465,7 @@ function parseFrontmatter(content) {
 }
 function readSkill(skillMd, source) {
   try {
-    const content = (0, import_node_fs43.readFileSync)(skillMd, "utf8");
+    const content = (0, import_node_fs45.readFileSync)(skillMd, "utf8");
     const { name: fmName, description } = parseFrontmatter(content);
     const dirName = skillMd.split("/").slice(-2, -1)[0] || "skill";
     const name = fmName || dirName;
@@ -18244,19 +18484,19 @@ function readSkill(skillMd, source) {
   }
 }
 function scanSkillsDir(dir, source, out) {
-  if (!(0, import_node_fs43.existsSync)(dir)) return;
+  if (!(0, import_node_fs45.existsSync)(dir)) return;
   let entries;
   try {
-    entries = (0, import_node_fs43.readdirSync)(dir);
+    entries = (0, import_node_fs45.readdirSync)(dir);
   } catch {
     return;
   }
   for (const entry of entries) {
     if (entry.startsWith(".")) continue;
-    const skillMd = (0, import_node_path40.join)(dir, entry, "SKILL.md");
-    if (!(0, import_node_fs43.existsSync)(skillMd)) continue;
+    const skillMd = (0, import_node_path42.join)(dir, entry, "SKILL.md");
+    if (!(0, import_node_fs45.existsSync)(skillMd)) continue;
     try {
-      if (!(0, import_node_fs43.statSync)(skillMd).isFile()) continue;
+      if (!(0, import_node_fs45.statSync)(skillMd).isFile()) continue;
     } catch {
       continue;
     }
@@ -18265,24 +18505,24 @@ function scanSkillsDir(dir, source, out) {
   }
 }
 function scanClaudePluginSkills(pluginsRoot, out) {
-  if (!(0, import_node_fs43.existsSync)(pluginsRoot)) return;
+  if (!(0, import_node_fs45.existsSync)(pluginsRoot)) return;
   const walk = (dir, depth, lookingForSkillsDir) => {
     if (depth > 7) return;
     let entries;
     try {
-      entries = (0, import_node_fs43.readdirSync)(dir);
+      entries = (0, import_node_fs45.readdirSync)(dir);
     } catch {
       return;
     }
     if (lookingForSkillsDir && entries.includes("SKILL.md")) {
-      const skill = readSkill((0, import_node_path40.join)(dir, "SKILL.md"), "cli");
+      const skill = readSkill((0, import_node_path42.join)(dir, "SKILL.md"), "cli");
       if (skill) out.push(skill);
     }
     for (const entry of entries) {
       if (entry === "node_modules" || entry === ".git") continue;
-      const full = (0, import_node_path40.join)(dir, entry);
+      const full = (0, import_node_path42.join)(dir, entry);
       try {
-        if (!(0, import_node_fs43.statSync)(full).isDirectory()) continue;
+        if (!(0, import_node_fs45.statSync)(full).isDirectory()) continue;
       } catch {
         continue;
       }
@@ -18297,20 +18537,20 @@ function scanClaudePluginSkills(pluginsRoot, out) {
   walk(pluginsRoot, 0, false);
 }
 function discoverSkills(worktreePath) {
-  const home = (0, import_node_os12.homedir)();
+  const home = (0, import_node_os14.homedir)();
   const collected = [];
   for (const rel of [".claude/skills", ".cursor/skills", ".sideboard/skills", ".brightsy/skills", "skills"]) {
-    scanSkillsDir((0, import_node_path40.join)(worktreePath, rel), "workspace", collected);
+    scanSkillsDir((0, import_node_path42.join)(worktreePath, rel), "workspace", collected);
   }
   for (const abs of [
-    (0, import_node_path40.join)(home, ".claude/skills"),
-    (0, import_node_path40.join)(home, ".cursor/skills"),
-    (0, import_node_path40.join)(home, ".sideboard/skills"),
-    (0, import_node_path40.join)(home, ".brightsy/skills")
+    (0, import_node_path42.join)(home, ".claude/skills"),
+    (0, import_node_path42.join)(home, ".cursor/skills"),
+    (0, import_node_path42.join)(home, ".sideboard/skills"),
+    (0, import_node_path42.join)(home, ".brightsy/skills")
   ]) {
     scanSkillsDir(abs, "user", collected);
   }
-  scanClaudePluginSkills((0, import_node_path40.join)(home, ".claude/plugins"), collected);
+  scanClaudePluginSkills((0, import_node_path42.join)(home, ".claude/plugins"), collected);
   collected.push(...bundledSkills());
   const rank = {
     workspace: 0,
@@ -18336,7 +18576,7 @@ function readSkillBody(skillPath, maxChars = 12e3) {
 \u2026(truncated)` : body;
     }
   }
-  const raw = (0, import_node_fs43.readFileSync)(skillPath, "utf8");
+  const raw = (0, import_node_fs45.readFileSync)(skillPath, "utf8");
   if (raw.startsWith("---")) {
     const end = raw.indexOf("\n---", 3);
     if (end >= 0) {
@@ -18350,13 +18590,13 @@ function readSkillBody(skillPath, maxChars = 12e3) {
 
 \u2026(truncated)` : raw;
 }
-var import_node_fs43, import_node_os12, import_node_path40, BUNDLED_SKILL_PREFIX;
+var import_node_fs45, import_node_os14, import_node_path42, BUNDLED_SKILL_PREFIX;
 var init_discover = __esm({
   "src/skills/discover.ts"() {
     "use strict";
-    import_node_fs43 = require("fs");
-    import_node_os12 = require("os");
-    import_node_path40 = require("path");
+    import_node_fs45 = require("fs");
+    import_node_os14 = require("os");
+    import_node_path42 = require("path");
     init_long_running();
     BUNDLED_SKILL_PREFIX = "bundled:";
   }
@@ -18451,17 +18691,17 @@ var init_expand = __esm({
 function packagedDetachedJobPath() {
   const dir = packagedMcpDir();
   if (!dir) return null;
-  const script = (0, import_node_path41.join)(dir, "scripts", "detached-job.js");
-  return (0, import_node_fs44.existsSync)(script) ? script : null;
+  const script = (0, import_node_path43.join)(dir, "scripts", "detached-job.js");
+  return (0, import_node_fs46.existsSync)(script) ? script : null;
 }
 function resolveDetachedJobScript() {
   const packaged = packagedDetachedJobPath();
   if (packaged) return packaged;
-  let dir = (0, import_node_path41.dirname)((0, import_node_url3.fileURLToPath)(import_meta3.url));
+  let dir = (0, import_node_path43.dirname)((0, import_node_url3.fileURLToPath)(import_meta3.url));
   for (let i = 0; i < 8; i++) {
-    const candidate = (0, import_node_path41.join)(dir, "scripts", "detached-job.js");
-    if ((0, import_node_fs44.existsSync)(candidate)) return candidate;
-    const parent = (0, import_node_path41.dirname)(dir);
+    const candidate = (0, import_node_path43.join)(dir, "scripts", "detached-job.js");
+    if ((0, import_node_fs46.existsSync)(candidate)) return candidate;
+    const parent = (0, import_node_path43.dirname)(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -18472,12 +18712,12 @@ function formatDetachedJobInvoke(scriptPath) {
   if (resolved) return `node ${JSON.stringify(resolved)}`;
   return "node scripts/detached-job.js";
 }
-var import_node_fs44, import_node_path41, import_node_url3, import_meta3;
+var import_node_fs46, import_node_path43, import_node_url3, import_meta3;
 var init_detached_job_path = __esm({
   "src/skills/detached-job-path.ts"() {
     "use strict";
-    import_node_fs44 = require("fs");
-    import_node_path41 = require("path");
+    import_node_fs46 = require("fs");
+    import_node_path43 = require("path");
     import_node_url3 = require("url");
     init_packaged_runtime();
     import_meta3 = {};
@@ -18662,11 +18902,11 @@ function loadAgentInstructions(worktreePath, agent) {
   const out = [];
   for (const rel of candidates) {
     if (seenPaths.has(rel)) continue;
-    const abs = (0, import_node_path42.join)(worktreePath, rel);
-    if (!(0, import_node_fs45.existsSync)(abs)) continue;
+    const abs = (0, import_node_path44.join)(worktreePath, rel);
+    if (!(0, import_node_fs47.existsSync)(abs)) continue;
     try {
-      if (!(0, import_node_fs45.statSync)(abs).isFile()) continue;
-      let content = (0, import_node_fs45.readFileSync)(abs, "utf8");
+      if (!(0, import_node_fs47.statSync)(abs).isFile()) continue;
+      let content = (0, import_node_fs47.readFileSync)(abs, "utf8");
       if (!content.trim()) continue;
       if (content.length > MAX_CHARS_PER_FILE) {
         content = `${content.slice(0, MAX_CHARS_PER_FILE)}
@@ -18706,12 +18946,12 @@ function withAgentInstructions(prompt, files) {
 
 ${prompt}`;
 }
-var import_node_fs45, import_node_path42, FILES_BY_AGENT, MAX_CHARS_PER_FILE;
+var import_node_fs47, import_node_path44, FILES_BY_AGENT, MAX_CHARS_PER_FILE;
 var init_instructions = __esm({
   "src/agents/instructions.ts"() {
     "use strict";
-    import_node_fs45 = require("fs");
-    import_node_path42 = require("path");
+    import_node_fs47 = require("fs");
+    import_node_path44 = require("path");
     init_git_auth_mode();
     init_worktree_labels();
     init_detached_job_path();
@@ -19057,40 +19297,40 @@ __export(plan_file_exports, {
   writePlanFile: () => writePlanFile
 });
 function ensureAttachmentsGitignore(worktreePath) {
-  const gitignoreAbs = (0, import_node_path43.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
-  if ((0, import_node_fs46.existsSync)(gitignoreAbs)) return;
-  (0, import_node_fs46.mkdirSync)((0, import_node_path43.dirname)(gitignoreAbs), { recursive: true });
-  (0, import_node_fs46.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
+  const gitignoreAbs = (0, import_node_path45.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
+  if ((0, import_node_fs48.existsSync)(gitignoreAbs)) return;
+  (0, import_node_fs48.mkdirSync)((0, import_node_path45.dirname)(gitignoreAbs), { recursive: true });
+  (0, import_node_fs48.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
 }
 function planFileAbs(worktreePath) {
-  return (0, import_node_path43.join)(worktreePath, PLAN_FILE_REL);
+  return (0, import_node_path45.join)(worktreePath, PLAN_FILE_REL);
 }
 function readTextIfPresent2(abs) {
-  if (!(0, import_node_fs46.existsSync)(abs)) return null;
+  if (!(0, import_node_fs48.existsSync)(abs)) return null;
   try {
-    const content = (0, import_node_fs46.readFileSync)(abs, "utf8");
+    const content = (0, import_node_fs48.readFileSync)(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
   }
 }
 function readPlanFile(worktreePath) {
-  return readTextIfPresent2(planFileAbs(worktreePath)) ?? readTextIfPresent2((0, import_node_path43.join)(worktreePath, `${LEGACY_ATTACHMENTS_DIR}/plan.md`)) ?? readTextIfPresent2((0, import_node_path43.join)(worktreePath, LEGACY_PLAN_FILE_REL));
+  return readTextIfPresent2(planFileAbs(worktreePath)) ?? readTextIfPresent2((0, import_node_path45.join)(worktreePath, `${LEGACY_ATTACHMENTS_DIR}/plan.md`)) ?? readTextIfPresent2((0, import_node_path45.join)(worktreePath, LEGACY_PLAN_FILE_REL));
 }
 function writePlanFile(worktreePath, content) {
   ensureAttachmentsGitignore(worktreePath);
   const abs = planFileAbs(worktreePath);
-  (0, import_node_fs46.mkdirSync)((0, import_node_path43.dirname)(abs), { recursive: true });
+  (0, import_node_fs48.mkdirSync)((0, import_node_path45.dirname)(abs), { recursive: true });
   const body = content.trimEnd() + (content.endsWith("\n") ? "" : "\n");
-  (0, import_node_fs46.writeFileSync)(abs, body, "utf8");
+  (0, import_node_fs48.writeFileSync)(abs, body, "utf8");
   return PLAN_FILE_REL;
 }
-var import_node_fs46, import_node_path43;
+var import_node_fs48, import_node_path45;
 var init_plan_file = __esm({
   "src/plan/plan-file.ts"() {
     "use strict";
-    import_node_fs46 = require("fs");
-    import_node_path43 = require("path");
+    import_node_fs48 = require("fs");
+    import_node_path45 = require("path");
     init_workspace_scratch();
     init_plan_present();
     init_plan_present();
@@ -19138,13 +19378,13 @@ var init_sync_branch = __esm({
 
 // src/agents/cursor-store.ts
 function cursorSdkStoreDir(threadId) {
-  const root = (0, import_node_path44.join)(appDataDir(), CURSOR_SDK_STORE_DIR);
+  const root = (0, import_node_path46.join)(appDataDir(), CURSOR_SDK_STORE_DIR);
   const id = sanitizeCursorStoreSegment(threadId);
   if (!id) return root;
-  return (0, import_node_path44.join)(root, "threads", id);
+  return (0, import_node_path46.join)(root, "threads", id);
 }
 function cursorSdkRunsNdjsonPath(threadId) {
-  return (0, import_node_path44.join)(cursorSdkStoreDir(threadId), "runs.ndjson");
+  return (0, import_node_path46.join)(cursorSdkStoreDir(threadId), "runs.ndjson");
 }
 function cursorSdkRunsNdjsonSearchPaths(threadId) {
   const scoped = cursorSdkRunsNdjsonPath(threadId);
@@ -19157,11 +19397,11 @@ function cursorSdkRunsNdjsonSearchPaths(threadId) {
 function sanitizeCursorStoreSegment(threadId) {
   return (threadId ?? "").trim().replace(/[^a-zA-Z0-9._-]/g, "_");
 }
-var import_node_path44, CURSOR_SDK_STORE_DIR;
+var import_node_path46, CURSOR_SDK_STORE_DIR;
 var init_cursor_store = __esm({
   "src/agents/cursor-store.ts"() {
     "use strict";
-    import_node_path44 = require("path");
+    import_node_path46 = require("path");
     init_paths();
     CURSOR_SDK_STORE_DIR = "cursor-sdk-store";
   }
@@ -19183,9 +19423,9 @@ function recoverFinishedCursorRun(opts) {
   return best;
 }
 function scanFinishedCursorRuns(runsPath, agentId, startedAfterMs) {
-  if (!(0, import_node_fs47.existsSync)(runsPath)) return null;
+  if (!(0, import_node_fs49.existsSync)(runsPath)) return null;
   try {
-    const lines = (0, import_node_fs47.readFileSync)(runsPath, "utf8").split("\n");
+    const lines = (0, import_node_fs49.readFileSync)(runsPath, "utf8").split("\n");
     let best = null;
     for (const line of lines) {
       const trimmed = line.trim();
@@ -19211,11 +19451,11 @@ function scanFinishedCursorRuns(runsPath, agentId, startedAfterMs) {
     return null;
   }
 }
-var import_node_fs47;
+var import_node_fs49;
 var init_cursor_recover = __esm({
   "src/agents/cursor-recover.ts"() {
     "use strict";
-    import_node_fs47 = require("fs");
+    import_node_fs49 = require("fs");
     init_cursor_store();
   }
 });
@@ -19347,13 +19587,13 @@ async function startOrchestration(opts) {
   }
   return updated;
 }
-var import_node_events, import_node_fs48, LIVE_TURN_SPAWN_GRACE_MS, STALE_AGENT_PID_WAIT_MS, Orchestrator, singleton;
+var import_node_events, import_node_fs50, LIVE_TURN_SPAWN_GRACE_MS, STALE_AGENT_PID_WAIT_MS, Orchestrator, singleton;
 var init_orchestrator = __esm({
   "src/orchestrator/orchestrator.ts"() {
     "use strict";
     import_node_events = require("events");
     init_outbound_watch();
-    import_node_fs48 = require("fs");
+    import_node_fs50 = require("fs");
     init_error_detail();
     init_run();
     init_stale_lock();
@@ -19521,7 +19761,7 @@ var init_orchestrator = __esm({
             }
             continue;
           }
-          if (!(0, import_node_fs48.existsSync)(thread.worktreePath)) {
+          if (!(0, import_node_fs50.existsSync)(thread.worktreePath)) {
             setStatus(thread.id, "broken", "Worktree missing on disk");
             this.emit({ type: "status_changed", threadId: thread.id, status: "broken" });
             continue;
@@ -19791,21 +20031,11 @@ var init_orchestrator = __esm({
       /** Run workspace setup after a new worktree is created (no-op if none configured). */
       async runSetupAfterCreate(threadId) {
         try {
-          await this.runSetup(threadId);
+          await this.runSetup(threadId, { stampLastError: false });
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           if (/no setup script/i.test(message)) return;
           if (/already running/i.test(message)) return;
-          const live = readThread(threadId);
-          if (!shouldStampSetupLastError({
-            turnInFlight: this.activeTurns.has(threadId) || this.startingTurns.has(threadId),
-            status: live?.status
-          })) {
-            return;
-          }
-          updateThread(threadId, {
-            lastError: `Setup failed: ${message}`
-          });
         }
       }
       listWorkspaces() {
@@ -20593,7 +20823,7 @@ var init_orchestrator = __esm({
         }
         return snap;
       }
-      async runSetup(threadRef) {
+      async runSetup(threadRef, opts) {
         const thread = this.requireThread(threadRef);
         this.assertNotGlobal(thread, "Setup");
         const key = `${thread.id}:setup`;
@@ -20634,9 +20864,10 @@ var init_orchestrator = __esm({
           }
           if (setup.exitCode !== 0 && setup.exitCode !== null) {
             const live = readThread(thread.id);
-            if (shouldStampSetupLastError({
+            if ((opts?.stampLastError ?? true) && shouldStampSetupLastError({
               turnInFlight: this.activeTurns.has(thread.id) || this.startingTurns.has(thread.id),
-              status: live?.status
+              status: live?.status,
+              hasQueuedPrompt: Boolean(live?.queue?.length)
             })) {
               updateThread(thread.id, {
                 lastError: `Setup exited ${setup.exitCode}`
@@ -21339,7 +21570,7 @@ var init_orchestrator = __esm({
           this.emit({ type: "status_changed", threadId: restored2.id, status: restored2.status });
           return restored2;
         }
-        if (!(0, import_node_fs48.existsSync)(thread.worktreePath)) {
+        if (!(0, import_node_fs50.existsSync)(thread.worktreePath)) {
           if (isCowboyThread(thread) || isPrimaryCheckoutThread(thread)) {
             throw new Error(
               `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
@@ -21936,6 +22167,7 @@ __export(index_exports, {
   isImageFilePath: () => isImageFilePath,
   isInPrStack: () => isInPrStack,
   isInboundForThisDesktop: () => isInboundForThisDesktop,
+  isInjectedOrchMcpName: () => isInjectedOrchMcpName,
   isInternalAgentStatusText: () => isInternalAgentStatusText,
   isIssueSourceConnected: () => isIssueSourceConnected,
   isLinearConnected: () => isLinearConnected,
@@ -21951,11 +22183,13 @@ __export(index_exports, {
   isPresentPlanToolName: () => isPresentPlanToolName,
   isPrimaryCheckoutThread: () => isPrimaryCheckoutThread,
   isSessionQuotaLimit: () => isSessionQuotaLimit,
+  isSetupLastError: () => isSetupLastError,
   isShellToolName: () => isShellToolName,
   isSideboardScratchPath: () => isSideboardScratchPath,
   isSlackCoordinatorThread: () => isSlackCoordinatorThread,
   isSlackExternalReplyPrompt: () => isSlackExternalReplyPrompt,
   isSlackOAuthCancelled: () => isSlackOAuthCancelled,
+  isStaleLastErrorDuringTurn: () => isStaleLastErrorDuringTurn,
   isSubagentToolName: () => isSubagentToolName,
   isThinkingEffort: () => isThinkingEffort,
   isThisProcessDesktopHost: () => isThisProcessDesktopHost,
@@ -22021,6 +22255,7 @@ __export(index_exports, {
   maybeCompactContext: () => maybeCompactContext,
   mcpAllowTools: () => mcpAllowTools,
   mcpAuthWarnings: () => mcpAuthWarnings,
+  mcpStatusThinkingFromClaudeInit: () => mcpStatusThinkingFromClaudeInit,
   mergeAgentGitAuthEnv: () => mergeAgentGitAuthEnv,
   mergePr: () => mergePr,
   mergePrStack: () => mergePrStack,
@@ -22173,6 +22408,7 @@ __export(index_exports, {
   shouldRemoveWorktreeOnTeardown: () => shouldRemoveWorktreeOnTeardown,
   shouldResetSessionForOccupancy: () => shouldResetSessionForOccupancy,
   shouldRunWorktreeCleanup: () => shouldRunWorktreeCleanup,
+  shouldStampSetupLastError: () => shouldStampSetupLastError,
   showCostEnabled: () => showCostEnabled,
   sideboardHomeDir: () => sideboardHomeDir,
   sideboardMcpProfile: () => sideboardMcpProfile,
@@ -22245,6 +22481,7 @@ __export(index_exports, {
   updateThread: () => updateThread,
   userClaudeMcpConfigPath: () => userClaudeMcpConfigPath,
   userCursorMcpConfigPath: () => userCursorMcpConfigPath,
+  userMcpNamesToDisable: () => userMcpNamesToDisable,
   validateLinearApiKey: () => validateLinearApiKey,
   verifyAbleTimeConnection: () => verifyAbleTimeConnection,
   verifyOptionalService: () => verifyOptionalService,
@@ -23609,6 +23846,7 @@ init_fork_worktree();
 init_stack_layers();
 init_adopt();
 init_orchestrator();
+init_setup_last_error();
 init_request_review();
 init_workspace_scratch();
 
@@ -23743,7 +23981,7 @@ var import_mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
 var import_stdio = require("@modelcontextprotocol/sdk/server/stdio.js");
 var import_zod5 = require("zod");
 var import_node_crypto13 = require("crypto");
-var import_node_path47 = require("path");
+var import_node_path49 = require("path");
 init_orchestrator();
 init_worktree();
 init_global_workspace();
@@ -24817,27 +25055,27 @@ init_gh_errors();
 init_git_auth_mode();
 
 // src/board/load-home-board.ts
-var import_node_fs50 = require("fs");
-var import_node_path46 = require("path");
+var import_node_fs52 = require("fs");
+var import_node_path48 = require("path");
 init_worktree();
 init_paths();
 
 // src/board/board-pins.ts
 var import_node_crypto12 = require("crypto");
-var import_node_fs49 = require("fs");
-var import_node_path45 = require("path");
+var import_node_fs51 = require("fs");
+var import_node_path47 = require("path");
 init_paths();
 init_home_board();
 var FILE = "home-board-pins.json";
 var VERSION = 1;
 function pinsFile() {
-  return (0, import_node_path45.join)(appDataDir(), FILE);
+  return (0, import_node_path47.join)(appDataDir(), FILE);
 }
 function readDisk() {
   const path2 = pinsFile();
-  if (!(0, import_node_fs49.existsSync)(path2)) return [];
+  if (!(0, import_node_fs51.existsSync)(path2)) return [];
   try {
-    const raw = JSON.parse((0, import_node_fs49.readFileSync)(path2, "utf8"));
+    const raw = JSON.parse((0, import_node_fs51.readFileSync)(path2, "utf8"));
     if (raw?.version !== VERSION || !Array.isArray(raw.items)) return [];
     return raw.items.filter((item) => item?.id && item.kind && item.ref);
   } catch {
@@ -24845,8 +25083,8 @@ function readDisk() {
   }
 }
 function writeDisk(items) {
-  (0, import_node_fs49.mkdirSync)(appDataDir(), { recursive: true });
-  (0, import_node_fs49.writeFileSync)(pinsFile(), JSON.stringify({ version: VERSION, items }, null, 2), "utf8");
+  (0, import_node_fs51.mkdirSync)(appDataDir(), { recursive: true });
+  (0, import_node_fs51.writeFileSync)(pinsFile(), JSON.stringify({ version: VERSION, items }, null, 2), "utf8");
 }
 function listBoardPins() {
   return readDisk();
@@ -24898,7 +25136,7 @@ function replaceBoardPins(items) {
 }
 function clearBoardPins() {
   try {
-    (0, import_node_fs49.unlinkSync)(pinsFile());
+    (0, import_node_fs51.unlinkSync)(pinsFile());
   } catch {
   }
 }
@@ -24915,7 +25153,7 @@ function homeBoardWorkspaceKey(workspaces) {
   return workspaces.map((w) => w.path).filter(Boolean).sort().join("\n");
 }
 function cacheFile() {
-  return (0, import_node_path46.join)(appDataDir(), "home-board-cache.json");
+  return (0, import_node_path48.join)(appDataDir(), "home-board-cache.json");
 }
 function emptyInputs() {
   return {
@@ -24941,9 +25179,9 @@ function shouldCacheHomeBoardInputs(inputs) {
 }
 function readDiskCache() {
   const path2 = cacheFile();
-  if (!(0, import_node_fs50.existsSync)(path2)) return null;
+  if (!(0, import_node_fs52.existsSync)(path2)) return null;
   try {
-    const raw = JSON.parse((0, import_node_fs50.readFileSync)(path2, "utf8"));
+    const raw = JSON.parse((0, import_node_fs52.readFileSync)(path2, "utf8"));
     if (raw?.version !== CACHE_VERSION || typeof raw.fetchedAt !== "number") {
       return null;
     }
@@ -24957,14 +25195,14 @@ function readDiskCache() {
 }
 function writeDiskCache(entry) {
   try {
-    (0, import_node_fs50.mkdirSync)(appDataDir(), { recursive: true });
-    (0, import_node_fs50.writeFileSync)(cacheFile(), JSON.stringify(entry), "utf8");
+    (0, import_node_fs52.mkdirSync)(appDataDir(), { recursive: true });
+    (0, import_node_fs52.writeFileSync)(cacheFile(), JSON.stringify(entry), "utf8");
   } catch {
   }
 }
 function deleteDiskCache() {
   try {
-    (0, import_node_fs50.unlinkSync)(cacheFile());
+    (0, import_node_fs52.unlinkSync)(cacheFile());
   } catch {
   }
 }
@@ -25268,7 +25506,7 @@ async function startMcpServer() {
       async () => {
         const threads = orch.getThreads(true);
         const lines = threads.map((t) => {
-          const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path47.basename)(t.repoPath) || t.repoPath;
+          const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path49.basename)(t.repoPath) || t.repoPath;
           const live = orch.threadLooksLive(t) ? readTurnLive(t.id) : null;
           const parent = t.parentThreadId ? `  parent:${t.parentThreadId.slice(0, 8)}` : "";
           const preview = lastMessagePreview(t.messages, 80);
@@ -26740,79 +26978,8 @@ init_accounts();
 init_connected_teams();
 init_oauth();
 init_injected_mcp();
-
-// src/agents/user-mcp-config.ts
-var import_node_fs51 = require("fs");
-var import_node_os13 = require("os");
-var import_node_path48 = require("path");
-init_paths();
-init_injected_mcp();
-function userCursorMcpConfigPath() {
-  return (0, import_node_path48.join)((0, import_node_os13.homedir)(), ".cursor", "mcp.json");
-}
-function userClaudeMcpConfigPath() {
-  return (0, import_node_path48.join)((0, import_node_os13.homedir)(), ".claude.json");
-}
-function asObject(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
-  return { ...value };
-}
-function stripElectronSpawnEnv(env) {
-  if (!env) return void 0;
-  const next = { ...env };
-  delete next.ELECTRON_RUN_AS_NODE;
-  delete next.ELECTRON_RUN_AS_NODE;
-  return Object.keys(next).length > 0 ? next : void 0;
-}
-function mergeSideboardIntoMcpServersJson(existing, sideboard) {
-  const root = asObject(existing);
-  const servers = asObject(root.mcpServers);
-  const env = stripElectronSpawnEnv(sideboard.env);
-  servers.sideboard = {
-    type: "stdio",
-    command: sideboard.command,
-    ...sideboard.args && sideboard.args.length > 0 ? { args: sideboard.args } : {},
-    ...env ? { env } : {}
-  };
-  return { ...root, mcpServers: servers };
-}
-function writeMergedMcpServersJson(configPath, sideboard) {
-  let existing = {};
-  if ((0, import_node_fs51.existsSync)(configPath)) {
-    try {
-      existing = JSON.parse((0, import_node_fs51.readFileSync)(configPath, "utf8"));
-    } catch {
-      existing = {};
-    }
-  }
-  const next = mergeSideboardIntoMcpServersJson(existing, sideboard);
-  (0, import_node_fs51.mkdirSync)((0, import_node_path48.dirname)(configPath), { recursive: true });
-  (0, import_node_fs51.writeFileSync)(configPath, `${JSON.stringify(next, null, 2)}
-`);
-}
-function launchFromResolved(server) {
-  return {
-    command: server.command,
-    args: server.args,
-    env: {
-      ...server.env ?? {},
-      SIDEBOARD_APP_DATA: appDataDir()
-    }
-  };
-}
-async function registerPackagedUserMcpClients() {
-  const launch = launchFromResolved(await resolveSideboardMcpServer());
-  const cursor = userCursorMcpConfigPath();
-  writeMergedMcpServersJson(cursor, launch);
-  const claude = userClaudeMcpConfigPath();
-  if ((0, import_node_fs51.existsSync)(claude)) {
-    writeMergedMcpServersJson(claude, launch);
-    return { cursor, claude };
-  }
-  return { cursor };
-}
-
-// src/index.ts
+init_user_mcp_config();
+init_orch_mcp_isolation();
 init_workspaces2();
 
 // src/slack/oauth.ts
@@ -28435,9 +28602,9 @@ var import_node_http3 = require("http");
 var import_ws3 = require("ws");
 
 // src/slack/relay-static.ts
-var import_node_fs52 = require("fs");
+var import_node_fs53 = require("fs");
 var import_promises = require("fs/promises");
-var import_node_path49 = __toESM(require("path"), 1);
+var import_node_path50 = __toESM(require("path"), 1);
 var TYPES = {
   ".css": "text/css; charset=utf-8",
   ".html": "text/html; charset=utf-8",
@@ -28468,9 +28635,9 @@ function resolveStaticPath(root, requestUrl) {
     return null;
   }
   if (!pathname.startsWith("/") || pathname.includes("\0")) return null;
-  const rootResolved = import_node_path49.default.resolve(root);
-  const candidate = import_node_path49.default.resolve(rootResolved, `.${pathname}`);
-  if (candidate !== rootResolved && !candidate.startsWith(rootResolved + import_node_path49.default.sep)) {
+  const rootResolved = import_node_path50.default.resolve(root);
+  const candidate = import_node_path50.default.resolve(rootResolved, `.${pathname}`);
+  if (candidate !== rootResolved && !candidate.startsWith(rootResolved + import_node_path50.default.sep)) {
     return null;
   }
   return candidate;
@@ -28484,7 +28651,7 @@ async function fileSize(file) {
   }
 }
 function sendFile(req, res, file, size) {
-  const ext = import_node_path49.default.extname(file).toLowerCase();
+  const ext = import_node_path50.default.extname(file).toLowerCase();
   res.writeHead(200, {
     "Content-Type": TYPES[ext] ?? "application/octet-stream",
     "Content-Length": size,
@@ -28494,7 +28661,7 @@ function sendFile(req, res, file, size) {
     res.end();
     return true;
   }
-  (0, import_node_fs52.createReadStream)(file).pipe(res);
+  (0, import_node_fs53.createReadStream)(file).pipe(res);
   return true;
 }
 async function tryServeStatic(req, res, root) {
@@ -28503,7 +28670,7 @@ async function tryServeStatic(req, res, root) {
   if (!candidate) return false;
   const direct = await fileSize(candidate);
   if (direct != null) return sendFile(req, res, candidate, direct);
-  const asIndex = import_node_path49.default.join(candidate, "index.html");
+  const asIndex = import_node_path50.default.join(candidate, "index.html");
   const indexSize = await fileSize(asIndex);
   if (indexSize != null) return sendFile(req, res, asIndex, indexSize);
   return false;
@@ -29132,6 +29299,7 @@ init_outbound_watch();
   isImageFilePath,
   isInPrStack,
   isInboundForThisDesktop,
+  isInjectedOrchMcpName,
   isInternalAgentStatusText,
   isIssueSourceConnected,
   isLinearConnected,
@@ -29147,11 +29315,13 @@ init_outbound_watch();
   isPresentPlanToolName,
   isPrimaryCheckoutThread,
   isSessionQuotaLimit,
+  isSetupLastError,
   isShellToolName,
   isSideboardScratchPath,
   isSlackCoordinatorThread,
   isSlackExternalReplyPrompt,
   isSlackOAuthCancelled,
+  isStaleLastErrorDuringTurn,
   isSubagentToolName,
   isThinkingEffort,
   isThisProcessDesktopHost,
@@ -29217,6 +29387,7 @@ init_outbound_watch();
   maybeCompactContext,
   mcpAllowTools,
   mcpAuthWarnings,
+  mcpStatusThinkingFromClaudeInit,
   mergeAgentGitAuthEnv,
   mergePr,
   mergePrStack,
@@ -29369,6 +29540,7 @@ init_outbound_watch();
   shouldRemoveWorktreeOnTeardown,
   shouldResetSessionForOccupancy,
   shouldRunWorktreeCleanup,
+  shouldStampSetupLastError,
   showCostEnabled,
   sideboardHomeDir,
   sideboardMcpProfile,
@@ -29441,6 +29613,7 @@ init_outbound_watch();
   updateThread,
   userClaudeMcpConfigPath,
   userCursorMcpConfigPath,
+  userMcpNamesToDisable,
   validateLinearApiKey,
   verifyAbleTimeConnection,
   verifyOptionalService,