@sideboard-ai/core 0.1.262 → 0.1.263

package/dist/{chunk-4F7J6UWD.js → chunk-EK3KVT7I.js}

@@ -2,13 +2,13 @@
 
 import {
   isOrchestratorThread
-} from "./chunk-JTNY5CK4.js";
+} from "./chunk-L5WGAIL2.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-FSZ7YYFQ.js";
+} from "./chunk-4ALDX5IO.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
@@ -37,7 +37,7 @@ import {
   loadAppSettings,
   resolveAgentExecutable,
   resolveClaudeExecutable
-} from "./chunk-VIC6TDYT.js";
+} from "./chunk-36FOBJBF.js";
 import {
   isElectronLikeCommand,
   unwrapStrippedElectronLaunch,
@@ -803,7 +803,7 @@ var brightsyAdapter = {
 };
 
 // src/agents/claude.ts
-import { existsSync as existsSync8 } from "fs";
+import { existsSync as existsSync10 } from "fs";
 
 // src/agents/claude-mcp.ts
 function sanitizeMcpServerName(name) {
@@ -825,6 +825,29 @@ function mcpAllowToolsFromNames(names) {
     [...names].map((name) => name.trim()).filter(Boolean).map((name) => ({ name, connected: true, needsAuth: false }))
   );
 }
+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 existsSync7, readFileSync as readFileSync3 } from "fs";
@@ -844,9 +867,67 @@ import { tmpdir } from "os";
 import { dirname as dirname2, join as join4 } from "path";
 import { fileURLToPath } from "url";
 
+// src/agent-rpc/protocol.ts
+var AGENT_RPC_PROTOCOL_VERSION = 1;
+var AGENT_RPC_TOKEN_QUERY = "authToken";
+var AGENT_RPC_NATIVE_ENV = "SIDEBOARD_AGENT_RPC_NATIVE";
+var AGENT_RPC_URL_ENV = "SIDEBOARD_AGENT_RPC_URL";
+var AGENT_RPC_TOKEN_ENV = "SIDEBOARD_AGENT_RPC_TOKEN";
+var AGENT_RPC_CWD_ENV = "SIDEBOARD_AGENT_RPC_CWD";
+var AGENT_RPC_CLAUDE_SDK_SERVER = "sideboard_rpc";
+
 // 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",
+  "present_plan",
+  "present_schema",
+  "present_files",
+  "wait_for_job",
+  "stop_job",
+  "list_run_scripts",
+  "run_dev_script",
+  "stop_dev_script",
+  "get_run_log",
+  "notify_orchestrator",
+  "get_viewer_context",
+  "update_viewer_context",
+  "list_schedules",
+  "create_schedule",
+  "update_schedule",
+  "delete_schedule",
+  "run_schedule"
+];
 function sideboardMcpProfile(env = process.env) {
   return env[SIDEBOARD_MCP_PROFILE_ENV]?.trim().toLowerCase() === "worktree" ? "worktree" : "orchestration";
 }
@@ -1408,20 +1489,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,
@@ -1526,7 +1597,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);
@@ -1543,6 +1614,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(join4(tmpdir(), "sideboard-mcp-"));
   const cfgPath = join4(dir, "mcp.json");
@@ -2524,34 +2599,166 @@ function permissionMode(thread) {
   };
 }
 
-// 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"
+// src/agent-rpc/metadata.ts
+import { existsSync as existsSync8, readFileSync as readFileSync4, unlinkSync, writeFileSync as writeFileSync4 } from "fs";
+import { join as join7 } from "path";
+function agentRuntimeMetadataPath() {
+  return join7(appDataDir(), "agent-runtime.json");
+}
+function readAgentRuntimeMetadata() {
+  try {
+    const raw = JSON.parse(readFileSync4(agentRuntimeMetadataPath(), "utf8"));
+    if (!raw || typeof raw !== "object") return null;
+    const rec = raw;
+    if (typeof rec.runtimeId !== "string" || !rec.runtimeId.trim()) return null;
+    if (typeof rec.authToken !== "string" || !rec.authToken.trim()) return null;
+    const pid = Number(rec.pid);
+    if (!Number.isInteger(pid) || pid <= 0) return null;
+    const transports = Array.isArray(rec.transports) ? rec.transports : [];
+    const ws = transports.filter((t) => {
+      if (!t || typeof t !== "object") return false;
+      const row = t;
+      return row.kind === "websocket" && typeof row.url === "string" && Boolean(row.url.trim());
+    });
+    return {
+      runtimeId: rec.runtimeId.trim(),
+      pid,
+      protocolVersion: Number(rec.protocolVersion) || AGENT_RPC_PROTOCOL_VERSION,
+      authToken: rec.authToken,
+      startedAt: Number(rec.startedAt) || 0,
+      transports: ws
+    };
+  } catch {
+    return null;
+  }
+}
+function websocketUrlFromMetadata(meta) {
+  const url = meta?.transports.find((t) => t.kind === "websocket")?.url?.trim();
+  return url || null;
+}
+function agentRpcConnectFromMetadata(meta = readAgentRuntimeMetadata()) {
+  if (!agentRuntimeLooksLive(meta)) return null;
+  const url = websocketUrlFromMetadata(meta);
+  const authToken = meta?.authToken;
+  if (!url || !authToken) return null;
+  return { url, authToken };
+}
+function pidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function agentRuntimeLooksLive(meta = readAgentRuntimeMetadata()) {
+  if (!meta) return false;
+  return pidAlive(meta.pid);
+}
+
+// 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 existsSync9 } from "fs";
+import { createRequire as createRequire2 } from "module";
+import { dirname as dirname4, join as join8 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+
+// src/agent-rpc/client.ts
+import { WebSocket } from "ws";
+
+// src/agent-rpc/pilot-tools.ts
+var PILOT_TOOL_NAMES = [
+  "present_artifact",
+  "wait_for_job",
+  "stop_job"
 ];
-var CLAUDE_PRINT_BG_WAIT_CEILING_MS = 72e5;
+var PILOT_TOOL_DESCRIPTIONS = {
+  present_artifact: "Show a document or live log in Sideboard\u2019s side column. For html/svg/markdown/react, pass the FULL document and do not also fence that same body in chat. For type=log, pass only NEW lines (same artifact_id appends). Prefer type=log for long-running job output \u2014 do not resend HTML. type=react is a single default-export component (JSX/TSX); only react/react-dom imports.",
+  wait_for_job: "Wait until a detached long job (tests, pack, deploy, connector CLI) finishes. This call stays open for up to ~2 minutes. stillRunning true means the runtime hit the max hold; call wait_for_job again immediately. If the job is hanging, producing no useful output, or doing the wrong thing, call stop_job instead. Do not end the turn or tell the user you will let them know later.",
+  stop_job: "Stop a detached job you started with detached-job.cjs when it is hanging, producing no useful output, buffering forever, or doing the wrong thing (wrong project, infinite watch, huge dump). Do not stop a pack/test/deploy that is clearly making progress."
+};
+
+// src/agents/claude-host.ts
+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 dirname4(fileURLToPath2(import.meta.url));
+  } catch {
+    try {
+      const req = createRequire2(process.cwd() + "/");
+      return dirname4(req.resolve("@sideboard-ai/core"));
+    } catch {
+      return process.cwd();
+    }
+  }
+}
+function claudeRunnerPath() {
+  const packagedDir = packagedCursorRuntimeDir();
+  if (packagedDir) {
+    const packaged = join8(packagedDir, "core-dist", "agents", "claude-runner.js");
+    if (existsSync9(packaged)) return packaged;
+  }
+  const root = entryDir();
+  const candidates = [
+    join8(root, "agents", "claude-runner.js"),
+    join8(root, "agents", "claude-runner.cjs"),
+    join8(root, "dist", "agents", "claude-runner.js"),
+    join8(root, "dist", "agents", "claude-runner.cjs"),
+    join8(root, "claude-runner.ts"),
+    join8(root, "src", "agents", "claude-runner.ts")
+  ];
+  for (const candidate of candidates) {
+    if (existsSync9(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
 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;
@@ -2589,6 +2796,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() : "";
@@ -2921,7 +3135,7 @@ var claudeAdapter = {
   async detect() {
     const claude = resolveClaudeExecutable();
     if (claude !== "claude") {
-      if (!existsSync8(claude)) {
+      if (!existsSync10(claude)) {
         return {
           agent: "claude",
           installed: false,
@@ -2970,15 +3184,17 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-PHF2MOGW.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-6LDUZ2NF.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();
@@ -3006,6 +3222,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],
@@ -3140,6 +3373,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;
@@ -3210,9 +3445,9 @@ function parseIssuesJson(raw) {
 }
 
 // src/agents/codex.ts
-import { existsSync as existsSync9, readFileSync as readFileSync4, statSync as statSync2 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync5, statSync as statSync2 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join7 } from "path";
+import { join as join9 } from "path";
 var CODEX_PROMPT_ARG_MAX = 2e5;
 var FALLBACK_CODEX_MODELS = [
   { id: "gpt-5.6-sol", displayName: "GPT-5.6 Sol" },
@@ -3232,7 +3467,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 (!existsSync9(codex)) {
+  } else if (!existsSync11(codex)) {
     return FALLBACK_CODEX_MODELS;
   }
   const listed = await run(codex, ["debug", "models"], { reject: false });
@@ -3267,12 +3502,12 @@ function usageFromCodex(usage) {
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
-    join7(homedir4(), ".codex", "config.toml"),
-    join7(homedir4(), ".config", "codex", "config.toml")
+    join9(homedir4(), ".codex", "config.toml"),
+    join9(homedir4(), ".config", "codex", "config.toml")
   ];
   for (const path of candidates) {
-    if (!existsSync9(path)) continue;
-    const text = readFileSync4(path, "utf8");
+    if (!existsSync11(path)) continue;
+    const text = readFileSync5(path, "utf8");
     if (/network_access\s*=\s*true/.test(text)) return true;
   }
   return false;
@@ -3304,8 +3539,8 @@ function asRecord2(value) {
   return void 0;
 }
 function codexLooksAuthenticated() {
-  const authPath = join7(homedir4(), ".codex", "auth.json");
-  if (!existsSync9(authPath)) return false;
+  const authPath = join9(homedir4(), ".codex", "auth.json");
+  if (!existsSync11(authPath)) return false;
   try {
     return statSync2(authPath).size > 2;
   } catch {
@@ -3317,7 +3552,7 @@ var codexAdapter = {
   async detect() {
     const codex = resolveAgentExecutable("codex");
     if (codex !== "codex") {
-      if (!existsSync9(codex)) {
+      if (!existsSync11(codex)) {
         return {
           agent: "codex",
           installed: false,
@@ -3591,40 +3826,40 @@ var codexAdapter = {
 };
 
 // src/agents/cursor.ts
-import { existsSync as existsSync12 } from "fs";
-import { createRequire as createRequire4 } from "module";
-import { dirname as dirname6, join as join10 } from "path";
-import { fileURLToPath as fileURLToPath3 } from "url";
+import { existsSync as existsSync14 } from "fs";
+import { createRequire as createRequire5 } from "module";
+import { dirname as dirname7, join as join12 } from "path";
+import { fileURLToPath as fileURLToPath4 } from "url";
 
 // src/agents/cursor-sdk-resolve.ts
-import { existsSync as existsSync10, readFileSync as readFileSync5 } from "fs";
-import { createRequire as createRequire2 } from "module";
-import { basename, dirname as dirname4, join as join8 } from "path";
-import { fileURLToPath as fileURLToPath2, pathToFileURL } from "url";
+import { existsSync as existsSync12, readFileSync as readFileSync6 } from "fs";
+import { createRequire as createRequire3 } from "module";
+import { basename, dirname as dirname5, join as join10 } from "path";
+import { fileURLToPath as fileURLToPath3, pathToFileURL } from "url";
 var CURSOR_SDK_INSTALL_HINT = "Cursor SDK is not installed. Settings \u2192 Agents \u2192 Cursor \u2192 Install (`npm i -g @cursor/sdk`). Sideboard does not ship the SDK \u2014 update it anytime without a new Sideboard build.";
 function thisModuleFile() {
   const cjsDir = typeof __dirname !== "undefined" ? __dirname : "";
-  if (cjsDir) return join8(cjsDir, "cursor-sdk-resolve.js");
+  if (cjsDir) return join10(cjsDir, "cursor-sdk-resolve.js");
   try {
-    return fileURLToPath2(import.meta.url);
+    return fileURLToPath3(import.meta.url);
   } catch {
-    return join8(process.cwd(), "package.json");
+    return join10(process.cwd(), "package.json");
   }
 }
 function packageRootLooksLikeSdk(dir) {
   try {
-    const raw = readFileSync5(join8(dir, "package.json"), "utf8");
+    const raw = readFileSync6(join10(dir, "package.json"), "utf8");
     const pkg = JSON.parse(raw);
-    return pkg.name === "@cursor/sdk" && existsSync10(dir);
+    return pkg.name === "@cursor/sdk" && existsSync12(dir);
   } catch {
     return false;
   }
 }
 function resolvedPackageRoot(fromFile) {
   try {
-    const req = createRequire2(fromFile);
+    const req = createRequire3(fromFile);
     const pkgJson = req.resolve("@cursor/sdk/package.json");
-    const root = dirname4(pkgJson);
+    const root = dirname5(pkgJson);
     return packageRootLooksLikeSdk(root) ? root : null;
   } catch {
     return null;
@@ -3638,10 +3873,10 @@ function resolveCursorSdkRoot(opts) {
   }
   const globalNm = npmGlobalNodeModules(env);
   if (globalNm) {
-    const globalRoot = join8(globalNm, "@cursor/sdk");
+    const globalRoot = join10(globalNm, "@cursor/sdk");
     if (packageRootLooksLikeSdk(globalRoot)) return globalRoot;
   }
-  const cwdPkg = join8(process.cwd(), "package.json");
+  const cwdPkg = join10(process.cwd(), "package.json");
   return resolvedPackageRoot(thisModuleFile()) ?? resolvedPackageRoot(cwdPkg);
 }
 function isCursorSdkInstalled(opts) {
@@ -3657,13 +3892,13 @@ function exportTarget(value) {
 }
 function cursorSdkEsmEntry(root) {
   try {
-    const pkg = JSON.parse(readFileSync5(join8(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync6(join10(root, "package.json"), "utf8"));
     const exp = pkg.exports;
     const dot = exp && typeof exp === "object" && !Array.isArray(exp) && "." in exp ? exp["."] : exp;
     const rel = exportTarget(dot) ?? (typeof pkg.module === "string" ? pkg.module : null);
     if (!rel) return null;
-    const entry = join8(root, rel);
-    return existsSync10(entry) ? entry : null;
+    const entry = join10(root, rel);
+    return existsSync12(entry) ? entry : null;
   } catch {
     return null;
   }
@@ -3679,7 +3914,7 @@ async function importCursorSdk(opts) {
   try {
     let entry = cursorSdkEsmEntry(root);
     if (!entry) {
-      const req = createRequire2(join8(root, "package.json"));
+      const req = createRequire3(join10(root, "package.json"));
       entry = req.resolve("@cursor/sdk");
     }
     return unwrapCursorSdkModule(await import(pathToFileURL(entry).href));
@@ -3691,8 +3926,8 @@ function cursorSdkPlatformRipgrepPackage() {
   return `@cursor/sdk-${process.platform}-${process.arch}`;
 }
 function nodeModulesDirForPackageRoot(packageRoot) {
-  const parent = dirname4(packageRoot);
-  return basename(parent).startsWith("@") ? dirname4(parent) : parent;
+  const parent = dirname5(packageRoot);
+  return basename(parent).startsWith("@") ? dirname5(parent) : parent;
 }
 function cursorSdkRipgrepCandidate(opts) {
   const root = resolveCursorSdkRoot(opts);
@@ -3700,10 +3935,10 @@ function cursorSdkRipgrepCandidate(opts) {
   const nm = nodeModulesDirForPackageRoot(root);
   const pkg = cursorSdkPlatformRipgrepPackage();
   const bin = process.platform === "win32" ? "rg.exe" : "rg";
-  const sibling = join8(nm, pkg, "bin", bin);
-  if (existsSync10(sibling)) return sibling;
-  const nested = join8(root, "node_modules", pkg, "bin", bin);
-  return existsSync10(nested) ? nested : null;
+  const sibling = join10(nm, pkg, "bin", bin);
+  if (existsSync12(sibling)) return sibling;
+  const nested = join10(root, "node_modules", pkg, "bin", bin);
+  return existsSync12(nested) ? nested : null;
 }
 
 // src/agents/cursor-events.ts
@@ -3918,9 +4153,9 @@ function parseCursorRunnerLine(line) {
 }
 
 // src/agents/cursor-ripgrep.ts
-import { existsSync as existsSync11 } from "fs";
-import { createRequire as createRequire3 } from "module";
-import { dirname as dirname5, isAbsolute, join as join9, parse, resolve as resolvePath } from "path";
+import { existsSync as existsSync13 } from "fs";
+import { createRequire as createRequire4 } from "module";
+import { dirname as dirname6, isAbsolute, join as join11, parse, resolve as resolvePath } from "path";
 var RIPGREP_ENV = "CURSOR_RIPGREP_PATH";
 function rgBinaryName() {
   return process.platform === "win32" ? "rg.exe" : "rg";
@@ -3932,19 +4167,19 @@ function usableRipgrepPath(candidate) {
   const raw = candidate?.trim();
   if (!raw || !isAbsolute(raw)) return null;
   const readable = nodeReadableScriptPath(raw);
-  if (!existsSync11(readable) || isAsarPath(readable)) return null;
+  if (!existsSync13(readable) || isAsarPath(readable)) return null;
   return readable;
 }
 function walkForBundledRipgrep(startFile) {
   if (!startFile) return null;
   const pkg = platformRipgrepPackage();
   const name = rgBinaryName();
-  let dir = dirname5(resolvePath(startFile));
+  let dir = dirname6(resolvePath(startFile));
   const root = parse(dir).root;
   while (dir !== root) {
-    const hit = usableRipgrepPath(join9(dir, "node_modules", pkg, "bin", name));
+    const hit = usableRipgrepPath(join11(dir, "node_modules", pkg, "bin", name));
     if (hit) return hit;
-    const next = dirname5(dir);
+    const next = dirname6(dir);
     if (next === dir) break;
     dir = next;
   }
@@ -3952,9 +4187,9 @@ function walkForBundledRipgrep(startFile) {
 }
 function requireResolveBundledRipgrep(fromFile) {
   try {
-    const req = createRequire3(fromFile);
+    const req = createRequire4(fromFile);
     const pkgJson = req.resolve(`${platformRipgrepPackage()}/package.json`);
-    return usableRipgrepPath(join9(dirname5(pkgJson), "bin", rgBinaryName()));
+    return usableRipgrepPath(join11(dirname6(pkgJson), "bin", rgBinaryName()));
   } catch {
     return null;
   }
@@ -4024,15 +4259,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 dirname6(fileURLToPath3(import.meta.url));
+    return dirname7(fileURLToPath4(import.meta.url));
   } catch {
     try {
-      const req = createRequire4(process.cwd() + "/");
-      return dirname6(req.resolve("@sideboard-ai/core"));
+      const req = createRequire5(process.cwd() + "/");
+      return dirname7(req.resolve("@sideboard-ai/core"));
     } catch {
       return process.cwd();
     }
@@ -4041,19 +4276,19 @@ function entryDir() {
 function cursorRunnerPath() {
   const packaged = packagedCursorRunnerPath();
   if (packaged) return packaged;
-  const root = entryDir();
+  const root = entryDir2();
   const candidates = [
-    join10(root, "agents", "cursor-runner.js"),
-    join10(root, "agents", "cursor-runner.cjs"),
+    join12(root, "agents", "cursor-runner.js"),
+    join12(root, "agents", "cursor-runner.cjs"),
     // If somehow resolved from package root instead of dist/
-    join10(root, "dist", "agents", "cursor-runner.js"),
-    join10(root, "dist", "agents", "cursor-runner.cjs"),
+    join12(root, "dist", "agents", "cursor-runner.js"),
+    join12(root, "dist", "agents", "cursor-runner.cjs"),
     // Source tree (dev): packages/core/src/agents/cursor-runner.ts
-    join10(root, "cursor-runner.ts"),
-    join10(root, "src", "agents", "cursor-runner.ts")
+    join12(root, "cursor-runner.ts"),
+    join12(root, "src", "agents", "cursor-runner.ts")
   ];
   for (const candidate of candidates) {
-    if (existsSync12(candidate)) return candidate;
+    if (existsSync14(candidate)) return candidate;
   }
   return candidates[0];
 }
@@ -4094,13 +4329,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 = {
@@ -4114,6 +4351,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();
@@ -4152,7 +4391,155 @@ var cursorAdapter = {
 };
 
 // src/agents/opencode.ts
-import { existsSync as existsSync13 } from "fs";
+import { existsSync as existsSync15 } from "fs";
+
+// src/agent-rpc/opencode-hook.ts
+import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync5 } from "fs";
+import { join as join13 } 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 = join13(appDataDir(), "agent-rpc", "opencode");
+  const pluginDir = join13(configDir, "plugins");
+  mkdirSync3(pluginDir, { recursive: true });
+  const pluginFile = join13(pluginDir, "sideboard-rpc.js");
+  writeFileSync5(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" },
   {
@@ -4211,7 +4598,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 (!existsSync13(opencode)) {
+  } else if (!existsSync15(opencode)) {
     return FALLBACK_OPENCODE_MODELS;
   }
   const listed = await run(opencode, ["models"], { reject: false });
@@ -4246,7 +4633,7 @@ var opencodeAdapter = {
   async detect() {
     const opencode = resolveAgentExecutable("opencode");
     if (opencode !== "opencode") {
-      if (!existsSync13(opencode)) {
+      if (!existsSync15(opencode)) {
         return {
           agent: "opencode",
           installed: false,
@@ -4300,20 +4687,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,
@@ -4323,7 +4697,7 @@ var opencodeAdapter = {
       stdin: prompt,
       env: {
         OPENCODE_PERMISSION: mode.opencodePermission,
-        ...mcpContent ? { OPENCODE_CONFIG_CONTENT: mcpContent } : {}
+        ...hostEnv
       }
     };
   },
@@ -4924,9 +5298,9 @@ function formatClaudeUsageOverLimitWait(windows, now = /* @__PURE__ */ new Date(
 }
 
 // src/agents/claude-usage-client.ts
-import { existsSync as existsSync14, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync16, readFileSync as readFileSync7 } from "fs";
 import { homedir as homedir5 } from "os";
-import { join as join11 } from "path";
+import { join as join14 } 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;
@@ -4966,14 +5340,14 @@ function accessTokenFromCredentialsJson(raw) {
   }
 }
 function claudeCredentialsPath(configDir) {
-  const root = configDir?.trim() || process.env.CLAUDE_CONFIG_DIR?.trim() || join11(homedir5(), ".claude");
-  return join11(root, ".credentials.json");
+  const root = configDir?.trim() || process.env.CLAUDE_CONFIG_DIR?.trim() || join14(homedir5(), ".claude");
+  return join14(root, ".credentials.json");
 }
 async function readFileAccessToken(configDir) {
   const path = claudeCredentialsPath(configDir);
-  if (!existsSync14(path)) return null;
+  if (!existsSync16(path)) return null;
   try {
-    return accessTokenFromCredentialsJson(readFileSync6(path, "utf8"));
+    return accessTokenFromCredentialsJson(readFileSync7(path, "utf8"));
   } catch {
     return null;
   }
@@ -5086,7 +5460,7 @@ async function getClaudePlanUsage(opts = {}) {
 }
 
 // src/agents/install.ts
-import { existsSync as existsSync15 } from "fs";
+import { existsSync as existsSync17 } from "fs";
 var SETUP = {
   claude: {
     agent: "claude",
@@ -5267,7 +5641,7 @@ async function installNpmGlobalPackage(opts) {
 async function resolveExistingCli(agent) {
   if (agent === "cursor") return null;
   const exe = resolveAgentExecutable(agent);
-  if ((exe.includes("/") || exe.includes("\\")) && existsSync15(exe)) return exe;
+  if ((exe.includes("/") || exe.includes("\\")) && existsSync17(exe)) return exe;
   enrichPathWithNpmGlobalBin();
   return whichOnPath(CLI_BIN[agent]);
 }
@@ -5341,7 +5715,7 @@ async function loginAgent(agent) {
   };
 }
 async function loginManagedAccount(accountId) {
-  const { loadAppSettings: loadAppSettings2 } = await import("./app-settings-OM7H64YM.js");
+  const { loadAppSettings: loadAppSettings2 } = await import("./app-settings-MVZPM6WW.js");
   const { loginEnvPrefix } = await import("./managed-accounts-4BLTJKAN.js");
   const account = loadAppSettings2().accounts.accounts.find((a) => a.id === accountId);
   if (!account) {
@@ -5395,16 +5769,6 @@ export {
   shouldFeedErrorBackToAgent,
   formatAgentErrorContinuePrompt,
   formatTurnExitError,
-  encodeBrightsyTarget,
-  decodeBrightsyTarget,
-  parseBrightsyCliLine,
-  adjustBrightsyTurnExit,
-  listBrightsyChatTargets,
-  brightsyAdapter,
-  SIDEBOARD_THREAD_ID_ENV,
-  sideboardMcpProfile,
-  packagedMcpDir,
-  applyAgentRunnerHeapEnv,
   toolDescription,
   isInternalAgentStatusText,
   isPollWrapperToolName,
@@ -5418,6 +5782,18 @@ export {
   isBrightsyNdjsonLine,
   finalizeParts,
   normalizeParseResult,
+  encodeBrightsyTarget,
+  decodeBrightsyTarget,
+  parseBrightsyCliLine,
+  adjustBrightsyTurnExit,
+  listBrightsyChatTargets,
+  brightsyAdapter,
+  SIDEBOARD_THREAD_ID_ENV,
+  shouldRegisterMcpWaitForTurn,
+  worktreeMcpToolNames,
+  sideboardMcpProfile,
+  packagedMcpDir,
+  applyAgentRunnerHeapEnv,
   PLAN_MODE_INSTRUCTION,
   PLAN_MODE_OFF_INSTRUCTION,
   planModeTurnInstruction,