@sideboard-ai/core 0.1.57 → 0.1.60

package/dist/index.d.cts

@@ -855,6 +855,8 @@ declare function run(file: string, args: string[], opts?: {
     cwd?: string;
     reject?: boolean;
     env?: Record<string, string>;
+    /** Kill the child after this many ms (execa `timeout`). */
+    timeoutMs?: number;
 }): Promise<{
     stdout: string;
     stderr: string;
@@ -865,6 +867,8 @@ declare function git(args: string[], cwd: string, opts?: {
     env?: Record<string, string>;
     /** Passed as `git -c key=value` (e.g. authenticated HTTPS via http.extraHeader). */
     config?: Record<string, string>;
+    /** Kill after this many ms — critical for MCP so a stuck fetch cannot pin the stdio server. */
+    timeoutMs?: number;
 }): Promise<{
     stdout: string;
     stderr: string;
@@ -872,6 +876,7 @@ declare function git(args: string[], cwd: string, opts?: {
 }>;
 declare function gh(args: string[], cwd: string, opts?: {
     reject?: boolean;
+    timeoutMs?: number;
 }): Promise<{
     stdout: string;
     stderr: string;
@@ -1274,10 +1279,10 @@ interface AgentAdapter {
     }>>;
 }
 declare const PLAN_MODE_INSTRUCTION = "Plan mode is active and must remain active until the user turns Plan mode off in the UI (or Approves / Hands off the plan). Analyze the codebase, search and read files as needed, and produce or refine a clear implementation plan. Do not modify, create, or delete any project files except via Sideboard MCP present_plan (writes .context/attachments/plan.md). When you need a clarifying decision (approach forks, auth choice, scope): (1) first write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it) \u2014 do not leave the user staring at bare labels; (2) then call Sideboard MCP ask_user with the same options, including a description on every option. Sideboard shows questions in the composer and mirrors them in chat. After ask_user, wait for the user's next message with their answers before finalizing the plan. When the plan is ready for approval: (1) call present_plan with the full markdown plan (title + content) so Sideboard saves .context/attachments/plan.md and shows it in chat for Approve / Hand off / Copy; (2) Claude should also call ExitPlanMode after present_plan. Do not skip present_plan \u2014 the plan must be a markdown file, not only chat prose.";
-declare function permissionMode(thread: Pick<Thread, 'autonomy' | 'planMode'>): {
+declare function permissionMode(thread: Pick<Thread, 'autonomy' | 'planMode' | 'sourceType'>): {
     claude: string;
     opencodePermission: string;
-    codexSandbox: 'read-only' | 'workspace-write';
+    codexSandbox: 'read-only' | 'workspace-write' | 'danger-full-access';
 };
 
 /**
@@ -1606,7 +1611,7 @@ declare function formatAgentInstructions(files: AgentInstructionFile[]): string
 declare function withAgentInstructions(prompt: string, files: AgentInstructionFile[]): string;
 
 declare function detectAgents(): Promise<AgentStatus[]>;
-declare function requireAgent(agent: AgentStatus['agent'], opts?: {
+declare function requireAgent(agent: AgentKind, opts?: {
     requireLinear?: boolean;
 }): Promise<AgentStatus>;
 
@@ -2505,7 +2510,7 @@ declare const REVIEW_REQUEST_PATH = ".context/attachments/Review request.md";
 declare const LEGACY_REVIEW_REQUEST_PATH = ".sideboard/attachments/Review request.md";
 declare const REVIEW_REQUEST_NAME = "Review request.md";
 /** Short chat message — guidelines live in the attached review file. */
-declare const REVIEW_REQUEST_PREFILL = "Review.";
+declare const REVIEW_REQUEST_PREFILL = "Review changes in this workspace.";
 type ReviewGuidelinesSource = 'repo' | 'local' | 'stock';
 interface ResolvedReviewGuidelines {
     path: string;
@@ -2550,7 +2555,7 @@ interface RequestReviewResult {
 }
 type SendFn = (threadRef: string, prompt: string) => Promise<Thread>;
 /**
- * Open a fresh "Review" chat tab, attach resolved guidelines, send "Review."
+ * Open a fresh "Review" chat tab, attach resolved guidelines, send the review prefill.
  */
 declare function requestReview(threadRef: string, send: SendFn): Promise<RequestReviewResult>;
 
@@ -2675,8 +2680,12 @@ declare function coordinatorTurnReminder(opts: {
 /**
  * Write durable CLAUDE.md / AGENTS.md into the global synthetic cwd so Claude
  * (and other agents that load AGENTS.md) keep orchestrator identity on resume.
+ * When `orchestratorThreadId` is set, embed that uuid so Codex/Claude resume
+ * cannot invent a stale parentThreadId.
  */
-declare function ensureGlobalCoordinatorCwd(): string;
+declare function ensureGlobalCoordinatorCwd(opts?: {
+    orchestratorThreadId?: string | null;
+}): string;
 declare function coordinatorSystemPrompt(opts: {
     goal: string;
     parentId: string;

package/dist/index.d.ts

@@ -855,6 +855,8 @@ declare function run(file: string, args: string[], opts?: {
     cwd?: string;
     reject?: boolean;
     env?: Record<string, string>;
+    /** Kill the child after this many ms (execa `timeout`). */
+    timeoutMs?: number;
 }): Promise<{
     stdout: string;
     stderr: string;
@@ -865,6 +867,8 @@ declare function git(args: string[], cwd: string, opts?: {
     env?: Record<string, string>;
     /** Passed as `git -c key=value` (e.g. authenticated HTTPS via http.extraHeader). */
     config?: Record<string, string>;
+    /** Kill after this many ms — critical for MCP so a stuck fetch cannot pin the stdio server. */
+    timeoutMs?: number;
 }): Promise<{
     stdout: string;
     stderr: string;
@@ -872,6 +876,7 @@ declare function git(args: string[], cwd: string, opts?: {
 }>;
 declare function gh(args: string[], cwd: string, opts?: {
     reject?: boolean;
+    timeoutMs?: number;
 }): Promise<{
     stdout: string;
     stderr: string;
@@ -1274,10 +1279,10 @@ interface AgentAdapter {
     }>>;
 }
 declare const PLAN_MODE_INSTRUCTION = "Plan mode is active and must remain active until the user turns Plan mode off in the UI (or Approves / Hands off the plan). Analyze the codebase, search and read files as needed, and produce or refine a clear implementation plan. Do not modify, create, or delete any project files except via Sideboard MCP present_plan (writes .context/attachments/plan.md). When you need a clarifying decision (approach forks, auth choice, scope): (1) first write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it) \u2014 do not leave the user staring at bare labels; (2) then call Sideboard MCP ask_user with the same options, including a description on every option. Sideboard shows questions in the composer and mirrors them in chat. After ask_user, wait for the user's next message with their answers before finalizing the plan. When the plan is ready for approval: (1) call present_plan with the full markdown plan (title + content) so Sideboard saves .context/attachments/plan.md and shows it in chat for Approve / Hand off / Copy; (2) Claude should also call ExitPlanMode after present_plan. Do not skip present_plan \u2014 the plan must be a markdown file, not only chat prose.";
-declare function permissionMode(thread: Pick<Thread, 'autonomy' | 'planMode'>): {
+declare function permissionMode(thread: Pick<Thread, 'autonomy' | 'planMode' | 'sourceType'>): {
     claude: string;
     opencodePermission: string;
-    codexSandbox: 'read-only' | 'workspace-write';
+    codexSandbox: 'read-only' | 'workspace-write' | 'danger-full-access';
 };
 
 /**
@@ -1606,7 +1611,7 @@ declare function formatAgentInstructions(files: AgentInstructionFile[]): string
 declare function withAgentInstructions(prompt: string, files: AgentInstructionFile[]): string;
 
 declare function detectAgents(): Promise<AgentStatus[]>;
-declare function requireAgent(agent: AgentStatus['agent'], opts?: {
+declare function requireAgent(agent: AgentKind, opts?: {
     requireLinear?: boolean;
 }): Promise<AgentStatus>;
 
@@ -2505,7 +2510,7 @@ declare const REVIEW_REQUEST_PATH = ".context/attachments/Review request.md";
 declare const LEGACY_REVIEW_REQUEST_PATH = ".sideboard/attachments/Review request.md";
 declare const REVIEW_REQUEST_NAME = "Review request.md";
 /** Short chat message — guidelines live in the attached review file. */
-declare const REVIEW_REQUEST_PREFILL = "Review.";
+declare const REVIEW_REQUEST_PREFILL = "Review changes in this workspace.";
 type ReviewGuidelinesSource = 'repo' | 'local' | 'stock';
 interface ResolvedReviewGuidelines {
     path: string;
@@ -2550,7 +2555,7 @@ interface RequestReviewResult {
 }
 type SendFn = (threadRef: string, prompt: string) => Promise<Thread>;
 /**
- * Open a fresh "Review" chat tab, attach resolved guidelines, send "Review."
+ * Open a fresh "Review" chat tab, attach resolved guidelines, send the review prefill.
  */
 declare function requestReview(threadRef: string, send: SendFn): Promise<RequestReviewResult>;
 
@@ -2675,8 +2680,12 @@ declare function coordinatorTurnReminder(opts: {
 /**
  * Write durable CLAUDE.md / AGENTS.md into the global synthetic cwd so Claude
  * (and other agents that load AGENTS.md) keep orchestrator identity on resume.
+ * When `orchestratorThreadId` is set, embed that uuid so Codex/Claude resume
+ * cannot invent a stale parentThreadId.
  */
-declare function ensureGlobalCoordinatorCwd(): string;
+declare function ensureGlobalCoordinatorCwd(opts?: {
+    orchestratorThreadId?: string | null;
+}): string;
 declare function coordinatorSystemPrompt(opts: {
     goal: string;
     parentId: string;

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-5DMYULLC.js";
+} from "./chunk-2P2UK7E7.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -24,7 +24,7 @@ import {
   orchestratorSessionPoisonedByBuiltins,
   parseForceStopMessage,
   takenTeamSlugsForOrchestration
-} from "./chunk-S42XDFKF.js";
+} from "./chunk-MLAST5BB.js";
 import {
   BRIGHTSY_MCP_ALLOWED_TOOLS,
   CLAUDE_MODEL_CATALOG,
@@ -70,7 +70,7 @@ import {
   resolveQuotaFallbackAgent,
   sanitizeMcpServerName,
   writeInjectedMcpConfig
-} from "./chunk-7F454EE2.js";
+} from "./chunk-ZXDOI6IH.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
@@ -88,7 +88,7 @@ import {
   loadBrightsyConfig,
   saveBrightsyConfig,
   switchBrightsyAccount
-} from "./chunk-BXJ76RHF.js";
+} from "./chunk-MBAL5FE6.js";
 import {
   LEGACY_PLAN_FILE_REL,
   PLAN_FILE_NAME,
@@ -118,7 +118,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-UA5NDAHL.js";
+} from "./chunk-XWPKLRB3.js";
 import {
   HARNESS_ENV_KEYS,
   appSettingsPath,
@@ -157,7 +157,7 @@ import {
   updateClaudeSettings,
   updateDefaultsSettings,
   updateIntegrationsSettings
-} from "./chunk-DIOF73S2.js";
+} from "./chunk-75QR74KM.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   addPrStackLayer,
@@ -220,7 +220,7 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-DZFH2KLT.js";
+} from "./chunk-P7EQUFB6.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
@@ -277,7 +277,7 @@ import {
   git,
   resolveGhAuthToken,
   run
-} from "./chunk-7LNGIP3X.js";
+} from "./chunk-73AT5K4A.js";
 
 // src/integrations/github.ts
 async function getGitHubStatus() {
@@ -706,10 +706,12 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-S7VLWPWG.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-TMMAVRVW.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-ICF36NUQ.js");
-    ensureGlobalCoordinatorCwd2();
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-LNWHZ64D.js");
+    ensureGlobalCoordinatorCwd2(
+      isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
+    );
   }
   if (isOrchestratorThread(thread)) {
     assertOrchestratorCapableAgent(thread.agent);
@@ -995,9 +997,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`);
   }
@@ -2827,7 +2841,7 @@ async function previewLand(thread) {
   const target = await resolveDefaultBranch(thread.repoPath);
   if (thread.branchName === target || thread.branchName === "main" || thread.branchName === "master") {
   }
-  const { stdout: head } = await import("./run-ZJKYHXGN.js").then(
+  const { stdout: head } = await import("./run-GPSVV5OH.js").then(
     ({ git: git2 }) => git2(["rev-parse", "--abbrev-ref", "HEAD"], thread.worktreePath)
   );
   const current = head.trim();
@@ -2866,7 +2880,7 @@ async function confirmLand(thread, opts) {
   if (preview.dirty) {
     committed = await commitAll(thread.worktreePath, meta.commitMessage);
   }
-  const { git: git2 } = await import("./run-ZJKYHXGN.js");
+  const { git: git2 } = await import("./run-GPSVV5OH.js");
   const { stdout: headOut } = await git2(
     ["rev-parse", "--abbrev-ref", "HEAD"],
     thread.worktreePath,
@@ -2964,7 +2978,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-2YYWW723.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-B2723EOF.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -3490,7 +3504,7 @@ async function adoptThread(input) {
     throw new Error(`Worktree not found: ${input.worktreePath}`);
   }
   const repoPath = await resolveRepoRoot(input.worktreePath);
-  const { stdout: branch } = await import("./run-ZJKYHXGN.js").then(
+  const { stdout: branch } = await import("./run-GPSVV5OH.js").then(
     ({ git: git2 }) => git2(["rev-parse", "--abbrev-ref", "HEAD"], input.worktreePath)
   );
   const thread = createEmptyThread({
@@ -3505,7 +3519,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-FPJJXXAE.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-3GO3EDQG.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -4066,7 +4080,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:"
@@ -4442,7 +4456,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled: autoCleanupOrphansEnabled2 } = await import("./app-settings-2LQNRTBE.js");
+      const { autoCleanupOrphansEnabled: autoCleanupOrphansEnabled2 } = await import("./app-settings-TBHTJWLQ.js");
       if (autoCleanupOrphansEnabled2() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -4599,7 +4613,7 @@ var Orchestrator = class {
   }
   async finishCreateThread(threadId, prompt) {
     await this.runSetupAfterCreate(threadId);
-    const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await import("./app-settings-2LQNRTBE.js");
+    const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await import("./app-settings-TBHTJWLQ.js");
     if (autoRunAfterSetupEnabled2()) {
       try {
         await this.startDev(threadId);
@@ -4870,7 +4884,7 @@ var Orchestrator = class {
     });
     const artifactDirective = isBrightsy ? null : formatArtifactDirective();
     const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
-    const { autoRenameBranchEnabled: autoRenameBranchEnabled2 } = await import("./app-settings-2LQNRTBE.js");
+    const { autoRenameBranchEnabled: autoRenameBranchEnabled2 } = await import("./app-settings-TBHTJWLQ.js");
     const renameBranchDirective = !isBrightsy && !isOrchestration && autoRenameBranchEnabled2() ? formatRenameBranchDirective(fresh, {
       customPrompt: settings?.prompts?.renameBranch
     }) : null;
@@ -4882,7 +4896,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({
@@ -5739,7 +5755,7 @@ var Orchestrator = class {
     const archived = setStatus(thread.id, "archived");
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-FPJJXXAE.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-3GO3EDQG.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -5760,7 +5776,7 @@ var Orchestrator = class {
         await runArchiveScript(thread.repoPath, thread.worktreePath);
       } catch {
       }
-      const { deleteBranchOnPurgeEnabled: deleteBranchOnPurgeEnabled2 } = await import("./app-settings-2LQNRTBE.js");
+      const { deleteBranchOnPurgeEnabled: deleteBranchOnPurgeEnabled2 } = await import("./app-settings-TBHTJWLQ.js");
       const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled2();
       await removeWorktree(thread.repoPath, thread.worktreePath, {
         deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -5779,7 +5795,7 @@ var Orchestrator = class {
       return setStatus(thread.id, "idle");
     }
     if (!existsSync13(thread.worktreePath)) {
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-RWGL7FUV.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-GBLHEFHR.js");
       const { execa: execa6 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
@@ -5864,7 +5880,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-RWGL7FUV.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-GBLHEFHR.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return createThread({
@@ -5999,14 +6015,39 @@ 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 {
-    const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-2LQNRTBE.js");
+    const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-TBHTJWLQ.js");
     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 McpServer({
     name: "sideboard",
     version: "0.1.0"
@@ -6206,12 +6247,12 @@ async function startMcpServer() {
       return { content: [{ type: "text", text: JSON.stringify(payload) }] };
     }
   );
-  const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults: resolveThreadDefaults2 } = await import("./app-settings-2LQNRTBE.js");
+  const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults: resolveThreadDefaults2 } = await import("./app-settings-TBHTJWLQ.js");
   const accountDefaults = resolveThreadDefaults2();
   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: z.enum(["branch", "pr", "ticket"]),
       sourceRef: z.string(),
@@ -6221,11 +6262,31 @@ async function startMcpServer() {
       ),
       repoPath: z.string(),
       title: z.string().optional(),
-      parentThreadId: z.string().optional()
+      parentThreadId: 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: [
@@ -6238,38 +6299,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(
@@ -6450,7 +6543,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: z.string().describe("Worktree thread id/ref to review") },
     async ({ ref }) => {
       try {