@sideboard-ai/core 0.1.217 → 0.1.219

package/dist/{chunk-DFTVZEZY.js → chunk-K642ORWF.js}

@@ -1,18 +1,18 @@
 import {
   isOrchestratorThread
-} from "./chunk-FNGXKY5W.js";
+} from "./chunk-N2VST3NL.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-NI243N27.js";
+} from "./chunk-KTZESHYH.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens
-} from "./chunk-SALM35KD.js";
+} from "./chunk-IILG7DPX.js";
 import {
   loadBrightsyConfig
 } from "./chunk-AN3THU7F.js";
@@ -33,7 +33,7 @@ import {
   packagedMcpStdioPath,
   parseCursorRunnerLine,
   resolveNodeLaunch
-} from "./chunk-JZHRZ3DR.js";
+} from "./chunk-TQBUXKIB.js";
 import {
   claudeChromeEnabled,
   fromInclusiveInputUsage,
@@ -42,11 +42,7 @@ import {
   loadAppSettings,
   resolveAgentExecutable,
   resolveClaudeExecutable
-} from "./chunk-L5CIEBLR.js";
-import {
-  isElectronLikeCommand,
-  unwrapStrippedElectronLaunch
-} from "./chunk-4TR3HZFT.js";
+} from "./chunk-EWHJNJHV.js";
 import {
   appDataDir
 } from "./chunk-WFUDY6PC.js";
@@ -56,7 +52,11 @@ import {
   resolveCommandBinarySync,
   run,
   withExportedPath
-} from "./chunk-UFHNSFAS.js";
+} from "./chunk-HVUVQXZ2.js";
+import {
+  isElectronLikeCommand,
+  unwrapStrippedElectronLaunch
+} from "./chunk-4TR3HZFT.js";
 
 // src/agents/brightsy.ts
 import { existsSync } from "fs";
@@ -486,7 +486,7 @@ var brightsyAdapter = {
 };
 
 // src/agents/claude.ts
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync5 } from "fs";
 
 // src/agents/claude-mcp.ts
 function parseMcpList(text) {
@@ -521,6 +521,11 @@ function mcpAllowTools(servers) {
   }
   return out;
 }
+function mcpAllowToolsFromNames(names) {
+  return mcpAllowTools(
+    [...names].map((name) => name.trim()).filter(Boolean).map((name) => ({ name, connected: true, needsAuth: false }))
+  );
+}
 function mcpAuthWarnings(servers) {
   const needing = servers.filter((s) => s.needsAuth).map((s) => s.name);
   if (needing.length === 0) return [];
@@ -529,964 +534,1168 @@ function mcpAuthWarnings(servers) {
   ];
 }
 
-// src/agents/message-parts.ts
-function asRecord(input) {
-  if (input && typeof input === "object" && !Array.isArray(input)) {
-    return input;
+// src/agents/orch-mcp-isolation.ts
+import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join3 } from "path";
+import { parse as parseToml } from "smol-toml";
+
+// src/agents/user-mcp-config.ts
+import { existsSync as existsSync3, mkdirSync, readFileSync, writeFileSync as writeFileSync2 } from "fs";
+import { homedir } from "os";
+import { dirname as dirname2, join as join2 } from "path";
+
+// src/agents/injected-mcp.ts
+import { existsSync as existsSync2, mkdtempSync, writeFileSync } from "fs";
+import { createRequire } from "module";
+import { tmpdir } from "os";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+
+// src/mcp/profile.ts
+var SIDEBOARD_MCP_PROFILE_ENV = "SIDEBOARD_MCP_PROFILE";
+var WORKTREE_MCP_TOOLS = [
+  "present_artifact",
+  "ask_user",
+  "present_plan",
+  "present_schema",
+  "present_files",
+  "wait_for_job",
+  "stop_job",
+  "get_viewer_context",
+  "update_viewer_context"
+];
+var WORKTREE_GITHUB_MCP_TOOLS = [
+  "github_search_issues",
+  "github_get_issue",
+  "github_comment",
+  "github_update_issue",
+  "github_create_issue"
+];
+var WORKTREE_LINEAR_MCP_TOOLS = [
+  "linear_list_teams",
+  "linear_search_issues",
+  "linear_get_issue",
+  "linear_create_issue",
+  "linear_update_issue",
+  "linear_comment"
+];
+var WORKTREE_ABLETIME_MCP_TOOLS = [
+  "abletime_orientation",
+  "abletime_list_projects",
+  "abletime_list_tasks",
+  "abletime_search_tasks",
+  "abletime_get_task",
+  "abletime_comment",
+  "abletime_update_task",
+  "abletime_create_task",
+  "abletime_ensure_task"
+];
+function sideboardMcpProfile(env = process.env) {
+  return env[SIDEBOARD_MCP_PROFILE_ENV]?.trim().toLowerCase() === "worktree" ? "worktree" : "orchestration";
+}
+
+// src/agents/injected-mcp.ts
+var SIDEBOARD_MCP_ALLOWED_TOOLS = [
+  "mcp__sideboard",
+  "mcp__sideboard__*"
+];
+var SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS = [
+  "mcp__sideboard__present_artifact",
+  "mcp__sideboard__present_schema",
+  "mcp__sideboard__present_files",
+  "mcp__sideboard__ask_user",
+  "mcp__sideboard__present_plan",
+  "mcp__sideboard__wait_for_job",
+  "mcp__sideboard__stop_job",
+  "mcp__sideboard__get_viewer_context",
+  "mcp__sideboard__update_viewer_context"
+];
+var SIDEBOARD_GITHUB_MCP_ALLOWED_TOOLS = ["mcp__sideboard__github_*"];
+var SIDEBOARD_LINEAR_MCP_ALLOWED_TOOLS = ["mcp__sideboard__linear_*"];
+var SIDEBOARD_ABLETIME_MCP_ALLOWED_TOOLS = ["mcp__sideboard__abletime_*"];
+function sideboardWorktreeAllowedTools(opts) {
+  const out = [...SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS];
+  if (opts?.github !== false) out.push(...SIDEBOARD_GITHUB_MCP_ALLOWED_TOOLS);
+  if (opts?.linear) out.push(...SIDEBOARD_LINEAR_MCP_ALLOWED_TOOLS);
+  if (opts?.abletime) out.push(...SIDEBOARD_ABLETIME_MCP_ALLOWED_TOOLS);
+  return out;
+}
+var BRIGHTSY_MCP_ALLOWED_TOOLS = [
+  "mcp__brightsy",
+  "mcp__brightsy__*"
+];
+var brightsyMcpCommandCache = null;
+async function resolveBrightsyMcpCommand() {
+  const now = Date.now();
+  if (brightsyMcpCommandCache && now - brightsyMcpCommandCache.at < 6e4 && brightsyMcpCommandCache.command) {
+    return brightsyMcpCommandCache.command;
   }
-  return void 0;
+  const which = await run("which", ["brightsy-mcp"], { reject: false });
+  const command = which.exitCode === 0 && which.stdout.trim() ? "brightsy-mcp" : "npx";
+  brightsyMcpCommandCache = { at: now, command };
+  return command;
 }
-function str(v) {
-  return typeof v === "string" && v.trim() ? v : void 0;
+function isBrightsyConnected() {
+  try {
+    loadBrightsyConfig();
+    return true;
+  } catch {
+    return false;
+  }
 }
-var CHAT_DETAIL_MAX = 72;
-function clipChatLine(value, max = CHAT_DETAIL_MAX) {
-  const line = value.trim().split(/\r?\n/, 1)[0] ?? "";
-  if (line.length <= max) return line;
-  return `${line.slice(0, Math.max(1, max - 1))}\u2026`;
+var BRIGHTSY_WORD = /(?<![a-z0-9_-])brightsy(?![a-z0-9_-])/i;
+function promptMentionsBrightsy(text) {
+  return BRIGHTSY_WORD.test(text ?? "");
 }
-var SHELL_BIN_DIR = /^(?:\/usr\/local\/bin|\/usr\/bin|\/bin|\/opt\/homebrew\/bin|\/sbin|\/usr\/sbin)\//;
-function rootedPathWithSpaces(trimmed) {
-  const [head = "", ...rest] = trimmed.split(/\s+/);
-  if (SHELL_BIN_DIR.test(head)) return false;
-  return rest.every((tok) => !/^[-/~$]/.test(tok) && !tok.includes("="));
+function isBrightsyMcpToolName(name) {
+  const n = name.toLowerCase();
+  return n === "brightsy" || n.startsWith("mcp__brightsy") || n.startsWith("brightsy_");
 }
-function looksLikeFilePath(value) {
-  const trimmed = value.trim();
-  if (!trimmed || /[\r\n;|&<>]/.test(trimmed)) return false;
-  const rooted = trimmed.startsWith("/") || trimmed.startsWith("~/") || /^[A-Za-z]:[\\/]/.test(trimmed);
-  if (/\s/.test(trimmed)) return rooted && rootedPathWithSpaces(trimmed);
-  if (rooted) return true;
-  return trimmed.includes("/") || trimmed.includes("\\");
+function toolInputUsesBrightsyDatasource(input) {
+  const ds = input?.datasource;
+  return typeof ds === "string" && ds.toLowerCase() === "brightsy";
 }
-function stripWorktreePrefix(path, worktreePath) {
-  if (!worktreePath) return path;
-  const prefix = worktreePath.replace(/[/\\]+$/, "");
-  if (path === prefix || path === `${prefix}/`) return "";
-  if (path.startsWith(`${prefix}/`)) return path.slice(prefix.length + 1);
-  return path;
+function messageUsedBrightsyMcp(msg) {
+  if (msg.role === "user" && promptMentionsBrightsy(msg.text)) return true;
+  for (const part of msg.parts ?? []) {
+    if (part.type !== "tool") continue;
+    if (isBrightsyMcpToolName(part.name)) return true;
+    if (/present_(schema|files)$/i.test(part.name) && toolInputUsesBrightsyDatasource(part.input)) {
+      return true;
+    }
+  }
+  return false;
 }
-function visibleToolRowDetail(detail, description, worktreePath) {
-  if (!detail?.trim()) return void 0;
-  const raw = detail.trim();
-  const desc = (description ?? "").trim();
-  if (!looksLikeFilePath(raw)) {
-    const clipped = clipChatLine(raw);
-    if (!clipped || desc === clipped || desc === raw) return void 0;
-    return clipped;
+function threadRequestsBrightsyMcp(thread) {
+  return (thread?.messages ?? []).some(messageUsedBrightsyMcp);
+}
+function shouldInjectBrightsyMcp(thread, opts) {
+  if (!(opts?.connected ?? isBrightsyConnected())) return false;
+  if (opts?.orchestrator) return true;
+  const alwaysOn = opts?.alwaysOnWorktree ?? Boolean(loadAppSettings().brightsy?.injectWorktreeMcp);
+  if (alwaysOn) return true;
+  return threadRequestsBrightsyMcp(thread);
+}
+function mcpLaunch(cmd, name, env) {
+  if (cmd === "brightsy-mcp") {
+    return { name, command: "brightsy-mcp", ...env ? { env } : {} };
   }
-  const rel = stripWorktreePrefix(raw, worktreePath);
-  if (!rel) return void 0;
-  const base = fileBasename(rel);
-  if (desc && (desc === base || desc.endsWith(` ${base}`))) return void 0;
-  if (rel.length <= 42) return rel;
-  const parts = rel.split(/[/\\]/).filter(Boolean);
-  if (parts.length >= 2) return `\u2026/${parts.slice(-2).join("/")}`;
-  return base;
+  return {
+    name,
+    command: "npx",
+    args: ["-y", "@brightsy/mcp-server"],
+    ...env ? { env } : {}
+  };
 }
-function toolDetail(name, input) {
-  if (!input) return void 0;
-  const command = str(input.command) ?? str(input.cmd);
-  if (command) return clipChatLine(command);
-  const pattern = str(input.pattern) ?? str(input.glob) ?? str(input.glob_pattern);
-  const isSearch = /grep|glob|search|ripgrep|findfiles|semsearch/i.test(name);
-  if (isSearch && pattern) {
-    return pattern.length > 80 ? `${pattern.slice(0, 77)}\u2026` : pattern;
+function teamEnv(team) {
+  const endpoint = (team.endpoint || "https://brightsy.ai").replace(/\/$/, "");
+  return {
+    BRIGHTSY_API_TOKEN: team.access_token,
+    ...team.refresh_token ? { BRIGHTSY_REFRESH_TOKEN: team.refresh_token } : {},
+    BRIGHTSY_ACCOUNT_ID: team.id,
+    BRIGHTSY_API_URL: endpoint
+  };
+}
+function brightsyMcpAllowedTools(serverNames) {
+  const out = [];
+  for (const name of serverNames) {
+    out.push(`mcp__${name}`, `mcp__${name}__*`);
   }
-  const path = str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
-  if (path) return path;
-  if (pattern) return pattern.length > 80 ? `${pattern.slice(0, 77)}\u2026` : pattern;
-  const query = str(input.query) ?? str(input.prompt);
-  if (query) return query.length > 80 ? `${query.slice(0, 77)}\u2026` : query;
+  return out;
+}
+function corePackageDir() {
+  const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
+  if (cjsDir) return cjsDir;
   try {
-    const raw = JSON.stringify(input);
-    return raw.length > 80 ? `${raw.slice(0, 77)}\u2026` : raw;
+    const url = import.meta.url;
+    if (typeof url === "string" && url.length > 0) {
+      return dirname(fileURLToPath(url));
+    }
   } catch {
-    return name;
-  }
-}
-function toolDescription(name, input) {
-  const n = name.replace(/^mcp__/, "").replace(/__/g, " \xB7 ");
-  if (/^get_record_types$|recordTypes/i.test(name)) return "List record types";
-  if (/connectedAgentRequest/i.test(name)) {
-    return str(input?.agent_id) ? `Ask connected agent` : "Ask connected agent";
   }
-  if (/present_artifact$/i.test(name)) {
-    return str(input?.title) ? `Present ${str(input?.title)}` : "Present artifact";
-  }
-  if (/present_plan$/i.test(name)) {
-    return str(input?.title) ? `Plan ${str(input?.title)}` : "Present plan";
+  try {
+    const req = createRequire(join(process.cwd(), "package.json"));
+    return dirname(req.resolve("@sideboard-ai/core"));
+  } catch {
+    return process.cwd();
   }
-  if (/present_schema$/i.test(name)) {
-    return str(input?.title) ? `Schema ${str(input?.title)}` : "Present schema";
-  }
-  if (/present_files$/i.test(name)) {
-    return str(input?.title) ? `Files ${str(input?.title)}` : "Present files";
+}
+function findSideboardMcpJsEntry() {
+  const override = process.env.SIDEBOARD_MCP_ENTRY?.trim() || process.env.SIDEBOARD_CLI?.trim();
+  if (override && existsSync2(override)) return override;
+  const packaged = packagedMcpStdioPath();
+  if (packaged) return packaged;
+  let dir = corePackageDir();
+  for (let i = 0; i < 10; i++) {
+    const candidates = [
+      join(dir, "mcp/run-stdio.js"),
+      join(dir, "mcp/run-stdio.cjs"),
+      join(dir, "dist/mcp/run-stdio.js"),
+      join(dir, "dist/mcp/run-stdio.cjs"),
+      join(dir, "packages/core/dist/mcp/run-stdio.js"),
+      join(dir, "packages/cli/dist/index.js"),
+      join(dir, "cli/dist/index.js")
+    ];
+    for (const p of candidates) {
+      if (existsSync2(p) && !isAsarPath(p)) return p;
+    }
+    const parent = dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
   }
-  if (/wait_for_job$/i.test(name)) {
-    return str(input?.id) ? `Wait for ${str(input?.id)}` : "Wait for job";
+  return null;
+}
+async function resolveSideboardMcpServer() {
+  const entry = findSideboardMcpJsEntry();
+  if (entry) {
+    const isCli = /[/\\]cli[/\\]dist[/\\]index\.js$/.test(entry);
+    const scriptArgs = isCli ? [entry, "mcp"] : [entry];
+    const launch = applyNodeLaunch(await resolveNodeLaunch(entry), scriptArgs);
+    if (launch.file !== "/bin/sh" && !isElectronLikeCommand(launch.file)) {
+      return {
+        name: "sideboard",
+        command: launch.file,
+        args: launch.args,
+        ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
+      };
+    }
   }
-  if (/stop_job$/i.test(name)) {
-    return str(input?.id) ? `Stop ${str(input?.id)}` : "Stop job";
+  const which = await run("which", ["sideboard"], { reject: false });
+  if (which.exitCode === 0 && which.stdout.trim()) {
+    return { name: "sideboard", command: which.stdout.trim(), args: ["mcp"] };
   }
-  if (isSubagentToolName(name)) {
-    const desc = str(input?.description);
-    const sub = asRecord(input?.subagentType);
-    const kind = str(sub?.name) ?? str(sub?.kind) ?? str(input?.subagent_type) ?? str(input?.subagentType);
-    if (/^spawn_agent$/i.test(name)) {
-      return str(input?.prompt) ?? desc ?? "Subagent";
+  return { name: "sideboard", command: "sideboard", args: ["mcp"] };
+}
+async function buildInjectedMcpServers(opts) {
+  const servers = [];
+  if (opts.includeSideboard) {
+    const sideboard = await resolveSideboardMcpServer();
+    const orchId = opts.orchestratorThreadId?.trim();
+    const profile = orchId ? "orchestration" : "worktree";
+    sideboard.env = {
+      ...sideboard.env ?? {},
+      SIDEBOARD_APP_DATA: appDataDir(),
+      [SIDEBOARD_MCP_PROFILE_ENV]: profile
+    };
+    if (orchId) {
+      sideboard.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID = orchId;
     }
-    if (/connectedAgentRequest/i.test(name)) {
-      return str(input?.agent_id) ? `Ask connected agent` : "Ask connected agent";
+    try {
+      mergeAgentGitAuthEnv(
+        sideboard.env,
+        await resolveAgentGitAuthEnv(sideboard.env)
+      );
+    } catch {
     }
-    if (desc && kind) return `${kind}: ${desc}${subagentLiveSuffix(input)}`;
-    if (desc) return `${desc}${subagentLiveSuffix(input)}`;
-    return `Subagent${subagentLiveSuffix(input)}`;
-  }
-  if (/^(create|update)_artifact$/i.test(name.replace(/^mcp__[^_]+__/, ""))) {
-    return str(input?.title) ? `Artifact ${str(input?.title)}` : "Artifact";
-  }
-  if (!input) return n;
-  if (/bash|shell|terminal/i.test(name) && str(input.command)) {
-    const cmd = str(input.command);
-    if (/git\s+fetch/i.test(cmd)) return "Fetch latest from origin and check status";
-    if (/git\s+status/i.test(cmd)) return "Check git status";
-    if (/git\s+log/i.test(cmd)) return "Inspect recent commits";
-    if (/git\s+branch/i.test(cmd)) return "List branches";
-    if (/grep|rg\b/i.test(cmd)) return "Search repository";
-    return "Run shell command";
-  }
-  if (/edit|write|apply/i.test(name)) {
-    const path = str(input.file_path) ?? str(input.path);
-    return path ? `Edit ${path.split("/").pop()}` : "Edit file";
+    applyAgentRunnerHeapEnv(sideboard.env);
+    servers.push(sideboard);
   }
-  if (/read/i.test(name)) {
-    const path = str(input.file_path) ?? str(input.path);
-    return path ? `Read ${path.split("/").pop()}` : "Read file";
+  if (opts.includeBrightsy && isBrightsyConnected()) {
+    const cmd = await resolveBrightsyMcpCommand();
+    const teams = await ensureConnectedBrightsyTeamTokens();
+    if (teams.length > 0) {
+      const used = /* @__PURE__ */ new Set();
+      for (const team of teams) {
+        let name = brightsyMcpServerName(team.slug);
+        if (used.has(name)) name = `${name}_${team.id.slice(0, 8)}`;
+        used.add(name);
+        servers.push(mcpLaunch(cmd, name, teamEnv(team)));
+      }
+    } else {
+      servers.push(mcpLaunch(cmd, "brightsy"));
+    }
   }
-  if (/grep/i.test(name)) return "Search files";
-  if (/glob/i.test(name)) return "Find files";
-  const compact = n.replace(/[_-]/g, "");
-  if (/^taskoutput$/i.test(compact)) {
-    return str(input.task_id) ? `Wait for ${str(input.task_id)}` : "Wait for background task";
+  return servers;
+}
+function cursorSafeMcpLaunch(command, args) {
+  if (process.platform === "win32") {
+    return args && args.length > 0 ? { command, args } : { command };
   }
-  if (/^taskstop$/i.test(compact)) {
-    return str(input.task_id) ? `Stop ${str(input.task_id)}` : "Stop background task";
+  const unwrapped = unwrapStrippedElectronLaunch(command, args);
+  const file = unwrapped?.file ?? command;
+  const fileArgs = unwrapped?.args ?? args ?? [];
+  return fileArgs.length > 0 ? { command: file, args: fileArgs } : { command: file };
+}
+function mcpSpawnEnv(env) {
+  if (!env) return void 0;
+  const out = { ...env };
+  delete out.ELECTRON_RUN_AS_NODE;
+  delete out.ELECTRON_RUN_AS_NODE;
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+function toCursorMcpServers(servers) {
+  const out = {};
+  for (const s of servers) {
+    const env = mcpSpawnEnv(s.env);
+    const launch = cursorSafeMcpLaunch(s.command, s.args);
+    out[s.name] = {
+      type: "stdio",
+      command: launch.command,
+      ...launch.args && launch.args.length > 0 ? { args: launch.args } : {},
+      ...env ? { env } : {}
+    };
   }
-  if (/^monitor$/i.test(compact)) {
-    const command = str(input.command);
-    return command ? `Watch ${command.length > 48 ? `${command.slice(0, 45)}\u2026` : command}` : "Watch command";
+  return out;
+}
+function toCodexMcpConfigArgs(servers) {
+  const args = [];
+  for (const s of servers) {
+    const prefix = `mcp_servers.${s.name}`;
+    args.push("-c", `${prefix}.command=${JSON.stringify(s.command)}`);
+    if (s.args?.length) {
+      args.push("-c", `${prefix}.args=${JSON.stringify(s.args)}`);
+    }
+    const env = mcpSpawnEnv(s.env);
+    if (env) {
+      for (const [key, value] of Object.entries(env)) {
+        args.push("-c", `${prefix}.env.${key}=${JSON.stringify(value)}`);
+      }
+    }
+    args.push("-c", `${prefix}.default_tools_approval_mode=${JSON.stringify("approve")}`);
+    args.push("-c", `${prefix}.tool_timeout_sec=300`);
+    args.push("-c", `${prefix}.startup_timeout_sec=30`);
   }
-  return n;
+  return args;
 }
-function subagentLiveSuffix(input) {
-  if (!input) return "";
-  const bits = [];
-  const status = str(input.live_status);
-  if (status && !/^runn(ing)?$|^working$/i.test(status)) bits.push(status);
-  if (typeof input.live_tool_uses === "number") bits.push(`${input.live_tool_uses} tools`);
-  if (typeof input.live_duration_ms === "number") {
-    bits.push(`${Math.max(0, Math.round(Number(input.live_duration_ms) / 1e3))}s`);
+function toOpencodeMcpConfigContent(servers, opts) {
+  const mcp = {};
+  for (const s of servers) {
+    const env = mcpSpawnEnv(s.env);
+    mcp[s.name] = {
+      type: "local",
+      command: [s.command, ...s.args ?? []],
+      enabled: true,
+      ...env ? { environment: env } : {}
+    };
   }
-  const last = str(input.live_last_tool);
-  if (last) bits.push(last);
-  return bits.length ? ` \xB7 ${bits.join(" \xB7 ")}` : "";
+  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 isSubagentToolName(name) {
-  const n = (name ?? "").trim();
-  if (/^(task|agent|spawn_agent)$/i.test(n)) return true;
-  return /connectedAgentRequest/i.test(n);
+function stripElectronFromUserMcpEntry(entry) {
+  const next = { ...entry };
+  const env = next.env;
+  if (!env || typeof env !== "object" || Array.isArray(env)) return next;
+  const cleaned = { ...env };
+  delete cleaned.ELECTRON_RUN_AS_NODE;
+  next.env = cleaned;
+  return next;
 }
-function isInternalAgentStatusText(text) {
-  const t = text.trim();
-  if (!t) return false;
-  if (/waiting for gate to pass/i.test(t)) return true;
-  if (/^agent is running\b/i.test(t) && t.length < 160) return true;
-  return false;
+function writeMcpServersConfig(servers, extraServers) {
+  const mcpServers = {};
+  for (const s of servers) {
+    const env = mcpSpawnEnv(s.env);
+    mcpServers[s.name] = {
+      command: s.command,
+      ...s.args ? { args: s.args } : {},
+      ...env ? { env } : {}
+    };
+  }
+  if (extraServers) {
+    for (const [rawName, entry] of Object.entries(extraServers)) {
+      const name = rawName.trim();
+      if (!name || mcpServers[name] || !entry) continue;
+      mcpServers[name] = stripElectronFromUserMcpEntry(entry);
+    }
+  }
+  if (Object.keys(mcpServers).length === 0) return null;
+  const dir = mkdtempSync(join(tmpdir(), "sideboard-mcp-"));
+  const cfgPath = join(dir, "mcp.json");
+  writeFileSync(cfgPath, JSON.stringify({ mcpServers }, null, 2));
+  return cfgPath;
 }
-function isPollWrapperToolName(name) {
-  const n = (name ?? "").replace(/[_-]/g, "");
-  return /^(taskoutput|taskstop|sleep)$/i.test(n);
+async function writeInjectedMcpConfig(opts) {
+  return writeMcpServersConfig(await buildInjectedMcpServers(opts));
 }
-function lastTextPart(parts, type) {
-  for (let i = parts.length - 1; i >= 0; i--) {
-    const p = parts[i];
-    if (p.type !== type) continue;
-    const text = p.text.trim();
-    if (!text || isInternalAgentStatusText(text)) continue;
-    return text;
-  }
-  return "";
+
+// src/agents/user-mcp-config.ts
+function userCursorMcpConfigPath() {
+  return join2(homedir(), ".cursor", "mcp.json");
 }
-function toolLabel(tool) {
-  return tool.description || toolDescription(tool.name, tool.input) || tool.name;
+function userClaudeMcpConfigPath() {
+  return join2(homedir(), ".claude.json");
 }
-function fileBasename(path) {
-  const parts = path.replace(/\/$/, "").split(/[/\\]/);
-  return parts[parts.length - 1] || path;
+function asObject(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  return { ...value };
 }
-function classifyTool(name) {
-  const compact = name.replace(/^mcp__[^_]+__/, "").replace(/[_-]/g, "");
-  if (/bash|shell|terminal|^zsh$|^sh$/i.test(compact)) return "shell";
-  if (/grep|glob|search|ripgrep|findfiles|semsearch/i.test(compact)) return "search";
-  if (/^(read|cat)$/i.test(compact) || /^read/i.test(compact)) return "read";
-  if (/edit|write|apply|strreplace|multiedit|updatefile|createfile/i.test(compact)) {
-    return "edit";
-  }
-  return "other";
+function 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 isShellToolName(name) {
-  return classifyTool(name ?? "") === "shell";
+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 toolActivityLine(parts) {
-  const tools = parts.filter((p) => {
-    if (p.type !== "tool" || p.parentId) return false;
-    if (isPollWrapperToolName(p.name)) return false;
-    if (/present_plan$/i.test(p.name ?? "")) return false;
-    if (/ask_user|AskUserQuestion/i.test(p.name ?? "")) return false;
-    return true;
-  });
-  if (tools.length === 0) return null;
-  const edited = [];
-  let reads = 0;
-  let searches = 0;
-  let shells = 0;
-  let others = 0;
-  let additions = 0;
-  let deletions = 0;
-  for (const tool of tools) {
-    const kind = classifyTool(tool.name);
-    if (kind === "edit") {
-      const path = tool.filePath ?? toolFilePath(tool.input);
-      edited.push({
-        name: path ? fileBasename(path) : tool.name,
-        running: tool.status === "running"
-      });
-    } else if (kind === "read") reads += 1;
-    else if (kind === "search") searches += 1;
-    else if (kind === "shell") shells += 1;
-    else others += 1;
-    if (typeof tool.additions === "number") additions += tool.additions;
-    if (typeof tool.deletions === "number") deletions += tool.deletions;
-  }
-  const bits = [];
-  const editing = edited.filter((e) => e.running);
-  const editedDone = edited.filter((e) => !e.running);
-  if (editing.length === 1) bits.push(`Editing ${editing[0].name}`);
-  else if (editing.length > 1) bits.push(`Editing ${editing.length} files`);
-  if (editedDone.length === 1) bits.push(`${editing.length ? "edited" : "Edited"} ${editedDone[0].name}`);
-  else if (editedDone.length > 1) {
-    bits.push(`${editing.length ? "edited" : "Edited"} ${editedDone.length} files`);
+function writeMergedMcpServersJson(configPath, sideboard) {
+  let existing = {};
+  if (existsSync3(configPath)) {
+    try {
+      existing = JSON.parse(readFileSync(configPath, "utf8"));
+    } catch {
+      existing = {};
+    }
   }
-  if (reads === 1) bits.push("explored 1 file");
-  else if (reads > 1) bits.push(`explored ${reads} files`);
-  if (searches === 1) bits.push("1 search");
-  else if (searches > 1) bits.push(`${searches} searches`);
-  if (shells === 1) bits.push("ran 1 command");
-  else if (shells > 1) bits.push(`ran ${shells} commands`);
-  if (others === 1) bits.push("1 tool");
-  else if (others > 1) bits.push(`${others} tools`);
-  if (bits.length === 0) return null;
-  return { text: bits.join(", "), additions, deletions };
+  const next = mergeSideboardIntoMcpServersJson(existing, sideboard);
+  mkdirSync(dirname2(configPath), { recursive: true });
+  writeFileSync2(configPath, `${JSON.stringify(next, null, 2)}
+`);
 }
-function liveActivitySummary(parts, opts) {
-  if (opts?.queued && parts.length === 0) {
-    return "Queued \u2014 waiting for a slot";
+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 (existsSync3(claude)) {
+    writeMergedMcpServersJson(claude, launch);
+    return { cursor, claude };
   }
-  const tools = parts.filter((p) => p.type === "tool");
-  const runningSubs = tools.filter(
-    (t) => t.status === "running" && !t.parentId && isSubagentToolName(t.name)
-  );
-  const runningNested = [...tools].reverse().find((t) => t.status === "running" && t.parentId && !isPollWrapperToolName(t.name));
-  const runningTop = [...tools].reverse().find(
-    (t) => t.status === "running" && !t.parentId && !isPollWrapperToolName(t.name) && !isSubagentToolName(t.name)
-  );
-  const runningPoll = [...tools].reverse().find((t) => t.status === "running" && isPollWrapperToolName(t.name));
-  const thinking = lastTextPart(parts, "thinking");
-  const text = lastTextPart(parts, "text");
-  if (runningSubs.length > 0) {
-    const heads = runningSubs.map(toolLabel);
-    const head = runningSubs.length === 1 ? heads[0] : `${runningSubs.length} subagents \xB7 ${heads.slice(0, 2).join(" \xB7 ")}`;
-    if (runningNested) return `${head} \xB7 ${toolLabel(runningNested)}`;
-    return head;
+  return { cursor };
+}
+
+// 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(text) {
+  try {
+    const parsed = parseToml(text);
+    return Object.keys(asObject2(parsed.mcp_servers)).filter((n) => n.trim());
+  } catch {
+    return [];
   }
-  if (runningTop) return toolLabel(runningTop);
-  if (runningPoll) return toolLabel(runningPoll);
-  if (thinking) return thinking.length > 96 ? `\u2026${thinking.slice(-96)}` : thinking;
-  if (text) return "Writing reply\u2026";
-  const last = [...tools].reverse().find((t) => !isPollWrapperToolName(t.name)) ?? tools.at(-1);
-  if (last) {
-    const label = toolLabel(last);
-    return last.status === "running" ? label : `Finished ${label}`;
+}
+function readJsonObject(path) {
+  try {
+    return JSON.parse(readFileSync2(path, "utf8"));
+  } catch {
+    return {};
   }
-  return "Working\u2026";
 }
-function messagePartParentId(part) {
-  if ("parentId" in part && typeof part.parentId === "string" && part.parentId.trim()) {
-    return part.parentId;
+function readText(path) {
+  try {
+    return readFileSync2(path, "utf8");
+  } catch {
+    return "";
   }
-  return void 0;
 }
-function sameParentId(a, b) {
-  return (a ?? "") === (b ?? "");
+function userCodexConfigPaths(home = homedir2()) {
+  return [join3(home, ".codex", "config.toml"), join3(home, ".config", "codex", "config.toml")];
 }
-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 };
+function userOpencodeConfigPaths(home = homedir2()) {
+  return [
+    join3(home, ".config", "opencode", "opencode.json"),
+    join3(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 event;
+  return out;
 }
-function withEventsParentId(events, parentId) {
-  if (!parentId) return events;
-  return events.map((event) => withEventParentId(event, parentId));
+function listUserCodexMcpNames(home = homedir2()) {
+  const names = [];
+  for (const path of userCodexConfigPaths(home)) {
+    if (!existsSync4(path)) continue;
+    names.push(...listMcpNamesFromCodexToml(readText(path)));
+  }
+  return names;
 }
-function toolFilePath(input) {
-  if (!input) return void 0;
-  return str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
+function listUserOpencodeMcpNames(home = homedir2()) {
+  const names = [];
+  for (const path of userOpencodeConfigPaths(home)) {
+    if (!existsSync4(path)) continue;
+    names.push(...listMcpNamesFromJsonMap(readJsonObject(path), "mcp"));
+  }
+  return names;
 }
-function countLines(text) {
-  if (!text) return 0;
-  return text.split("\n").length;
+function userClaudeMcpConfigObject(home = homedir2()) {
+  const claudePath = home === homedir2() ? userClaudeMcpConfigPath() : join3(home, ".claude.json");
+  if (!existsSync4(claudePath)) return {};
+  return asObject2(asObject2(readJsonObject(claudePath)).mcpServers);
 }
-function diffFromInput(input) {
-  if (!input) return {};
-  const oldS = str(input.old_string) ?? str(input.oldString);
-  const newS = str(input.new_string) ?? str(input.newString) ?? str(input.content);
-  if (oldS != null || newS != null) {
-    return {
-      additions: countLines(newS),
-      deletions: countLines(oldS)
-    };
+function listUserClaudeMcpServerEntries(home = homedir2()) {
+  const out = {};
+  for (const [rawName, value] of Object.entries(userClaudeMcpConfigObject(home))) {
+    const name = rawName.trim();
+    if (!name || isInjectedOrchMcpName(name)) continue;
+    if (!value || typeof value !== "object" || Array.isArray(value)) continue;
+    out[name] = value;
   }
-  return {};
+  return out;
 }
-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
-    };
+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 {};
+  return args;
 }
-var THINKING_PART_MAX_CHARS = 64e3;
-function clipThinkingForStore(text, max = THINKING_PART_MAX_CHARS) {
-  if (text.length <= max) return text;
-  const marker = "\u2026(earlier thinking trimmed)\n";
-  return marker + text.slice(text.length - Math.max(1, max - marker.length));
-}
-var STDOUT_EVENT_MAX_CHARS = 16e3;
-var STDERR_EVENT_MAX_CHARS = 4e3;
-function clipEventTail(text, max) {
-  if (text.length <= max) return text;
-  const marker = "\u2026(truncated)\n";
-  return marker + text.slice(text.length - Math.max(1, max - marker.length));
+function toCodexUnattendedAppsArgs() {
+  return [
+    "-c",
+    "features.apps=false",
+    "-c",
+    "apps._default.enabled=false",
+    "-c",
+    "apps.posthog.enabled=false",
+    "-c",
+    "features.plugins=false"
+  ];
 }
-function clipAgentEventForPaint(event) {
-  if (event.type === "tool_result" && event.content) {
-    const content = clipToolResultForStore(event.content);
-    if (content === event.content) return event;
-    return { ...event, content };
-  }
-  if (event.type === "thinking" && event.data.length > THINKING_PART_MAX_CHARS) {
-    return { ...event, data: clipThinkingForStore(event.data) };
-  }
-  if (event.type === "stdout" && event.data.length > STDOUT_EVENT_MAX_CHARS) {
-    return { ...event, data: clipEventTail(event.data, STDOUT_EVENT_MAX_CHARS) };
-  }
-  if (event.type === "stderr" && event.data.length > STDERR_EVENT_MAX_CHARS) {
-    return { ...event, data: clipEventTail(event.data, STDERR_EVENT_MAX_CHARS) };
+
+// src/agents/message-parts.ts
+function asRecord(input) {
+  if (input && typeof input === "object" && !Array.isArray(input)) {
+    return input;
   }
-  return event;
+  return void 0;
 }
-function withPartTimes(next, prev) {
-  const now = Date.now();
-  const startedAt = prev && typeof prev.startedAt === "number" ? prev.startedAt : now;
-  return { ...next, startedAt, updatedAt: now };
+function str(v) {
+  return typeof v === "string" && v.trim() ? v : void 0;
 }
-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] = withPartTimes(
-        {
-          type: "text",
-          text: last.text + data,
-          ...event.parentId ? { parentId: event.parentId } : {}
-        },
-        last
-      );
-    } else {
-      next.push(
-        withPartTimes({
-          type: "text",
-          text: data,
-          ...event.parentId ? { parentId: event.parentId } : {}
-        })
-      );
-    }
-    return next;
+var CHAT_DETAIL_MAX = 72;
+function clipChatLine(value, max = CHAT_DETAIL_MAX) {
+  const line = value.trim().split(/\r?\n/, 1)[0] ?? "";
+  if (line.length <= max) return line;
+  return `${line.slice(0, Math.max(1, max - 1))}\u2026`;
+}
+var SHELL_BIN_DIR = /^(?:\/usr\/local\/bin|\/usr\/bin|\/bin|\/opt\/homebrew\/bin|\/sbin|\/usr\/sbin)\//;
+function rootedPathWithSpaces(trimmed) {
+  const [head = "", ...rest] = trimmed.split(/\s+/);
+  if (SHELL_BIN_DIR.test(head)) return false;
+  return rest.every((tok) => !/^[-/~$]/.test(tok) && !tok.includes("="));
+}
+function looksLikeFilePath(value) {
+  const trimmed = value.trim();
+  if (!trimmed || /[\r\n;|&<>]/.test(trimmed)) return false;
+  const rooted = trimmed.startsWith("/") || trimmed.startsWith("~/") || /^[A-Za-z]:[\\/]/.test(trimmed);
+  if (/\s/.test(trimmed)) return rooted && rootedPathWithSpaces(trimmed);
+  if (rooted) return true;
+  return trimmed.includes("/") || trimmed.includes("\\");
+}
+function stripWorktreePrefix(path, worktreePath) {
+  if (!worktreePath) return path;
+  const prefix = worktreePath.replace(/[/\\]+$/, "");
+  if (path === prefix || path === `${prefix}/`) return "";
+  if (path.startsWith(`${prefix}/`)) return path.slice(prefix.length + 1);
+  return path;
+}
+function visibleToolRowDetail(detail, description, worktreePath) {
+  if (!detail?.trim()) return void 0;
+  const raw = detail.trim();
+  const desc = (description ?? "").trim();
+  if (!looksLikeFilePath(raw)) {
+    const clipped = clipChatLine(raw);
+    if (!clipped || desc === clipped || desc === raw) return void 0;
+    return clipped;
   }
-  if (event.type === "thinking") {
-    const data = event.data;
-    if (!data) return parts;
-    const next = [...parts];
-    if (event.replace) {
-      for (let i = next.length - 1; i >= 0; i--) {
-        const prev = next[i];
-        if (prev?.type === "thinking" && sameParentId(prev.parentId, event.parentId)) {
-          next[i] = withPartTimes(
-            {
-              type: "thinking",
-              text: clipThinkingForStore(data),
-              ...event.parentId ? { parentId: event.parentId } : {}
-            },
-            prev
-          );
-          return next;
-        }
-      }
-      next.push(
-        withPartTimes({
-          type: "thinking",
-          text: clipThinkingForStore(data),
-          ...event.parentId ? { parentId: event.parentId } : {}
-        })
-      );
-      return next;
-    }
-    const last = next[next.length - 1];
-    if (last?.type === "thinking" && sameParentId(last.parentId, event.parentId)) {
-      next[next.length - 1] = withPartTimes(
-        {
-          type: "thinking",
-          text: clipThinkingForStore(last.text + data),
-          ...event.parentId ? { parentId: event.parentId } : {}
-        },
-        last
-      );
-    } else {
-      next.push(
-        withPartTimes({
-          type: "thinking",
-          text: clipThinkingForStore(data),
-          ...event.parentId ? { parentId: event.parentId } : {}
-        })
-      );
-    }
-    return next;
+  const rel = stripWorktreePrefix(raw, worktreePath);
+  if (!rel) return void 0;
+  const base = fileBasename(rel);
+  if (desc && (desc === base || desc.endsWith(` ${base}`))) return void 0;
+  if (rel.length <= 42) return rel;
+  const parts = rel.split(/[/\\]/).filter(Boolean);
+  if (parts.length >= 2) return `\u2026/${parts.slice(-2).join("/")}`;
+  return base;
+}
+function toolDetail(name, input) {
+  if (!input) return void 0;
+  const command = str(input.command) ?? str(input.cmd);
+  if (command) return clipChatLine(command);
+  const pattern = str(input.pattern) ?? str(input.glob) ?? str(input.glob_pattern);
+  const isSearch = /grep|glob|search|ripgrep|findfiles|semsearch/i.test(name);
+  if (isSearch && pattern) {
+    return pattern.length > 80 ? `${pattern.slice(0, 77)}\u2026` : pattern;
   }
-  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 = {
-        ...prev.input ?? {},
-        ...input ?? {}
-      };
-      const mergedRecord = Object.keys(mergedInput).length > 0 ? mergedInput : void 0;
-      next[existing] = withPartTimes(
-        {
-          ...prev,
-          name: event.name || prev.name,
-          input: mergedRecord,
-          description: toolDescription(event.name || prev.name, mergedRecord),
-          detail: toolDetail(event.name || prev.name, mergedRecord) ?? prev.detail,
-          filePath: toolFilePath(mergedRecord) ?? prev.filePath,
-          additions: diff.additions ?? prev.additions,
-          deletions: diff.deletions ?? prev.deletions,
-          parentId: event.parentId ?? prev.parentId
-        },
-        prev
-      );
-      return next;
-    }
-    return [
-      ...parts,
-      withPartTimes({
-        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
-      })
-    ];
+  const path = str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
+  if (path) return path;
+  if (pattern) return pattern.length > 80 ? `${pattern.slice(0, 77)}\u2026` : pattern;
+  const query = str(input.query) ?? str(input.prompt);
+  if (query) return query.length > 80 ? `${query.slice(0, 77)}\u2026` : query;
+  try {
+    const raw = JSON.stringify(input);
+    return raw.length > 80 ? `${raw.slice(0, 77)}\u2026` : raw;
+  } catch {
+    return name;
   }
-  if (event.type === "tool_result") {
-    const existing = parts.findIndex((p) => p.type === "tool" && p.id === event.id);
-    const fromResult = parseDiffStat(event.content);
-    if (event.partial) {
-      if (existing < 0) {
-        return [
-          ...parts,
-          withPartTimes({
-            type: "tool",
-            id: event.id,
-            name: "tool",
-            description: "tool",
-            status: event.isError ? "error" : "running",
-            result: clipToolResultForStore(event.content),
-            ...event.parentId ? { parentId: event.parentId } : {}
-          })
-        ];
-      }
-      return parts.map((p, i) => {
-        if (i !== existing || p.type !== "tool") return p;
-        if (p.status === "done" || p.status === "error") return p;
-        return withPartTimes(
-          {
-            ...p,
-            result: clipToolResultForStore(event.content) ?? p.result
-          },
-          p
-        );
-      });
+}
+function toolDescription(name, input) {
+  const n = name.replace(/^mcp__/, "").replace(/__/g, " \xB7 ");
+  if (/^get_record_types$|recordTypes/i.test(name)) return "List record types";
+  if (/connectedAgentRequest/i.test(name)) {
+    return str(input?.agent_id) ? `Ask connected agent` : "Ask connected agent";
+  }
+  if (/present_artifact$/i.test(name)) {
+    return str(input?.title) ? `Present ${str(input?.title)}` : "Present artifact";
+  }
+  if (/present_plan$/i.test(name)) {
+    return str(input?.title) ? `Plan ${str(input?.title)}` : "Present plan";
+  }
+  if (/present_schema$/i.test(name)) {
+    return str(input?.title) ? `Schema ${str(input?.title)}` : "Present schema";
+  }
+  if (/present_files$/i.test(name)) {
+    return str(input?.title) ? `Files ${str(input?.title)}` : "Present files";
+  }
+  if (/wait_for_job$/i.test(name)) {
+    return str(input?.id) ? `Wait for ${str(input?.id)}` : "Wait for job";
+  }
+  if (/stop_job$/i.test(name)) {
+    return str(input?.id) ? `Stop ${str(input?.id)}` : "Stop job";
+  }
+  if (isSubagentToolName(name)) {
+    const desc = str(input?.description);
+    const sub = asRecord(input?.subagentType);
+    const kind = str(sub?.name) ?? str(sub?.kind) ?? str(input?.subagent_type) ?? str(input?.subagentType);
+    if (/^spawn_agent$/i.test(name)) {
+      return str(input?.prompt) ?? desc ?? "Subagent";
     }
-    if (existing < 0) {
-      return [
-        ...parts,
-        withPartTimes({
-          type: "tool",
-          id: event.id,
-          name: "tool",
-          description: "tool",
-          status: event.isError ? "error" : "done",
-          result: clipToolResultForStore(event.content),
-          ...event.parentId ? { parentId: event.parentId } : {},
-          ...fromResult.additions != null ? { additions: fromResult.additions } : {},
-          ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
-        })
-      ];
+    if (/connectedAgentRequest/i.test(name)) {
+      return str(input?.agent_id) ? `Ask connected agent` : "Ask connected agent";
     }
-    return parts.map((p, i) => {
-      if (i !== existing || p.type !== "tool") return p;
-      return withPartTimes(
-        {
-          ...p,
-          status: event.isError ? "error" : "done",
-          result: clipToolResultForStore(event.content),
-          ...fromResult.additions != null ? { additions: fromResult.additions } : {},
-          ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
-        },
-        p
-      );
-    });
+    if (desc && kind) return `${kind}: ${desc}${subagentLiveSuffix(input)}`;
+    if (desc) return `${desc}${subagentLiveSuffix(input)}`;
+    return `Subagent${subagentLiveSuffix(input)}`;
   }
-  return parts;
+  if (/^(create|update)_artifact$/i.test(name.replace(/^mcp__[^_]+__/, ""))) {
+    return str(input?.title) ? `Artifact ${str(input?.title)}` : "Artifact";
+  }
+  if (!input) return n;
+  if (/bash|shell|terminal/i.test(name) && str(input.command)) {
+    const cmd = str(input.command);
+    if (/git\s+fetch/i.test(cmd)) return "Fetch latest from origin and check status";
+    if (/git\s+status/i.test(cmd)) return "Check git status";
+    if (/git\s+log/i.test(cmd)) return "Inspect recent commits";
+    if (/git\s+branch/i.test(cmd)) return "List branches";
+    if (/grep|rg\b/i.test(cmd)) return "Search repository";
+    return "Run shell command";
+  }
+  if (/edit|write|apply/i.test(name)) {
+    const path = str(input.file_path) ?? str(input.path);
+    return path ? `Edit ${path.split("/").pop()}` : "Edit file";
+  }
+  if (/read/i.test(name)) {
+    const path = str(input.file_path) ?? str(input.path);
+    return path ? `Read ${path.split("/").pop()}` : "Read file";
+  }
+  if (/grep/i.test(name)) return "Search files";
+  if (/glob/i.test(name)) return "Find files";
+  const compact = n.replace(/[_-]/g, "");
+  if (/^taskoutput$/i.test(compact)) {
+    return str(input.task_id) ? `Wait for ${str(input.task_id)}` : "Wait for background task";
+  }
+  if (/^taskstop$/i.test(compact)) {
+    return str(input.task_id) ? `Stop ${str(input.task_id)}` : "Stop background task";
+  }
+  if (/^monitor$/i.test(compact)) {
+    const command = str(input.command);
+    return command ? `Watch ${command.length > 48 ? `${command.slice(0, 45)}\u2026` : command}` : "Watch command";
+  }
+  return n;
 }
-function partsToAssistantText(parts) {
-  return parts.filter(
-    (p) => p.type === "text" && !messagePartParentId(p)
-  ).map((p) => p.text).join("").trim();
+function subagentLiveSuffix(input) {
+  if (!input) return "";
+  const bits = [];
+  const status = str(input.live_status);
+  if (status && !/^runn(ing)?$|^working$/i.test(status)) bits.push(status);
+  if (typeof input.live_tool_uses === "number") bits.push(`${input.live_tool_uses} tools`);
+  if (typeof input.live_duration_ms === "number") {
+    bits.push(`${Math.max(0, Math.round(Number(input.live_duration_ms) / 1e3))}s`);
+  }
+  const last = str(input.live_last_tool);
+  if (last) bits.push(last);
+  return bits.length ? ` \xB7 ${bits.join(" \xB7 ")}` : "";
 }
-function lastAssistantMessageText(parts) {
-  if (!parts?.length) return "";
+function isSubagentToolName(name) {
+  const n = (name ?? "").trim();
+  if (/^(task|agent|spawn_agent)$/i.test(n)) return true;
+  return /connectedAgentRequest/i.test(n);
+}
+function isInternalAgentStatusText(text) {
+  const t = text.trim();
+  if (!t) return false;
+  if (/waiting for gate to pass/i.test(t)) return true;
+  if (/^agent is running\b/i.test(t) && t.length < 160) return true;
+  return false;
+}
+function isPollWrapperToolName(name) {
+  const n = (name ?? "").replace(/[_-]/g, "");
+  return /^(taskoutput|taskstop|sleep)$/i.test(n);
+}
+function lastTextPart(parts, type) {
   for (let i = parts.length - 1; i >= 0; i--) {
     const p = parts[i];
-    if (!p || p.type !== "text" || messagePartParentId(p)) continue;
+    if (p.type !== type) continue;
     const text = p.text.trim();
     if (!text || isInternalAgentStatusText(text)) continue;
     return text;
   }
   return "";
 }
-function stripBrightsyNdjsonNoise(text) {
-  if (!text || !text.includes('"type"')) return text;
-  let out = text;
-  out = out.replace(
-    /\{"type":"(?:tool_use|tool_result|tool|thinking|usage|done|error)"[\s\S]*?\}\s*(?=\{"type":"|$|(?=[A-Za-z*#]))/g,
-    ""
-  );
-  out = out.replace(/\{"type":"(?:tool_use|tool_result|tool)"[\s\S]*$/g, "");
-  return out.trim();
-}
-function isBrightsyNdjsonLine(line) {
-  const t = line.trim();
-  if (!t.startsWith("{")) return false;
-  return /"type"\s*:\s*"(tool_use|tool_result|tool|thinking|usage|done|error|text)"/.test(t);
-}
-function finalizeParts(parts) {
-  return parts.map(
-    (p) => p.type === "tool" && p.status === "running" ? { ...p, status: "done" } : p
-  );
-}
-function normalizeParseResult(parsed) {
-  if (!parsed) return [];
-  return Array.isArray(parsed) ? parsed : [parsed];
-}
-
-// src/agents/injected-mcp.ts
-import { existsSync as existsSync2, mkdtempSync, writeFileSync } from "fs";
-import { createRequire } from "module";
-import { tmpdir } from "os";
-import { dirname, join } from "path";
-import { fileURLToPath } from "url";
-
-// src/mcp/profile.ts
-var SIDEBOARD_MCP_PROFILE_ENV = "SIDEBOARD_MCP_PROFILE";
-var WORKTREE_MCP_TOOLS = [
-  "present_artifact",
-  "ask_user",
-  "present_plan",
-  "present_schema",
-  "present_files",
-  "wait_for_job",
-  "stop_job",
-  "get_viewer_context",
-  "update_viewer_context"
-];
-var WORKTREE_GITHUB_MCP_TOOLS = [
-  "github_search_issues",
-  "github_get_issue",
-  "github_comment",
-  "github_update_issue",
-  "github_create_issue"
-];
-var WORKTREE_LINEAR_MCP_TOOLS = [
-  "linear_list_teams",
-  "linear_search_issues",
-  "linear_get_issue",
-  "linear_create_issue",
-  "linear_update_issue",
-  "linear_comment"
-];
-var WORKTREE_ABLETIME_MCP_TOOLS = [
-  "abletime_orientation",
-  "abletime_list_projects",
-  "abletime_list_tasks",
-  "abletime_search_tasks",
-  "abletime_get_task",
-  "abletime_comment",
-  "abletime_update_task",
-  "abletime_create_task",
-  "abletime_ensure_task"
-];
-function sideboardMcpProfile(env = process.env) {
-  return env[SIDEBOARD_MCP_PROFILE_ENV]?.trim().toLowerCase() === "worktree" ? "worktree" : "orchestration";
+function toolLabel(tool) {
+  return tool.description || toolDescription(tool.name, tool.input) || tool.name;
 }
-
-// src/agents/injected-mcp.ts
-var SIDEBOARD_MCP_ALLOWED_TOOLS = [
-  "mcp__sideboard",
-  "mcp__sideboard__*"
-];
-var SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS = [
-  "mcp__sideboard__present_artifact",
-  "mcp__sideboard__present_schema",
-  "mcp__sideboard__present_files",
-  "mcp__sideboard__ask_user",
-  "mcp__sideboard__present_plan",
-  "mcp__sideboard__wait_for_job",
-  "mcp__sideboard__stop_job",
-  "mcp__sideboard__get_viewer_context",
-  "mcp__sideboard__update_viewer_context"
-];
-var SIDEBOARD_GITHUB_MCP_ALLOWED_TOOLS = ["mcp__sideboard__github_*"];
-var SIDEBOARD_LINEAR_MCP_ALLOWED_TOOLS = ["mcp__sideboard__linear_*"];
-var SIDEBOARD_ABLETIME_MCP_ALLOWED_TOOLS = ["mcp__sideboard__abletime_*"];
-function sideboardWorktreeAllowedTools(opts) {
-  const out = [...SIDEBOARD_ARTIFACT_MCP_ALLOWED_TOOLS];
-  if (opts?.github !== false) out.push(...SIDEBOARD_GITHUB_MCP_ALLOWED_TOOLS);
-  if (opts?.linear) out.push(...SIDEBOARD_LINEAR_MCP_ALLOWED_TOOLS);
-  if (opts?.abletime) out.push(...SIDEBOARD_ABLETIME_MCP_ALLOWED_TOOLS);
-  return out;
+function fileBasename(path) {
+  const parts = path.replace(/\/$/, "").split(/[/\\]/);
+  return parts[parts.length - 1] || path;
 }
-var BRIGHTSY_MCP_ALLOWED_TOOLS = [
-  "mcp__brightsy",
-  "mcp__brightsy__*"
-];
-var brightsyMcpCommandCache = null;
-async function resolveBrightsyMcpCommand() {
-  const now = Date.now();
-  if (brightsyMcpCommandCache && now - brightsyMcpCommandCache.at < 6e4 && brightsyMcpCommandCache.command) {
-    return brightsyMcpCommandCache.command;
-  }
-  const which = await run("which", ["brightsy-mcp"], { reject: false });
-  const command = which.exitCode === 0 && which.stdout.trim() ? "brightsy-mcp" : "npx";
-  brightsyMcpCommandCache = { at: now, command };
-  return command;
+function classifyTool(name) {
+  const compact = name.replace(/^mcp__[^_]+__/, "").replace(/[_-]/g, "");
+  if (/bash|shell|terminal|^zsh$|^sh$/i.test(compact)) return "shell";
+  if (/grep|glob|search|ripgrep|findfiles|semsearch/i.test(compact)) return "search";
+  if (/^(read|cat)$/i.test(compact) || /^read/i.test(compact)) return "read";
+  if (/edit|write|apply|strreplace|multiedit|updatefile|createfile/i.test(compact)) {
+    return "edit";
+  }
+  return "other";
 }
-function isBrightsyConnected() {
-  try {
-    loadBrightsyConfig();
+function isShellToolName(name) {
+  return classifyTool(name ?? "") === "shell";
+}
+function toolActivityLine(parts) {
+  const tools = parts.filter((p) => {
+    if (p.type !== "tool" || p.parentId) return false;
+    if (isPollWrapperToolName(p.name)) return false;
+    if (/present_plan$/i.test(p.name ?? "")) return false;
+    if (/ask_user|AskUserQuestion/i.test(p.name ?? "")) return false;
     return true;
-  } catch {
-    return false;
+  });
+  if (tools.length === 0) return null;
+  const edited = [];
+  let reads = 0;
+  let searches = 0;
+  let shells = 0;
+  let others = 0;
+  let additions = 0;
+  let deletions = 0;
+  for (const tool of tools) {
+    const kind = classifyTool(tool.name);
+    if (kind === "edit") {
+      const path = tool.filePath ?? toolFilePath(tool.input);
+      edited.push({
+        name: path ? fileBasename(path) : tool.name,
+        running: tool.status === "running"
+      });
+    } else if (kind === "read") reads += 1;
+    else if (kind === "search") searches += 1;
+    else if (kind === "shell") shells += 1;
+    else others += 1;
+    if (typeof tool.additions === "number") additions += tool.additions;
+    if (typeof tool.deletions === "number") deletions += tool.deletions;
+  }
+  const bits = [];
+  const editing = edited.filter((e) => e.running);
+  const editedDone = edited.filter((e) => !e.running);
+  if (editing.length === 1) bits.push(`Editing ${editing[0].name}`);
+  else if (editing.length > 1) bits.push(`Editing ${editing.length} files`);
+  if (editedDone.length === 1) bits.push(`${editing.length ? "edited" : "Edited"} ${editedDone[0].name}`);
+  else if (editedDone.length > 1) {
+    bits.push(`${editing.length ? "edited" : "Edited"} ${editedDone.length} files`);
   }
+  if (reads === 1) bits.push("explored 1 file");
+  else if (reads > 1) bits.push(`explored ${reads} files`);
+  if (searches === 1) bits.push("1 search");
+  else if (searches > 1) bits.push(`${searches} searches`);
+  if (shells === 1) bits.push("ran 1 command");
+  else if (shells > 1) bits.push(`ran ${shells} commands`);
+  if (others === 1) bits.push("1 tool");
+  else if (others > 1) bits.push(`${others} tools`);
+  if (bits.length === 0) return null;
+  return { text: bits.join(", "), additions, deletions };
 }
-var BRIGHTSY_WORD = /(?<![a-z0-9_-])brightsy(?![a-z0-9_-])/i;
-function promptMentionsBrightsy(text) {
-  return BRIGHTSY_WORD.test(text ?? "");
+function liveActivitySummary(parts, opts) {
+  if (opts?.queued && parts.length === 0) {
+    return "Queued \u2014 waiting for a slot";
+  }
+  const tools = parts.filter((p) => p.type === "tool");
+  const runningSubs = tools.filter(
+    (t) => t.status === "running" && !t.parentId && isSubagentToolName(t.name)
+  );
+  const runningNested = [...tools].reverse().find((t) => t.status === "running" && t.parentId && !isPollWrapperToolName(t.name));
+  const runningTop = [...tools].reverse().find(
+    (t) => t.status === "running" && !t.parentId && !isPollWrapperToolName(t.name) && !isSubagentToolName(t.name)
+  );
+  const runningPoll = [...tools].reverse().find((t) => t.status === "running" && isPollWrapperToolName(t.name));
+  const thinking = lastTextPart(parts, "thinking");
+  const text = lastTextPart(parts, "text");
+  if (runningSubs.length > 0) {
+    const heads = runningSubs.map(toolLabel);
+    const head = runningSubs.length === 1 ? heads[0] : `${runningSubs.length} subagents \xB7 ${heads.slice(0, 2).join(" \xB7 ")}`;
+    if (runningNested) return `${head} \xB7 ${toolLabel(runningNested)}`;
+    return head;
+  }
+  if (runningTop) return toolLabel(runningTop);
+  if (runningPoll) return toolLabel(runningPoll);
+  if (thinking) return thinking.length > 96 ? `\u2026${thinking.slice(-96)}` : thinking;
+  if (text) return "Writing reply\u2026";
+  const last = [...tools].reverse().find((t) => !isPollWrapperToolName(t.name)) ?? tools.at(-1);
+  if (last) {
+    const label = toolLabel(last);
+    return last.status === "running" ? label : `Finished ${label}`;
+  }
+  return "Working\u2026";
 }
-function isBrightsyMcpToolName(name) {
-  const n = name.toLowerCase();
-  return n === "brightsy" || n.startsWith("mcp__brightsy") || n.startsWith("brightsy_");
+function messagePartParentId(part) {
+  if ("parentId" in part && typeof part.parentId === "string" && part.parentId.trim()) {
+    return part.parentId;
+  }
+  return void 0;
 }
-function toolInputUsesBrightsyDatasource(input) {
-  const ds = input?.datasource;
-  return typeof ds === "string" && ds.toLowerCase() === "brightsy";
+function sameParentId(a, b) {
+  return (a ?? "") === (b ?? "");
 }
-function messageUsedBrightsyMcp(msg) {
-  if (msg.role === "user" && promptMentionsBrightsy(msg.text)) return true;
-  for (const part of msg.parts ?? []) {
-    if (part.type !== "tool") continue;
-    if (isBrightsyMcpToolName(part.name)) return true;
-    if (/present_(schema|files)$/i.test(part.name) && toolInputUsesBrightsyDatasource(part.input)) {
-      return true;
-    }
+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 false;
-}
-function threadRequestsBrightsyMcp(thread) {
-  return (thread?.messages ?? []).some(messageUsedBrightsyMcp);
+  return event;
 }
-function shouldInjectBrightsyMcp(thread, opts) {
-  if (!(opts?.connected ?? isBrightsyConnected())) return false;
-  if (opts?.orchestrator) return true;
-  const alwaysOn = opts?.alwaysOnWorktree ?? Boolean(loadAppSettings().brightsy?.injectWorktreeMcp);
-  if (alwaysOn) return true;
-  return threadRequestsBrightsyMcp(thread);
+function withEventsParentId(events, parentId) {
+  if (!parentId) return events;
+  return events.map((event) => withEventParentId(event, parentId));
 }
-function mcpLaunch(cmd, name, env) {
-  if (cmd === "brightsy-mcp") {
-    return { name, command: "brightsy-mcp", ...env ? { env } : {} };
-  }
-  return {
-    name,
-    command: "npx",
-    args: ["-y", "@brightsy/mcp-server"],
-    ...env ? { env } : {}
-  };
+function toolFilePath(input) {
+  if (!input) return void 0;
+  return str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
 }
-function teamEnv(team) {
-  const endpoint = (team.endpoint || "https://brightsy.ai").replace(/\/$/, "");
-  return {
-    BRIGHTSY_API_TOKEN: team.access_token,
-    ...team.refresh_token ? { BRIGHTSY_REFRESH_TOKEN: team.refresh_token } : {},
-    BRIGHTSY_ACCOUNT_ID: team.id,
-    BRIGHTSY_API_URL: endpoint
-  };
+function countLines(text) {
+  if (!text) return 0;
+  return text.split("\n").length;
 }
-function brightsyMcpAllowedTools(serverNames) {
-  const out = [];
-  for (const name of serverNames) {
-    out.push(`mcp__${name}`, `mcp__${name}__*`);
+function diffFromInput(input) {
+  if (!input) return {};
+  const oldS = str(input.old_string) ?? str(input.oldString);
+  const newS = str(input.new_string) ?? str(input.newString) ?? str(input.content);
+  if (oldS != null || newS != null) {
+    return {
+      additions: countLines(newS),
+      deletions: countLines(oldS)
+    };
   }
-  return out;
+  return {};
 }
-function corePackageDir() {
-  const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
-  if (cjsDir) return cjsDir;
-  try {
-    const url = import.meta.url;
-    if (typeof url === "string" && url.length > 0) {
-      return dirname(fileURLToPath(url));
-    }
-  } catch {
+function parseDiffStat(result) {
+  if (!result) return {};
+  const paired = result.match(/\+(\d+)\s+-(\d+)/);
+  if (paired) {
+    return {
+      additions: Number(paired[1]),
+      deletions: Number(paired[2])
+    };
   }
-  try {
-    const req = createRequire(join(process.cwd(), "package.json"));
-    return dirname(req.resolve("@sideboard-ai/core"));
-  } catch {
-    return process.cwd();
+  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 findSideboardMcpJsEntry() {
-  const override = process.env.SIDEBOARD_MCP_ENTRY?.trim() || process.env.SIDEBOARD_CLI?.trim();
-  if (override && existsSync2(override)) return override;
-  const packaged = packagedMcpStdioPath();
-  if (packaged) return packaged;
-  let dir = corePackageDir();
-  for (let i = 0; i < 10; i++) {
-    const candidates = [
-      join(dir, "mcp/run-stdio.js"),
-      join(dir, "mcp/run-stdio.cjs"),
-      join(dir, "dist/mcp/run-stdio.js"),
-      join(dir, "dist/mcp/run-stdio.cjs"),
-      join(dir, "packages/core/dist/mcp/run-stdio.js"),
-      join(dir, "packages/cli/dist/index.js"),
-      join(dir, "cli/dist/index.js")
-    ];
-    for (const p of candidates) {
-      if (existsSync2(p) && !isAsarPath(p)) return p;
-    }
-    const parent = dirname(dir);
-    if (parent === dir) break;
-    dir = parent;
-  }
-  return null;
+var THINKING_PART_MAX_CHARS = 64e3;
+function clipThinkingForStore(text, max = THINKING_PART_MAX_CHARS) {
+  if (text.length <= max) return text;
+  const marker = "\u2026(earlier thinking trimmed)\n";
+  return marker + text.slice(text.length - Math.max(1, max - marker.length));
 }
-async function resolveSideboardMcpServer() {
-  const entry = findSideboardMcpJsEntry();
-  if (entry) {
-    const isCli = /[/\\]cli[/\\]dist[/\\]index\.js$/.test(entry);
-    const scriptArgs = isCli ? [entry, "mcp"] : [entry];
-    const launch = applyNodeLaunch(await resolveNodeLaunch(entry), scriptArgs);
-    if (launch.file !== "/bin/sh" && !isElectronLikeCommand(launch.file)) {
-      return {
-        name: "sideboard",
-        command: launch.file,
-        args: launch.args,
-        ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
-      };
-    }
+var STDOUT_EVENT_MAX_CHARS = 16e3;
+var STDERR_EVENT_MAX_CHARS = 4e3;
+function clipEventTail(text, max) {
+  if (text.length <= max) return text;
+  const marker = "\u2026(truncated)\n";
+  return marker + text.slice(text.length - Math.max(1, max - marker.length));
+}
+function clipAgentEventForPaint(event) {
+  if (event.type === "tool_result" && event.content) {
+    const content = clipToolResultForStore(event.content);
+    if (content === event.content) return event;
+    return { ...event, content };
   }
-  const which = await run("which", ["sideboard"], { reject: false });
-  if (which.exitCode === 0 && which.stdout.trim()) {
-    return { name: "sideboard", command: which.stdout.trim(), args: ["mcp"] };
+  if (event.type === "thinking" && event.data.length > THINKING_PART_MAX_CHARS) {
+    return { ...event, data: clipThinkingForStore(event.data) };
   }
-  return { name: "sideboard", command: "sideboard", args: ["mcp"] };
+  if (event.type === "stdout" && event.data.length > STDOUT_EVENT_MAX_CHARS) {
+    return { ...event, data: clipEventTail(event.data, STDOUT_EVENT_MAX_CHARS) };
+  }
+  if (event.type === "stderr" && event.data.length > STDERR_EVENT_MAX_CHARS) {
+    return { ...event, data: clipEventTail(event.data, STDERR_EVENT_MAX_CHARS) };
+  }
+  return event;
 }
-async function buildInjectedMcpServers(opts) {
-  const servers = [];
-  if (opts.includeSideboard) {
-    const sideboard = await resolveSideboardMcpServer();
-    const orchId = opts.orchestratorThreadId?.trim();
-    const profile = orchId ? "orchestration" : "worktree";
-    sideboard.env = {
-      ...sideboard.env ?? {},
-      SIDEBOARD_APP_DATA: appDataDir(),
-      [SIDEBOARD_MCP_PROFILE_ENV]: profile
-    };
-    if (orchId) {
-      sideboard.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID = orchId;
-    }
-    try {
-      mergeAgentGitAuthEnv(
-        sideboard.env,
-        await resolveAgentGitAuthEnv(sideboard.env)
+function withPartTimes(next, prev) {
+  const now = Date.now();
+  const startedAt = prev && typeof prev.startedAt === "number" ? prev.startedAt : now;
+  return { ...next, startedAt, updatedAt: now };
+}
+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] = withPartTimes(
+        {
+          type: "text",
+          text: last.text + data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        },
+        last
+      );
+    } else {
+      next.push(
+        withPartTimes({
+          type: "text",
+          text: data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        })
       );
-    } catch {
     }
-    applyAgentRunnerHeapEnv(sideboard.env);
-    servers.push(sideboard);
+    return next;
   }
-  if (opts.includeBrightsy && isBrightsyConnected()) {
-    const cmd = await resolveBrightsyMcpCommand();
-    const teams = await ensureConnectedBrightsyTeamTokens();
-    if (teams.length > 0) {
-      const used = /* @__PURE__ */ new Set();
-      for (const team of teams) {
-        let name = brightsyMcpServerName(team.slug);
-        if (used.has(name)) name = `${name}_${team.id.slice(0, 8)}`;
-        used.add(name);
-        servers.push(mcpLaunch(cmd, name, teamEnv(team)));
+  if (event.type === "thinking") {
+    const data = event.data;
+    if (!data) return parts;
+    const next = [...parts];
+    if (event.replace) {
+      for (let i = next.length - 1; i >= 0; i--) {
+        const prev = next[i];
+        if (prev?.type === "thinking" && sameParentId(prev.parentId, event.parentId)) {
+          next[i] = withPartTimes(
+            {
+              type: "thinking",
+              text: clipThinkingForStore(data),
+              ...event.parentId ? { parentId: event.parentId } : {}
+            },
+            prev
+          );
+          return next;
+        }
       }
+      next.push(
+        withPartTimes({
+          type: "thinking",
+          text: clipThinkingForStore(data),
+          ...event.parentId ? { parentId: event.parentId } : {}
+        })
+      );
+      return next;
+    }
+    const last = next[next.length - 1];
+    if (last?.type === "thinking" && sameParentId(last.parentId, event.parentId)) {
+      next[next.length - 1] = withPartTimes(
+        {
+          type: "thinking",
+          text: clipThinkingForStore(last.text + data),
+          ...event.parentId ? { parentId: event.parentId } : {}
+        },
+        last
+      );
     } else {
-      servers.push(mcpLaunch(cmd, "brightsy"));
+      next.push(
+        withPartTimes({
+          type: "thinking",
+          text: clipThinkingForStore(data),
+          ...event.parentId ? { parentId: event.parentId } : {}
+        })
+      );
     }
+    return next;
   }
-  return servers;
-}
-function cursorSafeMcpLaunch(command, args) {
-  if (process.platform === "win32") {
-    return args && args.length > 0 ? { command, args } : { command };
-  }
-  const unwrapped = unwrapStrippedElectronLaunch(command, args);
-  const file = unwrapped?.file ?? command;
-  const fileArgs = unwrapped?.args ?? args ?? [];
-  return fileArgs.length > 0 ? { command: file, args: fileArgs } : { command: file };
-}
-function mcpSpawnEnv(env) {
-  if (!env) return void 0;
-  const out = { ...env };
-  delete out.ELECTRON_RUN_AS_NODE;
-  delete out.ELECTRON_RUN_AS_NODE;
-  return Object.keys(out).length > 0 ? out : void 0;
-}
-function toCursorMcpServers(servers) {
-  const out = {};
-  for (const s of servers) {
-    const env = mcpSpawnEnv(s.env);
-    const launch = cursorSafeMcpLaunch(s.command, s.args);
-    out[s.name] = {
-      type: "stdio",
-      command: launch.command,
-      ...launch.args && launch.args.length > 0 ? { args: launch.args } : {},
-      ...env ? { env } : {}
-    };
-  }
-  return out;
-}
-function toCodexMcpConfigArgs(servers) {
-  const args = [];
-  for (const s of servers) {
-    const prefix = `mcp_servers.${s.name}`;
-    args.push("-c", `${prefix}.command=${JSON.stringify(s.command)}`);
-    if (s.args?.length) {
-      args.push("-c", `${prefix}.args=${JSON.stringify(s.args)}`);
+  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 = {
+        ...prev.input ?? {},
+        ...input ?? {}
+      };
+      const mergedRecord = Object.keys(mergedInput).length > 0 ? mergedInput : void 0;
+      next[existing] = withPartTimes(
+        {
+          ...prev,
+          name: event.name || prev.name,
+          input: mergedRecord,
+          description: toolDescription(event.name || prev.name, mergedRecord),
+          detail: toolDetail(event.name || prev.name, mergedRecord) ?? prev.detail,
+          filePath: toolFilePath(mergedRecord) ?? prev.filePath,
+          additions: diff.additions ?? prev.additions,
+          deletions: diff.deletions ?? prev.deletions,
+          parentId: event.parentId ?? prev.parentId
+        },
+        prev
+      );
+      return next;
     }
-    const env = mcpSpawnEnv(s.env);
-    if (env) {
-      for (const [key, value] of Object.entries(env)) {
-        args.push("-c", `${prefix}.env.${key}=${JSON.stringify(value)}`);
+    return [
+      ...parts,
+      withPartTimes({
+        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 (event.partial) {
+      if (existing < 0) {
+        return [
+          ...parts,
+          withPartTimes({
+            type: "tool",
+            id: event.id,
+            name: "tool",
+            description: "tool",
+            status: event.isError ? "error" : "running",
+            result: clipToolResultForStore(event.content),
+            ...event.parentId ? { parentId: event.parentId } : {}
+          })
+        ];
       }
+      return parts.map((p, i) => {
+        if (i !== existing || p.type !== "tool") return p;
+        if (p.status === "done" || p.status === "error") return p;
+        return withPartTimes(
+          {
+            ...p,
+            result: clipToolResultForStore(event.content) ?? p.result
+          },
+          p
+        );
+      });
     }
-    args.push("-c", `${prefix}.default_tools_approval_mode=${JSON.stringify("approve")}`);
-    args.push("-c", `${prefix}.tool_timeout_sec=300`);
-    args.push("-c", `${prefix}.startup_timeout_sec=30`);
+    if (existing < 0) {
+      return [
+        ...parts,
+        withPartTimes({
+          type: "tool",
+          id: event.id,
+          name: "tool",
+          description: "tool",
+          status: event.isError ? "error" : "done",
+          result: clipToolResultForStore(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 withPartTimes(
+        {
+          ...p,
+          status: event.isError ? "error" : "done",
+          result: clipToolResultForStore(event.content),
+          ...fromResult.additions != null ? { additions: fromResult.additions } : {},
+          ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
+        },
+        p
+      );
+    });
   }
-  return args;
+  return parts;
 }
-function toOpencodeMcpConfigContent(servers, opts) {
-  const mcp = {};
-  for (const s of servers) {
-    const env = mcpSpawnEnv(s.env);
-    mcp[s.name] = {
-      type: "local",
-      command: [s.command, ...s.args ?? []],
-      enabled: true,
-      ...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 partsToAssistantText(parts) {
+  return parts.filter(
+    (p) => p.type === "text" && !messagePartParentId(p)
+  ).map((p) => p.text).join("").trim();
 }
-function writeMcpServersConfig(servers) {
-  if (servers.length === 0) return null;
-  const mcpServers = {};
-  for (const s of servers) {
-    const env = mcpSpawnEnv(s.env);
-    mcpServers[s.name] = {
-      command: s.command,
-      ...s.args ? { args: s.args } : {},
-      ...env ? { env } : {}
-    };
+function lastAssistantMessageText(parts) {
+  if (!parts?.length) return "";
+  for (let i = parts.length - 1; i >= 0; i--) {
+    const p = parts[i];
+    if (!p || p.type !== "text" || messagePartParentId(p)) continue;
+    const text = p.text.trim();
+    if (!text || isInternalAgentStatusText(text)) continue;
+    return text;
   }
-  const dir = mkdtempSync(join(tmpdir(), "sideboard-mcp-"));
-  const cfgPath = join(dir, "mcp.json");
-  writeFileSync(cfgPath, JSON.stringify({ mcpServers }, null, 2));
-  return cfgPath;
+  return "";
 }
-async function writeInjectedMcpConfig(opts) {
-  return writeMcpServersConfig(await buildInjectedMcpServers(opts));
+function stripBrightsyNdjsonNoise(text) {
+  if (!text || !text.includes('"type"')) return text;
+  let out = text;
+  out = out.replace(
+    /\{"type":"(?:tool_use|tool_result|tool|thinking|usage|done|error)"[\s\S]*?\}\s*(?=\{"type":"|$|(?=[A-Za-z*#]))/g,
+    ""
+  );
+  out = out.replace(/\{"type":"(?:tool_use|tool_result|tool)"[\s\S]*$/g, "");
+  return out.trim();
+}
+function isBrightsyNdjsonLine(line) {
+  const t = line.trim();
+  if (!t.startsWith("{")) return false;
+  return /"type"\s*:\s*"(tool_use|tool_result|tool|thinking|usage|done|error|text)"/.test(t);
+}
+function finalizeParts(parts) {
+  return parts.map(
+    (p) => p.type === "tool" && p.status === "running" ? { ...p, status: "done" } : p
+  );
+}
+function normalizeParseResult(parsed) {
+  if (!parsed) return [];
+  return Array.isArray(parsed) ? parsed : [parsed];
 }
 
 // src/agents/types.ts
@@ -1550,24 +1759,15 @@ var BASE_ALLOWED_TOOLS = [
   "Skill"
 ];
 var CLAUDE_PRINT_BG_WAIT_CEILING_MS = 72e5;
+function isLocalDevAppDataDir(dir = process.env.SIDEBOARD_APP_DATA) {
+  return /[/\\]\.sideboard[/\\]dev-app-data(?:[/\\]|$)/.test(dir ?? "");
+}
 var CLAUDE_CHROME_ALLOWED_TOOLS = [
   "mcp__claude-in-chrome",
   "mcp__claude-in-chrome__*",
   "Skill(claude-in-chrome)"
 ];
 var CLAUDE_PROMPT_ARG_MAX = 2e5;
-var mcpListCache = null;
-async function loadMcpServers() {
-  if (mcpListCache && Date.now() - mcpListCache.at < 3e4) {
-    return mcpListCache.servers;
-  }
-  const claude = resolveClaudeExecutable();
-  const mcpText = await run(claude, ["mcp", "list"], { reject: false });
-  const servers = parseMcpList(`${mcpText.stdout}
-${mcpText.stderr}`);
-  mcpListCache = { at: Date.now(), servers };
-  return servers;
-}
 function usageFromClaude(usage) {
   if (!usage) return null;
   const inputTokens = Number(usage.input_tokens ?? 0);
@@ -1854,7 +2054,7 @@ var claudeAdapter = {
   async detect() {
     const claude = resolveClaudeExecutable();
     if (claude !== "claude") {
-      if (!existsSync3(claude)) {
+      if (!existsSync5(claude)) {
         return {
           agent: "claude",
           installed: false,
@@ -1903,7 +2103,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-6P236KKG.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-3FDAUNN2.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1914,6 +2114,7 @@ var claudeAdapter = {
     });
     const injectedBrightsyNames = injectedServers.filter((s) => s.name === "brightsy" || s.name.startsWith("brightsy_")).map((s) => s.name);
     const chromeOn = claudeChromeEnabled();
+    const userMcpEntries = isOrchestrator ? {} : listUserClaudeMcpServerEntries();
     let allowedTools;
     if (isOrchestrator) {
       allowedTools = [
@@ -1922,10 +2123,9 @@ var claudeAdapter = {
         ...brightsyMcpAllowedTools(injectedBrightsyNames)
       ];
     } else {
-      const servers = await loadMcpServers();
       allowedTools = [
         ...BASE_ALLOWED_TOOLS,
-        ...mcpAllowTools(servers),
+        ...mcpAllowToolsFromNames(Object.keys(userMcpEntries)),
         ...sideboardWorktreeAllowedTools({
           github: true,
           linear: isLinearConnected(),
@@ -1950,12 +2150,10 @@ var claudeAdapter = {
     if (systemPrompt) {
       args.push("--append-system-prompt", systemPrompt);
     }
-    const mcpConfigPath = writeMcpServersConfig(injectedServers);
+    const mcpConfigPath = writeMcpServersConfig(injectedServers, userMcpEntries);
     if (mcpConfigPath) {
       args.push("--mcp-config", mcpConfigPath);
-      if (isOrchestrator) {
-        args.push("--strict-mcp-config");
-      }
+      args.push("--strict-mcp-config");
     }
     if (chromeOn) {
       args.push("--chrome");
@@ -1987,8 +2185,10 @@ var claudeAdapter = {
         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),
         // `--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" } : {}
+        // builds (anthropics/claude-code#60252). Coordinators never need them.
+        // Local `pnpm dev` also disables them: those HTTP connectors hang the
+        // first worktree turn when Electron's cwd is this Sideboard repo.
+        ...isOrchestrator || isLocalDevAppDataDir() ? { ENABLE_CLAUDEAI_MCP_SERVERS: "false" } : {}
       }
     };
   },
@@ -2139,179 +2339,6 @@ function parseIssuesJson(raw) {
 import { existsSync as existsSync6, readFileSync as readFileSync3, statSync } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join4 } from "path";
-
-// src/agents/orch-mcp-isolation.ts
-import { existsSync as existsSync5, readFileSync as readFileSync2 } from "fs";
-import { homedir as homedir2 } from "os";
-import { join as join3 } from "path";
-import { parse as parseToml } from "smol-toml";
-
-// src/agents/user-mcp-config.ts
-import { existsSync as existsSync4, mkdirSync, readFileSync, writeFileSync as writeFileSync2 } from "fs";
-import { homedir } from "os";
-import { dirname as dirname2, join as join2 } from "path";
-function userCursorMcpConfigPath() {
-  return join2(homedir(), ".cursor", "mcp.json");
-}
-function userClaudeMcpConfigPath() {
-  return join2(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 (existsSync4(configPath)) {
-    try {
-      existing = JSON.parse(readFileSync(configPath, "utf8"));
-    } catch {
-      existing = {};
-    }
-  }
-  const next = mergeSideboardIntoMcpServersJson(existing, sideboard);
-  mkdirSync(dirname2(configPath), { recursive: true });
-  writeFileSync2(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 (existsSync4(claude)) {
-    writeMergedMcpServersJson(claude, launch);
-    return { cursor, claude };
-  }
-  return { cursor };
-}
-
-// 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(text) {
-  try {
-    const parsed = parseToml(text);
-    return Object.keys(asObject2(parsed.mcp_servers)).filter((n) => n.trim());
-  } catch {
-    return [];
-  }
-}
-function readJsonObject(path) {
-  try {
-    return JSON.parse(readFileSync2(path, "utf8"));
-  } catch {
-    return {};
-  }
-}
-function readText(path) {
-  try {
-    return readFileSync2(path, "utf8");
-  } catch {
-    return "";
-  }
-}
-function userCodexConfigPaths(home = homedir2()) {
-  return [join3(home, ".codex", "config.toml"), join3(home, ".config", "codex", "config.toml")];
-}
-function userOpencodeConfigPaths(home = homedir2()) {
-  return [
-    join3(home, ".config", "opencode", "opencode.json"),
-    join3(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 = homedir2()) {
-  const names = [];
-  for (const path of userCodexConfigPaths(home)) {
-    if (!existsSync5(path)) continue;
-    names.push(...listMcpNamesFromCodexToml(readText(path)));
-  }
-  return names;
-}
-function listUserOpencodeMcpNames(home = homedir2()) {
-  const names = [];
-  for (const path of userOpencodeConfigPaths(home)) {
-    if (!existsSync5(path)) continue;
-    names.push(...listMcpNamesFromJsonMap(readJsonObject(path), "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;
-}
-function toCodexUnattendedAppsArgs() {
-  return [
-    "-c",
-    "features.apps=false",
-    "-c",
-    "apps._default.enabled=false",
-    "-c",
-    "apps.posthog.enabled=false",
-    "-c",
-    "features.plugins=false"
-  ];
-}
-
-// src/agents/codex.ts
 var CODEX_PROMPT_ARG_MAX = 2e5;
 var FALLBACK_CODEX_MODELS = [
   { id: "gpt-5.6-sol", displayName: "GPT-5.6 Sol" },
@@ -4056,6 +4083,7 @@ export {
   parseMcpList,
   sanitizeMcpServerName,
   mcpAllowTools,
+  mcpAllowToolsFromNames,
   mcpAuthWarnings,
   SIDEBOARD_MCP_PROFILE_ENV,
   WORKTREE_MCP_TOOLS,
@@ -4071,16 +4099,16 @@ export {
   shouldInjectBrightsyMcp,
   brightsyMcpAllowedTools,
   writeInjectedMcpConfig,
-  PLAN_MODE_INSTRUCTION,
-  permissionMode,
-  mcpStatusThinkingFromClaudeInit,
-  claudeAdapter,
   userCursorMcpConfigPath,
   userClaudeMcpConfigPath,
   mergeSideboardIntoMcpServersJson,
   registerPackagedUserMcpClients,
   isInjectedOrchMcpName,
   userMcpNamesToDisable,
+  PLAN_MODE_INSTRUCTION,
+  permissionMode,
+  mcpStatusThinkingFromClaudeInit,
+  claudeAdapter,
   listCodexModels,
   codexAdapter,
   isCursorApiKeyConfigured,