@sideboard-ai/core 0.1.79 → 0.1.81

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-PW5YHHP3.js";
+} from "./chunk-K553XK7M.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-XNECBC6T.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -85,7 +91,7 @@ import {
   parseForceStopMessage,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-5LXWTU3J.js";
+} from "./chunk-6F2TQFJE.js";
 import {
   COORDINATOR_TOOL_PLAYBOOK,
   SLACK_REPLY_FORMATTING,
@@ -94,7 +100,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-HCGEFU3J.js";
+} from "./chunk-CQBQWX73.js";
 import {
   brightsyConfigPath,
   brightsyMcpServerName,
@@ -1296,41 +1302,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 +1310,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-DZM4ZFGU.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-2OVON2LQ.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-JQF72JKX.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -1508,7 +1479,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(
@@ -1546,7 +1517,7 @@ function formatWorktreeDirective(thread, opts) {
     '- "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.'
   );
   return lines.join("\n");
 }
@@ -1589,10 +1560,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 +1576,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 {
     }
@@ -3838,7 +3813,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-UQ7D6U6L.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -4381,7 +4356,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-TYPJNUSM.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QLRCOXAY.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -7336,7 +7311,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-QLRCOXAY.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -8608,7 +8583,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 +8679,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 +8787,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 +9088,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);
@@ -11358,6 +11333,7 @@ export {
   formatWorkspaceInventory,
   formatWorktreeDirective,
   formatWorktreeReminder,
+  fromInclusiveInputUsage,
   getAdapter,
   getAgentSetupInfo,
   getBrightsySession,

package/dist/mcp/run-stdio.cjs

@@ -4489,7 +4489,7 @@ function coordinatorTurnReminder(opts) {
     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.`,
-    "- Existing repo: create_thread on a repoPath \u2192 send_to_thread \u2192 wait_for_turn. Land with ask_git (commit-push / create-draft / merge) on the child, then wait_for_turn \u2014 never git/gh from this cwd.",
+    "- Existing repo: create_thread on a repoPath \u2192 send_to_thread \u2192 wait_for_turn. Commit/push/draft PR with ask_git on the child, then wait_for_turn \u2014 never git/gh from this cwd. Call ask_git merge only if the user explicitly asked to merge.",
     "- New repo: Bash (clone or gh repo create under ~/sideboard/repos/<name>) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 ask_git create-draft.",
     "- When naming threads for the user, link them as `[Title](sideboard://thread/<id>)`.",
     "- If they will wait on Slack or leave the Mac, call set_caffeinate enabled=true. When they say they are done / wrapping up / going to sleep, call set_caffeinate enabled=false. Closing this chat also turns it off."
@@ -4543,9 +4543,9 @@ function ensureGlobalCoordinatorCwd(opts) {
     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 \u2192 ask_git create-draft \u2192 wait_for_turn \u2192 (when ready) ask_git merge \u2192 wait_for_turn.",
+    "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 ask_git create-draft \u2192 wait_for_turn. Merge only if the user explicitly asked (`ask_git` merge).",
     "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 ask_git create-draft.",
-    "Always ask worktree agents to commit, push, open draft PRs, and merge (`ask_git` / `send_to_thread`). The worktree agent runs git/gh; never merge from this orchestration cwd."
+    "Always ask worktree agents to commit, push, and open draft PRs (`ask_git` / `send_to_thread`). Tell them to merge only when the user explicitly asked. The worktree agent runs git/gh; never merge from this orchestration cwd."
   ].join("\n");
   try {
     (0, import_node_fs11.writeFileSync)((0, import_node_path12.join)(dir, "CLAUDE.md"), `${body}
@@ -4558,7 +4558,6 @@ function ensureGlobalCoordinatorCwd(opts) {
 }
 function coordinatorSystemPrompt(opts) {
   const audience = opts.audience ?? "cloud";
-  const reposDir = sideboardReposDir();
   const intro = audience === "cloud" ? [
     "You are a Sideboard coordinator responding to a request from a Brightsy cloud agent (Discord, Teams, or other chat).",
     "Your reply will be sent back to that cloud agent \u2014 be concise and actionable."
@@ -4576,14 +4575,8 @@ function coordinatorSystemPrompt(opts) {
     ...intro,
     "You operate across ALL registered workspaces below.",
     "You have no project git home \u2014 this process cwd is synthetic and empty on purpose.",
-    COORDINATOR_TOOL_PLAYBOOK,
-    accountDefaultsPlaybookLine(),
-    coordinatorGreenfieldPlaybook(reposDir),
-    "When creating threads, pass the correct repoPath for the target workspace.",
+    "Follow AGENTS.md / CLAUDE.md in this cwd for the fleet playbook (they are the same document).",
     `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 ask_git create-draft \u2192 wait_for_turn \u2192 (when ready) ask_git merge \u2192 wait_for_turn. Never target upstream. Never git/gh from this orchestration cwd.",
-    "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 ask_git create-draft.",
     `Goal: ${opts.goal}`,
     "Registered workspaces:",
     formatWorkspaceInventory(opts.workspaces)
@@ -4628,6 +4621,7 @@ var init_coordinator_prompt = __esm({
       "- 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 changes in this workspace."); then wait_for_turn / get_turn_result on the returned id',
       "- ask_git \u2014 commit & push, open a draft PR, resolve conflicts, or merge. When the worktree is clean, Sideboard pushes / opens the PR itself. When dirty, it queues the worktree agent \u2014 then wait_for_turn. Prefer this over paraphrasing.",
+      '- Merge (`ask_git` action=merge / send_to_thread "Merge PR.") only when the user explicitly asked to merge that PR. Do not merge because the work looks done, CI is green, or a typical flow includes it.',
       '- Or send_to_thread with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Fix merge conflicts.", "Merge PR." (draft PRs: `gh pr create --draft -R <origin-owner/name>` using the workspace `github:` slug \u2014 never upstream). Never run git/gh from this orchestration cwd, and never merge the PR yourself.',
       "Human-only (do not attempt): ready-for-review land (confirm_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.",
@@ -5065,6 +5059,51 @@ var init_connected_teams = __esm({
   }
 });
 
+// src/agents/usage.ts
+function sumOptional(a, b) {
+  if (a == null && b == null) return void 0;
+  return (a ?? 0) + (b ?? 0);
+}
+function fromInclusiveInputUsage(opts) {
+  const totalInput = Number(opts.inputTokens) || 0;
+  const outputTokens = Number(opts.outputTokens) || 0;
+  const cached = Number(opts.cachedInputTokens) || 0;
+  if (!totalInput && !outputTokens) return null;
+  const cacheReadTokens = cached > 0 ? Math.min(cached, totalInput) : 0;
+  return {
+    inputTokens: Math.max(0, totalInput - cacheReadTokens),
+    outputTokens,
+    cacheReadTokens: cacheReadTokens || void 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) };
+}
+var init_usage = __esm({
+  "src/agents/usage.ts"() {
+    "use strict";
+  }
+});
+
 // src/agents/brightsy-targets.ts
 function encodeBrightsyTarget(type, id, accountId) {
   if (accountId) return `team:${accountId}:${type}:${id}`;
@@ -5129,15 +5168,11 @@ var init_turn_input = __esm({
 // src/agents/brightsy.ts
 function usageFromBrightsy(usage) {
   if (!usage) return null;
-  const inputTokens = Number(usage.prompt_tokens ?? 0);
-  const outputTokens = Number(usage.completion_tokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
-  const cached = Number(usage.prompt_tokens_details?.cached_tokens ?? 0);
-  return {
-    inputTokens,
-    outputTokens,
-    cacheReadTokens: cached || void 0
-  };
+  return fromInclusiveInputUsage({
+    inputTokens: Number(usage.prompt_tokens ?? 0),
+    outputTokens: Number(usage.completion_tokens ?? 0),
+    cachedInputTokens: Number(usage.prompt_tokens_details?.cached_tokens ?? 0)
+  });
 }
 function parseBrightsyCliLine(line) {
   const trimmed = line.trim();
@@ -5353,6 +5388,7 @@ var init_brightsy = __esm({
     init_connected_teams();
     init_config();
     init_app_settings();
+    init_usage();
     init_brightsy_targets();
     init_error_detail();
     init_turn_input();
@@ -6232,14 +6268,11 @@ async function listCodexModels() {
 }
 function usageFromCodex(usage) {
   if (!usage) return null;
-  const inputTokens = Number(usage.input_tokens ?? 0);
-  const outputTokens = Number(usage.output_tokens ?? 0) + Number(usage.reasoning_output_tokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
-  return {
-    inputTokens,
-    outputTokens,
-    cacheReadTokens: usage.cached_input_tokens ? Number(usage.cached_input_tokens) : void 0
-  };
+  return fromInclusiveInputUsage({
+    inputTokens: Number(usage.input_tokens ?? 0),
+    outputTokens: Number(usage.output_tokens ?? 0),
+    cachedInputTokens: Number(usage.cached_input_tokens ?? 0)
+  });
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
@@ -6299,6 +6332,7 @@ var init_codex = __esm({
     init_app_settings();
     init_global_workspace();
     init_error_detail();
+    init_usage();
     init_injected_mcp();
     init_turn_input();
     init_types();
@@ -8899,36 +8933,7 @@ function normalizeParseResult(parsed) {
 
 // src/agents/spawn.ts
 init_path();
-
-// 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) };
-}
-
-// src/agents/spawn.ts
+init_usage();
 async function spawnAgentTurn(thread, input, onEvent) {
   ensureAgentPath();
   if (!thread.worktreePath?.trim()) {
@@ -12553,7 +12558,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(
@@ -12591,7 +12596,7 @@ function formatWorktreeDirective(thread, opts) {
     '- "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.'
   );
   return lines.join("\n");
 }
@@ -15799,7 +15804,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: import_zod3.z.string(),
         prompt: import_zod3.z.string(),
@@ -15895,7 +15900,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: import_zod3.z.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
@@ -16003,7 +16008,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: import_zod3.z.string().describe("Worktree thread id/ref"),
         action: import_zod3.z.enum(AGENT_GIT_ACTIONS).describe(
@@ -16304,7 +16309,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: import_zod3.z.string() },
       async ({ ref }) => {
         const stack = await orch.getPrStack(ref);

package/dist/mcp/run-stdio.js

@@ -2,6 +2,7 @@
 
 import {
   PLAN_MODE_INSTRUCTION,
+  applyTurnUsage,
   fallbackTurnFailDetail,
   formatTurnExitError,
   getAdapter,
@@ -16,14 +17,14 @@ import {
   resolveQuotaFallbackAgent,
   sideboardMcpProfile,
   summarizeTurnStderr
-} from "../chunk-P33ZQ7ZC.js";
+} from "../chunk-4AVU4QXO.js";
 import "../chunk-VROPG6QF.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "../chunk-5VTWBI3I.js";
+} from "../chunk-TDJ43HUD.js";
 import {
   extractPresentedPlan,
   readPlanFile,
@@ -41,14 +42,14 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "../chunk-6T2SKGCS.js";
+} from "../chunk-P5VDPGAN.js";
 import {
   SLACK_REPLY_FORMATTING,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "../chunk-HSLQXL6M.js";
+} from "../chunk-4HJK57XU.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -882,34 +883,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) };
-}
-
 // src/agents/spawn.ts
 async function spawnAgentTurn(thread, input, onEvent) {
   ensureAgentPath();
@@ -918,9 +891,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-RI367AM6.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-NUMUJRWG.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-K2R34A5T.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-NYNEFKIV.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -1852,7 +1825,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("../agents-GRAPUXWW.js");
+  const { getAdapter: getAdapter2 } = await import("../agents-EBKJ55PN.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2716,7 +2689,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-BQWQEZWE.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-SUU2GO3A.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -4487,7 +4460,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(
@@ -4525,7 +4498,7 @@ function formatWorktreeDirective(thread, opts) {
     '- "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.'
   );
   return lines.join("\n");
 }
@@ -6122,7 +6095,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-BQWQEZWE.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-SUU2GO3A.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -7704,7 +7677,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(),
@@ -7800,7 +7773,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);
@@ -7908,7 +7881,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(
@@ -8209,7 +8182,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);