@sideboard-ai/core 0.1.73 → 0.1.74

package/dist/agents/cursor-runner.cjs

@@ -209,7 +209,7 @@ function cursorSdkMessageToEvents(msg) {
   }
   if (msg.type === "usage") {
     const usage = usageFromCursor(msg.usage);
-    if (usage) return [{ type: "usage", data: usage }];
+    if (usage) return [{ type: "usage", data: usage, scope: "request" }];
   }
   if (msg.type === "status" && msg.status === "ERROR") {
     const rawMessage = msg.message;

package/dist/agents/cursor-runner.js

@@ -2,7 +2,7 @@
 import {
   cursorSdkMessageToEvents,
   formatUnknownDetail
-} from "../chunk-3WJAUKIL.js";
+} from "../chunk-SEOICVGB.js";
 import {
   appDataDir
 } from "../chunk-M37RITA6.js";

package/dist/{agents-77GE7VRW.js → agents-2S2JVLZ6.js}

@@ -32,15 +32,15 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent
-} from "./chunk-AFW3M6LU.js";
+} from "./chunk-KBKPVKYZ.js";
 import "./chunk-VROPG6QF.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-POW7JCB5.js";
-import "./chunk-6RFPKZNC.js";
+} from "./chunk-2NKSHIRI.js";
+import "./chunk-XA2FQJTN.js";
 import "./chunk-OE7YBB5X.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-7FD7COKE.js";

package/dist/{agents-GUFUYXKP.js → agents-H7M5CQY2.js}

@@ -28,19 +28,19 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent
-} from "./chunk-WSFZPOPH.js";
+} from "./chunk-5KJMNNCB.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-NF6Y4GTE.js";
-import "./chunk-V4ACEJX2.js";
+} from "./chunk-77W62MTX.js";
+import "./chunk-HCWAIEBU.js";
 import "./chunk-BTL7EMGT.js";
 import {
   cursorSdkMessageToEvents,
   parseCursorRunnerLine
-} from "./chunk-3WJAUKIL.js";
+} from "./chunk-SEOICVGB.js";
 import "./chunk-W7YOTDVO.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-MF2YMEGD.js";

package/dist/{chunk-POW7JCB5.js → chunk-2NKSHIRI.js}

@@ -2,7 +2,7 @@
 
 import {
   ensureGlobalCoordinatorCwd
-} from "./chunk-6RFPKZNC.js";
+} from "./chunk-XA2FQJTN.js";
 import {
   allocateTeamName,
   takenSlugsFromThread,

package/dist/{chunk-WSFZPOPH.js → chunk-5KJMNNCB.js}

@@ -1,6 +1,6 @@
 import {
   isOrchestratorThread
-} from "./chunk-NF6Y4GTE.js";
+} from "./chunk-77W62MTX.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
@@ -13,7 +13,7 @@ import {
   formatUnknownDetail,
   looksLikeAgentFailureMessage,
   parseCursorRunnerLine
-} from "./chunk-3WJAUKIL.js";
+} from "./chunk-SEOICVGB.js";
 import {
   claudeChromeEnabled,
   loadAppSettings,
@@ -825,12 +825,14 @@ function usageFromClaude(usage) {
   if (!usage) return null;
   const inputTokens = Number(usage.input_tokens ?? 0);
   const outputTokens = Number(usage.output_tokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
+  const cacheReadTokens = Number(usage.cache_read_input_tokens ?? 0);
+  const cacheWriteTokens = Number(usage.cache_creation_input_tokens ?? 0);
+  if (!inputTokens && !outputTokens && !cacheReadTokens && !cacheWriteTokens) return null;
   return {
     inputTokens,
     outputTokens,
-    cacheReadTokens: usage.cache_read_input_tokens ? Number(usage.cache_read_input_tokens) : void 0,
-    cacheWriteTokens: usage.cache_creation_input_tokens ? Number(usage.cache_creation_input_tokens) : void 0
+    cacheReadTokens: cacheReadTokens || void 0,
+    cacheWriteTokens: cacheWriteTokens || void 0
   };
 }
 function claudeResultErrorDetail(obj) {
@@ -947,7 +949,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-S3B6ESZS.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-CSIS62Z4.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1030,8 +1032,12 @@ var claudeAdapter = {
         return { type: "session_id", data: obj.session_id };
       }
       if (obj.type === "assistant" || obj.type === "user") {
-        const content = obj.message?.content;
-        const events = eventsFromContentBlocks(content);
+        const message = obj.message;
+        const events = eventsFromContentBlocks(message?.content);
+        if (obj.type === "assistant") {
+          const usage = usageFromClaude(message?.usage);
+          if (usage) events.push({ type: "usage", data: usage, scope: "request" });
+        }
         if (events.length === 0) return null;
         return events.length === 1 ? events[0] : events;
       }
@@ -1076,7 +1082,7 @@ var claudeAdapter = {
           if (typeof text === "string" && text) events.push({ type: "stdout", data: text });
         }
         const usage = usageFromClaude(obj.usage);
-        if (usage) events.push({ type: "usage", data: usage });
+        if (usage) events.push({ type: "usage", data: usage, scope: "turn" });
         if (events.length === 0) return null;
         return events.length === 1 ? events[0] : events;
       }
@@ -1412,7 +1418,7 @@ var codexAdapter = {
       }
       if (type === "turn.completed" || type === "turn_completed") {
         const usage = usageFromCodex(obj.usage);
-        return usage ? { type: "usage", data: usage } : null;
+        return usage ? { type: "usage", data: usage, scope: "turn" } : null;
       }
       if (typeof obj.content === "string" && obj.content.trim()) {
         return { type: "stdout", data: obj.content };
@@ -1830,7 +1836,7 @@ var opencodeAdapter = {
         const usage = usageFromOpencode(
           part?.tokens ?? obj.tokens
         );
-        return usage ? { type: "usage", data: usage } : null;
+        return usage ? { type: "usage", data: usage, scope: "request" } : null;
       }
       return null;
     } catch {

package/dist/{chunk-NF6Y4GTE.js → chunk-77W62MTX.js}

@@ -1,6 +1,6 @@
 import {
   ensureGlobalCoordinatorCwd
-} from "./chunk-V4ACEJX2.js";
+} from "./chunk-HCWAIEBU.js";
 import {
   resolveNewThreadOptions,
   resolveThreadDefaults

package/dist/{chunk-CYKPUTXN.js → chunk-DG3S2UXP.js}

@@ -1,6 +1,6 @@
 import {
   isGlobalRepoPath
-} from "./chunk-NF6Y4GTE.js";
+} from "./chunk-77W62MTX.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot

package/dist/{chunk-CXT2PLO7.js → chunk-GJ2LZQJI.js}

@@ -2,7 +2,7 @@
 
 import {
   isGlobalRepoPath
-} from "./chunk-POW7JCB5.js";
+} from "./chunk-2NKSHIRI.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot

package/dist/{chunk-V4ACEJX2.js → chunk-HCWAIEBU.js}

@@ -34,7 +34,7 @@ function coordinatorGreenfieldPlaybook(reposDir) {
     "- Examples:",
     `  - Clone: \`git clone <url> ${reposDir}/<name>\``,
     `  - New GitHub repo: \`gh repo create <owner>/<name> --private --clone -- ${reposDir}/<name>\` (or mkdir + git init + gh repo create + remote add + push)`,
-    "- Then: add_workspace with that absolute path \u2192 create_thread (repoPath + parentThreadId) \u2192 send_to_thread (build) \u2192 wait_for_turn \u2192 send_to_thread (`gh pr create --draft -R <origin-owner/name>`).",
+    "- Then: add_workspace with that absolute path \u2192 create_thread (repoPath + parentThreadId) \u2192 send_to_thread (build) \u2192 wait_for_turn \u2192 ask_git create-draft (or send_to_thread `gh pr create --draft -R <origin-owner/name>`).",
     "- Always target the child worktree's **origin** (`github:` slug from list_workspaces / `git remote get-url origin` in that worktree). Never open PRs against `upstream`.",
     "- Do coding work in the child worktree thread, not by editing files in this home cwd."
   ].join("\n");
@@ -67,8 +67,9 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   "Inspect / review / PRs:",
   "- get_diff \u2014 compact diff summary",
   '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .sideboard/review.md when present, else local guidelines; sends "Review changes in this workspace."); then wait_for_turn / get_turn_result on the returned id',
-  "- Ask the worktree agent via send_to_thread to open a draft PR with `gh pr create --draft -R <origin-owner/name>` (workspace `github:` slug / that worktree's origin \u2014 never upstream). Do not open PRs from the orchestrator yourself.",
-  "Human-only (do not attempt): merge, ready-for-review land, purge_thread.",
+  "- ask_git \u2014 tell a worktree agent to commit & push, open a draft PR, resolve conflicts, or merge (`Merge PR.`). You only queue that prompt \u2014 the worktree agent runs git/gh (including `gh pr merge`). Then wait_for_turn. Prefer this over paraphrasing.",
+  '- 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.",
   "Bash / Read / etc: allowed for (1) inspecting target worktrees / registered repo paths from MCP, and (2) greenfield setup under ~/sideboard/repos (git clone, gh repo create, git init+remote). Never git init/clone *inside* this synthetic home cwd \u2014 emptiness here is expected, not a bug."
 ].join("\n");
@@ -97,8 +98,8 @@ 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.",
-    "- 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 draft PR.",
+    "- 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.",
+    "- 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."
   ].filter(Boolean).join("\n");
@@ -151,9 +152,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.",
-    "Typical flow (new app): Bash create/clone under repos dir \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 draft PR via worktree agent.",
-    "Always ask worktree agents to open draft PRs (`send_to_thread` + `gh pr create --draft -R <origin>`); never open PRs from the orchestrator."
+    "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 (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."
   ].join("\n");
   try {
     writeFileSync(join(dir, "CLAUDE.md"), `${body}
@@ -190,8 +191,8 @@ function coordinatorSystemPrompt(opts) {
     "When creating threads, pass the correct repoPath for the target workspace.",
     `YOUR orchestration thread id is ${opts.parentId} \u2014 pass parentThreadId="${opts.parentId}" on create_thread, or omit parentThreadId (Sideboard binds it). Never invent a uuid.`,
     "Omit agent/model on create_thread unless you need to override Account defaults.",
-    "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 send_to_thread (ask for `gh pr create --draft -R <origin-owner/name>` using the workspace github slug) \u2192 wait_for_turn. Never target upstream. Never open PRs from the orchestrator.",
-    "Typical flow (new app): Bash under repos dir (clone or gh repo create) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 draft PR via worktree agent.",
+    "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)

package/dist/{chunk-AFW3M6LU.js → chunk-KBKPVKYZ.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-VROPG6QF.js";
 import {
   isOrchestratorThread
-} from "./chunk-POW7JCB5.js";
+} from "./chunk-2NKSHIRI.js";
 import {
   enrichPathWithNpmGlobalBin,
   isConductorBundledCli,
@@ -885,12 +885,14 @@ function usageFromClaude(usage) {
   if (!usage) return null;
   const inputTokens = Number(usage.input_tokens ?? 0);
   const outputTokens = Number(usage.output_tokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
+  const cacheReadTokens = Number(usage.cache_read_input_tokens ?? 0);
+  const cacheWriteTokens = Number(usage.cache_creation_input_tokens ?? 0);
+  if (!inputTokens && !outputTokens && !cacheReadTokens && !cacheWriteTokens) return null;
   return {
     inputTokens,
     outputTokens,
-    cacheReadTokens: usage.cache_read_input_tokens ? Number(usage.cache_read_input_tokens) : void 0,
-    cacheWriteTokens: usage.cache_creation_input_tokens ? Number(usage.cache_creation_input_tokens) : void 0
+    cacheReadTokens: cacheReadTokens || void 0,
+    cacheWriteTokens: cacheWriteTokens || void 0
   };
 }
 function claudeResultErrorDetail(obj) {
@@ -1007,7 +1009,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-VF56FTPY.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-PJU6HISJ.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1090,8 +1092,12 @@ var claudeAdapter = {
         return { type: "session_id", data: obj.session_id };
       }
       if (obj.type === "assistant" || obj.type === "user") {
-        const content = obj.message?.content;
-        const events = eventsFromContentBlocks(content);
+        const message = obj.message;
+        const events = eventsFromContentBlocks(message?.content);
+        if (obj.type === "assistant") {
+          const usage = usageFromClaude(message?.usage);
+          if (usage) events.push({ type: "usage", data: usage, scope: "request" });
+        }
         if (events.length === 0) return null;
         return events.length === 1 ? events[0] : events;
       }
@@ -1136,7 +1142,7 @@ var claudeAdapter = {
           if (typeof text === "string" && text) events.push({ type: "stdout", data: text });
         }
         const usage = usageFromClaude(obj.usage);
-        if (usage) events.push({ type: "usage", data: usage });
+        if (usage) events.push({ type: "usage", data: usage, scope: "turn" });
         if (events.length === 0) return null;
         return events.length === 1 ? events[0] : events;
       }
@@ -1472,7 +1478,7 @@ var codexAdapter = {
       }
       if (type === "turn.completed" || type === "turn_completed") {
         const usage = usageFromCodex(obj.usage);
-        return usage ? { type: "usage", data: usage } : null;
+        return usage ? { type: "usage", data: usage, scope: "turn" } : null;
       }
       if (typeof obj.content === "string" && obj.content.trim()) {
         return { type: "stdout", data: obj.content };
@@ -1676,7 +1682,7 @@ function cursorSdkMessageToEvents(msg) {
   }
   if (msg.type === "usage") {
     const usage = usageFromCursor(msg.usage);
-    if (usage) return [{ type: "usage", data: usage }];
+    if (usage) return [{ type: "usage", data: usage, scope: "request" }];
   }
   if (msg.type === "status" && msg.status === "ERROR") {
     const rawMessage = msg.message;
@@ -2061,7 +2067,7 @@ var opencodeAdapter = {
         const usage = usageFromOpencode(
           part?.tokens ?? obj.tokens
         );
-        return usage ? { type: "usage", data: usage } : null;
+        return usage ? { type: "usage", data: usage, scope: "request" } : null;
       }
       return null;
     } catch {

package/dist/{chunk-3WJAUKIL.js → chunk-SEOICVGB.js}

@@ -257,7 +257,7 @@ function cursorSdkMessageToEvents(msg) {
   }
   if (msg.type === "usage") {
     const usage = usageFromCursor(msg.usage);
-    if (usage) return [{ type: "usage", data: usage }];
+    if (usage) return [{ type: "usage", data: usage, scope: "request" }];
   }
   if (msg.type === "status" && msg.status === "ERROR") {
     const rawMessage = msg.message;

package/dist/{chunk-6RFPKZNC.js → chunk-XA2FQJTN.js}

@@ -36,7 +36,7 @@ function coordinatorGreenfieldPlaybook(reposDir) {
     "- Examples:",
     `  - Clone: \`git clone <url> ${reposDir}/<name>\``,
     `  - New GitHub repo: \`gh repo create <owner>/<name> --private --clone -- ${reposDir}/<name>\` (or mkdir + git init + gh repo create + remote add + push)`,
-    "- Then: add_workspace with that absolute path \u2192 create_thread (repoPath + parentThreadId) \u2192 send_to_thread (build) \u2192 wait_for_turn \u2192 send_to_thread (`gh pr create --draft -R <origin-owner/name>`).",
+    "- Then: add_workspace with that absolute path \u2192 create_thread (repoPath + parentThreadId) \u2192 send_to_thread (build) \u2192 wait_for_turn \u2192 ask_git create-draft (or send_to_thread `gh pr create --draft -R <origin-owner/name>`).",
     "- Always target the child worktree's **origin** (`github:` slug from list_workspaces / `git remote get-url origin` in that worktree). Never open PRs against `upstream`.",
     "- Do coding work in the child worktree thread, not by editing files in this home cwd."
   ].join("\n");
@@ -69,8 +69,9 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   "Inspect / review / PRs:",
   "- get_diff \u2014 compact diff summary",
   '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .sideboard/review.md when present, else local guidelines; sends "Review changes in this workspace."); then wait_for_turn / get_turn_result on the returned id',
-  "- Ask the worktree agent via send_to_thread to open a draft PR with `gh pr create --draft -R <origin-owner/name>` (workspace `github:` slug / that worktree's origin \u2014 never upstream). Do not open PRs from the orchestrator yourself.",
-  "Human-only (do not attempt): merge, ready-for-review land, purge_thread.",
+  "- ask_git \u2014 tell a worktree agent to commit & push, open a draft PR, resolve conflicts, or merge (`Merge PR.`). You only queue that prompt \u2014 the worktree agent runs git/gh (including `gh pr merge`). Then wait_for_turn. Prefer this over paraphrasing.",
+  '- 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.",
   "Bash / Read / etc: allowed for (1) inspecting target worktrees / registered repo paths from MCP, and (2) greenfield setup under ~/sideboard/repos (git clone, gh repo create, git init+remote). Never git init/clone *inside* this synthetic home cwd \u2014 emptiness here is expected, not a bug."
 ].join("\n");
@@ -99,8 +100,8 @@ 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.",
-    "- 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 draft PR.",
+    "- 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.",
+    "- 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."
   ].filter(Boolean).join("\n");
@@ -153,9 +154,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.",
-    "Typical flow (new app): Bash create/clone under repos dir \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 draft PR via worktree agent.",
-    "Always ask worktree agents to open draft PRs (`send_to_thread` + `gh pr create --draft -R <origin>`); never open PRs from the orchestrator."
+    "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 (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."
   ].join("\n");
   try {
     writeFileSync(join(dir, "CLAUDE.md"), `${body}
@@ -192,8 +193,8 @@ function coordinatorSystemPrompt(opts) {
     "When creating threads, pass the correct repoPath for the target workspace.",
     `YOUR orchestration thread id is ${opts.parentId} \u2014 pass parentThreadId="${opts.parentId}" on create_thread, or omit parentThreadId (Sideboard binds it). Never invent a uuid.`,
     "Omit agent/model on create_thread unless you need to override Account defaults.",
-    "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 send_to_thread (ask for `gh pr create --draft -R <origin-owner/name>` using the workspace github slug) \u2192 wait_for_turn. Never target upstream. Never open PRs from the orchestrator.",
-    "Typical flow (new app): Bash under repos dir (clone or gh repo create) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 draft PR via worktree agent.",
+    "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)

package/dist/{coordinator-prompt-4U2QNHGT.js → coordinator-prompt-3XXSG7M2.js}

@@ -7,7 +7,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-V4ACEJX2.js";
+} from "./chunk-HCWAIEBU.js";
 import "./chunk-W7YOTDVO.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-MF2YMEGD.js";

package/dist/{coordinator-prompt-ZHBDHMZB.js → coordinator-prompt-RTUCCPCI.js}

@@ -9,7 +9,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-6RFPKZNC.js";
+} from "./chunk-XA2FQJTN.js";
 import "./chunk-OE7YBB5X.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-7FD7COKE.js";

package/dist/{global-workspace-S3B6ESZS.js → global-workspace-CSIS62Z4.js}

@@ -14,8 +14,8 @@ import {
   orchestratorSessionPoisonedByBuiltins,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-NF6Y4GTE.js";
-import "./chunk-V4ACEJX2.js";
+} from "./chunk-77W62MTX.js";
+import "./chunk-HCWAIEBU.js";
 import "./chunk-W7YOTDVO.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-MF2YMEGD.js";

package/dist/{global-workspace-VF56FTPY.js → global-workspace-PJU6HISJ.js}

@@ -16,8 +16,8 @@ import {
   orchestratorSessionPoisonedByBuiltins,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-POW7JCB5.js";
-import "./chunk-6RFPKZNC.js";
+} from "./chunk-2NKSHIRI.js";
+import "./chunk-XA2FQJTN.js";
 import "./chunk-OE7YBB5X.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-7FD7COKE.js";