@sideboard-ai/core 0.1.153 → 0.1.156

package/dist/{chunk-4THE3EY7.js → chunk-UA3YZKRX.js}

@@ -11,7 +11,7 @@ import {
 } from "./chunk-S42XV45P.js";
 import {
   isOrchestratorThread
-} from "./chunk-RNC3GR6L.js";
+} from "./chunk-TI6UMRWK.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
@@ -1709,7 +1709,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);
@@ -1720,6 +1720,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) {
@@ -1935,13 +1940,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");
@@ -2098,7 +2140,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-4LHCZ2DC.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-MR75BDBY.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -2141,6 +2183,9 @@ var claudeAdapter = {
     const mcpConfigPath = writeMcpServersConfig(injectedServers);
     if (mcpConfigPath) {
       args.push("--mcp-config", mcpConfigPath);
+      if (isOrchestrator) {
+        args.push("--strict-mcp-config");
+      }
     }
     if (chromeOn) {
       args.push("--chrome");
@@ -2170,7 +2215,10 @@ var claudeAdapter = {
       // 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" } : {}
       }
     };
   },
@@ -2318,9 +2366,106 @@ function parseIssuesJson(raw) {
 }
 
 // src/agents/codex.ts
-import { existsSync as existsSync6, readFileSync, statSync } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync3, statSync } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join6 } from "path";
+
+// src/agents/orch-mcp-isolation.ts
+import { existsSync as existsSync7, readFileSync as readFileSync2 } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join5 } from "path";
+import { parse as parseToml } from "smol-toml";
+
+// src/agents/user-mcp-config.ts
+import { existsSync as existsSync6, mkdirSync, readFileSync, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir2 } from "os";
-import { join as join4 } from "path";
+import { dirname as dirname2, join as join4 } from "path";
+
+// src/agents/orch-mcp-isolation.ts
+function isInjectedOrchMcpName(name) {
+  const n = name.trim().toLowerCase();
+  return n === "sideboard" || n === "brightsy" || n.startsWith("brightsy_");
+}
+function asObject(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  return value;
+}
+function listMcpNamesFromJsonMap(raw, key) {
+  return Object.keys(asObject(asObject(raw)[key])).filter((n) => n.trim());
+}
+function listMcpNamesFromCodexToml(text) {
+  try {
+    const parsed = parseToml(text);
+    return Object.keys(asObject(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 = homedir3()) {
+  return [join5(home, ".codex", "config.toml"), join5(home, ".config", "codex", "config.toml")];
+}
+function userOpencodeConfigPaths(home = homedir3()) {
+  return [
+    join5(home, ".config", "opencode", "opencode.json"),
+    join5(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 = homedir3()) {
+  const names = [];
+  for (const path of userCodexConfigPaths(home)) {
+    if (!existsSync7(path)) continue;
+    names.push(...listMcpNamesFromCodexToml(readText(path)));
+  }
+  return names;
+}
+function listUserOpencodeMcpNames(home = homedir3()) {
+  const names = [];
+  for (const path of userOpencodeConfigPaths(home)) {
+    if (!existsSync7(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;
+}
+
+// src/agents/codex.ts
 var CODEX_PROMPT_ARG_MAX = 2e5;
 var FALLBACK_CODEX_MODELS = [
   { id: "gpt-5.6-sol", displayName: "GPT-5.6 Sol" },
@@ -2340,7 +2485,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 (!existsSync6(codex)) {
+  } else if (!existsSync8(codex)) {
     return FALLBACK_CODEX_MODELS;
   }
   const listed = await run(codex, ["debug", "models"], { reject: false });
@@ -2375,12 +2520,12 @@ function usageFromCodex(usage) {
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
-    join4(homedir2(), ".codex", "config.toml"),
-    join4(homedir2(), ".config", "codex", "config.toml")
+    join6(homedir4(), ".codex", "config.toml"),
+    join6(homedir4(), ".config", "codex", "config.toml")
   ];
   for (const path of candidates) {
-    if (!existsSync6(path)) continue;
-    const text = readFileSync(path, "utf8");
+    if (!existsSync8(path)) continue;
+    const text = readFileSync3(path, "utf8");
     if (/network_access\s*=\s*true/.test(text)) return true;
   }
   return false;
@@ -2412,8 +2557,8 @@ function asRecord2(value) {
   return void 0;
 }
 function codexLooksAuthenticated() {
-  const authPath = join4(homedir2(), ".codex", "auth.json");
-  if (!existsSync6(authPath)) return false;
+  const authPath = join6(homedir4(), ".codex", "auth.json");
+  if (!existsSync8(authPath)) return false;
   try {
     return statSync(authPath).size > 2;
   } catch {
@@ -2425,7 +2570,7 @@ var codexAdapter = {
   async detect() {
     const codex = resolveAgentExecutable("codex");
     if (codex !== "codex") {
-      if (!existsSync6(codex)) {
+      if (!existsSync8(codex)) {
         return {
           agent: "codex",
           installed: false,
@@ -2485,7 +2630,15 @@ var codexAdapter = {
       }),
       orchestratorThreadId: isOrchestrator ? thread.id : null
     });
-    const mcpOverrides = toCodexMcpConfigArgs(injected);
+    const mcpOverrides = [
+      ...toCodexMcpConfigArgs(injected),
+      ...isOrchestrator ? toCodexDisableUserMcpArgs(
+        userMcpNamesToDisable({
+          injectedNames: injected.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").
@@ -2685,9 +2838,9 @@ var codexAdapter = {
 };
 
 // src/agents/cursor.ts
-import { existsSync as existsSync8 } from "fs";
+import { existsSync as existsSync10 } from "fs";
 import { createRequire as createRequire3 } from "module";
-import { dirname as dirname3, join as join6 } from "path";
+import { dirname as dirname4, join as join8 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { Cursor } from "@cursor/sdk";
 
@@ -2903,9 +3056,9 @@ function parseCursorRunnerLine(line) {
 }
 
 // src/agents/cursor-ripgrep.ts
-import { existsSync as existsSync7 } from "fs";
+import { existsSync as existsSync9 } from "fs";
 import { createRequire as createRequire2 } from "module";
-import { dirname as dirname2, isAbsolute, join as join5, parse, resolve as resolvePath } from "path";
+import { dirname as dirname3, isAbsolute, join as join7, parse, resolve as resolvePath } from "path";
 var RIPGREP_ENV = "CURSOR_RIPGREP_PATH";
 function rgBinaryName() {
   return process.platform === "win32" ? "rg.exe" : "rg";
@@ -2917,19 +3070,19 @@ function usableRipgrepPath(candidate) {
   const raw = candidate?.trim();
   if (!raw || !isAbsolute(raw)) return null;
   const readable = nodeReadableScriptPath(raw);
-  if (!existsSync7(readable) || isAsarPath(readable)) return null;
+  if (!existsSync9(readable) || isAsarPath(readable)) return null;
   return readable;
 }
 function walkForBundledRipgrep(startFile) {
   if (!startFile) return null;
   const pkg = platformRipgrepPackage();
   const name = rgBinaryName();
-  let dir = dirname2(resolvePath(startFile));
+  let dir = dirname3(resolvePath(startFile));
   const root = parse(dir).root;
   while (dir !== root) {
-    const hit = usableRipgrepPath(join5(dir, "node_modules", pkg, "bin", name));
+    const hit = usableRipgrepPath(join7(dir, "node_modules", pkg, "bin", name));
     if (hit) return hit;
-    const next = dirname2(dir);
+    const next = dirname3(dir);
     if (next === dir) break;
     dir = next;
   }
@@ -2939,7 +3092,7 @@ function requireResolveBundledRipgrep(fromFile) {
   try {
     const req = createRequire2(fromFile);
     const pkgJson = req.resolve(`${platformRipgrepPackage()}/package.json`);
-    return usableRipgrepPath(join5(dirname2(pkgJson), "bin", rgBinaryName()));
+    return usableRipgrepPath(join7(dirname3(pkgJson), "bin", rgBinaryName()));
   } catch {
     return null;
   }
@@ -3008,11 +3161,11 @@ function entryDir() {
   const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
   if (cjsDir) return cjsDir;
   try {
-    return dirname3(fileURLToPath2(import.meta.url));
+    return dirname4(fileURLToPath2(import.meta.url));
   } catch {
     try {
       const req = createRequire3(process.cwd() + "/");
-      return dirname3(req.resolve("@sideboard-ai/core"));
+      return dirname4(req.resolve("@sideboard-ai/core"));
     } catch {
       return process.cwd();
     }
@@ -3023,17 +3176,17 @@ function cursorRunnerPath() {
   if (packaged) return packaged;
   const root = entryDir();
   const candidates = [
-    join6(root, "agents", "cursor-runner.js"),
-    join6(root, "agents", "cursor-runner.cjs"),
+    join8(root, "agents", "cursor-runner.js"),
+    join8(root, "agents", "cursor-runner.cjs"),
     // If somehow resolved from package root instead of dist/
-    join6(root, "dist", "agents", "cursor-runner.js"),
-    join6(root, "dist", "agents", "cursor-runner.cjs"),
+    join8(root, "dist", "agents", "cursor-runner.js"),
+    join8(root, "dist", "agents", "cursor-runner.cjs"),
     // Source tree (dev): packages/core/src/agents/cursor-runner.ts
-    join6(root, "cursor-runner.ts"),
-    join6(root, "src", "agents", "cursor-runner.ts")
+    join8(root, "cursor-runner.ts"),
+    join8(root, "src", "agents", "cursor-runner.ts")
   ];
   for (const candidate of candidates) {
-    if (existsSync8(candidate)) return candidate;
+    if (existsSync10(candidate)) return candidate;
   }
   return candidates[0];
 }
@@ -3082,6 +3235,7 @@ var cursorAdapter = {
       fast: thread.fast,
       planMode: thread.planMode,
       apiKey,
+      ...isOrchestrator ? { isolateAmbientMcp: true } : {},
       ...Object.keys(mcpServers).length > 0 ? { mcpServers } : {}
     };
     const runner = cursorRunnerPath();
@@ -3120,7 +3274,7 @@ var cursorAdapter = {
 };
 
 // src/agents/opencode.ts
-import { existsSync as existsSync9 } from "fs";
+import { existsSync as existsSync11 } from "fs";
 var FALLBACK_OPENCODE_MODELS = [
   { id: "opencode/big-pickle", displayName: "opencode \xB7 big-pickle" },
   {
@@ -3179,7 +3333,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 (!existsSync9(opencode)) {
+  } else if (!existsSync11(opencode)) {
     return FALLBACK_OPENCODE_MODELS;
   }
   const listed = await run(opencode, ["models"], { reject: false });
@@ -3214,7 +3368,7 @@ var opencodeAdapter = {
   async detect() {
     const opencode = resolveAgentExecutable("opencode");
     if (opencode !== "opencode") {
-      if (!existsSync9(opencode)) {
+      if (!existsSync11(opencode)) {
         return {
           agent: "opencode",
           installed: false,
@@ -3276,7 +3430,11 @@ var opencodeAdapter = {
       }),
       orchestratorThreadId: isOrchestrator ? thread.id : null
     });
-    const mcpContent = injected.length > 0 ? toOpencodeMcpConfigContent(injected) : null;
+    const disableNames = isOrchestrator ? userMcpNamesToDisable({
+      injectedNames: injected.map((s) => s.name),
+      names: listUserOpencodeMcpNames()
+    }) : [];
+    const mcpContent = injected.length > 0 || disableNames.length > 0 ? toOpencodeMcpConfigContent(injected, { disableNames }) : null;
     return {
       file: resolveAgentExecutable("opencode"),
       args,
@@ -3949,6 +4107,7 @@ export {
   applyAgentRunnerHeapEnv,
   PLAN_MODE_INSTRUCTION,
   permissionMode,
+  mcpStatusThinkingFromClaudeInit,
   claudeAdapter,
   listCodexModels,
   codexAdapter,