@sideboard-ai/core 0.1.270 → 0.1.272

package/dist/{agents-G3JTULM2.js → agents-LAFFXBBZ.js}

@@ -47,10 +47,10 @@ import {
   resolveLoginCommand,
   resolveQuotaFallbackAgent,
   whichOnPath
-} from "./chunk-3VBS6MES.js";
+} from "./chunk-ADWNK2JH.js";
 import "./chunk-GWFVCCJZ.js";
 import "./chunk-FAGK33E2.js";
-import "./chunk-DB7MVDYS.js";
+import "./chunk-PTNGMA5C.js";
 import "./chunk-USBZ7PH4.js";
 import "./chunk-FWNL62VA.js";
 import "./chunk-2P4XKWV2.js";

package/dist/{agents-XRXJCAWJ.js → agents-ZCO37SKG.js}

@@ -56,12 +56,12 @@ import {
   resolveQuotaFallbackAgent,
   turnCostUsdFromCursorUsage,
   whichOnPath
-} from "./chunk-2XIRV7FS.js";
+} from "./chunk-JLDJGGCL.js";
 import "./chunk-TQRSVE7D.js";
 import "./chunk-P2BSMNHB.js";
 import "./chunk-VKQGAWHY.js";
 import "./chunk-UKSJO36E.js";
-import "./chunk-GZXKUUJO.js";
+import "./chunk-2QUILREI.js";
 import "./chunk-NWE3NOWQ.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";

package/dist/{chunk-GZXKUUJO.js → chunk-2QUILREI.js}

@@ -373,7 +373,7 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   '- request_review \u2014 run a Review on a worktree thread. Reuses the only unused idle agent when the checkout has a single chat with no messages; otherwise opens a Review tab (attaches .claude/skills/review/SKILL.md when present, else .context/review.md copied from .sideboard/review.md / stock; sends "Review changes in this workspace."); then wait_for_turn (loop while stillRunning) / get_turn_result on the returned id. The review stays in that chat so they can read it and type next steps \u2014 do not tell the child to comment or update the PR or ticket.',
   "- ask_git \u2014 commit & push, open a draft PR, mark ready for review, resolve conflicts, or merge \u2014 same prompts as the desktop git buttons (Resolve, Create PR, \u2026). Always steers the worktree agent; then wait_for_turn (loop while stillRunning). Prefer this over paraphrasing. If the user gave a goal (Greptile 5/5, CI green), send_to_chat that goal so the worktree agent enters the watch-fix-push loop \u2014 do not tell the human to poll.",
   '- Merge (`ask_git` action=merge / send_to_chat "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_chat with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Ready for review.", "Merge the remote branch (main) into your branch and resolve conflicts. Then, commit and push your changes.", "Merge PR." (draft PRs: `gh pr create --draft --assignee @me -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.',
+  '- Or send_to_chat with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Ready for review.", "Merge PR." Prefer ask_git resolve-conflicts (it names the actual PR base \u2014 not always main) over paraphrasing. (draft PRs: `gh pr create --draft --assignee @me -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.',
   "Process guides:",
   "- Long child jobs (pack, test, deploy, anything that may run more than ~30s): workers always have `/long-running` (Sideboard product skill). Tell them to detach and wait; they may `stop_job` if it hangs or is doing the wrong thing; do not ask the human to poll.",
   "- Recurring multi-item / fan-out: if the child worktree has `.claude/skills/graph-engineering/SKILL.md`, tell the worker to follow it (`/graph-engineering`). Judge first; state on disk; grow the rulebook; do not patch three threads.",

package/dist/{chunk-3VBS6MES.js → chunk-ADWNK2JH.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-FAGK33E2.js";
 import {
   isOrchestratorThread
-} from "./chunk-DB7MVDYS.js";
+} from "./chunk-PTNGMA5C.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
@@ -1745,7 +1745,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-EEWJOMED.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-34Z2IWYQ.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const rpc = worktreeAgentRpc(isOrchestrator);
     const injectedServers = await buildInjectedMcpServers({

package/dist/{chunk-2XIRV7FS.js → chunk-JLDJGGCL.js}

@@ -24,7 +24,7 @@ import {
 } from "./chunk-UKSJO36E.js";
 import {
   isOrchestratorThread
-} from "./chunk-GZXKUUJO.js";
+} from "./chunk-2QUILREI.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
@@ -2010,7 +2010,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-EWFL4HPW.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-FR7QTLPK.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const rpc = worktreeAgentRpc(isOrchestrator);
     const injectedServers = await buildInjectedMcpServers({

package/dist/{chunk-X7RP3TQB.js → chunk-M7626KJO.js}

@@ -8,7 +8,7 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   isSlackCoordinatorThread
-} from "./chunk-DB7MVDYS.js";
+} from "./chunk-PTNGMA5C.js";
 import {
   allocateTeamName,
   mergeAgentGitAuthEnv,
@@ -1628,7 +1628,7 @@ var PORT_RANGE_SIZE = 10;
 var RECLAIM_RETRY_DELAY_MS = 40;
 var RECLAIM_TRIES = 8;
 async function killReclaimable(ports, worktreePath, signal) {
-  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-MLM5NGTP.js");
+  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-POUIKR5A.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }

package/dist/{chunk-HSRN2CSL.js → chunk-ODC3Y4GQ.js}

@@ -21,7 +21,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-2XIRV7FS.js";
+} from "./chunk-JLDJGGCL.js";
 import {
   REVIEW_TAB_TITLE,
   applyWorktreePkgCacheEnv,
@@ -58,7 +58,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-4ECDIKAS.js";
+} from "./chunk-RQR25LUB.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -105,7 +105,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-GZXKUUJO.js";
+} from "./chunk-2QUILREI.js";
 import {
   addPrStackLayer,
   agentNicknameFromWorktreePath,
@@ -485,9 +485,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-EWFL4HPW.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-FR7QTLPK.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-4GHKCVRH.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-MVUHFNSC.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -655,6 +655,14 @@ var AGENT_GIT_ACTIONS = [
   "ready-for-review",
   "merge"
 ];
+function namedPrBase(prBase) {
+  const base = prBase?.trim().replace(/^refs\/heads\//, "").replace(/^origin\//, "");
+  return base || null;
+}
+function isMainishPrBase(base) {
+  const n = base.toLowerCase();
+  return n === "main" || n === "master";
+}
 function agentGitPrompt(action, opts) {
   switch (action) {
     case "commit-push":
@@ -664,14 +672,19 @@ function agentGitPrompt(action, opts) {
     case "create-web":
       return "Commit, push, and open a PR in the browser.";
     case "resolve-conflicts": {
-      const base = opts?.prBase?.trim().replace(/^refs\/heads\//, "");
+      const base = namedPrBase(opts?.prBase);
       const named = base ? ` (${base})` : "";
       return `Merge the remote branch${named} into your branch and resolve conflicts. Then, commit and push your changes.`;
     }
     case "ready-for-review":
       return "Ready for review.";
-    case "merge":
+    case "merge": {
+      const base = namedPrBase(opts?.prBase);
+      if (base && !isMainishPrBase(base)) {
+        return `Merge PR into ${base}.`;
+      }
       return "Merge PR.";
+    }
   }
 }
 function resolveSidebarGitPrompt(action, opts) {
@@ -688,6 +701,7 @@ function resolveSidebarGitPrompt(action, opts) {
   return agentGitPrompt(action, opts);
 }
 var RESOLVE_CONFLICTS_RE = /^Merge the remote branch(?: \(([^)]+)\))? into your branch and resolve conflicts\. Then, commit and push your changes\.$/;
+var MERGE_INTO_RE = /^Merge PR into (.+)\.$/;
 function gitActionExpansion(action, base) {
   switch (action) {
     case "commit-push":
@@ -697,10 +711,19 @@ function gitActionExpansion(action, base) {
     case "create-web":
       return "Commit, push, then `gh pr create --web --assignee @me -R <origin-owner/name>`. Use a different `--assignee` only if the user named someone else.";
     case "resolve-conflicts":
-      return `Fetch the PR base${base ? ` (\`${base}\`)` : ""}, merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
+      if (base && !isMainishPrBase(base)) {
+        return `Fetch \`origin/${base}\` (this PR's base \u2014 not main/master), merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable. Do not merge origin/main.`;
+      }
+      if (base) {
+        return `Fetch the PR base (\`${base}\`), merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
+      }
+      return "Look up this PR's base with `gh pr view --json baseRefName` and merge that remote branch into this branch (do not assume main). Resolve conflicts carefully, then commit and push until the PR is mergeable.";
     case "ready-for-review":
       return "This phrase is the explicit ask to mark this thread's draft pull request ready for review on GitHub (`gh pr ready -R <origin-owner/name>` or `gh pr ready`). Update title/body if the purpose drifted. Do not merge.";
     case "merge":
+      if (base && !isMainishPrBase(base)) {
+        return `This phrase is the explicit ask to merge this thread's open pull request into \`${base}\` on GitHub with \`gh pr merge\` (respect repo defaults / squash vs merge). This PR targets \`${base}\`, not main \u2014 do not use \`gh stack merge\` and do not retarget or merge into main/master. Do not force-push main/master or merge locally into the main checkout.`;
+      }
       return "This phrase is the explicit ask to 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.";
   }
 }
@@ -722,6 +745,13 @@ function expandCanonicalGitRequest(prompt) {
       base = m[1] ?? null;
     }
   }
+  if (!action) {
+    const m = MERGE_INTO_RE.exec(trimmed);
+    if (m) {
+      action = "merge";
+      base = m[1]?.trim() || null;
+    }
+  }
   let expansion = action ? gitActionExpansion(action, base) : null;
   if (!expansion && trimmed === "Address review comments.") {
     expansion = "Read the PR review feedback (`gh pr view --comments`, `gh api` review comments), make the requested changes, commit, and push.";
@@ -2750,7 +2780,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-SLP24Z3S.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-5GERYHDJ.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored } = await import("./worktree-exclude-5N2KTYIT.js");
   await ensureWorktreeSideboardIgnored(input.worktreePath);
@@ -4273,6 +4303,10 @@ node <detached-job.cjs> start pr-checks -- gh pr checks --watch
 \`\`\`
 
 On miss, fix, commit, push, and watch again until the goal is met or you are blocked. Do not ask the human to poll. Do not merge unless asked.
+
+## GitHub Actions runs
+
+Do **not** \`gh run watch\`. It reprints the full TTY every 3 seconds and floods the Sideboard log pane. Poll \`gh run view --json status,conclusion,jobs\` every 20\u201330s and print only when status or the in-progress step changes.
 `;
 
 // src/skills/discover.ts
@@ -5237,7 +5271,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-MA3MHYIM.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-NLCTI3MC.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7779,10 +7813,10 @@ var Orchestrator = class {
       );
     }
     let prBase;
-    if (action === "resolve-conflicts") {
+    if (action === "resolve-conflicts" || action === "merge") {
       try {
-        const details = await this.getPrDetails(threadRef);
-        prBase = details?.baseRefName?.trim() || void 0;
+        const meta = await this.getPrMeta(threadRef);
+        prBase = meta?.baseRefName?.trim() || void 0;
       } catch {
       }
     }
@@ -7924,7 +7958,7 @@ var Orchestrator = class {
     this.enforceHistoryRetention();
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-SLP24Z3S.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-5GERYHDJ.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }

package/dist/{chunk-DB7MVDYS.js → chunk-PTNGMA5C.js}

@@ -418,7 +418,7 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   '- request_review \u2014 run a Review on a worktree thread. Reuses the only unused idle agent when the checkout has a single chat with no messages; otherwise opens a Review tab (attaches .claude/skills/review/SKILL.md when present, else .context/review.md copied from .sideboard/review.md / stock; sends "Review changes in this workspace."); then wait_for_turn (loop while stillRunning) / get_turn_result on the returned id. The review stays in that chat so they can read it and type next steps \u2014 do not tell the child to comment or update the PR or ticket.',
   "- ask_git \u2014 commit & push, open a draft PR, mark ready for review, resolve conflicts, or merge \u2014 same prompts as the desktop git buttons (Resolve, Create PR, \u2026). Always steers the worktree agent; then wait_for_turn (loop while stillRunning). Prefer this over paraphrasing. If the user gave a goal (Greptile 5/5, CI green), send_to_chat that goal so the worktree agent enters the watch-fix-push loop \u2014 do not tell the human to poll.",
   '- Merge (`ask_git` action=merge / send_to_chat "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_chat with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Ready for review.", "Merge the remote branch (main) into your branch and resolve conflicts. Then, commit and push your changes.", "Merge PR." (draft PRs: `gh pr create --draft --assignee @me -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.',
+  '- Or send_to_chat with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Ready for review.", "Merge PR." Prefer ask_git resolve-conflicts (it names the actual PR base \u2014 not always main) over paraphrasing. (draft PRs: `gh pr create --draft --assignee @me -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.',
   "Process guides:",
   "- Long child jobs (pack, test, deploy, anything that may run more than ~30s): workers always have `/long-running` (Sideboard product skill). Tell them to detach and wait; they may `stop_job` if it hangs or is doing the wrong thing; do not ask the human to poll.",
   "- Recurring multi-item / fan-out: if the child worktree has `.claude/skills/graph-engineering/SKILL.md`, tell the worker to follow it (`/graph-engineering`). Judge first; state on disk; grow the rulebook; do not patch three threads.",

package/dist/{chunk-4ECDIKAS.js → chunk-RQR25LUB.js}

@@ -11,7 +11,7 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   isSlackCoordinatorThread
-} from "./chunk-GZXKUUJO.js";
+} from "./chunk-2QUILREI.js";
 import {
   allocateTeamName,
   mergeAgentGitAuthEnv,
@@ -1572,7 +1572,7 @@ var PORT_RANGE_SIZE = 10;
 var RECLAIM_RETRY_DELAY_MS = 40;
 var RECLAIM_TRIES = 8;
 async function killReclaimable(ports, worktreePath, signal) {
-  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-NRKTEN5X.js");
+  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-JA3A4NAI.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }

package/dist/{chunk-ZSGSVFWD.js → chunk-SVXGDQAI.js}

@@ -7,7 +7,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-3VBS6MES.js";
+} from "./chunk-ADWNK2JH.js";
 import {
   REVIEW_TAB_TITLE,
   applyWorktreePkgCacheEnv,
@@ -44,7 +44,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-X7RP3TQB.js";
+} from "./chunk-M7626KJO.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -88,7 +88,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-DB7MVDYS.js";
+} from "./chunk-PTNGMA5C.js";
 import {
   addPrStackLayer,
   agentNicknameFromWorktreePath,
@@ -437,9 +437,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-EEWJOMED.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-34Z2IWYQ.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-BKRQDZFT.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-4KVA6XUX.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -607,6 +607,14 @@ var AGENT_GIT_ACTIONS = [
   "ready-for-review",
   "merge"
 ];
+function namedPrBase(prBase) {
+  const base = prBase?.trim().replace(/^refs\/heads\//, "").replace(/^origin\//, "");
+  return base || null;
+}
+function isMainishPrBase(base) {
+  const n = base.toLowerCase();
+  return n === "main" || n === "master";
+}
 function agentGitPrompt(action, opts) {
   switch (action) {
     case "commit-push":
@@ -616,14 +624,19 @@ function agentGitPrompt(action, opts) {
     case "create-web":
       return "Commit, push, and open a PR in the browser.";
     case "resolve-conflicts": {
-      const base = opts?.prBase?.trim().replace(/^refs\/heads\//, "");
+      const base = namedPrBase(opts?.prBase);
       const named = base ? ` (${base})` : "";
       return `Merge the remote branch${named} into your branch and resolve conflicts. Then, commit and push your changes.`;
     }
     case "ready-for-review":
       return "Ready for review.";
-    case "merge":
+    case "merge": {
+      const base = namedPrBase(opts?.prBase);
+      if (base && !isMainishPrBase(base)) {
+        return `Merge PR into ${base}.`;
+      }
       return "Merge PR.";
+    }
   }
 }
 function resolveSidebarGitPrompt(action, opts) {
@@ -640,6 +653,7 @@ function resolveSidebarGitPrompt(action, opts) {
   return agentGitPrompt(action, opts);
 }
 var RESOLVE_CONFLICTS_RE = /^Merge the remote branch(?: \(([^)]+)\))? into your branch and resolve conflicts\. Then, commit and push your changes\.$/;
+var MERGE_INTO_RE = /^Merge PR into (.+)\.$/;
 function gitActionExpansion(action, base) {
   switch (action) {
     case "commit-push":
@@ -649,10 +663,19 @@ function gitActionExpansion(action, base) {
     case "create-web":
       return "Commit, push, then `gh pr create --web --assignee @me -R <origin-owner/name>`. Use a different `--assignee` only if the user named someone else.";
     case "resolve-conflicts":
-      return `Fetch the PR base${base ? ` (\`${base}\`)` : ""}, merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
+      if (base && !isMainishPrBase(base)) {
+        return `Fetch \`origin/${base}\` (this PR's base \u2014 not main/master), merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable. Do not merge origin/main.`;
+      }
+      if (base) {
+        return `Fetch the PR base (\`${base}\`), merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
+      }
+      return "Look up this PR's base with `gh pr view --json baseRefName` and merge that remote branch into this branch (do not assume main). Resolve conflicts carefully, then commit and push until the PR is mergeable.";
     case "ready-for-review":
       return "This phrase is the explicit ask to mark this thread's draft pull request ready for review on GitHub (`gh pr ready -R <origin-owner/name>` or `gh pr ready`). Update title/body if the purpose drifted. Do not merge.";
     case "merge":
+      if (base && !isMainishPrBase(base)) {
+        return `This phrase is the explicit ask to merge this thread's open pull request into \`${base}\` on GitHub with \`gh pr merge\` (respect repo defaults / squash vs merge). This PR targets \`${base}\`, not main \u2014 do not use \`gh stack merge\` and do not retarget or merge into main/master. Do not force-push main/master or merge locally into the main checkout.`;
+      }
       return "This phrase is the explicit ask to 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.";
   }
 }
@@ -674,6 +697,13 @@ function expandCanonicalGitRequest(prompt) {
       base = m[1] ?? null;
     }
   }
+  if (!action) {
+    const m = MERGE_INTO_RE.exec(trimmed);
+    if (m) {
+      action = "merge";
+      base = m[1]?.trim() || null;
+    }
+  }
   let expansion = action ? gitActionExpansion(action, base) : null;
   if (!expansion && trimmed === "Address review comments.") {
     expansion = "Read the PR review feedback (`gh pr view --comments`, `gh api` review comments), make the requested changes, commit, and push.";
@@ -2376,7 +2406,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-G3JTULM2.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-LAFFXBBZ.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2883,7 +2913,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-F33Z4CEY.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-2JBDUMM6.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored } = await import("./worktree-exclude-RXZPTCNH.js");
   await ensureWorktreeSideboardIgnored(input.worktreePath);
@@ -4419,6 +4449,10 @@ node <detached-job.cjs> start pr-checks -- gh pr checks --watch
 \`\`\`
 
 On miss, fix, commit, push, and watch again until the goal is met or you are blocked. Do not ask the human to poll. Do not merge unless asked.
+
+## GitHub Actions runs
+
+Do **not** \`gh run watch\`. It reprints the full TTY every 3 seconds and floods the Sideboard log pane. Poll \`gh run view --json status,conclusion,jobs\` every 20\u201330s and print only when status or the in-progress step changes.
 `;
 
 // src/skills/discover.ts
@@ -5576,7 +5610,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-6ZQ2CYS4.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-VF5PZMS3.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -8118,10 +8152,10 @@ var Orchestrator = class {
       );
     }
     let prBase;
-    if (action === "resolve-conflicts") {
+    if (action === "resolve-conflicts" || action === "merge") {
       try {
-        const details = await this.getPrDetails(threadRef);
-        prBase = details?.baseRefName?.trim() || void 0;
+        const meta = await this.getPrMeta(threadRef);
+        prBase = meta?.baseRefName?.trim() || void 0;
       } catch {
       }
     }
@@ -8263,7 +8297,7 @@ var Orchestrator = class {
     this.enforceHistoryRetention();
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-F33Z4CEY.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-2JBDUMM6.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }

package/dist/{conductor-NRKTEN5X.js → conductor-JA3A4NAI.js}

@@ -33,9 +33,9 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-4ECDIKAS.js";
+} from "./chunk-RQR25LUB.js";
 import "./chunk-UKSJO36E.js";
-import "./chunk-GZXKUUJO.js";
+import "./chunk-2QUILREI.js";
 import "./chunk-NWE3NOWQ.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";

package/dist/{conductor-MLM5NGTP.js → conductor-POUIKR5A.js}

@@ -31,9 +31,9 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-X7RP3TQB.js";
+} from "./chunk-M7626KJO.js";
 import "./chunk-FAGK33E2.js";
-import "./chunk-DB7MVDYS.js";
+import "./chunk-PTNGMA5C.js";
 import "./chunk-USBZ7PH4.js";
 import "./chunk-FWNL62VA.js";
 import "./chunk-2P4XKWV2.js";

package/dist/{coordinator-prompt-BKRQDZFT.js → coordinator-prompt-4KVA6XUX.js}

@@ -7,7 +7,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-DB7MVDYS.js";
+} from "./chunk-PTNGMA5C.js";
 import "./chunk-USBZ7PH4.js";
 import "./chunk-FWNL62VA.js";
 import "./chunk-2P4XKWV2.js";

package/dist/{coordinator-prompt-4GHKCVRH.js → coordinator-prompt-MVUHFNSC.js}

@@ -9,7 +9,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-GZXKUUJO.js";
+} from "./chunk-2QUILREI.js";
 import "./chunk-NWE3NOWQ.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";

package/dist/{global-workspace-EEWJOMED.js → global-workspace-34Z2IWYQ.js}

@@ -18,7 +18,7 @@ import {
   remoteCoordinatorSourceRef,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-DB7MVDYS.js";
+} from "./chunk-PTNGMA5C.js";
 import "./chunk-USBZ7PH4.js";
 import "./chunk-FWNL62VA.js";
 import "./chunk-2P4XKWV2.js";

package/dist/{global-workspace-EWFL4HPW.js → global-workspace-FR7QTLPK.js}

@@ -20,7 +20,7 @@ import {
   remoteCoordinatorSourceRef,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-GZXKUUJO.js";
+} from "./chunk-2QUILREI.js";
 import "./chunk-NWE3NOWQ.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";

package/dist/index.cjs

@@ -11423,7 +11423,7 @@ var init_coordinator_prompt = __esm({
       '- request_review \u2014 run a Review on a worktree thread. Reuses the only unused idle agent when the checkout has a single chat with no messages; otherwise opens a Review tab (attaches .claude/skills/review/SKILL.md when present, else .context/review.md copied from .sideboard/review.md / stock; sends "Review changes in this workspace."); then wait_for_turn (loop while stillRunning) / get_turn_result on the returned id. The review stays in that chat so they can read it and type next steps \u2014 do not tell the child to comment or update the PR or ticket.',
       "- ask_git \u2014 commit & push, open a draft PR, mark ready for review, resolve conflicts, or merge \u2014 same prompts as the desktop git buttons (Resolve, Create PR, \u2026). Always steers the worktree agent; then wait_for_turn (loop while stillRunning). Prefer this over paraphrasing. If the user gave a goal (Greptile 5/5, CI green), send_to_chat that goal so the worktree agent enters the watch-fix-push loop \u2014 do not tell the human to poll.",
       '- Merge (`ask_git` action=merge / send_to_chat "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_chat with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Ready for review.", "Merge the remote branch (main) into your branch and resolve conflicts. Then, commit and push your changes.", "Merge PR." (draft PRs: `gh pr create --draft --assignee @me -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.',
+      '- Or send_to_chat with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Ready for review.", "Merge PR." Prefer ask_git resolve-conflicts (it names the actual PR base \u2014 not always main) over paraphrasing. (draft PRs: `gh pr create --draft --assignee @me -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.',
       "Process guides:",
       "- Long child jobs (pack, test, deploy, anything that may run more than ~30s): workers always have `/long-running` (Sideboard product skill). Tell them to detach and wait; they may `stop_job` if it hangs or is doing the wrong thing; do not ask the human to poll.",
       "- Recurring multi-item / fan-out: if the child worktree has `.claude/skills/graph-engineering/SKILL.md`, tell the worker to follow it (`/graph-engineering`). Judge first; state on disk; grow the rulebook; do not patch three threads.",
@@ -17852,6 +17852,14 @@ var init_spawn = __esm({
 });
 
 // src/git/agent-git-actions.ts
+function namedPrBase(prBase) {
+  const base = prBase?.trim().replace(/^refs\/heads\//, "").replace(/^origin\//, "");
+  return base || null;
+}
+function isMainishPrBase(base) {
+  const n = base.toLowerCase();
+  return n === "main" || n === "master";
+}
 function agentGitPrompt(action, opts) {
   switch (action) {
     case "commit-push":
@@ -17861,14 +17869,19 @@ function agentGitPrompt(action, opts) {
     case "create-web":
       return "Commit, push, and open a PR in the browser.";
     case "resolve-conflicts": {
-      const base = opts?.prBase?.trim().replace(/^refs\/heads\//, "");
+      const base = namedPrBase(opts?.prBase);
       const named = base ? ` (${base})` : "";
       return `Merge the remote branch${named} into your branch and resolve conflicts. Then, commit and push your changes.`;
     }
     case "ready-for-review":
       return "Ready for review.";
-    case "merge":
+    case "merge": {
+      const base = namedPrBase(opts?.prBase);
+      if (base && !isMainishPrBase(base)) {
+        return `Merge PR into ${base}.`;
+      }
       return "Merge PR.";
+    }
   }
 }
 function resolveSidebarGitPrompt(action, opts) {
@@ -17893,10 +17906,19 @@ function gitActionExpansion(action, base) {
     case "create-web":
       return "Commit, push, then `gh pr create --web --assignee @me -R <origin-owner/name>`. Use a different `--assignee` only if the user named someone else.";
     case "resolve-conflicts":
-      return `Fetch the PR base${base ? ` (\`${base}\`)` : ""}, merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
+      if (base && !isMainishPrBase(base)) {
+        return `Fetch \`origin/${base}\` (this PR's base \u2014 not main/master), merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable. Do not merge origin/main.`;
+      }
+      if (base) {
+        return `Fetch the PR base (\`${base}\`), merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
+      }
+      return "Look up this PR's base with `gh pr view --json baseRefName` and merge that remote branch into this branch (do not assume main). Resolve conflicts carefully, then commit and push until the PR is mergeable.";
     case "ready-for-review":
       return "This phrase is the explicit ask to mark this thread's draft pull request ready for review on GitHub (`gh pr ready -R <origin-owner/name>` or `gh pr ready`). Update title/body if the purpose drifted. Do not merge.";
     case "merge":
+      if (base && !isMainishPrBase(base)) {
+        return `This phrase is the explicit ask to merge this thread's open pull request into \`${base}\` on GitHub with \`gh pr merge\` (respect repo defaults / squash vs merge). This PR targets \`${base}\`, not main \u2014 do not use \`gh stack merge\` and do not retarget or merge into main/master. Do not force-push main/master or merge locally into the main checkout.`;
+      }
       return "This phrase is the explicit ask to 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.";
   }
 }
@@ -17918,6 +17940,13 @@ function expandCanonicalGitRequest(prompt) {
       base = m[1] ?? null;
     }
   }
+  if (!action) {
+    const m = MERGE_INTO_RE.exec(trimmed);
+    if (m) {
+      action = "merge";
+      base = m[1]?.trim() || null;
+    }
+  }
   let expansion = action ? gitActionExpansion(action, base) : null;
   if (!expansion && trimmed === "Address review comments.") {
     expansion = "Read the PR review feedback (`gh pr view --comments`, `gh api` review comments), make the requested changes, commit, and push.";
@@ -17929,7 +17958,7 @@ function expandCanonicalGitRequest(prompt) {
 
 (Sideboard git request \u2014 do not ask for clarification: ${expansion})`;
 }
-var AGENT_GIT_ACTIONS, RESOLVE_CONFLICTS_RE, FIX_CI_RE;
+var AGENT_GIT_ACTIONS, RESOLVE_CONFLICTS_RE, MERGE_INTO_RE, FIX_CI_RE;
 var init_agent_git_actions = __esm({
   "src/git/agent-git-actions.ts"() {
     "use strict";
@@ -17942,6 +17971,7 @@ var init_agent_git_actions = __esm({
       "merge"
     ];
     RESOLVE_CONFLICTS_RE = /^Merge the remote branch(?: \(([^)]+)\))? into your branch and resolve conflicts\. Then, commit and push your changes\.$/;
+    MERGE_INTO_RE = /^Merge PR into (.+)\.$/;
     FIX_CI_RE = /^Fix CI: .+\.$/;
   }
 });
@@ -24907,6 +24937,10 @@ node <detached-job.cjs> start pr-checks -- gh pr checks --watch
 \`\`\`
 
 On miss, fix, commit, push, and watch again until the goal is met or you are blocked. Do not ask the human to poll. Do not merge unless asked.
+
+## GitHub Actions runs
+
+Do **not** \`gh run watch\`. It reprints the full TTY every 3 seconds and floods the Sideboard log pane. Poll \`gh run view --json status,conclusion,jobs\` every 20\u201330s and print only when status or the in-progress step changes.
 `;
   }
 });
@@ -28635,10 +28669,10 @@ var init_orchestrator = __esm({
           );
         }
         let prBase;
-        if (action === "resolve-conflicts") {
+        if (action === "resolve-conflicts" || action === "merge") {
           try {
-            const details = await this.getPrDetails(threadRef);
-            prBase = details?.baseRefName?.trim() || void 0;
+            const meta = await this.getPrMeta(threadRef);
+            prBase = meta?.baseRefName?.trim() || void 0;
           } catch {
           }
         }
@@ -39640,7 +39674,19 @@ async function startRelayServer(opts) {
       }
     });
   });
-  const wss = new import_ws6.WebSocketServer({ server: httpServer, path: SLACK_RELAY_DESKTOP_PATH });
+  const wss = new import_ws6.WebSocketServer({ noServer: true });
+  const remoteWss = new import_ws6.WebSocketServer({ noServer: true });
+  httpServer.on("upgrade", (req, socket, head) => {
+    const pathname = (req.url ?? "/").split("?")[0];
+    const target = pathname === SLACK_RELAY_DESKTOP_PATH ? wss : pathname === REMOTE_RELAY_PATH ? remoteWss : null;
+    if (!target) {
+      socket.destroy();
+      return;
+    }
+    target.handleUpgrade(req, socket, head, (ws) => {
+      target.emit("connection", ws, req);
+    });
+  });
   wss.on("connection", (ws, _req) => {
     const socket = {
       send: (data) => {
@@ -39671,7 +39717,6 @@ async function startRelayServer(opts) {
       hub.detachSocket(socket);
     });
   });
-  const remoteWss = new import_ws6.WebSocketServer({ server: httpServer, path: REMOTE_RELAY_PATH });
   remoteWss.on("connection", (ws) => {
     const socket = {
       send: (data) => {

package/dist/index.js

@@ -173,7 +173,7 @@ import {
   worktreeBoardStatus,
   worktreeCleanupSettings,
   writeWorktreeFile
-} from "./chunk-ZSGSVFWD.js";
+} from "./chunk-SVXGDQAI.js";
 import {
   BASE_ALLOWED_TOOLS,
   BRIGHTSY_MCP_ALLOWED_TOOLS,
@@ -263,7 +263,7 @@ import {
   whichOnPath,
   worktreeMcpToolNames,
   writeInjectedMcpConfig
-} from "./chunk-3VBS6MES.js";
+} from "./chunk-ADWNK2JH.js";
 import {
   brightsyMcpServerName,
   connectBrightsyTeam,
@@ -380,7 +380,7 @@ import {
   waitForTurnToolResult,
   worktreeRunPortsPath,
   wrapReviewSkillMarkdown
-} from "./chunk-X7RP3TQB.js";
+} from "./chunk-M7626KJO.js";
 import {
   STDERR_EVENT_MAX_CHARS,
   STDOUT_EVENT_MAX_CHARS,
@@ -557,7 +557,7 @@ import {
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads,
   takenTeamSlugsForOrchestration
-} from "./chunk-DB7MVDYS.js";
+} from "./chunk-PTNGMA5C.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   GITHUB_PR_BODY_MAX_CHARS,
@@ -5139,7 +5139,7 @@ async function handleJobStop(params, _ctx) {
   return stopDetachedJob(jobCwd(rec), id, reason ? { reason } : void 0);
 }
 async function defaultTurnWait(ref, timeoutMs) {
-  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-6ZQ2CYS4.js");
+  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-VF5PZMS3.js");
   const orch = getOrchestrator2();
   const thread = await orch.waitForTurn(ref, timeoutMs, {
     resolveIfStillRunning: true
@@ -10274,7 +10274,19 @@ async function startRelayServer(opts) {
       }
     });
   });
-  const wss = new WebSocketServer2({ server: httpServer, path: SLACK_RELAY_DESKTOP_PATH });
+  const wss = new WebSocketServer2({ noServer: true });
+  const remoteWss = new WebSocketServer2({ noServer: true });
+  httpServer.on("upgrade", (req, socket, head) => {
+    const pathname = (req.url ?? "/").split("?")[0];
+    const target = pathname === SLACK_RELAY_DESKTOP_PATH ? wss : pathname === REMOTE_RELAY_PATH ? remoteWss : null;
+    if (!target) {
+      socket.destroy();
+      return;
+    }
+    target.handleUpgrade(req, socket, head, (ws) => {
+      target.emit("connection", ws, req);
+    });
+  });
   wss.on("connection", (ws, _req) => {
     const socket = {
       send: (data) => {
@@ -10305,7 +10317,6 @@ async function startRelayServer(opts) {
       hub.detachSocket(socket);
     });
   });
-  const remoteWss = new WebSocketServer2({ server: httpServer, path: REMOTE_RELAY_PATH });
   remoteWss.on("connection", (ws) => {
     const socket = {
       send: (data) => {
@@ -10458,7 +10469,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-6ZQ2CYS4.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-VF5PZMS3.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }

package/dist/mcp/run-stdio.cjs

@@ -9752,7 +9752,7 @@ var init_coordinator_prompt = __esm({
       '- request_review \u2014 run a Review on a worktree thread. Reuses the only unused idle agent when the checkout has a single chat with no messages; otherwise opens a Review tab (attaches .claude/skills/review/SKILL.md when present, else .context/review.md copied from .sideboard/review.md / stock; sends "Review changes in this workspace."); then wait_for_turn (loop while stillRunning) / get_turn_result on the returned id. The review stays in that chat so they can read it and type next steps \u2014 do not tell the child to comment or update the PR or ticket.',
       "- ask_git \u2014 commit & push, open a draft PR, mark ready for review, resolve conflicts, or merge \u2014 same prompts as the desktop git buttons (Resolve, Create PR, \u2026). Always steers the worktree agent; then wait_for_turn (loop while stillRunning). Prefer this over paraphrasing. If the user gave a goal (Greptile 5/5, CI green), send_to_chat that goal so the worktree agent enters the watch-fix-push loop \u2014 do not tell the human to poll.",
       '- Merge (`ask_git` action=merge / send_to_chat "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_chat with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Ready for review.", "Merge the remote branch (main) into your branch and resolve conflicts. Then, commit and push your changes.", "Merge PR." (draft PRs: `gh pr create --draft --assignee @me -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.',
+      '- Or send_to_chat with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Ready for review.", "Merge PR." Prefer ask_git resolve-conflicts (it names the actual PR base \u2014 not always main) over paraphrasing. (draft PRs: `gh pr create --draft --assignee @me -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.',
       "Process guides:",
       "- Long child jobs (pack, test, deploy, anything that may run more than ~30s): workers always have `/long-running` (Sideboard product skill). Tell them to detach and wait; they may `stop_job` if it hangs or is doing the wrong thing; do not ask the human to poll.",
       "- Recurring multi-item / fan-out: if the child worktree has `.claude/skills/graph-engineering/SKILL.md`, tell the worker to follow it (`/graph-engineering`). Judge first; state on disk; grow the rulebook; do not patch three threads.",
@@ -14756,6 +14756,14 @@ var init_spawn = __esm({
 });
 
 // src/git/agent-git-actions.ts
+function namedPrBase(prBase) {
+  const base = prBase?.trim().replace(/^refs\/heads\//, "").replace(/^origin\//, "");
+  return base || null;
+}
+function isMainishPrBase(base) {
+  const n = base.toLowerCase();
+  return n === "main" || n === "master";
+}
 function agentGitPrompt(action, opts) {
   switch (action) {
     case "commit-push":
@@ -14765,14 +14773,19 @@ function agentGitPrompt(action, opts) {
     case "create-web":
       return "Commit, push, and open a PR in the browser.";
     case "resolve-conflicts": {
-      const base = opts?.prBase?.trim().replace(/^refs\/heads\//, "");
+      const base = namedPrBase(opts?.prBase);
       const named = base ? ` (${base})` : "";
       return `Merge the remote branch${named} into your branch and resolve conflicts. Then, commit and push your changes.`;
     }
     case "ready-for-review":
       return "Ready for review.";
-    case "merge":
+    case "merge": {
+      const base = namedPrBase(opts?.prBase);
+      if (base && !isMainishPrBase(base)) {
+        return `Merge PR into ${base}.`;
+      }
       return "Merge PR.";
+    }
   }
 }
 function resolveSidebarGitPrompt(action, opts) {
@@ -14797,10 +14810,19 @@ function gitActionExpansion(action, base) {
     case "create-web":
       return "Commit, push, then `gh pr create --web --assignee @me -R <origin-owner/name>`. Use a different `--assignee` only if the user named someone else.";
     case "resolve-conflicts":
-      return `Fetch the PR base${base ? ` (\`${base}\`)` : ""}, merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
+      if (base && !isMainishPrBase(base)) {
+        return `Fetch \`origin/${base}\` (this PR's base \u2014 not main/master), merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable. Do not merge origin/main.`;
+      }
+      if (base) {
+        return `Fetch the PR base (\`${base}\`), merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
+      }
+      return "Look up this PR's base with `gh pr view --json baseRefName` and merge that remote branch into this branch (do not assume main). Resolve conflicts carefully, then commit and push until the PR is mergeable.";
     case "ready-for-review":
       return "This phrase is the explicit ask to mark this thread's draft pull request ready for review on GitHub (`gh pr ready -R <origin-owner/name>` or `gh pr ready`). Update title/body if the purpose drifted. Do not merge.";
     case "merge":
+      if (base && !isMainishPrBase(base)) {
+        return `This phrase is the explicit ask to merge this thread's open pull request into \`${base}\` on GitHub with \`gh pr merge\` (respect repo defaults / squash vs merge). This PR targets \`${base}\`, not main \u2014 do not use \`gh stack merge\` and do not retarget or merge into main/master. Do not force-push main/master or merge locally into the main checkout.`;
+      }
       return "This phrase is the explicit ask to 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.";
   }
 }
@@ -14822,6 +14844,13 @@ function expandCanonicalGitRequest(prompt) {
       base = m[1] ?? null;
     }
   }
+  if (!action) {
+    const m = MERGE_INTO_RE.exec(trimmed);
+    if (m) {
+      action = "merge";
+      base = m[1]?.trim() || null;
+    }
+  }
   let expansion = action ? gitActionExpansion(action, base) : null;
   if (!expansion && trimmed === "Address review comments.") {
     expansion = "Read the PR review feedback (`gh pr view --comments`, `gh api` review comments), make the requested changes, commit, and push.";
@@ -14833,7 +14862,7 @@ function expandCanonicalGitRequest(prompt) {
 
 (Sideboard git request \u2014 do not ask for clarification: ${expansion})`;
 }
-var AGENT_GIT_ACTIONS, RESOLVE_CONFLICTS_RE, FIX_CI_RE;
+var AGENT_GIT_ACTIONS, RESOLVE_CONFLICTS_RE, MERGE_INTO_RE, FIX_CI_RE;
 var init_agent_git_actions = __esm({
   "src/git/agent-git-actions.ts"() {
     "use strict";
@@ -14846,6 +14875,7 @@ var init_agent_git_actions = __esm({
       "merge"
     ];
     RESOLVE_CONFLICTS_RE = /^Merge the remote branch(?: \(([^)]+)\))? into your branch and resolve conflicts\. Then, commit and push your changes\.$/;
+    MERGE_INTO_RE = /^Merge PR into (.+)\.$/;
     FIX_CI_RE = /^Fix CI: .+\.$/;
   }
 });
@@ -22576,6 +22606,10 @@ node <detached-job.cjs> start pr-checks -- gh pr checks --watch
 \`\`\`
 
 On miss, fix, commit, push, and watch again until the goal is met or you are blocked. Do not ask the human to poll. Do not merge unless asked.
+
+## GitHub Actions runs
+
+Do **not** \`gh run watch\`. It reprints the full TTY every 3 seconds and floods the Sideboard log pane. Poll \`gh run view --json status,conclusion,jobs\` every 20\u201330s and print only when status or the in-progress step changes.
 `;
   }
 });
@@ -26658,10 +26692,10 @@ var init_orchestrator = __esm({
           );
         }
         let prBase;
-        if (action === "resolve-conflicts") {
+        if (action === "resolve-conflicts" || action === "merge") {
           try {
-            const details = await this.getPrDetails(threadRef);
-            prBase = details?.baseRefName?.trim() || void 0;
+            const meta = await this.getPrMeta(threadRef);
+            prBase = meta?.baseRefName?.trim() || void 0;
           } catch {
           }
         }

package/dist/mcp/run-stdio.js

@@ -52,7 +52,7 @@ import {
   sliceRunLogOutput,
   syncBoardPins,
   updateSchedule
-} from "../chunk-HSRN2CSL.js";
+} from "../chunk-ODC3Y4GQ.js";
 import "../chunk-LX5R5JOR.js";
 import {
   PRESENT_PLAN_REQUIRES_PLAN_MODE,
@@ -71,7 +71,7 @@ import {
   sideboardMcpProfile,
   trustSystemCertificates,
   worktreeMcpToolNames
-} from "../chunk-2XIRV7FS.js";
+} from "../chunk-JLDJGGCL.js";
 import "../chunk-TQRSVE7D.js";
 import "../chunk-P2BSMNHB.js";
 import {
@@ -86,7 +86,7 @@ import {
   threadsSharingWorktree,
   waitForDetachedJob,
   waitForTurnToolResult
-} from "../chunk-4ECDIKAS.js";
+} from "../chunk-RQR25LUB.js";
 import {
   clipToolResultForStore,
   isInternalAgentStatusText,
@@ -97,7 +97,7 @@ import {
   isCloudCoordinatorThread,
   isOrchestratorThread,
   listWorkspaces
-} from "../chunk-GZXKUUJO.js";
+} from "../chunk-2QUILREI.js";
 import {
   canonicalizeRepoPath,
   formatGhLandError,

package/dist/{orchestrator-MA3MHYIM.js → orchestrator-NLCTI3MC.js}

@@ -11,17 +11,17 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-HSRN2CSL.js";
+} from "./chunk-ODC3Y4GQ.js";
 import "./chunk-LX5R5JOR.js";
 import "./chunk-4GK32AYX.js";
 import "./chunk-5DZUWGKV.js";
-import "./chunk-2XIRV7FS.js";
+import "./chunk-JLDJGGCL.js";
 import "./chunk-TQRSVE7D.js";
 import "./chunk-P2BSMNHB.js";
 import "./chunk-VKQGAWHY.js";
-import "./chunk-4ECDIKAS.js";
+import "./chunk-RQR25LUB.js";
 import "./chunk-UKSJO36E.js";
-import "./chunk-GZXKUUJO.js";
+import "./chunk-2QUILREI.js";
 import "./chunk-NWE3NOWQ.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";

package/dist/{orchestrator-6ZQ2CYS4.js → orchestrator-VF5PZMS3.js}

@@ -9,14 +9,14 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-ZSGSVFWD.js";
-import "./chunk-3VBS6MES.js";
+} from "./chunk-SVXGDQAI.js";
+import "./chunk-ADWNK2JH.js";
 import "./chunk-GWFVCCJZ.js";
-import "./chunk-X7RP3TQB.js";
+import "./chunk-M7626KJO.js";
 import "./chunk-FAGK33E2.js";
 import "./chunk-7H655NEW.js";
 import "./chunk-PGPSIEMW.js";
-import "./chunk-DB7MVDYS.js";
+import "./chunk-PTNGMA5C.js";
 import "./chunk-USBZ7PH4.js";
 import "./chunk-FWNL62VA.js";
 import "./chunk-2P4XKWV2.js";

package/dist/{workspaces-F33Z4CEY.js → workspaces-2JBDUMM6.js}

@@ -5,7 +5,7 @@ import {
   primaryCheckoutFromLinkedWorktree,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-DB7MVDYS.js";
+} from "./chunk-PTNGMA5C.js";
 import "./chunk-USBZ7PH4.js";
 import "./chunk-FWNL62VA.js";
 import "./chunk-2P4XKWV2.js";

package/dist/{workspaces-SLP24Z3S.js → workspaces-5GERYHDJ.js}

@@ -7,7 +7,7 @@ import {
   primaryCheckoutFromLinkedWorktree,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-GZXKUUJO.js";
+} from "./chunk-2QUILREI.js";
 import "./chunk-NWE3NOWQ.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-DD67JWTN.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideboard-ai/core",
-  "version": "0.1.270",
+  "version": "0.1.272",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",