@sideboard-ai/core 0.1.79 → 0.1.83

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-PW5YHHP3.js";
+} from "./chunk-LVTNWH7B.js";
 import {
   BRIGHTSY_MCP_ALLOWED_TOOLS,
   CLAUDE_MODEL_CATALOG,
@@ -13,12 +13,14 @@ import {
   SIDEBOARD_MCP_ALLOWED_TOOLS,
   SIDEBOARD_MCP_PROFILE_ENV,
   allAdapters,
+  applyTurnUsage,
   brightsyAdapter,
   brightsyMcpAllowedTools,
   buildCachedUserContent,
   buildClaudeStreamJsonUserMessage,
   claudeAdapter,
   codexAdapter,
+  contextTokens,
   countCacheControlBlocks,
   cursorAdapter,
   decodeBrightsyTarget,
@@ -26,6 +28,7 @@ import {
   encodeBrightsyTarget,
   findInvalidCacheControlTtlOrder,
   flattenTurnInput,
+  fromInclusiveInputUsage,
   getAdapter,
   getAgentSetupInfo,
   installAgent,
@@ -41,6 +44,7 @@ import {
   loginAgent,
   mcpAllowTools,
   mcpAuthWarnings,
+  mergeUsage,
   normalizeTurnInput,
   openInSystemTerminal,
   opencodeAdapter,
@@ -50,6 +54,7 @@ import {
   permissionMode,
   prepareTerminalCommand,
   promptMentionsBrightsy,
+  requestOccupancy,
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent,
@@ -57,8 +62,9 @@ import {
   shouldInjectBrightsyMcp,
   sideboardMcpProfile,
   threadRequestsBrightsyMcp,
+  totalTokens,
   writeInjectedMcpConfig
-} from "./chunk-SHCR6RPU.js";
+} from "./chunk-JW6YFPQE.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -85,7 +91,7 @@ import {
   parseForceStopMessage,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-5LXWTU3J.js";
+} from "./chunk-NXXT5SE3.js";
 import {
   COORDINATOR_TOOL_PLAYBOOK,
   SLACK_REPLY_FORMATTING,
@@ -94,7 +100,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-HCGEFU3J.js";
+} from "./chunk-E2MIA7DO.js";
 import {
   brightsyConfigPath,
   brightsyMcpServerName,
@@ -159,6 +165,7 @@ import {
   formatGhLandError,
   formatGitAuthModeDirective,
   formatIpcInvokeError,
+  formatMergePrError,
   formatRateLimitResetHint,
   getPr,
   getPrChecks,
@@ -173,6 +180,7 @@ import {
   isGhRateLimitError,
   isInPrStack,
   isPlaceholderBranch,
+  isPrNotMergeableError,
   isSideboardScratchPath,
   listBranches,
   listPrs,
@@ -202,7 +210,7 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-YVVXWWCC.js";
+} from "./chunk-GD2FM6FN.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
@@ -271,7 +279,10 @@ import {
   updateIntegrationsSettings,
   updateOpencodeSettings,
   writeSecureJson
-} from "./chunk-IFPN6TER.js";
+} from "./chunk-YO3CYL6B.js";
+import {
+  stripNestedElectronEnv
+} from "./chunk-IZ7RPF54.js";
 import {
   writePrivateFile
 } from "./chunk-JT7R45JB.js";
@@ -351,7 +362,8 @@ function agentGitPrompt(action, opts) {
       return "Commit, push, and open a PR in the browser.";
     case "resolve-conflicts": {
       const base = opts?.prBase?.trim().replace(/^refs\/heads\//, "");
-      return base ? `Merge origin/${base} into this branch. Then push.` : "Fix merge conflicts.";
+      const named = base ? ` (${base})` : "";
+      return `Merge the remote branch${named} into your branch and resolve conflicts. Then, commit and push your changes.`;
     }
     case "merge":
       return "Merge PR.";
@@ -1296,41 +1308,6 @@ function normalizeParseResult(parsed) {
   return Array.isArray(parsed) ? parsed : [parsed];
 }
 
-// src/agents/usage.ts
-function sumOptional(a, b) {
-  if (a == null && b == null) return void 0;
-  return (a ?? 0) + (b ?? 0);
-}
-function requestOccupancy(u) {
-  return u.inputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWriteTokens ?? 0);
-}
-function mergeUsage(a, b) {
-  return {
-    inputTokens: (a?.inputTokens ?? 0) + b.inputTokens,
-    outputTokens: (a?.outputTokens ?? 0) + b.outputTokens,
-    cacheReadTokens: sumOptional(a?.cacheReadTokens, b.cacheReadTokens),
-    cacheWriteTokens: sumOptional(a?.cacheWriteTokens, b.cacheWriteTokens),
-    lastRequestTokens: b.lastRequestTokens ?? a?.lastRequestTokens
-  };
-}
-function applyTurnUsage(current, incoming, scope = "request") {
-  if (scope === "turn") {
-    return {
-      ...incoming,
-      lastRequestTokens: current?.lastRequestTokens ?? requestOccupancy(incoming)
-    };
-  }
-  const merged = mergeUsage(current, incoming);
-  return { ...merged, lastRequestTokens: requestOccupancy(incoming) };
-}
-function totalTokens(u) {
-  return u.inputTokens + u.outputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWriteTokens ?? 0);
-}
-function contextTokens(u) {
-  if (u.lastRequestTokens != null && u.lastRequestTokens > 0) return u.lastRequestTokens;
-  return requestOccupancy(u);
-}
-
 // src/agents/spawn.ts
 async function spawnAgentTurn(thread, input, onEvent) {
   ensureAgentPath();
@@ -1339,9 +1316,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-VG44RZUH.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-GSLCEB5E.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-2OVON2LQ.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-46JE4NQR.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -1508,7 +1485,7 @@ function formatWorktreeDirective(thread, opts) {
     "- Prefer a concise imperative title (Conventional Commits style when it fits: feat:/fix:/chore:/docs:). Body should summarize intent, key changes, and test notes."
   );
   lines.push(
-    "- Commit with messages that state the purpose of the change (same standard as the PR). Stay on this thread branch. Never push directly to main/master or merge locally into the main checkout. When asked to merge the PR, use GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
+    "- Commit with messages that state the purpose of the change (same standard as the PR). Stay on this thread branch. Never push directly to main/master or merge locally into the main checkout. Do not merge the PR unless this turn is a Merge PR request or the user explicitly asked. When merging, use GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
   );
   if (thread.prUrl) {
     lines.push(
@@ -1540,19 +1517,30 @@ function formatWorktreeDirective(thread, opts) {
     '- "Fix CI: <name>." \u2192 investigate that failing check, fix it, commit, and push.'
   );
   lines.push(
-    '- "Update the branch." / "Fix merge conflicts." / "Merge origin/<base> into this branch. Then push." \u2192 sync with the PR base (merge or rebase), resolve conflicts carefully, commit, and push until the PR is mergeable.'
+    '- "Merge the remote branch (<base>) into your branch and resolve conflicts. Then, commit and push your changes." \u2192 fetch the PR base, merge it into this branch, resolve conflicts carefully, commit, and push until the PR is mergeable.'
   );
   lines.push(
     '- "Address review comments." \u2192 read PR review feedback, make the requested changes, commit, and push.'
   );
   lines.push(
-    '- "Merge PR." \u2192 merge this thread\'s open pull request on GitHub. If `gh stack view` shows a stack, use `gh stack merge`; otherwise `gh pr merge` (respect repo defaults / squash vs merge). Do not force-push main/master or merge locally into the main checkout.'
+    '- "Merge PR." \u2192 merge this thread\'s open pull request on GitHub (this phrase is the explicit ask). If `gh stack view` shows a stack, use `gh stack merge`; otherwise `gh pr merge` (respect repo defaults / squash vs merge). Do not force-push main/master or merge locally into the main checkout.'
   );
+  lines.push("");
+  lines.push(formatProcessGuideDirective());
   return lines.join("\n");
 }
 function formatWorktreeReminder() {
   return "Sideboard worktree: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout.";
 }
+function formatProcessGuideDirective() {
+  return [
+    "Process guides (recurring work only):",
+    "- If `.claude/skills/graph-engineering/SKILL.md` exists, follow it (`/graph-engineering`) for migrations, ports, batch fixes, and other fan-out. Judge first; state on disk; grow the rulebook; do not patch around it.",
+    "- If this same shape of work will happen again, write `.claude/skills/<kebab-name>/SKILL.md` in this worktree (Claude Code project skill). Sideboard `/name`, Claude Code, and `attach` all load that path. Do not leave the method only in chat.",
+    "- Do not write new skills under `.sideboard/skills` \u2014 native agents do not scan it. Point Codex/OpenCode at the file from `AGENTS.md`. Optional: symlink `.cursor/skills/<name>` to the Claude skill.",
+    "- Skip a guide for a one-off. If a matching skill exists, follow it. Same miss twice \u2192 edit the skill (or `.sideboard/review.md`), do not patch around it."
+  ].join("\n");
+}
 function formatArtifactDirective() {
   return [
     "Sideboard side column (desktop UI):",
@@ -1570,9 +1558,22 @@ 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.",
-    "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."
+    "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."
   ].join("\n");
 }
+function formatUiReminder() {
+  return [
+    "Sideboard side column (important):",
+    "There is no claude.ai Artifact tool here \u2014 that is normal.",
+    "HTML/SVG/markdown: ```html fence or MCP present_artifact.",
+    "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."
+  ].join(" ");
+}
 var FILES_BY_AGENT = {
   claude: [
     "CLAUDE.md",
@@ -1589,10 +1590,11 @@ var FILES_BY_AGENT = {
 var MAX_CHARS_PER_FILE = 48e3;
 function loadAgentInstructions(worktreePath, agent) {
   const candidates = FILES_BY_AGENT[agent] ?? FILES_BY_AGENT.claude;
-  const seen = /* @__PURE__ */ new Set();
+  const seenPaths = /* @__PURE__ */ new Set();
+  const seenBodies = /* @__PURE__ */ new Set();
   const out = [];
   for (const rel of candidates) {
-    if (seen.has(rel)) continue;
+    if (seenPaths.has(rel)) continue;
     const abs = join(worktreePath, rel);
     if (!existsSync(abs)) continue;
     try {
@@ -1604,7 +1606,10 @@ function loadAgentInstructions(worktreePath, agent) {
 
 \u2026(truncated)`;
       }
-      seen.add(rel);
+      const body = content.trim().replace(/\r\n/g, "\n");
+      if (seenBodies.has(body)) continue;
+      seenPaths.add(rel);
+      seenBodies.add(body);
       out.push({ relativePath: rel, content });
     } catch {
     }
@@ -1763,16 +1768,6 @@ async function captureLoginEnv() {
   cachedLoginEnv = { ...process.env };
   return { ...cachedLoginEnv };
 }
-var NESTED_ELECTRON_ENV_PREFIXES = ["ELECTRON_", "CHROME_"];
-function stripNestedElectronEnv(env) {
-  const out = { ...env };
-  for (const key of Object.keys(out)) {
-    if (NESTED_ELECTRON_ENV_PREFIXES.some((prefix) => key.startsWith(prefix))) {
-      delete out[key];
-    }
-  }
-  return out;
-}
 function buildWorkspaceScriptEnv(opts, baseEnv) {
   const env = stripNestedElectronEnv({
     ...baseEnv ?? process.env
@@ -3838,7 +3833,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-EWPHOM6Y.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-3YPUZME7.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -4381,7 +4376,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-TYPJNUSM.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-7B3PTEF4.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -5514,6 +5509,10 @@ File: src/client/frontends/desktop/core/UserData.ts
 
 **Approve** \u2014 Diff is scoped, behavior looks correct, and there are no blocking issues. Safe to merge.
 </example>
+
+## Growing the rules
+
+If a blocking issue is a missing or ambiguous repo rule that will recur, say so and propose one sentence for \`.sideboard/review.md\` or a \`.claude/skills/<name>/SKILL.md\`. Do not only patch this diff when the same miss will happen again. New skills go under \`.claude/skills\` (Claude Code / attach) \u2014 not \`.sideboard/skills\`.
 `;
 
 // src/review/request-review.ts
@@ -5898,7 +5897,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled: autoCleanupOrphansEnabled2 } = await import("./app-settings-6IOQYGBK.js");
+      const { autoCleanupOrphansEnabled: autoCleanupOrphansEnabled2 } = await import("./app-settings-MQXL7OUF.js");
       if (autoCleanupOrphansEnabled2() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -6055,7 +6054,7 @@ var Orchestrator = class {
   }
   async finishCreateThread(threadId, prompt) {
     await this.runSetupAfterCreate(threadId);
-    const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await import("./app-settings-6IOQYGBK.js");
+    const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await import("./app-settings-MQXL7OUF.js");
     if (autoRunAfterSetupEnabled2()) {
       try {
         await this.startDev(threadId);
@@ -6297,14 +6296,7 @@ var Orchestrator = class {
         SLACK_REPLY_FORMATTING
       ].join("\n") : null
     ].filter(Boolean).join("\n") : null;
-    const artifactReminder = thread.agent !== "brightsy" ? [
-      "Sideboard side column (important):",
-      "There is no claude.ai Artifact tool here \u2014 that is normal.",
-      "HTML/SVG/markdown: ```html fence or MCP present_artifact.",
-      "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."
-    ].join(" ") : null;
+    const artifactReminder = thread.agent !== "brightsy" ? formatUiReminder() : null;
     const worktreeReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatWorktreeReminder() : null;
     const slackReplyContext = formatSlackRepliesForTurn(
       pendingSlackExternalReplies(thread.messages)
@@ -6333,7 +6325,7 @@ var Orchestrator = class {
     }
     const isBrightsy = fresh.agent === "brightsy";
     const isOrchestration = isOrchestratorThread(fresh);
-    const { autoRenameBranchEnabled: autoRenameBranchEnabled2, getGithubGitAuthMode: getGithubGitAuthMode2 } = await import("./app-settings-6IOQYGBK.js");
+    const { autoRenameBranchEnabled: autoRenameBranchEnabled2, getGithubGitAuthMode: getGithubGitAuthMode2 } = await import("./app-settings-MQXL7OUF.js");
     const gitAuthMode = getGithubGitAuthMode2();
     const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
       githubSlug: await resolveGithubRepoSlug(fresh.worktreePath).catch(
@@ -6998,7 +6990,9 @@ var Orchestrator = class {
       reviewDecision: null,
       baseRefName: "",
       headRefName: "",
-      isInMergeQueue: false
+      isInMergeQueue: false,
+      mergeable: null,
+      mergeStateStatus: null
     };
     await this.persistPrMetaAndMaybeArchive(thread, metaLike);
     return { url: metaLike.url, state };
@@ -7048,7 +7042,7 @@ var Orchestrator = class {
         updateThread(thread.id, { title: meta.title });
       }
     }
-    const { autoArchiveOnMergeEnabled: autoArchiveOnMergeEnabled2 } = await import("./app-settings-6IOQYGBK.js");
+    const { autoArchiveOnMergeEnabled: autoArchiveOnMergeEnabled2 } = await import("./app-settings-MQXL7OUF.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -7336,7 +7330,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-TYPJNUSM.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-7B3PTEF4.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -7358,7 +7352,7 @@ var Orchestrator = class {
         await runArchiveScript(thread.repoPath, thread.worktreePath);
       } catch {
       }
-      const { deleteBranchOnPurgeEnabled: deleteBranchOnPurgeEnabled2 } = await import("./app-settings-6IOQYGBK.js");
+      const { deleteBranchOnPurgeEnabled: deleteBranchOnPurgeEnabled2 } = await import("./app-settings-MQXL7OUF.js");
       const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled2();
       await removeWorktree(thread.repoPath, thread.worktreePath, {
         deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -7379,7 +7373,7 @@ var Orchestrator = class {
       return restored2;
     }
     if (!existsSync15(thread.worktreePath)) {
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-5VLLFI5W.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-HSN5LWY6.js");
       const { execa: execa6 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
@@ -7488,7 +7482,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-5VLLFI5W.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-HSN5LWY6.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return createThread({
@@ -8240,7 +8234,7 @@ function withTimeout(promise, ms, label) {
 async function startMcpServer() {
   const orch = getOrchestrator();
   try {
-    const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-6IOQYGBK.js");
+    const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-MQXL7OUF.js");
     orch.setMaxConcurrent(maxConcurrentAgents2());
   } catch {
   }
@@ -8345,7 +8339,7 @@ async function startMcpServer() {
   );
   server.tool(
     "ask_user",
-    "Ask the user clarifying multiple-choice questions in Sideboard\u2019s composer (plan mode). Before calling, write a short chat message explaining the decision and what each option means. Include a description on every option. Use for approach forks and requirements \u2014 not for \u201Cis the plan ready?\u201D. After calling, stop and wait for their next message with answers.",
+    "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.",
     {
       questions: z3.array(
         z3.object({
@@ -8450,7 +8444,7 @@ async function startMcpServer() {
   registerLinearTools(server);
   if (sideboardMcpProfile() !== "worktree") {
     const { getCaffeinateHold: getCaffeinateHold2, setCaffeinateHold: setCaffeinateHold2 } = await import("./caffeinate-hold-EAZNWJBE.js");
-    const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults: resolveThreadDefaults2 } = await import("./app-settings-6IOQYGBK.js");
+    const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults: resolveThreadDefaults2 } = await import("./app-settings-MQXL7OUF.js");
     const accountDefaults = resolveThreadDefaults2();
     const accountDefaultsHint = `Account defaults: agent=${accountDefaults.agent}, model=${accountDefaults.model?.trim() || "Auto"}, effort=${accountDefaults.effort}`;
     server.tool(
@@ -8608,7 +8602,7 @@ async function startMcpServer() {
     );
     server.tool(
       "send_to_thread",
-      "Queue a prompt on a worktree thread chat (runs under concurrency cap). Use after create_thread to start or continue a conversation. For commit/push/PR/merge, prefer ask_git (canonical desktop-button phrases). Set force_stop=true to interrupt an in-flight/queued turn (kill + clear queue) before queueing this prompt \u2014 use when the thread is mid-turn or has stale queued prompts you need to replace.",
+      'Queue a prompt on a worktree thread chat (runs under concurrency cap). Use after create_thread to start or continue a conversation. For commit/push/PR, prefer ask_git (canonical desktop-button phrases). Send "Merge PR." / ask_git merge only when the user explicitly asked to merge. Set force_stop=true to interrupt an in-flight/queued turn (kill + clear queue) before queueing this prompt \u2014 use when the thread is mid-turn or has stale queued prompts you need to replace.',
       {
         ref: z3.string(),
         prompt: z3.string(),
@@ -8704,7 +8698,7 @@ async function startMcpServer() {
     );
     server.tool(
       "archive_thread",
-      "Archive a thread (stops agent/dev, runs archive script, removes worktree when last chat tab). Coordinators commit, push, open PRs, and merge only by asking the worktree agent (ask_git).",
+      "Archive a thread (stops agent/dev, runs archive script, removes worktree when last chat tab). Coordinators commit, push, and open PRs by asking the worktree agent (ask_git). Merge only when the user explicitly asked.",
       { ref: z3.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
@@ -8812,7 +8806,7 @@ async function startMcpServer() {
     );
     server.tool(
       "ask_git",
-      "Commit & push, open a draft PR, resolve conflicts, or merge \u2014 same actions as the desktop git buttons. When the worktree is clean, Sideboard pushes / opens the PR itself (HTTPS via `gh` if SSH is missing). When dirty, queues the worktree agent to commit; then wait_for_turn. Pass a worktree thread ref (not the orchestrator). Do not run git or gh from the orchestration cwd.",
+      "Commit & push, open a draft PR, resolve conflicts, or merge \u2014 same actions as the desktop git buttons. When the worktree is clean, Sideboard pushes / opens the PR itself (HTTPS via `gh` if SSH is missing). When dirty, queues the worktree agent to commit; then wait_for_turn. Pass a worktree thread ref (not the orchestrator). action=merge only when the user explicitly asked to merge that PR. Do not run git or gh from the orchestration cwd.",
       {
         ref: z3.string().describe("Worktree thread id/ref"),
         action: z3.enum(AGENT_GIT_ACTIONS).describe(
@@ -9113,7 +9107,7 @@ async function startMcpServer() {
     );
     server.tool(
       "get_pr_stack",
-      "Load the GitHub PR stack for a thread worktree (`gh stack view --json`). Returns null JSON when the branch is not stacked. Prefer this before ask_git merge on stacked PRs.",
+      "Load the GitHub PR stack for a thread worktree (`gh stack view --json`). Returns null JSON when the branch is not stacked. Prefer this before ask_git merge on stacked PRs (and only merge when the user explicitly asked).",
       { ref: z3.string() },
       async ({ ref }) => {
         const stack = await orch.getPrStack(ref);
@@ -11197,6 +11191,7 @@ export {
   REVIEW_REQUEST_NAME,
   REVIEW_REQUEST_PATH,
   REVIEW_REQUEST_PREFILL,
+  REVIEW_REQUEST_TEMPLATE,
   SIDEBOARD_FORCE_STOP,
   SIDEBOARD_MCP_ALLOWED_TOOLS,
   SIDEBOARD_MCP_PROFILE_ENV,
@@ -11345,9 +11340,11 @@ export {
   formatGhLandError,
   formatGitAuthModeDirective,
   formatIpcInvokeError,
+  formatMergePrError,
   formatMessagesAsTranscript,
   formatPlanQuestionAnswers,
   formatPlanQuestionsForChat,
+  formatProcessGuideDirective,
   formatRateLimitResetHint,
   formatRenameBranchDirective,
   formatSlackExternalReplyPrompt,
@@ -11355,9 +11352,11 @@ export {
   formatSlackRepliesForTurn,
   formatSlackSignedReply,
   formatTranscriptMarkdown,
+  formatUiReminder,
   formatWorkspaceInventory,
   formatWorktreeDirective,
   formatWorktreeReminder,
+  fromInclusiveInputUsage,
   getAdapter,
   getAgentSetupInfo,
   getBrightsySession,
@@ -11428,6 +11427,7 @@ export {
   isOrchestratorThread,
   isPidAlive,
   isPlaceholderBranch,
+  isPrNotMergeableError,
   isPresentPlanToolName,
   isSessionQuotaLimit,
   isSideboardScratchPath,