@sideboard-ai/core 0.1.57 → 0.1.60

package/dist/index.cjs

@@ -712,9 +712,14 @@ function resolveThreadDefaults(settings = loadAppSettings()) {
 function resolveNewThreadOptions(overrides = {}, settings = loadAppSettings()) {
   const defaults = resolveThreadDefaults(settings);
   const effort = overrides.effort === void 0 || overrides.effort === null ? defaults.effort : normalizeThinkingEffort(overrides.effort) ?? defaults.effort;
+  const agent = overrides.agent ?? defaults.agent;
+  let model = overrides.model === void 0 ? defaults.model : overrides.model?.trim() || null;
+  if (model && agent !== "cursor" && /^(default|auto)$/i.test(model.trim())) {
+    model = null;
+  }
   return {
-    agent: overrides.agent ?? defaults.agent,
-    model: overrides.model === void 0 ? defaults.model : overrides.model?.trim() || null,
+    agent,
+    model,
     effort,
     fast: overrides.fast === void 0 || overrides.fast === null ? defaults.fast : Boolean(overrides.fast)
   };
@@ -2073,7 +2078,8 @@ async function run(file, args, opts) {
     const result = await (0, import_execa.execa)(file, args, {
       cwd: opts?.cwd,
       env: { ...process.env, ...opts?.env },
-      reject: opts?.reject ?? true
+      reject: opts?.reject ?? true,
+      ...opts?.timeoutMs != null ? { timeout: opts.timeoutMs } : {}
     });
     return {
       stdout: result.stdout ?? "",
@@ -2103,11 +2109,22 @@ async function git(args, cwd, opts) {
   return run("git", [...prefix, ...args], {
     cwd,
     reject: opts?.reject,
-    env: opts?.env
+    timeoutMs: opts?.timeoutMs,
+    // Never block forever on a credential/SSH prompt inside MCP / Electron.
+    env: {
+      GIT_TERMINAL_PROMPT: "0",
+      GIT_ASKPASS: process.env.GIT_ASKPASS || "echo",
+      GIT_SSH_COMMAND: process.env.GIT_SSH_COMMAND || "ssh -o BatchMode=yes -o ConnectTimeout=15",
+      ...opts?.env
+    }
   });
 }
 async function gh(args, cwd, opts) {
-  return run("gh", args, { cwd, reject: opts?.reject });
+  return run("gh", args, {
+    cwd,
+    reject: opts?.reject,
+    timeoutMs: opts?.timeoutMs
+  });
 }
 async function resolveGhAuthToken(cwd) {
   const result = await gh(["auth", "token"], cwd, { reject: false });
@@ -2576,12 +2593,16 @@ async function ensureGhPreferOrigin(cwd) {
   const hasAlt = Boolean(await slugFromGitRemote(cwd, "upstream")) || Boolean(await slugFromGitRemote(cwd, "github"));
   if (!hasAlt) return;
   const view = await gh(["repo", "set-default", "--view"], cwd, {
-    reject: false
+    reject: false,
+    timeoutMs: 15e3
   });
   const current = `${view.stdout}
 ${view.stderr}`;
   if (view.exitCode === 0 && current.includes(originSlug)) return;
-  await gh(["repo", "set-default", "origin"], cwd, { reject: false });
+  await gh(["repo", "set-default", "origin"], cwd, {
+    reject: false,
+    timeoutMs: 15e3
+  });
 }
 async function originGhRepoEnv(cwd) {
   await ensureGhPreferOrigin(cwd);
@@ -3127,20 +3148,42 @@ async function createThreadWorktree(opts) {
     throw new Error(`Worktree already exists at ${worktreePath}`);
   }
   await ensureGhPreferOrigin(opts.repoPath);
-  await git(["fetch", "origin", "--prune"], opts.repoPath, { reject: false });
-  if (!isLocalPrFetchBranch(opts.sourceRef) && !opts.sourceRef.startsWith("origin/") && !opts.sourceRef.startsWith("refs/")) {
-    await git(["fetch", "origin", opts.sourceRef], opts.repoPath, {
-      reject: false
+  let startPoint = null;
+  try {
+    startPoint = await resolveWorktreeStartPoint(opts.repoPath, opts.sourceRef);
+  } catch {
+    startPoint = null;
+  }
+  if (!isLocalPrFetchBranch(opts.sourceRef)) {
+    const fetchTimeoutMs = startPoint ? 12e3 : 45e3;
+    await git(["fetch", "origin", "--prune"], opts.repoPath, {
+      reject: false,
+      timeoutMs: fetchTimeoutMs
     });
+    if (!opts.sourceRef.startsWith("origin/") && !opts.sourceRef.startsWith("refs/")) {
+      await git(["fetch", "origin", opts.sourceRef], opts.repoPath, {
+        reject: false,
+        timeoutMs: fetchTimeoutMs
+      });
+    }
+    try {
+      startPoint = await resolveWorktreeStartPoint(
+        opts.repoPath,
+        opts.sourceRef
+      );
+    } catch (err) {
+      if (!startPoint) throw err;
+    }
+  }
+  if (!startPoint) {
+    throw new Error(
+      `Invalid git reference: ${opts.sourceRef} (and fetch did not resolve it)`
+    );
   }
-  const startPoint = await resolveWorktreeStartPoint(
-    opts.repoPath,
-    opts.sourceRef
-  );
   const add = await git(
     ["worktree", "add", "-b", branchName, worktreePath, startPoint],
     opts.repoPath,
-    { reject: false }
+    { reject: false, timeoutMs: 6e4 }
   );
   if (add.exitCode !== 0) {
     const err = `${add.stderr}
@@ -3151,7 +3194,7 @@ ${add.stdout}`;
         const retry = await git(
           ["worktree", "add", "-b", alt, worktreePath, startPoint],
           opts.repoPath,
-          { reject: false }
+          { reject: false, timeoutMs: 6e4 }
         );
         if (retry.exitCode === 0) {
           branchName = alt;
@@ -3540,7 +3583,9 @@ function coordinatorTurnReminder(opts) {
     "- You oversee Sideboard worktree agents. You are not yourself checked out in a project worktree.",
     "- This cwd is a synthetic empty home (not a git repo). Emptiness here is expected \u2014 it is not a problem to fix.",
     "- Registered workspaces / child threads are the fleet you manage via Sideboard MCP.",
-    `- Parent thread id (pass as parentThreadId when creating children): ${opts.parentId}`,
+    `- YOUR orchestration thread id is ${opts.parentId}`,
+    `- Always pass parentThreadId="${opts.parentId}" on create_thread (never invent or reuse another uuid).`,
+    `- Or omit parentThreadId \u2014 Sideboard MCP already binds children to ${opts.parentId}.`,
     goal ? `- Goal / title: ${goal}` : null,
     accountDefaultsPlaybookLine(),
     `- For "what's going on": call list_threads (and list_workspaces if needed). Summarize fleet status \u2014 do not ls/git-status this synthetic home.`,
@@ -3549,10 +3594,33 @@ function coordinatorTurnReminder(opts) {
     "- When naming threads for the user, link them as `[Title](sideboard://thread/<id>)`."
   ].filter(Boolean).join("\n");
 }
-function ensureGlobalCoordinatorCwd() {
+function ensureGlobalCoordinatorCwd(opts) {
   const dir = globalAgentCwd();
-  (0, import_node_fs6.mkdirSync)(dir, { recursive: true });
+  try {
+    (0, import_node_fs6.mkdirSync)(dir, { recursive: true });
+  } catch {
+    return dir;
+  }
   const reposDir = sideboardReposDir();
+  let orchId = opts?.orchestratorThreadId?.trim() || "";
+  if (!orchId) {
+    try {
+      const existing = (0, import_node_fs6.readFileSync)((0, import_node_path7.join)(dir, "AGENTS.md"), "utf8");
+      const m = existing.match(
+        /YOUR orchestration thread id is `([0-9a-f-]{36})`/i
+      );
+      if (m?.[1]) orchId = m[1];
+    } catch {
+    }
+  }
+  const parentBlock = orchId ? [
+    "",
+    `## This chat's id`,
+    "",
+    `YOUR orchestration thread id is \`${orchId}\`.`,
+    `On every create_thread, pass parentThreadId="${orchId}" \u2014 or omit parentThreadId (Sideboard binds it automatically).`,
+    "Never invent a uuid and never reuse an id from an earlier conversation."
+  ] : [];
   const body = [
     "# Sideboard Orchestration",
     "",
@@ -3562,6 +3630,7 @@ function ensureGlobalCoordinatorCwd() {
     "Repos from `list_workspaces` and threads from `list_threads` are the fleet you orchestrate.",
     'For status questions ("what\'s going on?"), use `list_threads` / `list_workspaces` \u2014 never diagnose this synthetic home as a broken worktree.',
     "Bash is fine for inspecting **child worktree** / registered-repo paths, and for greenfield repo setup under the Sideboard repos directory \u2014 not for treating this home as the project.",
+    ...parentBlock,
     "",
     COORDINATOR_TOOL_PLAYBOOK,
     "",
@@ -3569,16 +3638,21 @@ function ensureGlobalCoordinatorCwd() {
     "",
     coordinatorGreenfieldPlaybook(reposDir),
     "",
-    "When creating threads, pass `repoPath` from `list_workspaces` (or the path you just registered) and `parentThreadId` for children.",
+    "When creating threads, pass `repoPath` from `list_workspaces` (or the path you just registered).",
+    orchId ? `Pass parentThreadId="${orchId}" (or omit it). Never invent another parentThreadId.` : "Pass `parentThreadId` for children (this chat's id from the turn reminder).",
     "Omit `agent` / `model` on `create_thread` unless you have a reason to override Account defaults.",
+    "Never pass `agent=codex` when you yourself are Codex \u2014 nested Codex deadlocks on shared ~/.codex locks. Omit agent (Account default) or use cursor/claude.",
     "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn.",
     "Typical flow (new app): Bash create/clone under repos dir \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 draft PR via worktree agent.",
     "Always ask worktree agents to open draft PRs (`send_to_thread` + `gh pr create --draft -R <origin>`); never open PRs from the orchestrator."
   ].join("\n");
-  (0, import_node_fs6.writeFileSync)((0, import_node_path7.join)(dir, "CLAUDE.md"), `${body}
+  try {
+    (0, import_node_fs6.writeFileSync)((0, import_node_path7.join)(dir, "CLAUDE.md"), `${body}
 `, "utf8");
-  (0, import_node_fs6.writeFileSync)((0, import_node_path7.join)(dir, "AGENTS.md"), `${body}
+    (0, import_node_fs6.writeFileSync)((0, import_node_path7.join)(dir, "AGENTS.md"), `${body}
 `, "utf8");
+  } catch {
+  }
   return dir;
 }
 function coordinatorSystemPrompt(opts) {
@@ -3598,12 +3672,12 @@ function coordinatorSystemPrompt(opts) {
     COORDINATOR_TOOL_PLAYBOOK,
     accountDefaultsPlaybookLine(),
     coordinatorGreenfieldPlaybook(reposDir),
-    "When creating threads, pass the correct repoPath for the target workspace and parentThreadId for children.",
+    "When creating threads, pass the correct repoPath for the target workspace.",
+    `YOUR orchestration thread id is ${opts.parentId} \u2014 pass parentThreadId="${opts.parentId}" on create_thread, or omit parentThreadId (Sideboard binds it). Never invent a uuid.`,
     "Omit agent/model on create_thread unless you need to override Account defaults.",
     "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 send_to_thread (ask for `gh pr create --draft -R <origin-owner/name>` using the workspace github slug) \u2192 wait_for_turn. Never target upstream. Never open PRs from the orchestrator.",
     "Typical flow (new app): Bash under repos dir (clone or gh repo create) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 draft PR via worktree agent.",
     `Goal: ${opts.goal}`,
-    `Parent thread id (pass as parentThreadId when creating children): ${opts.parentId}`,
     "Registered workspaces:",
     formatWorkspaceInventory(opts.workspaces)
   ].join("\n");
@@ -3629,7 +3703,7 @@ var init_coordinator_prompt = __esm({
       "Workspaces:",
       "- add_workspace / remove_workspace \u2014 register or unregister a git repo",
       "Worktree threads (chats):",
-      "- create_thread \u2014 create a worktree + chat from branch | pr | ticket; pass repoPath + parentThreadId; omit agent and model to use Sideboard Account defaults (Settings \u2192 Default agent, model & effort)",
+      "- create_thread \u2014 create a worktree + chat from branch | pr | ticket; pass repoPath + parentThreadId; omit agent and model to use Sideboard Account defaults (Settings \u2192 Default agent, model & effort). If you are Codex, do not set agent=codex (nested Codex deadlocks)",
       "- fork_worktree \u2014 fork a worktree chat into a NEW git worktree + chat (transcript attached); optional agent; leave model unset (Auto) unless you have a reason. Not for orchestration chats.",
       "- fork_chat \u2014 fork a worktree chat (same worktree tab) OR a Global orchestration chat (new orchestration tab); optional agent; leave model unset (Auto) unless you have a reason. Remote coordinators: use this to continue another orchestration chat on a different agent after session limits.",
       "- send_to_thread \u2014 queue a prompt (start/continue a chat turn); pass force_stop: true to interrupt mid-turn / clear stale queued prompts before replacing with a new request",
@@ -3641,7 +3715,7 @@ var init_coordinator_prompt = __esm({
       "- list_run_scripts / run_dev_script / stop_dev_script \u2014 start/stop named run scripts",
       "Inspect / review / PRs:",
       "- get_diff \u2014 compact diff summary",
-      '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .sideboard/review.md when present, else local guidelines; sends "Review."); then wait_for_turn / get_turn_result on the returned id',
+      '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .sideboard/review.md when present, else local guidelines; sends "Review changes in this workspace."); then wait_for_turn / get_turn_result on the returned id',
       "- Ask the worktree agent via send_to_thread to open a draft PR with `gh pr create --draft -R <origin-owner/name>` (workspace `github:` slug / that worktree's origin \u2014 never upstream). Do not open PRs from the orchestrator yourself.",
       "Human-only (do not attempt): merge, ready-for-review land, purge_thread.",
       "Thread links in replies: when mentioning a chat/thread for the user, include a markdown link `[Title](sideboard://thread/<id>)` using the full id (or the link field from create_thread / list_threads). Sideboard renders these as clickable opens.",
@@ -4965,7 +5039,16 @@ async function resolveSideboardMcpServer() {
 async function buildInjectedMcpServers(opts) {
   const servers = [];
   if (opts.includeSideboard) {
-    servers.push(await resolveSideboardMcpServer());
+    const sideboard = await resolveSideboardMcpServer();
+    sideboard.env = {
+      ...sideboard.env ?? {},
+      SIDEBOARD_APP_DATA: appDataDir()
+    };
+    const orchId = opts.orchestratorThreadId?.trim();
+    if (orchId) {
+      sideboard.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID = orchId;
+    }
+    servers.push(sideboard);
   }
   if (opts.includeBrightsy && isBrightsyConnected()) {
     const cmd = await resolveBrightsyMcpCommand();
@@ -5009,6 +5092,8 @@ function toCodexMcpConfigArgs(servers) {
       }
     }
     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 args;
 }
@@ -5054,6 +5139,7 @@ var init_injected_mcp = __esm({
     init_run();
     init_config();
     init_connected_teams();
+    init_paths();
     init_node_launch();
     import_meta = {};
     SIDEBOARD_MCP_ALLOWED_TOOLS = [
@@ -5077,6 +5163,16 @@ var init_injected_mcp = __esm({
 
 // src/agents/types.ts
 function permissionMode(thread) {
+  if (thread.sourceType === "orchestration") {
+    return {
+      claude: "acceptEdits",
+      opencodePermission: JSON.stringify({
+        edit: "allow",
+        bash: { "*": "allow", "rm -rf *": "deny" }
+      }),
+      codexSandbox: "danger-full-access"
+    };
+  }
   if (thread.planMode) {
     return {
       claude: "plan",
@@ -5272,18 +5368,17 @@ var init_claude = __esm({
             };
           }
         }
-        const auth = await run(claude, ["auth", "status"], { reject: false });
+        const auth = await run(claude, ["auth", "status"], {
+          reject: false,
+          timeoutMs: 5e3
+        });
         const authenticated = auth.exitCode === 0;
-        const servers = await loadMcpServers();
-        const linearMcp = servers.some(
-          (s) => s.connected && /linear/i.test(s.name)
-        );
         return {
           agent: "claude",
           installed: true,
           authenticated,
-          linearMcp,
-          warnings: mcpAuthWarnings(servers),
+          linearMcp: false,
+          warnings: [],
           reason: authenticated ? void 0 : "claude auth status failed \u2014 run `claude auth login`"
         };
       },
@@ -5304,7 +5399,8 @@ var init_claude = __esm({
         const isOrchestrator = isOrchestratorThread2(thread);
         const injectedServers = await buildInjectedMcpServers({
           includeSideboard: true,
-          includeBrightsy: isBrightsyConnected()
+          includeBrightsy: isBrightsyConnected(),
+          orchestratorThreadId: isOrchestrator ? thread.id : null
         });
         const injectedBrightsyNames = injectedServers.filter((s) => s.name === "brightsy" || s.name.startsWith("brightsy_")).map((s) => s.name);
         const chromeOn = claudeChromeEnabled();
@@ -5550,6 +5646,15 @@ function asRecord(value) {
   }
   return void 0;
 }
+function codexLooksAuthenticated() {
+  const authPath = (0, import_node_path12.join)((0, import_node_os7.homedir)(), ".codex", "auth.json");
+  if (!(0, import_node_fs12.existsSync)(authPath)) return false;
+  try {
+    return (0, import_node_fs12.statSync)(authPath).size > 2;
+  } catch {
+    return false;
+  }
+}
 var import_node_fs12, import_node_os7, import_node_path12, CODEX_PROMPT_ARG_MAX, FALLBACK_CODEX_MODELS, cachedCodexModels, CODEX_MODEL_CACHE_MS, codexAdapter;
 var init_codex = __esm({
   "src/agents/codex.ts"() {
@@ -5575,7 +5680,7 @@ var init_codex = __esm({
     codexAdapter = {
       kind: "codex",
       async detect() {
-        const which = await run("which", ["codex"], { reject: false });
+        const which = await run("which", ["codex"], { reject: false, timeoutMs: 3e3 });
         if (which.exitCode !== 0) {
           return {
             agent: "codex",
@@ -5586,10 +5691,8 @@ var init_codex = __esm({
             reason: "codex CLI not found on PATH"
           };
         }
-        const auth = await run("codex", ["login", "status"], { reject: false });
-        const authenticated = auth.exitCode === 0;
-        const mcp = await run("codex", ["mcp", "list", "--json"], { reject: false });
-        const linearMcp = /linear/i.test(mcp.stdout + mcp.stderr);
+        const authenticated = codexLooksAuthenticated();
+        const linearMcp = false;
         const warnings = [];
         if (!codexConfigHasNetworkAccess()) {
           warnings.push(
@@ -5602,7 +5705,7 @@ var init_codex = __esm({
           authenticated,
           linearMcp,
           warnings,
-          reason: authenticated ? void 0 : "codex login status failed \u2014 run `codex login`"
+          reason: authenticated ? void 0 : "Codex auth not found \u2014 run `codex login` (expected ~/.codex/auth.json)"
         };
       },
       async buildTurn(thread, input) {
@@ -5620,23 +5723,26 @@ var init_codex = __esm({
         const model = thread.model?.trim();
         const injected = await buildInjectedMcpServers({
           includeSideboard: true,
-          includeBrightsy: isBrightsyConnected()
+          includeBrightsy: isBrightsyConnected(),
+          orchestratorThreadId: thread.sourceType === "orchestration" ? thread.id : null
         });
         const mcpOverrides = toCodexMcpConfigArgs(injected);
-        const args = [
-          "exec",
-          ...sessionId ? ["resume", sessionId] : [],
-          promptArg,
+        const execOpts = [
+          // Global orchestration cwd is not a git repo; without this Codex ≥0.147
+          // refuses to start ("Not inside a trusted directory").
+          "--skip-git-repo-check",
           "--cd",
           thread.worktreePath,
           "--json",
           "--sandbox",
           mode.codexSandbox,
-          "--ask-for-approval",
-          "never",
+          // `codex exec` rejects `--ask-for-approval` (global-only on newer CLIs).
+          "-c",
+          'approval_policy="never"',
           ...model ? ["--model", model] : [],
           ...mcpOverrides
         ];
+        const args = sessionId ? ["exec", ...execOpts, "resume", sessionId, promptArg] : ["exec", ...execOpts, promptArg];
         return {
           file: "codex",
           args,
@@ -5738,7 +5844,7 @@ var init_codex = __esm({
         if (sessionId) {
           return {
             file: "codex",
-            args: ["exec", "resume", sessionId, "--cd", thread.worktreePath],
+            args: ["exec", "--cd", thread.worktreePath, "resume", sessionId],
             cwd: thread.worktreePath
           };
         }
@@ -5754,12 +5860,12 @@ var init_codex = __esm({
           "codex",
           [
             "exec",
-            prompt,
             "--json",
             "--sandbox",
             "read-only",
-            "--ask-for-approval",
-            "never"
+            "-c",
+            'approval_policy="never"',
+            prompt
           ],
           { reject: false }
         );
@@ -6056,26 +6162,13 @@ var init_cursor = __esm({
             reason: "CURSOR_API_KEY not set \u2014 add it in Settings \u2192 Agents \u2192 Cursor, or Settings \u2192 Environment"
           };
         }
-        try {
-          await import_sdk.Cursor.models.list({ apiKey });
-          return {
-            agent: "cursor",
-            installed: true,
-            authenticated: true,
-            linearMcp: false,
-            warnings: []
-          };
-        } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
-          return {
-            agent: "cursor",
-            installed: true,
-            authenticated: false,
-            linearMcp: false,
-            warnings: [],
-            reason: `Cursor API auth failed: ${message}`
-          };
-        }
+        return {
+          agent: "cursor",
+          installed: true,
+          authenticated: true,
+          linearMcp: false,
+          warnings: []
+        };
       },
       async buildTurn(thread, input) {
         const prompt = flattenTurnInput(input);
@@ -6083,7 +6176,8 @@ var init_cursor = __esm({
         const apiKey = resolveCursorApiKey() || void 0;
         const injected = await buildInjectedMcpServers({
           includeSideboard: true,
-          includeBrightsy: isBrightsyConnected()
+          includeBrightsy: isBrightsyConnected(),
+          orchestratorThreadId: thread.sourceType === "orchestration" ? thread.id : null
         });
         const mcpServers = toCursorMcpServers(injected);
         const req = {
@@ -6252,7 +6346,8 @@ var init_opencode = __esm({
         }
         const injected = await buildInjectedMcpServers({
           includeSideboard: true,
-          includeBrightsy: isBrightsyConnected()
+          includeBrightsy: isBrightsyConnected(),
+          orchestratorThreadId: thread.sourceType === "orchestration" ? thread.id : null
         });
         const mcpContent = injected.length > 0 ? toOpencodeMcpConfigContent(injected) : null;
         return {
@@ -7886,7 +7981,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
   const { isGlobalThread: isGlobalThread2 } = await Promise.resolve().then(() => (init_global_workspace(), global_workspace_exports));
   if (isGlobalThread2(thread)) {
     const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await Promise.resolve().then(() => (init_coordinator_prompt(), coordinator_prompt_exports));
-    ensureGlobalCoordinatorCwd2();
+    ensureGlobalCoordinatorCwd2(
+      isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
+    );
   }
   if (isOrchestratorThread(thread)) {
     assertOrchestratorCapableAgent(thread.agent);
@@ -8180,9 +8277,21 @@ async function detectAgents() {
   ensureAgentPath();
   return Promise.all(allAdapters().map((a) => a.detect()));
 }
+var REQUIRE_AGENT_TIMEOUT_MS = 8e3;
 async function requireAgent(agent, opts) {
-  const status = (await detectAgents()).find((s) => s.agent === agent);
-  if (!status) throw new Error(`Unknown agent: ${agent}`);
+  ensureAgentPath();
+  const status = await Promise.race([
+    getAdapter(agent).detect(),
+    new Promise((_, reject) => {
+      setTimeout(() => {
+        reject(
+          new Error(
+            `${agent} detect timed out after ${REQUIRE_AGENT_TIMEOUT_MS / 1e3}s`
+          )
+        );
+      }, REQUIRE_AGENT_TIMEOUT_MS);
+    })
+  ]);
   if (!status.installed || !status.authenticated) {
     throw new Error(status.reason ?? `${agent} is not available`);
   }
@@ -11290,7 +11399,7 @@ var REPO_REVIEW_NAME = "review.md";
 var REVIEW_REQUEST_PATH = `${ATTACHMENTS_DIR}/Review request.md`;
 var LEGACY_REVIEW_REQUEST_PATH = `${LEGACY_ATTACHMENTS_DIR}/Review request.md`;
 var REVIEW_REQUEST_NAME = "Review request.md";
-var REVIEW_REQUEST_PREFILL = "Review.";
+var REVIEW_REQUEST_PREFILL = "Review changes in this workspace.";
 var LEGACY_REVIEW_TEMPLATE_MARKERS = [
   "You are acting as a reviewer for a proposed code change made by another engineer.",
   "HOW MANY FINDINGS TO RETURN:"
@@ -12121,7 +12230,9 @@ var Orchestrator = class {
     }
     let coordinatorDirective = null;
     if (isOrchestration) {
-      if (isGlobalThread(fresh)) ensureGlobalCoordinatorCwd();
+      if (isGlobalThread(fresh)) {
+        ensureGlobalCoordinatorCwd({ orchestratorThreadId: fresh.id });
+      }
       if (!fresh.sessionId) {
         const inventory = await enrichWorkspacesWithGithub(this.listWorkspaces());
         coordinatorDirective = coordinatorSystemPrompt({
@@ -13250,6 +13361,24 @@ function mcpArchiveBlockedReason(thread) {
 
 // src/mcp/server.ts
 var MAX_ORCH_THREADS = 5;
+var CREATE_THREAD_TIMEOUT_MS = 9e4;
+function withTimeout(promise, ms, label) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      reject(new Error(`${label} timed out after ${Math.round(ms / 1e3)}s`));
+    }, ms);
+    promise.then(
+      (value) => {
+        clearTimeout(timer);
+        resolve(value);
+      },
+      (err) => {
+        clearTimeout(timer);
+        reject(err);
+      }
+    );
+  });
+}
 async function startMcpServer() {
   const orch = getOrchestrator();
   try {
@@ -13257,7 +13386,14 @@ async function startMcpServer() {
     orch.setMaxConcurrent(maxConcurrentAgents2());
   } catch {
   }
-  await orch.reconcile(void 0, { reclaimStaleTurns: false, drainQueues: false });
+  try {
+    await orch.reconcile(void 0, { reclaimStaleTurns: false, drainQueues: false });
+  } catch (err) {
+    console.error(
+      "[sideboard-mcp] reconcile on boot failed (continuing):",
+      err instanceof Error ? err.message : err
+    );
+  }
   const server = new import_mcp.McpServer({
     name: "sideboard",
     version: "0.1.0"
@@ -13462,7 +13598,7 @@ async function startMcpServer() {
   const accountDefaultsHint = `Account defaults: agent=${accountDefaults.agent}, model=${accountDefaults.model?.trim() || "Auto"}, effort=${accountDefaults.effort}`;
   server.tool(
     "create_thread",
-    `Create a new worktree thread (chat) from branch, pr, or ticket. Pass repoPath from list_workspaces and parentThreadId when spawning from an orchestrator. Prefer omitting agent/model so Sideboard applies ${accountDefaultsHint}. Then use send_to_thread to chat.`,
+    `Create a new worktree thread (chat) from branch, pr, or ticket. Pass repoPath from list_workspaces. From an orchestration chat, omit parentThreadId (Sideboard binds the child to this chat) or pass the exact id from the turn reminder \u2014 never invent a uuid. Prefer omitting agent/model so Sideboard applies ${accountDefaultsHint}. Then use send_to_thread to chat.`,
     {
       sourceType: import_zod.z.enum(["branch", "pr", "ticket"]),
       sourceRef: import_zod.z.string(),
@@ -13472,11 +13608,31 @@ async function startMcpServer() {
       ),
       repoPath: import_zod.z.string(),
       title: import_zod.z.string().optional(),
-      parentThreadId: import_zod.z.string().optional()
+      parentThreadId: import_zod.z.string().optional().describe(
+        "Orchestration: omit (preferred) or pass YOUR chat id from the turn reminder / AGENTS.md. Do not invent uuids."
+      )
     },
     async (args) => {
-      if (args.parentThreadId) {
-        const children = orch.getThreads(true).filter((t) => t.parentThreadId === args.parentThreadId);
+      const envParentId = process.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID?.trim() || "";
+      let parentId = args.parentThreadId?.trim() || "";
+      let parent = parentId ? orch.getThread(parentId) : null;
+      let parentCorrectedFrom;
+      if (envParentId) {
+        const envParent = orch.getThread(envParentId);
+        if (envParent) {
+          if (parentId && parentId !== envParentId) parentCorrectedFrom = parentId;
+          else if (!parentId) parentCorrectedFrom = void 0;
+          parentId = envParentId;
+          parent = envParent;
+        }
+      }
+      if (parentId && !parent) {
+        parentCorrectedFrom = parentId;
+        parentId = "";
+        parent = null;
+      }
+      if (parentId) {
+        const children = orch.getThreads(true).filter((t) => t.parentThreadId === parentId);
         if (children.length >= MAX_ORCH_THREADS) {
           return {
             content: [
@@ -13489,38 +13645,70 @@ async function startMcpServer() {
           };
         }
       }
+      let agentArg = args.agent;
+      let agentCoercedFrom;
+      const resolvedProbe = resolveNewThreadOptions2({ agent: agentArg }).agent;
+      if (resolvedProbe === "codex") {
+        agentCoercedFrom = agentArg ?? "codex";
+        const accountAgent = resolveNewThreadOptions2({}).agent;
+        agentArg = accountAgent !== "codex" ? accountAgent : "cursor";
+      }
       const opts = resolveNewThreadOptions2({
-        agent: args.agent,
+        agent: agentArg,
         model: args.model
       });
-      const thread = await orch.createThread({
-        sourceType: args.sourceType,
-        sourceRef: args.sourceRef,
-        agent: opts.agent,
-        model: opts.model,
-        effort: opts.effort,
-        fast: opts.fast,
-        repoPath: args.repoPath,
-        title: args.title,
-        parentThreadId: args.parentThreadId ?? null
-      });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: thread.id,
-              title: thread.title,
-              branchName: thread.branchName,
-              worktreePath: thread.worktreePath,
-              agent: thread.agent,
-              model: thread.model,
-              status: thread.status,
-              link: `sideboard://thread/${thread.id}`
-            })
-          }
-        ]
-      };
+      try {
+        const thread = await withTimeout(
+          orch.createThread({
+            sourceType: args.sourceType,
+            sourceRef: args.sourceRef,
+            agent: opts.agent,
+            model: opts.model,
+            effort: opts.effort,
+            fast: opts.fast,
+            repoPath: args.repoPath,
+            title: args.title,
+            parentThreadId: parentId || null
+          }),
+          CREATE_THREAD_TIMEOUT_MS,
+          "create_thread"
+        );
+        const parentNote = parentCorrectedFrom ? parentId ? `Ignored unknown/stale parentThreadId ${parentCorrectedFrom}; nested under ${parentId}` : `Ignored unknown/stale parentThreadId ${parentCorrectedFrom}; created without parent` : void 0;
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                id: thread.id,
+                title: thread.title,
+                branchName: thread.branchName,
+                worktreePath: thread.worktreePath,
+                agent: thread.agent,
+                model: thread.model,
+                status: thread.status,
+                link: `sideboard://thread/${thread.id}`,
+                parentThreadId: thread.parentThreadId,
+                ...agentCoercedFrom ? {
+                  agentCoercedFrom,
+                  note: `Avoid nested Codex under a Codex orchestrator \u2014 used Account default agent=${thread.agent}`
+                } : {},
+                ...parentCorrectedFrom ? { parentCorrectedFrom, parentNote } : {}
+              })
+            }
+          ]
+        };
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        return {
+          content: [
+            {
+              type: "text",
+              text: `create_thread failed: ${message}`
+            }
+          ],
+          isError: true
+        };
+      }
     }
   );
   server.tool(
@@ -13701,7 +13889,7 @@ async function startMcpServer() {
   );
   server.tool(
     "request_review",
-    'Start a merge-readiness Review on a worktree agent thread (same as the desktop Review button). Opens a new Review chat tab, attaches .sideboard/review.md when present (else local Review request.md / stock template), and sends "Review." Expect Approve / Approve with nits / Request changes / Needs more information. Pass a worktree thread ref \u2014 not the orchestrator. Then wait_for_turn / get_turn_result on the returned review tab id.',
+    'Start a merge-readiness Review on a worktree agent thread (same as the desktop Review button). Opens a new Review chat tab, attaches .sideboard/review.md when present (else local Review request.md / stock template), and sends "Review changes in this workspace." Expect Approve / Approve with nits / Request changes / Needs more information. Pass a worktree thread ref \u2014 not the orchestrator. Then wait_for_turn / get_turn_result on the returned review tab id.',
     { ref: import_zod.z.string().describe("Worktree thread id/ref to review") },
     async ({ ref }) => {
       try {