@sideboard-ai/core 0.1.261 → 0.1.263

package/dist/{chunk-ABPNIYRS.js → chunk-3H7O27X2.js}

@@ -1,18 +1,18 @@
+import {
+  applyConnectedTeamToCli,
+  brightsyMcpServerName,
+  ensureCliTeamTracked,
+  ensureConnectedBrightsyTeamTokens
+} from "./chunk-GWFVCCJZ.js";
 import {
   isOrchestratorThread
-} from "./chunk-X2OTZ36G.js";
+} from "./chunk-RKPBIB2U.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-U3AOJLH3.js";
-import {
-  applyConnectedTeamToCli,
-  brightsyMcpServerName,
-  ensureCliTeamTracked,
-  ensureConnectedBrightsyTeamTokens
-} from "./chunk-LDXSAVWO.js";
+} from "./chunk-5ZPT5YAV.js";
 import {
   loadBrightsyConfig
 } from "./chunk-ROPGQRPU.js";
@@ -33,10 +33,11 @@ import {
   looksLikeAgentFailureMessage,
   looksLikeBrightsyEmptyCompletion,
   packagedCursorRunnerPath,
+  packagedCursorRuntimeDir,
   packagedMcpStdioPath,
   parseCursorRunnerLine,
   resolveNodeLaunch
-} from "./chunk-WV7KJH2E.js";
+} from "./chunk-A5SAYFJ4.js";
 import {
   enrichPathWithNpmGlobalBin,
   isConductorBundledCli,
@@ -44,6 +45,17 @@ import {
   run,
   withExportedPath
 } from "./chunk-QVN2WOKJ.js";
+import {
+  AGENT_RPC_CLAUDE_SDK_SERVER,
+  AGENT_RPC_CWD_ENV,
+  AGENT_RPC_NATIVE_ENV,
+  AGENT_RPC_TOKEN_ENV,
+  AGENT_RPC_TOKEN_QUERY,
+  AGENT_RPC_URL_ENV,
+  PILOT_TOOL_DESCRIPTIONS,
+  PILOT_TOOL_NAMES,
+  agentRpcConnectFromMetadata
+} from "./chunk-NYBFYFK7.js";
 import {
   claudeChromeEnabled,
   fromInclusiveInputUsage,
@@ -52,7 +64,7 @@ import {
   loadAppSettings,
   resolveAgentExecutable,
   resolveClaudeExecutable
-} from "./chunk-6PFZ6XO7.js";
+} from "./chunk-2QUQH2SZ.js";
 import {
   isElectronLikeCommand,
   unwrapStrippedElectronLaunch
@@ -489,7 +501,7 @@ var brightsyAdapter = {
 };
 
 // src/agents/claude.ts
-import { existsSync as existsSync5 } from "fs";
+import { existsSync as existsSync6 } from "fs";
 
 // src/agents/claude-mcp.ts
 function parseMcpList(text) {
@@ -536,6 +548,29 @@ function mcpAuthWarnings(servers) {
     `MCP needs login: ${needing.join(", ")}. Run: claude mcp login "<name>"`
   ];
 }
+var BASE_ALLOWED_TOOLS = [
+  "Edit",
+  "Write",
+  "Bash",
+  "Read",
+  "Glob",
+  "Grep",
+  "WebFetch",
+  "WebSearch",
+  "Task",
+  "Agent",
+  "TaskOutput",
+  "TaskStop",
+  "EnterWorktree",
+  "ExitWorktree",
+  "Skill"
+];
+var CLAUDE_PRINT_BG_WAIT_CEILING_MS = 72e5;
+var CLAUDE_CHROME_ALLOWED_TOOLS = [
+  "mcp__claude-in-chrome",
+  "mcp__claude-in-chrome__*",
+  "Skill(claude-in-chrome)"
+];
 
 // src/agents/orch-mcp-isolation.ts
 import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
@@ -558,6 +593,34 @@ import { fileURLToPath } from "url";
 // src/mcp/profile.ts
 var SIDEBOARD_MCP_PROFILE_ENV = "SIDEBOARD_MCP_PROFILE";
 var SIDEBOARD_THREAD_ID_ENV = "SIDEBOARD_THREAD_ID";
+function agentRpcOwnsPilotTools(env = process.env) {
+  return env[AGENT_RPC_NATIVE_ENV]?.trim() === "1";
+}
+function injectedSideboardMcpEnv(opts) {
+  const orchId = opts.orchestratorThreadId?.trim();
+  const threadId = opts.threadId?.trim() || orchId;
+  const env = {
+    SIDEBOARD_APP_DATA: appDataDir(),
+    [SIDEBOARD_MCP_PROFILE_ENV]: orchId ? "orchestration" : "worktree"
+  };
+  if (orchId) env.SIDEBOARD_ORCHESTRATOR_THREAD_ID = orchId;
+  if (threadId) env[SIDEBOARD_THREAD_ID_ENV] = threadId;
+  if (opts.rpcNativeTools) env[AGENT_RPC_NATIVE_ENV] = "1";
+  return env;
+}
+var AGENT_RPC_PILOT_MCP_TOOLS = [
+  "present_artifact",
+  "wait_for_job",
+  "stop_job"
+];
+function shouldRegisterMcpWaitForTurn(env = process.env) {
+  return !agentRpcOwnsPilotTools(env);
+}
+function worktreeMcpToolNames(env = process.env) {
+  if (!agentRpcOwnsPilotTools(env)) return WORKTREE_MCP_TOOLS;
+  const omit = new Set(AGENT_RPC_PILOT_MCP_TOOLS);
+  return WORKTREE_MCP_TOOLS.filter((name) => !omit.has(name));
+}
 var WORKTREE_MCP_TOOLS = [
   "present_artifact",
   "ask_user",
@@ -800,20 +863,10 @@ async function buildInjectedMcpServers(opts) {
   const servers = [];
   if (opts.includeSideboard) {
     const sideboard = await resolveSideboardMcpServer();
-    const orchId = opts.orchestratorThreadId?.trim();
-    const profile = orchId ? "orchestration" : "worktree";
-    const threadId = opts.threadId?.trim() || orchId;
     sideboard.env = {
       ...sideboard.env ?? {},
-      SIDEBOARD_APP_DATA: appDataDir(),
-      [SIDEBOARD_MCP_PROFILE_ENV]: profile
+      ...injectedSideboardMcpEnv(opts)
     };
-    if (orchId) {
-      sideboard.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID = orchId;
-    }
-    if (threadId) {
-      sideboard.env[SIDEBOARD_THREAD_ID_ENV] = threadId;
-    }
     try {
       mergeAgentGitAuthEnv(
         sideboard.env,
@@ -918,7 +971,7 @@ function stripElectronFromUserMcpEntry(entry) {
   next.env = cleaned;
   return next;
 }
-function writeMcpServersConfig(servers, extraServers) {
+function mcpServersRecord(servers, extraServers) {
   const mcpServers = {};
   for (const s of servers) {
     const env = mcpSpawnEnv(s.env);
@@ -935,6 +988,10 @@ function writeMcpServersConfig(servers, extraServers) {
       mcpServers[name] = stripElectronFromUserMcpEntry(entry);
     }
   }
+  return mcpServers;
+}
+function writeMcpServersConfig(servers, extraServers) {
+  const mcpServers = mcpServersRecord(servers, extraServers);
   if (Object.keys(mcpServers).length === 0) return null;
   const dir = mkdtempSync(join(tmpdir(), "sideboard-mcp-"));
   const cfgPath = join(dir, "mcp.json");
@@ -2115,34 +2172,92 @@ function permissionMode(thread) {
   };
 }
 
+// src/agent-rpc/rpc-env.ts
+function worktreeAgentRpc(isOrchestrator) {
+  return isOrchestrator ? null : agentRpcConnectFromMetadata();
+}
+function agentRpcChildEnv(rpc, cwd) {
+  return {
+    [AGENT_RPC_NATIVE_ENV]: "1",
+    [AGENT_RPC_URL_ENV]: rpc.url,
+    [AGENT_RPC_TOKEN_ENV]: rpc.authToken,
+    [AGENT_RPC_CWD_ENV]: cwd
+  };
+}
+
+// src/agents/claude-host.ts
+import { existsSync as existsSync5 } from "fs";
+import { createRequire as createRequire2 } from "module";
+import { dirname as dirname3, join as join4 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+function claudePilotSdkAllowedTools() {
+  return PILOT_TOOL_NAMES.map(
+    (name) => `mcp__${AGENT_RPC_CLAUDE_SDK_SERVER}__${name}`
+  );
+}
+function withClaudePilotRpcTools(allowed) {
+  const omit = new Set(PILOT_TOOL_NAMES.map((name) => `mcp__sideboard__${name}`));
+  return [...allowed.filter((name) => !omit.has(name)), ...claudePilotSdkAllowedTools()];
+}
+function entryDir() {
+  const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
+  if (cjsDir) return cjsDir;
+  try {
+    return dirname3(fileURLToPath2(import.meta.url));
+  } catch {
+    try {
+      const req = createRequire2(process.cwd() + "/");
+      return dirname3(req.resolve("@sideboard-ai/core"));
+    } catch {
+      return process.cwd();
+    }
+  }
+}
+function claudeRunnerPath() {
+  const packagedDir = packagedCursorRuntimeDir();
+  if (packagedDir) {
+    const packaged = join4(packagedDir, "core-dist", "agents", "claude-runner.js");
+    if (existsSync5(packaged)) return packaged;
+  }
+  const root = entryDir();
+  const candidates = [
+    join4(root, "agents", "claude-runner.js"),
+    join4(root, "agents", "claude-runner.cjs"),
+    join4(root, "dist", "agents", "claude-runner.js"),
+    join4(root, "dist", "agents", "claude-runner.cjs"),
+    join4(root, "claude-runner.ts"),
+    join4(root, "src", "agents", "claude-runner.ts")
+  ];
+  for (const candidate of candidates) {
+    if (existsSync5(candidate)) return candidate;
+  }
+  return candidates[0];
+}
+async function buildClaudeRpcTurnCommand(req) {
+  const runner = claudeRunnerPath();
+  const isTs = runner.endsWith(".ts");
+  const launch = applyNodeLaunch(
+    await resolveNodeLaunch(runner),
+    isTs ? ["--import", "tsx", runner] : [runner]
+  );
+  return {
+    file: launch.file,
+    args: launch.args,
+    cwd: req.cwd,
+    stdin: JSON.stringify(req),
+    env: {
+      ...launch.env,
+      CLAUDE_CODE_FORWARD_SUBAGENT_TEXT: "1",
+      CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS: process.env.CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS ?? "7200000",
+      ...req.isolateClaudeAiMcp ? { ENABLE_CLAUDEAI_MCP_SERVERS: "false" } : {}
+    }
+  };
+}
+
 // src/agents/claude.ts
-var BASE_ALLOWED_TOOLS = [
-  "Edit",
-  "Write",
-  "Bash",
-  "Read",
-  "Glob",
-  "Grep",
-  "WebFetch",
-  "WebSearch",
-  // Subagents (Claude Code v2.1.63 renamed Task → Agent; allow both).
-  "Task",
-  "Agent",
-  "TaskOutput",
-  "TaskStop",
-  "EnterWorktree",
-  "ExitWorktree",
-  "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;
 function usageFromClaude(usage) {
   if (!usage) return null;
@@ -2180,6 +2295,13 @@ function costUsdFromClaudeResult(obj) {
   }
   return void 0;
 }
+function sessionCostUsdFromClaudeResult(obj) {
+  const totalCost = obj.total_cost_usd ?? obj.totalCostUsd;
+  if (totalCost != null && Number.isFinite(Number(totalCost))) {
+    return Number(totalCost);
+  }
+  return void 0;
+}
 function claudeResultErrorDetail(obj) {
   const isError = Boolean(obj.is_error) || typeof obj.subtype === "string" && /^error/i.test(obj.subtype);
   const fromResult = typeof obj.result === "string" ? obj.result.trim() : "";
@@ -2512,7 +2634,7 @@ var claudeAdapter = {
   async detect() {
     const claude = resolveClaudeExecutable();
     if (claude !== "claude") {
-      if (!existsSync5(claude)) {
+      if (!existsSync6(claude)) {
         return {
           agent: "claude",
           installed: false,
@@ -2561,15 +2683,17 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-47NZVA44.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-TI26K25J.js");
     const isOrchestrator = isOrchestratorThread2(thread);
+    const rpc = worktreeAgentRpc(isOrchestrator);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
       includeBrightsy: shouldInjectBrightsyMcp(thread, {
         orchestrator: isOrchestrator
       }),
       orchestratorThreadId: isOrchestrator ? thread.id : null,
-      threadId: thread.id
+      threadId: thread.id,
+      rpcNativeTools: Boolean(rpc)
     });
     const injectedBrightsyNames = injectedServers.filter((s) => s.name === "brightsy" || s.name.startsWith("brightsy_")).map((s) => s.name);
     const chromeOn = claudeChromeEnabled();
@@ -2597,6 +2721,23 @@ var claudeAdapter = {
     if (chromeOn) {
       allowedTools = [...allowedTools, ...CLAUDE_CHROME_ALLOWED_TOOLS];
     }
+    if (rpc) {
+      return buildClaudeRpcTurnCommand({
+        prompt: promptText,
+        cwd: thread.worktreePath,
+        sessionId,
+        model: thread.model,
+        effort: thread.effort ?? (thread.fast ? "low" : "high"),
+        permissionMode: mode.claude,
+        systemPrompt,
+        claudePath: claude,
+        chrome: chromeOn,
+        mcpServers: mcpServersRecord(injectedServers, userMcpEntries),
+        allowedTools: withClaudePilotRpcTools(allowedTools),
+        agentRpc: rpc,
+        isolateClaudeAiMcp: isOrchestrator || isLocalDevAppDataDir()
+      });
+    }
     const args = [
       "-p",
       ...useStdin ? [] : [promptText],
@@ -2731,6 +2872,8 @@ var claudeAdapter = {
         if (usage) {
           const costUsd = costUsdFromClaudeResult(obj);
           if (costUsd != null) usage.costUsd = costUsd;
+          const sessionCostUsd = sessionCostUsdFromClaudeResult(obj);
+          if (sessionCostUsd != null) usage.sessionCostUsd = sessionCostUsd;
           events.push({ type: "usage", data: usage, scope: "turn" });
         }
         if (events.length === 0) return null;
@@ -2801,9 +2944,9 @@ function parseIssuesJson(raw) {
 }
 
 // src/agents/codex.ts
-import { existsSync as existsSync6, readFileSync as readFileSync3, statSync } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync3, statSync } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 var CODEX_PROMPT_ARG_MAX = 2e5;
 var FALLBACK_CODEX_MODELS = [
   { id: "gpt-5.6-sol", displayName: "GPT-5.6 Sol" },
@@ -2823,7 +2966,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 (!existsSync7(codex)) {
     return FALLBACK_CODEX_MODELS;
   }
   const listed = await run(codex, ["debug", "models"], { reject: false });
@@ -2858,11 +3001,11 @@ function usageFromCodex(usage) {
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
-    join4(homedir3(), ".codex", "config.toml"),
-    join4(homedir3(), ".config", "codex", "config.toml")
+    join5(homedir3(), ".codex", "config.toml"),
+    join5(homedir3(), ".config", "codex", "config.toml")
   ];
   for (const path of candidates) {
-    if (!existsSync6(path)) continue;
+    if (!existsSync7(path)) continue;
     const text = readFileSync3(path, "utf8");
     if (/network_access\s*=\s*true/.test(text)) return true;
   }
@@ -2895,8 +3038,8 @@ function asRecord2(value) {
   return void 0;
 }
 function codexLooksAuthenticated() {
-  const authPath = join4(homedir3(), ".codex", "auth.json");
-  if (!existsSync6(authPath)) return false;
+  const authPath = join5(homedir3(), ".codex", "auth.json");
+  if (!existsSync7(authPath)) return false;
   try {
     return statSync(authPath).size > 2;
   } catch {
@@ -2908,7 +3051,7 @@ var codexAdapter = {
   async detect() {
     const codex = resolveAgentExecutable("codex");
     if (codex !== "codex") {
-      if (!existsSync6(codex)) {
+      if (!existsSync7(codex)) {
         return {
           agent: "codex",
           installed: false,
@@ -3182,10 +3325,10 @@ var codexAdapter = {
 };
 
 // src/agents/cursor.ts
-import { existsSync as existsSync7 } from "fs";
-import { createRequire as createRequire2 } from "module";
-import { dirname as dirname3, join as join5 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { existsSync as existsSync8 } from "fs";
+import { createRequire as createRequire3 } from "module";
+import { dirname as dirname4, join as join6 } from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
 var FALLBACK_CURSOR_MODELS = [
   { id: "default", displayName: "Auto" },
   { id: "composer-2.5", displayName: "Composer 2.5" },
@@ -3232,15 +3375,15 @@ async function listCursorModels() {
     return cachedModels?.models ?? FALLBACK_CURSOR_MODELS;
   }
 }
-function entryDir() {
+function entryDir2() {
   const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
   if (cjsDir) return cjsDir;
   try {
-    return dirname3(fileURLToPath2(import.meta.url));
+    return dirname4(fileURLToPath3(import.meta.url));
   } catch {
     try {
-      const req = createRequire2(process.cwd() + "/");
-      return dirname3(req.resolve("@sideboard-ai/core"));
+      const req = createRequire3(process.cwd() + "/");
+      return dirname4(req.resolve("@sideboard-ai/core"));
     } catch {
       return process.cwd();
     }
@@ -3249,19 +3392,19 @@ function entryDir() {
 function cursorRunnerPath() {
   const packaged = packagedCursorRunnerPath();
   if (packaged) return packaged;
-  const root = entryDir();
+  const root = entryDir2();
   const candidates = [
-    join5(root, "agents", "cursor-runner.js"),
-    join5(root, "agents", "cursor-runner.cjs"),
+    join6(root, "agents", "cursor-runner.js"),
+    join6(root, "agents", "cursor-runner.cjs"),
     // If somehow resolved from package root instead of dist/
-    join5(root, "dist", "agents", "cursor-runner.js"),
-    join5(root, "dist", "agents", "cursor-runner.cjs"),
+    join6(root, "dist", "agents", "cursor-runner.js"),
+    join6(root, "dist", "agents", "cursor-runner.cjs"),
     // Source tree (dev): packages/core/src/agents/cursor-runner.ts
-    join5(root, "cursor-runner.ts"),
-    join5(root, "src", "agents", "cursor-runner.ts")
+    join6(root, "cursor-runner.ts"),
+    join6(root, "src", "agents", "cursor-runner.ts")
   ];
   for (const candidate of candidates) {
-    if (existsSync7(candidate)) return candidate;
+    if (existsSync8(candidate)) return candidate;
   }
   return candidates[0];
 }
@@ -3302,13 +3445,15 @@ var cursorAdapter = {
     const prompt = flattenTurnInput(dropCachedPrefixOnResume(input, agentId));
     const apiKey = resolveCursorApiKey() || void 0;
     const isOrchestrator = isOrchestratorThread(thread);
+    const rpc = agentRpcConnectFromMetadata();
     const injected = await buildInjectedMcpServers({
       includeSideboard: true,
       includeBrightsy: shouldInjectBrightsyMcp(thread, {
         orchestrator: isOrchestrator
       }),
       orchestratorThreadId: isOrchestrator ? thread.id : null,
-      threadId: thread.id
+      threadId: thread.id,
+      rpcNativeTools: Boolean(rpc)
     });
     const mcpServers = toCursorMcpServers(injected);
     const req = {
@@ -3322,6 +3467,8 @@ var cursorAdapter = {
       planMode: thread.planMode,
       apiKey,
       ...isOrchestrator ? { isolateAmbientMcp: true } : {},
+      ...rpc ? { agentRpc: rpc } : {},
+      ...isOrchestrator && rpc ? { rpcWaitForTurn: true } : {},
       ...Object.keys(mcpServers).length > 0 ? { mcpServers } : {}
     };
     const runner = cursorRunnerPath();
@@ -3360,7 +3507,155 @@ var cursorAdapter = {
 };
 
 // src/agents/opencode.ts
-import { existsSync as existsSync8 } from "fs";
+import { existsSync as existsSync9 } from "fs";
+
+// src/agent-rpc/opencode-hook.ts
+import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync3 } from "fs";
+import { join as join7 } from "path";
+var OPENCODE_PLUGIN_SOURCE = `import { tool } from "@opencode-ai/plugin"
+
+const URL = process.env[${JSON.stringify(AGENT_RPC_URL_ENV)}] || ""
+const TOKEN = process.env[${JSON.stringify(AGENT_RPC_TOKEN_ENV)}] || ""
+const CWD = process.env[${JSON.stringify(AGENT_RPC_CWD_ENV)}] || ""
+
+function jsonResult(value) {
+  return JSON.stringify(value)
+}
+
+function jsonError(err) {
+  return jsonResult({ ok: false, error: err instanceof Error ? err.message : String(err) })
+}
+
+function socketUrl() {
+  const u = new URL(URL)
+  u.searchParams.set(${JSON.stringify(AGENT_RPC_TOKEN_QUERY)}, TOKEN)
+  return u.toString()
+}
+
+function call(method, params) {
+  if (!URL || !TOKEN) {
+    return Promise.resolve(jsonError(new Error("Agent RPC runtime is not running")))
+  }
+  return new Promise((resolve) => {
+    let settled = false
+    const done = (value) => {
+      if (settled) return
+      settled = true
+      try { ws.close() } catch {}
+      resolve(value)
+    }
+    const ws = new WebSocket(socketUrl())
+    const id = Date.now()
+    ws.addEventListener("open", () => {
+      ws.send(JSON.stringify({ jsonrpc: "2.0", id, method, params, authToken: TOKEN }))
+    })
+    ws.addEventListener("message", (ev) => {
+      let msg
+      try { msg = JSON.parse(String(ev.data)) } catch { return }
+      if (msg && msg.id === id) {
+        if (msg.error) done(jsonError(new Error(msg.error.message || "Agent RPC error")))
+        else done(jsonResult(msg.result))
+      }
+    })
+    ws.addEventListener("error", () => done(jsonError(new Error("Agent RPC socket error"))))
+    ws.addEventListener("close", () => {
+      if (!settled) done(jsonError(new Error("Agent RPC socket closed")))
+    })
+  })
+}
+
+function str(description) {
+  return tool.schema.string().describe(description)
+}
+
+function opt(description) {
+  return tool.schema.string().optional().describe(description)
+}
+
+export const SideboardRpc = async (ctx) => {
+  const cwd = CWD || ctx.worktree || ctx.directory || ""
+  const job = (method, args) => call(method, { ...args, cwd })
+  return {
+    tool: {
+      present_artifact: tool({
+        description: ${JSON.stringify(PILOT_TOOL_DESCRIPTIONS.present_artifact)},
+        args: {
+          title: str("Short title shown in the artifact pane header"),
+          type: tool.schema.enum(["html", "svg", "markdown", "react", "log"]),
+          content: str("html/svg/markdown/react: full document. log: only the new lines."),
+          artifact_id: opt("Stable id. Required for type=log."),
+          status: tool.schema.enum(["running", "ok", "failed", "idle"]).optional(),
+          phase: opt("Progress phase"),
+          mode: tool.schema.enum(["append", "replace"]).optional(),
+        },
+        async execute(args) {
+          return call("ui.presentArtifact", args)
+        },
+      }),
+      wait_for_job: tool({
+        description: ${JSON.stringify(PILOT_TOOL_DESCRIPTIONS.wait_for_job)},
+        args: {
+          id: str("Detached job id (same kebab-case id passed to detached-job.cjs start)"),
+        },
+        async execute(args) {
+          return job("job.wait", args)
+        },
+      }),
+      stop_job: tool({
+        description: ${JSON.stringify(PILOT_TOOL_DESCRIPTIONS.stop_job)},
+        args: {
+          id: str("Detached job id"),
+          reason: opt("Why the job is being stopped"),
+        },
+        async execute(args) {
+          return job("job.stop", args)
+        },
+      }),
+    },
+  }
+}
+`;
+function writeOpencodeRpcPlugin() {
+  const configDir = join7(appDataDir(), "agent-rpc", "opencode");
+  const pluginDir = join7(configDir, "plugins");
+  mkdirSync2(pluginDir, { recursive: true });
+  const pluginFile = join7(pluginDir, "sideboard-rpc.js");
+  writeFileSync3(pluginFile, OPENCODE_PLUGIN_SOURCE);
+  return { configDir, pluginFile };
+}
+
+// src/agent-rpc/opencode-host.ts
+async function buildOpencodeHostEnv(thread) {
+  const isOrchestrator = isOrchestratorThread(thread);
+  const rpc = worktreeAgentRpc(isOrchestrator);
+  const injected = await buildInjectedMcpServers({
+    includeSideboard: true,
+    includeBrightsy: shouldInjectBrightsyMcp(thread, {
+      orchestrator: isOrchestrator
+    }),
+    orchestratorThreadId: isOrchestrator ? thread.id : null,
+    threadId: thread.id,
+    rpcNativeTools: Boolean(rpc)
+  });
+  const disableNames = isOrchestrator ? userMcpNamesToDisable({
+    injectedNames: injected.map((s) => s.name),
+    names: listUserOpencodeMcpNames()
+  }) : [];
+  const config = injected.length > 0 || disableNames.length > 0 ? JSON.parse(toOpencodeMcpConfigContent(injected, { disableNames })) : {};
+  const env = {};
+  if (rpc) {
+    const { configDir, pluginFile } = writeOpencodeRpcPlugin();
+    env.OPENCODE_CONFIG_DIR = configDir;
+    Object.assign(env, agentRpcChildEnv(rpc, thread.worktreePath));
+    config.plugin = [pluginFile];
+  }
+  if (Object.keys(config).length > 0) {
+    env.OPENCODE_CONFIG_CONTENT = JSON.stringify(config);
+  }
+  return env;
+}
+
+// src/agents/opencode.ts
 var FALLBACK_OPENCODE_MODELS = [
   { id: "opencode/big-pickle", displayName: "opencode \xB7 big-pickle" },
   {
@@ -3419,7 +3714,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 (!existsSync8(opencode)) {
+  } else if (!existsSync9(opencode)) {
     return FALLBACK_OPENCODE_MODELS;
   }
   const listed = await run(opencode, ["models"], { reject: false });
@@ -3454,7 +3749,7 @@ var opencodeAdapter = {
   async detect() {
     const opencode = resolveAgentExecutable("opencode");
     if (opencode !== "opencode") {
-      if (!existsSync8(opencode)) {
+      if (!existsSync9(opencode)) {
         return {
           agent: "opencode",
           installed: false,
@@ -3508,20 +3803,7 @@ var opencodeAdapter = {
     if (model) {
       args.push("--model", model);
     }
-    const isOrchestrator = isOrchestratorThread(thread);
-    const injected = await buildInjectedMcpServers({
-      includeSideboard: true,
-      includeBrightsy: shouldInjectBrightsyMcp(thread, {
-        orchestrator: isOrchestrator
-      }),
-      orchestratorThreadId: isOrchestrator ? thread.id : null,
-      threadId: thread.id
-    });
-    const disableNames = isOrchestrator ? userMcpNamesToDisable({
-      injectedNames: injected.map((s) => s.name),
-      names: listUserOpencodeMcpNames()
-    }) : [];
-    const mcpContent = injected.length > 0 || disableNames.length > 0 ? toOpencodeMcpConfigContent(injected, { disableNames }) : null;
+    const hostEnv = await buildOpencodeHostEnv(thread);
     return {
       file: resolveAgentExecutable("opencode"),
       args,
@@ -3531,7 +3813,7 @@ var opencodeAdapter = {
       stdin: prompt,
       env: {
         OPENCODE_PERMISSION: mode.opencodePermission,
-        ...mcpContent ? { OPENCODE_CONFIG_CONTENT: mcpContent } : {}
+        ...hostEnv
       }
     };
   },
@@ -4132,9 +4414,9 @@ function formatClaudeUsageOverLimitWait(windows, now = /* @__PURE__ */ new Date(
 }
 
 // src/agents/claude-usage-client.ts
-import { existsSync as existsSync9, readFileSync as readFileSync4 } from "fs";
+import { existsSync as existsSync10, readFileSync as readFileSync4 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join6 } from "path";
+import { join as join8 } from "path";
 var CLAUDE_OAUTH_USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
 var CLAUDE_USAGE_TTL_MS = 9e4;
 var CLAUDE_USAGE_ERROR_TTL_MS = 5 * 6e4;
@@ -4174,12 +4456,12 @@ function accessTokenFromCredentialsJson(raw) {
   }
 }
 function claudeCredentialsPath(configDir) {
-  const root = configDir?.trim() || process.env.CLAUDE_CONFIG_DIR?.trim() || join6(homedir4(), ".claude");
-  return join6(root, ".credentials.json");
+  const root = configDir?.trim() || process.env.CLAUDE_CONFIG_DIR?.trim() || join8(homedir4(), ".claude");
+  return join8(root, ".credentials.json");
 }
 async function readFileAccessToken(configDir) {
   const path = claudeCredentialsPath(configDir);
-  if (!existsSync9(path)) return null;
+  if (!existsSync10(path)) return null;
   try {
     return accessTokenFromCredentialsJson(readFileSync4(path, "utf8"));
   } catch {
@@ -4294,7 +4576,7 @@ async function getClaudePlanUsage(opts = {}) {
 }
 
 // src/agents/install.ts
-import { existsSync as existsSync10 } from "fs";
+import { existsSync as existsSync11 } from "fs";
 var SETUP = {
   claude: {
     agent: "claude",
@@ -4475,7 +4757,7 @@ async function installNpmGlobalPackage(opts) {
 async function resolveExistingCli(agent) {
   if (agent === "cursor") return null;
   const exe = resolveAgentExecutable(agent);
-  if ((exe.includes("/") || exe.includes("\\")) && existsSync10(exe)) return exe;
+  if ((exe.includes("/") || exe.includes("\\")) && existsSync11(exe)) return exe;
   enrichPathWithNpmGlobalBin();
   return whichOnPath(CLI_BIN[agent]);
 }
@@ -4549,7 +4831,7 @@ async function loginAgent(agent) {
   };
 }
 async function loginManagedAccount(accountId) {
-  const { loadAppSettings: loadAppSettings2 } = await import("./app-settings-VQEUCONM.js");
+  const { loadAppSettings: loadAppSettings2 } = await import("./app-settings-RKFFUIFQ.js");
   const { loginEnvPrefix } = await import("./managed-accounts-2AK5RIAF.js");
   const account = loadAppSettings2().accounts.accounts.find((a) => a.id === accountId);
   if (!account) {
@@ -4646,8 +4928,13 @@ export {
   mcpAllowTools,
   mcpAllowToolsFromNames,
   mcpAuthWarnings,
+  BASE_ALLOWED_TOOLS,
+  CLAUDE_PRINT_BG_WAIT_CEILING_MS,
+  CLAUDE_CHROME_ALLOWED_TOOLS,
   SIDEBOARD_MCP_PROFILE_ENV,
   SIDEBOARD_THREAD_ID_ENV,
+  shouldRegisterMcpWaitForTurn,
+  worktreeMcpToolNames,
   WORKTREE_MCP_TOOLS,
   WORKTREE_GITHUB_MCP_TOOLS,
   WORKTREE_LINEAR_MCP_TOOLS,