@sideboard-ai/core 0.1.89 → 0.1.95

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-6EZRSCIT.js";
+} from "./chunk-QKYO6BHB.js";
 import {
   BRIGHTSY_MCP_ALLOWED_TOOLS,
   CLAUDE_MODEL_CATALOG,
@@ -58,13 +58,14 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent,
+  resolveSideboardMcpServer,
   sanitizeMcpServerName,
   shouldInjectBrightsyMcp,
   sideboardMcpProfile,
   threadRequestsBrightsyMcp,
   totalTokens,
   writeInjectedMcpConfig
-} from "./chunk-RJLBSYUO.js";
+} from "./chunk-KWNUZ4LR.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -91,7 +92,7 @@ import {
   parseForceStopMessage,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-B2KIO2SD.js";
+} from "./chunk-CLGO7TLO.js";
 import {
   COORDINATOR_TOOL_PLAYBOOK,
   SLACK_REPLY_FORMATTING,
@@ -100,7 +101,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-VZ2L4AEJ.js";
+} from "./chunk-XUWDLRAE.js";
 import {
   brightsyConfigPath,
   brightsyMcpServerName,
@@ -137,7 +138,7 @@ import {
   parseCursorRunnerLine,
   pushTurnStderr,
   summarizeTurnStderr
-} from "./chunk-CBJSPTBG.js";
+} from "./chunk-GXSYI7FH.js";
 import {
   caffeinateHoldPath,
   getCaffeinateHold,
@@ -154,6 +155,7 @@ import {
   applyGithubGitAuthEnv,
   branchDisplayLabel,
   checkoutPrStackLayer,
+  codexSandboxWritableRootsArgs,
   codexUnattendedGitConfigArgs,
   collectTakenTeamSlugs,
   commitAll,
@@ -174,12 +176,14 @@ import {
   getPr,
   getPrChecks,
   getPrDetails,
+  getPrForHeadBranch,
   getPrMeta,
   getPrStack,
   ghHeadRef,
   ghRepoSelectArgs,
   githubAgentGitEnv,
   initPrStack,
+  isDefaultishSourceRef,
   isDirty,
   isGhRateLimitError,
   isInPrStack,
@@ -190,6 +194,7 @@ import {
   listPrs,
   listWorktrees,
   lookupSoccerTeam,
+  mergeAgentGitAuthEnv,
   mergePr,
   mergePrStack,
   nonInteractiveGitProcessEnv,
@@ -200,24 +205,29 @@ import {
   pushBranch,
   removeWorktree,
   resetGhStackDetectCache,
+  resetGithubAgentTokenMemo,
   resolveAgentGitAuthEnv,
+  resolveCodexGitWritableRoots,
   resolveDefaultBranch,
   resolveDiffBaseRef,
   resolveGithubAgentToken,
   resolveGithubRepoSlug,
   resolvePrSelector,
+  resolvePrSelectors,
   resolveRepoRoot,
   resolveWorktreeStartPoint,
+  scrubGithubTokensFromChildEnv,
   slugify,
   stackMergeReadiness,
   submitPrStack,
   suggestSlug,
   takenSlugsFromThread,
   threadDisplayLabel,
+  warmGithubAgentAuth,
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-7D27DD2X.js";
+} from "./chunk-CIRXAYWS.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
@@ -1328,9 +1338,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-JQQLPJM5.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-M3OMVDDH.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-UK5LYFN5.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-AKEY4WSO.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -1348,10 +1358,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
   const env = childEnvWithAppSettings(cmd.env);
   try {
     if (isOrchestratorThread(thread)) {
-      Object.assign(env, await resolveAgentGitAuthEnv(env));
+      mergeAgentGitAuthEnv(env, await resolveAgentGitAuthEnv(env));
     } else {
-      const originEnv = await originGhRepoEnv(thread.worktreePath, { env });
-      Object.assign(env, originEnv);
+      mergeAgentGitAuthEnv(env, await originGhRepoEnv(thread.worktreePath, { env }));
     }
   } catch (err) {
     const detail = err instanceof Error ? err.message : String(err);
@@ -1574,9 +1583,10 @@ function formatArtifactDirective() {
     "Files / media browser (CMS file manager column):",
     "4) Call Sideboard MCP `present_files` with optional title, path, and datasource (brightsy|memory).",
     "   Opens the Files column for browse/upload/pick. Do NOT say a file manager UI is missing.",
-    "Multiple-choice questions (any mode \u2014 not only Plan):",
-    "5) Call Sideboard MCP `ask_user` when the user should pick from predefined options (approach forks, requirements, which API). First write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it). Include a description on every option. After calling, stop and wait for their next message with answers. Do not ask multiple-choice questions as plain chat bullets \u2014 use ask_user so Sideboard shows the composer picker.",
-    "Never say artifacts, CMS UI, or the Files column are unavailable. Prefer present_schema for list/edit/publish; present_files for storage UI; html fences for standalone pages; ask_user for predefined-option questions."
+    "Multiple-choice questions:",
+    "5) Call Sideboard MCP `ask_user` only when work is blocked on choosing among a few concrete options (approach forks, which API, auth vs cookies). First write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it). Include a description on every option. After calling, stop and wait for their next message with answers. If you are asking a real multiple-choice, use ask_user rather than chat bullets so Sideboard shows the composer picker.",
+    "Do not call ask_user for greetings, check-ins, \u201Chello\u201D, open-ended how-can-I-help, or to invent a menu of possible next tasks \u2014 reply in chat. If one option is the obvious default, proceed without asking.",
+    "Never say artifacts, CMS UI, or the Files column are unavailable. Prefer present_schema for list/edit/publish; present_files for storage UI; html fences for standalone pages; ask_user only for those blocked predefined-option questions."
   ].join("\n");
 }
 function formatUiReminder() {
@@ -1587,7 +1597,7 @@ function formatUiReminder() {
     "CMS forms/tables: MCP present_schema (Brightsy resource_id or inline schema+schemaUi).",
     "Files column: MCP present_files (brightsy account storage or memory).",
     "Do not say artifacts/CMS UI are unavailable.",
-    "Multiple-choice questions: MCP ask_user (composer picker, any mode). Explain options in chat first, then wait for answers."
+    "ask_user: only when blocked on a real multiple-choice (approach fork, which API). Never for hellos, check-ins, or \u201Cwhat next?\u201D menus \u2014 reply in chat."
   ].join(" ");
 }
 var FILES_BY_AGENT = {
@@ -1874,7 +1884,10 @@ async function spawnWorkspaceScript(command, opts) {
     loginEnv
   );
   try {
-    Object.assign(env, await resolveAgentGitAuthEnv(env, { cwd: opts.worktreePath }));
+    mergeAgentGitAuthEnv(
+      env,
+      await resolveAgentGitAuthEnv(env, { cwd: opts.worktreePath })
+    );
   } catch {
   }
   const shell = process.platform === "darwin" ? "zsh" : "bash";
@@ -3759,6 +3772,7 @@ async function createThread(input, _onSetupLine) {
   let sourceRef = input.sourceRef;
   let sourceIsFork = false;
   let prUrl = null;
+  let prTitle = null;
   if (input.sourceType === "pr") {
     const num = Number(input.sourceRef.replace(/^#/, ""));
     if (!Number.isFinite(num)) throw new Error(`Invalid PR number: ${input.sourceRef}`);
@@ -3774,6 +3788,12 @@ async function createThread(input, _onSetupLine) {
   } else if (input.sourceType === "branch") {
     if (!sourceRef || sourceRef === "HEAD" || sourceRef === "default") {
       sourceRef = await resolveDefaultBranch(repoPath);
+    } else {
+      const existing = await getPrForHeadBranch(repoPath, sourceRef);
+      if (existing?.url) {
+        prUrl = existing.url;
+        prTitle = existing.title;
+      }
     }
   } else if (input.sourceType === "adopt") {
     throw new Error("Use adoptThread() for adopt sources");
@@ -3804,14 +3824,15 @@ async function createThread(input, _onSetupLine) {
     sourceIsFork,
     parentThreadId: input.parentThreadId ?? null,
     status: "idle",
-    prUrl
+    prUrl,
+    prTitle
   });
   writeThread(thread);
   await ensureWorkspace(repoPath);
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-ODBP7J6E.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-WS5QV6LE.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -4277,7 +4298,7 @@ import {
 } from "fs";
 import { tmpdir } from "os";
 import { join as join6 } from "path";
-import Database from "better-sqlite3";
+import { createRequire } from "module";
 var CONDUCTOR_APP_SUPPORT = join6(
   process.env.HOME ?? "",
   "Library",
@@ -4286,6 +4307,11 @@ var CONDUCTOR_APP_SUPPORT = join6(
 );
 var CONDUCTOR_DB = join6(CONDUCTOR_APP_SUPPORT, "conductor.db");
 var CURSOR_SDK_STORE = join6(CONDUCTOR_APP_SUPPORT, "cursor-sdk-store");
+function openReadonlySqlite(file) {
+  const req = createRequire(import.meta.url);
+  const Database = req("better-sqlite3");
+  return new Database(file, { readonly: true, fileMustExist: true });
+}
 function mapAgentType(raw) {
   if (!raw) return null;
   const v = raw.toLowerCase();
@@ -4354,7 +4380,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-YWCC3WV4.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-ERZC7ULY.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -4378,7 +4404,7 @@ function listConductorWorkspaces() {
         }
       }
     }
-    const db = new Database(snapshot, { readonly: true, fileMustExist: true });
+    const db = openReadonlySqlite(snapshot);
     try {
       const tables = db.prepare(`SELECT name FROM sqlite_master WHERE type='table'`).all();
       const names = new Set(tables.map((t) => t.name));
@@ -4469,7 +4495,7 @@ function importConductorWorkspace(workspaceId) {
         }
       }
     }
-    const db = new Database(snapshot, { readonly: true, fileMustExist: true });
+    const db = openReadonlySqlite(snapshot);
     try {
       const row = db.prepare(
         `SELECT
@@ -6948,8 +6974,9 @@ var Orchestrator = class {
     return result;
   }
   async mergePr(threadRef) {
-    const { thread, selector, cwd } = await this.withPrSelector(threadRef);
+    const { thread, selectors, cwd } = await this.withPrSelector(threadRef);
     this.assertNotGlobal(thread, "Merge PR");
+    const selector = selectors[0];
     if (!selector) throw new Error("No pull request linked to this thread");
     const result = await mergePr(cwd, selector);
     const state = normalizePrState(result.state) || "MERGED";
@@ -6969,29 +6996,34 @@ var Orchestrator = class {
     await this.persistPrMetaAndMaybeArchive(thread, metaLike);
     return { url: metaLike.url, state };
   }
-  /** Resolve PR selector and optionally persist `prUrl` when found. */
+  /** Resolve PR selectors and optionally persist `prUrl` when found. */
   async withPrSelector(threadRef) {
     const thread = this.requireThread(threadRef);
-    const selector = resolvePrSelector(thread);
+    const selectors = resolvePrSelectors(thread);
     const cwd = thread.worktreePath;
     if (!cwd?.trim()) {
       throw new Error(`Thread ${threadRef} has no worktreePath`);
     }
-    return { thread, selector, cwd };
+    return { thread, selectors, cwd };
   }
   async getPrChecks(threadRef) {
-    const { selector, cwd } = await this.withPrSelector(threadRef);
-    if (!selector) return null;
-    return getPrChecks(cwd, selector);
+    const { selectors, cwd } = await this.withPrSelector(threadRef);
+    for (const selector of selectors) {
+      const checks = await getPrChecks(cwd, selector);
+      if (checks) return checks;
+    }
+    return null;
   }
   async getPrMeta(threadRef) {
-    const { thread, selector, cwd } = await this.withPrSelector(threadRef);
-    if (!selector) return null;
-    const meta = await getPrMeta(cwd, selector);
-    if (meta) {
-      await this.persistPrMetaAndMaybeArchive(thread, meta);
+    const { thread, selectors, cwd } = await this.withPrSelector(threadRef);
+    for (const selector of selectors) {
+      const meta = await getPrMeta(cwd, selector);
+      if (meta) {
+        await this.persistPrMetaAndMaybeArchive(thread, meta);
+        return meta;
+      }
     }
-    return meta;
+    return null;
   }
   /**
    * Persist PR URL/title/state and Conductor-style auto-archive when the PR
@@ -7115,9 +7147,12 @@ var Orchestrator = class {
     return { stack: result.stack, threads: result.threads };
   }
   async getPrDetails(threadRef) {
-    const { thread, selector, cwd } = await this.withPrSelector(threadRef);
-    if (!selector) return null;
-    const details = await getPrDetails(cwd, selector);
+    const { thread, selectors, cwd } = await this.withPrSelector(threadRef);
+    let details = null;
+    for (const selector of selectors) {
+      details = await getPrDetails(cwd, selector);
+      if (details) break;
+    }
     if (details) {
       const patch = {};
       if (details.url && details.url !== thread.prUrl) patch.prUrl = details.url;
@@ -7302,7 +7337,7 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-YWCC3WV4.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-ERZC7ULY.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -7345,7 +7380,7 @@ var Orchestrator = class {
       return restored2;
     }
     if (!existsSync14(thread.worktreePath)) {
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-7YNSJ224.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-DA4BOV7G.js");
       const { execa: execa5 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
@@ -7454,7 +7489,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-7YNSJ224.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-DA4BOV7G.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -8205,6 +8240,14 @@ function withTimeout(promise, ms, label) {
 }
 async function startMcpServer() {
   const orch = getOrchestrator();
+  try {
+    await warmGithubAgentAuth();
+  } catch (err) {
+    console.error(
+      "[sideboard-mcp] GitHub agent auth warm skipped:",
+      err instanceof Error ? err.message : err
+    );
+  }
   try {
     const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-BRF7VKTQ.js");
     orch.setMaxConcurrent(maxConcurrentAgents2());
@@ -8311,7 +8354,7 @@ async function startMcpServer() {
   );
   server.tool(
     "ask_user",
-    "Ask the user clarifying multiple-choice questions in Sideboard\u2019s composer (any mode \u2014 not only Plan). Before calling, write a short chat message explaining the decision and what each option means. Include a description on every option. Use when the user should pick from predefined options (approach forks, requirements, which API) \u2014 not for \u201Cis the plan ready?\u201D. After calling, stop and wait for their next message with answers.",
+    "Ask the user a clarifying multiple-choice question in Sideboard\u2019s composer. Call only when work is blocked on choosing among a few concrete options (approach fork, which API, auth vs cookies). Do not call for greetings, check-ins, \u201Chello\u201D, open-ended how-can-I-help, or to invent a menu of possible next tasks \u2014 reply in chat instead. If one option is the obvious default, proceed without asking. Before calling, write a short chat message explaining the decision and what each option means. Include a description on every option. After calling, stop and wait for answers. Not for \u201Cis the plan ready?\u201D.",
     {
       questions: z3.array(
         z3.object({
@@ -9540,6 +9583,75 @@ async function runCloudConnect(opts) {
   }
 }
 
+// src/agents/user-mcp-config.ts
+import { existsSync as existsSync15, mkdirSync as mkdirSync5, readFileSync as readFileSync10, writeFileSync as writeFileSync4 } from "fs";
+import { homedir as homedir2 } from "os";
+import { dirname as dirname4, join as join13 } from "path";
+function userCursorMcpConfigPath() {
+  return join13(homedir2(), ".cursor", "mcp.json");
+}
+function userClaudeMcpConfigPath() {
+  return join13(homedir2(), ".claude.json");
+}
+function asObject(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  return { ...value };
+}
+function stripElectronSpawnEnv(env) {
+  if (!env) return void 0;
+  const next = { ...env };
+  delete next.ELECTRON_RUN_AS_NODE;
+  delete next.ELECTRON_RUN_AS_NODE;
+  return Object.keys(next).length > 0 ? next : void 0;
+}
+function mergeSideboardIntoMcpServersJson(existing, sideboard) {
+  const root = asObject(existing);
+  const servers = asObject(root.mcpServers);
+  const env = stripElectronSpawnEnv(sideboard.env);
+  servers.sideboard = {
+    type: "stdio",
+    command: sideboard.command,
+    ...sideboard.args && sideboard.args.length > 0 ? { args: sideboard.args } : {},
+    ...env ? { env } : {}
+  };
+  return { ...root, mcpServers: servers };
+}
+function writeMergedMcpServersJson(configPath, sideboard) {
+  let existing = {};
+  if (existsSync15(configPath)) {
+    try {
+      existing = JSON.parse(readFileSync10(configPath, "utf8"));
+    } catch {
+      existing = {};
+    }
+  }
+  const next = mergeSideboardIntoMcpServersJson(existing, sideboard);
+  mkdirSync5(dirname4(configPath), { recursive: true });
+  writeFileSync4(configPath, `${JSON.stringify(next, null, 2)}
+`);
+}
+function launchFromResolved(server) {
+  return {
+    command: server.command,
+    args: server.args,
+    env: {
+      ...server.env ?? {},
+      SIDEBOARD_APP_DATA: appDataDir()
+    }
+  };
+}
+async function registerPackagedUserMcpClients() {
+  const launch = launchFromResolved(await resolveSideboardMcpServer());
+  const cursor = userCursorMcpConfigPath();
+  writeMergedMcpServersJson(cursor, launch);
+  const claude = userClaudeMcpConfigPath();
+  if (existsSync15(claude)) {
+    writeMergedMcpServersJson(claude, launch);
+    return { cursor, claude };
+  }
+  return { cursor };
+}
+
 // src/slack/oauth.ts
 import { randomBytes as randomBytes2 } from "crypto";
 
@@ -10306,15 +10418,10 @@ function connectSession2(ws, opts, log) {
 }
 
 // src/slack/listen.ts
-var SLACK_LISTEN_BUSY_REPLY = [
-  "Sideboard is busy with an in-progress turn.",
-  "I did not start a new request.",
-  'Send "stop" to interrupt, or try again when idle.'
-].join(" ");
 var SLACK_LISTEN_STOPPED_REPLY = "Sideboard stopped the in-progress turn. Send another message when you want to continue.";
 var SLACK_LISTEN_TIMEOUT_REPLY = [
   "Sideboard timed out waiting for the local agent turn to finish.",
-  'Send "stop" to interrupt, or try again.'
+  'Send another message to interrupt and retry, or send "stop".'
 ].join(" ");
 var handleChain = Promise.resolve();
 function enqueueHandle(fn) {
@@ -10328,6 +10435,30 @@ function enqueueHandle(fn) {
 function refreshWorkspaces2() {
   return getOrchestrator().listWorkspaces();
 }
+function slackInboundSuperseded(opts) {
+  if (opts.inboundGeneration === void 0 || !opts.currentInboundGeneration) {
+    return false;
+  }
+  return opts.currentInboundGeneration() !== opts.inboundGeneration;
+}
+function interruptSlackCoordinatorForInbound(msg, agent, log = () => void 0) {
+  const userId = msg.userId?.trim();
+  if (!userId) return false;
+  const coordinator = ensureSlackCoordinator(msg.teamId, userId, agent);
+  const fresh = readThread(coordinator.id) ?? coordinator;
+  if (fresh.status !== "running" && fresh.status !== "queued") return false;
+  try {
+    getOrchestrator().stop(fresh.id, { clearQueue: true });
+    log(
+      `interrupt ${msg.kind} ${msg.ts} \u2192 coordinator ${fresh.id.slice(0, 8)} (${fresh.status})`
+    );
+    return true;
+  } catch (err) {
+    const errMsg = err instanceof Error ? err.message : String(err);
+    log(`interrupt ${msg.ts}: ${errMsg}`);
+    return false;
+  }
+}
 function formatSlackInboundPrompt(msg) {
   const kind = msg.kind === "mention" ? "Slack @mention" : "Slack DM";
   return `${kind}
@@ -10458,7 +10589,13 @@ async function relayCoordinatorReplyToSlack(threadId, opts) {
 }
 async function handleSlackInbound(msg, opts) {
   const log = opts.onLog ?? (() => void 0);
-  await ackSlackInboundSeen(msg, opts);
+  if (!opts.skipAck) {
+    await ackSlackInboundSeen(msg, opts);
+  }
+  if (slackInboundSuperseded(opts)) {
+    log(`skip superseded ${msg.kind} ${msg.ts}`);
+    return;
+  }
   const agent = coerceOrchestratorAgent(opts.agent ?? getDefaultAgent());
   const workspaces = refreshWorkspaces2();
   for (const ws of workspaces) {
@@ -10470,25 +10607,31 @@ async function handleSlackInbound(msg, opts) {
     log(`skip ${msg.kind} ${msg.ts}: missing Slack user id`);
     return;
   }
+  if (slackInboundSuperseded(opts)) {
+    log(`skip superseded ${msg.kind} ${msg.ts}`);
+    return;
+  }
   const coordinator = ensureSlackCoordinator(msg.teamId, userId, agent);
-  const fresh = readThread(coordinator.id) ?? coordinator;
+  let fresh = readThread(coordinator.id) ?? coordinator;
   if (isSlackStopCommand(msg.text)) {
     try {
-      getOrchestrator().stop(fresh.id);
+      getOrchestrator().stop(fresh.id, { clearQueue: true });
       log(`stop ${msg.kind} ${msg.ts} \u2192 coordinator ${fresh.id.slice(0, 8)}`);
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
       log(`stop ${msg.ts}: ${errMsg}`);
     }
+    if (slackInboundSuperseded(opts)) {
+      log(`skip superseded stop reply ${msg.ts}`);
+      return;
+    }
     await postSlackReply(msg, SLACK_LISTEN_STOPPED_REPLY, opts);
     log(`replied stopped ${msg.ts}`);
     return;
   }
   if (fresh.status === "running" || fresh.status === "queued") {
-    log(`busy ${msg.kind} ${msg.ts} \u2192 coordinator ${fresh.id.slice(0, 8)} (${fresh.status})`);
-    await postSlackReply(msg, SLACK_LISTEN_BUSY_REPLY, opts);
-    log(`replied busy ${msg.ts}`);
-    return;
+    interruptSlackCoordinatorForInbound(msg, agent, log);
+    fresh = readThread(coordinator.id) ?? coordinator;
   }
   log(
     `run ${msg.kind} ${msg.ts} user ${userId} \u2192 coordinator ${fresh.id.slice(0, 8)} (${inventory.length} workspace${inventory.length === 1 ? "" : "s"})`
@@ -10505,8 +10648,21 @@ async function handleSlackInbound(msg, opts) {
   try {
     await orch.send(fresh.id, prompt);
     await orch.waitForTurn(fresh.id, 14 * 60 * 1e3);
+    if (slackInboundSuperseded(opts)) {
+      log(`turn finished ${msg.ts} (superseded)`);
+      return;
+    }
+    const after = readThread(fresh.id);
+    if (after?.status === "stopped") {
+      log(`turn finished ${msg.ts} (interrupted, skip post)`);
+      return;
+    }
     reply = orch.getTurnResult(fresh.id).text.trim();
   } catch (err) {
+    if (slackInboundSuperseded(opts)) {
+      log(`turn error ${msg.ts} (superseded)`);
+      return;
+    }
     const errMsg = err instanceof Error ? err.message : String(err);
     const timedOut = /timed out|timeout/i.test(errMsg);
     const errorReply = timedOut ? SLACK_LISTEN_TIMEOUT_REPLY : `Sideboard coordinator error: ${errMsg}`;
@@ -10554,19 +10710,35 @@ async function runSlackListen(opts = {}) {
   const log = opts.onLog ?? console.log;
   const connected = listSlackWorkspacesRaw();
   const orch = getOrchestrator();
+  const agent = coerceOrchestratorAgent(opts.agent ?? getDefaultAgent());
+  let inboundGeneration = 0;
   const off = orch.on((event) => {
     if (event.type !== "turn_finished") return;
     void relayCoordinatorReplyToSlack(event.threadId, opts);
   });
-  const onInbound = (msg) => enqueueHandle(async () => {
+  const onInbound = (msg) => {
     if (!isInboundForThisDesktop(msg)) {
       log(
         `skip ${msg.kind} ${msg.ts}: Slack user ${msg.userId ?? "?"} is not connected on this Mac`
       );
       return;
     }
-    await handleSlackInbound(msg, opts);
-  });
+    const generation = ++inboundGeneration;
+    void ackSlackInboundSeen(msg, opts);
+    interruptSlackCoordinatorForInbound(msg, agent, log);
+    return enqueueHandle(async () => {
+      if (generation !== inboundGeneration) {
+        log(`skip superseded ${msg.kind} ${msg.ts}`);
+        return;
+      }
+      await handleSlackInbound(msg, {
+        ...opts,
+        skipAck: true,
+        inboundGeneration: generation,
+        currentInboundGeneration: () => inboundGeneration
+      });
+    });
+  };
   try {
     const relay = (opts.relayUrl ?? slackRelayUrl()).trim();
     if (!relay) {
@@ -11168,7 +11340,6 @@ export {
   SIDEBOARD_FORCE_STOP,
   SIDEBOARD_MCP_ALLOWED_TOOLS,
   SIDEBOARD_MCP_PROFILE_ENV,
-  SLACK_LISTEN_BUSY_REPLY,
   SLACK_LISTEN_STOPPED_REPLY,
   SLACK_LISTEN_TIMEOUT_REPLY,
   SLACK_OAUTH_CANCELLED,
@@ -11238,6 +11409,7 @@ export {
   cleanupOrphanWorktrees,
   cloneRepoIntoSideboard,
   codexAdapter,
+  codexSandboxWritableRootsArgs,
   codexUnattendedGitConfigArgs,
   coerceOrchestratorAgent,
   collectTakenTeamSlugs,
@@ -11354,6 +11526,7 @@ export {
   getPr,
   getPrChecks,
   getPrDetails,
+  getPrForHeadBranch,
   getPrMeta,
   getPrStack,
   getRepoSetupInfo,
@@ -11384,12 +11557,14 @@ export {
   initializeGitRepository,
   inspectGitWorktree,
   installAgent,
+  interruptSlackCoordinatorForInbound,
   isAskUserToolName,
   isBrightsyConnected,
   isBrightsyNdjsonLine,
   isCloudCoordinatorThread,
   isConductorBundledCli,
   isCursorAutoModel,
+  isDefaultishSourceRef,
   isDirty,
   isGhRateLimitError,
   isGlobalRepoPath,
@@ -11456,8 +11631,10 @@ export {
   maybeCompactContext,
   mcpAllowTools,
   mcpAuthWarnings,
+  mergeAgentGitAuthEnv,
   mergePr,
   mergePrStack,
+  mergeSideboardIntoMcpServersJson,
   mergeUsage,
   nextPastedTextName,
   nextThinkingEffort,
@@ -11508,6 +11685,7 @@ export {
   recordSlackOutboundWatch,
   refreshGitHubAuth,
   refreshSlackReplyBadges,
+  registerPackagedUserMcpClients,
   releaseCaffeinateHoldForThread,
   removeWorkspace,
   removeWorktree,
@@ -11516,9 +11694,11 @@ export {
   requestReview,
   requireAgent,
   resetGhStackDetectCache,
+  resetGithubAgentTokenMemo,
   resolveAgentExecutable,
   resolveAgentGitAuthEnv,
   resolveClaudeExecutable,
+  resolveCodexGitWritableRoots,
   resolveCommandBinarySync,
   resolveConductorCursorAgentId,
   resolveCursorModelId,
@@ -11535,6 +11715,7 @@ export {
   resolveNewThreadOptions,
   resolvePlanMarkdown,
   resolvePrSelector,
+  resolvePrSelectors,
   resolveQuotaFallbackAgent,
   resolveRepoRoot,
   resolveReviewGuidelines,
@@ -11557,6 +11738,7 @@ export {
   sanitizeMcpServerName,
   saveAppSettings,
   saveLinearOAuth,
+  scrubGithubTokensFromChildEnv,
   secureFileUnlocksWith,
   setCaffeinateHold,
   setHttpFetchImpl,
@@ -11627,7 +11809,10 @@ export {
   updateLinearIssue,
   updateOpencodeSettings,
   updateThread,
+  userClaudeMcpConfigPath,
+  userCursorMcpConfigPath,
   validateLinearApiKey,
+  warmGithubAgentAuth,
   withAgentInstructions,
   withExportedPath,
   withThreadLock,