@sideboard-ai/core 0.1.81 → 0.1.83

package/dist/agents/cursor-runner.cjs

@@ -7,6 +7,23 @@ var import_node_fs3 = require("fs");
 var import_node_path4 = require("path");
 var import_node_readline = require("readline");
 
+// src/hook/nested-electron-env.ts
+var NESTED_ELECTRON_ENV_PREFIXES = ["ELECTRON_", "CHROME_"];
+function isNestedElectronEnvKey(key) {
+  return NESTED_ELECTRON_ENV_PREFIXES.some((prefix) => key.startsWith(prefix));
+}
+function dropNestedElectronEnvFromProcess(env = process.env) {
+  for (const key of Object.keys(env)) {
+    if (isNestedElectronEnvKey(key)) delete env[key];
+  }
+}
+var STRIP_NESTED_ELECTRON_THEN_EXEC = [
+  "vars=`printenv | awk -F= '/^(ELECTRON_|CHROME_)/{print $1}'`",
+  '[ -n "$vars" ] && unset $vars',
+  "export ELECTRON_RUN_AS_NODE=1",
+  'exec "$@"'
+].join("; ");
+
 // src/store/paths.ts
 var import_node_path2 = require("path");
 var import_node_os2 = require("os");
@@ -224,6 +241,7 @@ function cursorSdkMessageToEvents(msg) {
 }
 
 // src/agents/cursor-runner.ts
+dropNestedElectronEnvFromProcess();
 function emit(event) {
   process.stdout.write(`${JSON.stringify(event)}
 `);

package/dist/agents/cursor-runner.js

@@ -3,6 +3,9 @@ import {
   cursorSdkMessageToEvents,
   formatUnknownDetail
 } from "../chunk-SEOICVGB.js";
+import {
+  dropNestedElectronEnvFromProcess
+} from "../chunk-IZ7RPF54.js";
 import {
   appDataDir
 } from "../chunk-M37RITA6.js";
@@ -12,6 +15,7 @@ import { Agent, AgentBusyError, CursorAgentError, JsonlLocalAgentStore } from "@
 import { mkdirSync } from "fs";
 import { join } from "path";
 import { createInterface } from "readline";
+dropNestedElectronEnvFromProcess();
 function emit(event) {
   process.stdout.write(`${JSON.stringify(event)}
 `);

package/dist/{agents-UQ7D6U6L.js → agents-3YPUZME7.js}

@@ -28,22 +28,23 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent
-} from "./chunk-XNECBC6T.js";
+} from "./chunk-JW6YFPQE.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-6F2TQFJE.js";
-import "./chunk-CQBQWX73.js";
+} from "./chunk-NXXT5SE3.js";
+import "./chunk-E2MIA7DO.js";
 import "./chunk-BTL7EMGT.js";
 import {
   cursorSdkMessageToEvents,
   parseCursorRunnerLine
 } from "./chunk-SEOICVGB.js";
-import "./chunk-YVVXWWCC.js";
+import "./chunk-GD2FM6FN.js";
 import "./chunk-FKOIHGKV.js";
-import "./chunk-IFPN6TER.js";
+import "./chunk-YO3CYL6B.js";
+import "./chunk-IZ7RPF54.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-FWJYLBO6.js";
 import "./chunk-77WWLBCI.js";

package/dist/{agents-EBKJ55PN.js → agents-4KRD46KG.js}

@@ -32,16 +32,16 @@ import {
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent
-} from "./chunk-4AVU4QXO.js";
+} from "./chunk-JMRJ4F5B.js";
 import "./chunk-VROPG6QF.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-P5VDPGAN.js";
-import "./chunk-4HJK57XU.js";
-import "./chunk-FUUVPN4A.js";
+} from "./chunk-DJFGX4RT.js";
+import "./chunk-ERJS3ZDP.js";
+import "./chunk-HBBXS2FR.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-7FD7COKE.js";
 import {
@@ -53,7 +53,7 @@ import {
   resolveCommandBinarySync,
   withExportedPath
 } from "./chunk-AE5VBOFE.js";
-import "./chunk-XKNBSYA7.js";
+import "./chunk-UHGN4KCL.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";

package/dist/{app-settings-NILNWNNQ.js → app-settings-GVSOIJLZ.js}

@@ -54,7 +54,7 @@ import {
   updateDefaultsSettings,
   updateIntegrationsSettings,
   updateOpencodeSettings
-} from "./chunk-XKNBSYA7.js";
+} from "./chunk-UHGN4KCL.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";

package/dist/{app-settings-6IOQYGBK.js → app-settings-MQXL7OUF.js}

@@ -52,7 +52,8 @@ import {
   updateDefaultsSettings,
   updateIntegrationsSettings,
   updateOpencodeSettings
-} from "./chunk-IFPN6TER.js";
+} from "./chunk-YO3CYL6B.js";
+import "./chunk-IZ7RPF54.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-M37RITA6.js";

package/dist/{chunk-P5VDPGAN.js → chunk-DJFGX4RT.js}

@@ -2,12 +2,12 @@
 
 import {
   ensureGlobalCoordinatorCwd
-} from "./chunk-4HJK57XU.js";
+} from "./chunk-ERJS3ZDP.js";
 import {
   allocateTeamName,
   takenSlugsFromThread,
   teamSlugFromName
-} from "./chunk-FUUVPN4A.js";
+} from "./chunk-HBBXS2FR.js";
 import {
   createEmptyThread,
   listThreads,
@@ -17,7 +17,7 @@ import {
 import {
   resolveNewThreadOptions,
   resolveThreadDefaults
-} from "./chunk-XKNBSYA7.js";
+} from "./chunk-UHGN4KCL.js";
 import {
   globalAgentCwd
 } from "./chunk-7MV3RXSC.js";

package/dist/{chunk-CQBQWX73.js → chunk-E2MIA7DO.js}

@@ -1,9 +1,9 @@
 import {
   resolveGithubRepoSlug
-} from "./chunk-YVVXWWCC.js";
+} from "./chunk-GD2FM6FN.js";
 import {
   resolveThreadDefaults
-} from "./chunk-IFPN6TER.js";
+} from "./chunk-YO3CYL6B.js";
 import {
   globalAgentCwd,
   sideboardReposDir
@@ -51,6 +51,7 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   "- get_pr_stack / open_pr_stack_layers / add_stack_layer / create_pr_stack \u2014 GitHub stacked PRs (`gh stack`); one worktree per layer",
   "- list_models \u2014 only when you need a specific model (rare); otherwise omit model so Account defaults apply",
   "- list_threads / get_thread \u2014 fleet status (what is going on)",
+  "- ask_user \u2014 multiple-choice questions in the composer (any mode, not only Plan). Explain options in chat first, include a description on every option, then wait for answers.",
   "- set_caffeinate \u2014 keep this Mac awake across turns (macOS caffeinate). Turn on for Slack / away-from-keyboard work. Turn OFF when the user says they are done, wrapping up, going to sleep, or no longer need the machine awake. Closing this chat also releases it.",
   "Workspaces:",
   "- add_workspace / remove_workspace \u2014 register or unregister a git repo",
@@ -70,7 +71,11 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   '- 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.',
+  '- Or send_to_thread with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "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 -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:",
+  "- 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.",
+  "- Recurring shapes: have the worktree agent write `.claude/skills/<kebab-name>/SKILL.md` (commit it) so later threads and native Claude Code / attach see it. Do not use `.sideboard/skills` for new guides. Codex/OpenCode: one line in AGENTS.md pointing at that file.",
+  "- One-offs: no guide. Same miss across threads: edit the skill or `.sideboard/review.md`, then rerun the batch \u2014 do not patch three threads.",
   "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."

package/dist/{chunk-4HJK57XU.js → chunk-ERJS3ZDP.js}

@@ -2,10 +2,10 @@
 
 import {
   resolveGithubRepoSlug
-} from "./chunk-FUUVPN4A.js";
+} from "./chunk-HBBXS2FR.js";
 import {
   resolveThreadDefaults
-} from "./chunk-XKNBSYA7.js";
+} from "./chunk-UHGN4KCL.js";
 import {
   globalAgentCwd,
   sideboardReposDir
@@ -53,6 +53,7 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   "- get_pr_stack / open_pr_stack_layers / add_stack_layer / create_pr_stack \u2014 GitHub stacked PRs (`gh stack`); one worktree per layer",
   "- list_models \u2014 only when you need a specific model (rare); otherwise omit model so Account defaults apply",
   "- list_threads / get_thread \u2014 fleet status (what is going on)",
+  "- ask_user \u2014 multiple-choice questions in the composer (any mode, not only Plan). Explain options in chat first, include a description on every option, then wait for answers.",
   "- set_caffeinate \u2014 keep this Mac awake across turns (macOS caffeinate). Turn on for Slack / away-from-keyboard work. Turn OFF when the user says they are done, wrapping up, going to sleep, or no longer need the machine awake. Closing this chat also releases it.",
   "Workspaces:",
   "- add_workspace / remove_workspace \u2014 register or unregister a git repo",
@@ -72,7 +73,11 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   '- 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.',
+  '- Or send_to_thread with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "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 -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:",
+  "- 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.",
+  "- Recurring shapes: have the worktree agent write `.claude/skills/<kebab-name>/SKILL.md` (commit it) so later threads and native Claude Code / attach see it. Do not use `.sideboard/skills` for new guides. Codex/OpenCode: one line in AGENTS.md pointing at that file.",
+  "- One-offs: no guide. Same miss across threads: edit the skill or `.sideboard/review.md`, then rerun the batch \u2014 do not patch three threads.",
   "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."

package/dist/{chunk-YVVXWWCC.js → chunk-GD2FM6FN.js}

@@ -4,7 +4,7 @@ import {
 import {
   getGithubGitAuthMode,
   getGithubPat
-} from "./chunk-IFPN6TER.js";
+} from "./chunk-YO3CYL6B.js";
 import {
   listThreads
 } from "./chunk-FWJYLBO6.js";
@@ -882,11 +882,25 @@ function formatGhLandError(raw, opts) {
   }
   return detail || "Failed to create or update pull request";
 }
+function isPrNotMergeableError(text) {
+  return /not mergeable|cannot be cleanly created|cannot merge cleanly|Merge conflict|\bCONFLICTING\b|must be (updated|rebased)|branch is out of date|needs? to be (updated|rebased)|Resolve conflicts or update the branch/i.test(
+    text
+  );
+}
+function formatMergePrError(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) return "gh pr merge failed";
+  if (isPrNotMergeableError(trimmed)) {
+    return "This pull request cannot merge cleanly into the base branch. Resolve conflicts or update the branch, then retry.";
+  }
+  return extractGhErrorDetail(trimmed) || trimmed;
+}
 function formatIpcInvokeError(err) {
   let msg = err instanceof Error ? err.message : String(err);
   msg = msg.replace(/^Error invoking remote method '[^']+':\s*/i, "");
   msg = msg.replace(/^ExecaError:\s*/i, "");
   msg = msg.replace(/^Error:\s*/i, "");
+  if (isPrNotMergeableError(msg)) return formatMergePrError(msg);
   return formatGhLandError(msg);
 }
 
@@ -1599,6 +1613,41 @@ ${result.stderr}`;
   ].slice(0, 20) : [];
   return { conflicting, base: baseName, files };
 }
+async function probeLocalMergeGate(cwd, gate) {
+  const mergeable = (gate?.mergeable ?? "").toUpperCase();
+  const mergeState = (gate?.mergeStateStatus ?? "").toUpperCase();
+  const alreadyConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
+  const inQueue = gate ? prIsInMergeQueue(gate) : false;
+  if (alreadyConflicting || inQueue) return { gate, files: [] };
+  try {
+    const local = await detectLocalMergeConflicts(cwd, gate?.baseRefName ?? null);
+    if (local.conflicting) {
+      return {
+        gate: {
+          mergeable: "CONFLICTING",
+          mergeStateStatus: "DIRTY",
+          reviewDecision: gate?.reviewDecision ?? null,
+          baseRefName: local.base,
+          url: gate?.url ?? null,
+          isInMergeQueue: false
+        },
+        files: local.files
+      };
+    }
+    if (gate && (mergeable === "UNKNOWN" || mergeState === "UNKNOWN")) {
+      return {
+        gate: {
+          ...gate,
+          mergeable: gate.mergeable === "UNKNOWN" ? "MERGEABLE" : gate.mergeable,
+          mergeStateStatus: gate.mergeStateStatus === "UNKNOWN" ? "CLEAN" : gate.mergeStateStatus
+        },
+        files: []
+      };
+    }
+  } catch {
+  }
+  return { gate, files: [] };
+}
 async function getPrChecks(cwd, selector) {
   const slug = await resolveGithubRepoSlug(cwd);
   const args = [
@@ -1634,47 +1683,9 @@ async function getPrChecks(cwd, selector) {
     }
   }
   let gate = await fetchPrMergeGate(cwd, selector, slug);
-  const mergeable = (gate?.mergeable ?? "").toUpperCase();
-  const mergeState = (gate?.mergeStateStatus ?? "").toUpperCase();
-  const alreadyConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
-  const inQueue = gate ? prIsInMergeQueue(gate) : false;
-  const needsLocalProbe = !alreadyConflicting && !inQueue;
-  if (needsLocalProbe) {
-    try {
-      const local = await detectLocalMergeConflicts(cwd, gate?.baseRefName ?? null);
-      if (local.conflicting) {
-        const fileHint = local.files.length > 0 ? ` Conflicting paths: ${local.files.slice(0, 8).join(", ")}${local.files.length > 8 ? "\u2026" : ""}.` : "";
-        gate = {
-          mergeable: "CONFLICTING",
-          mergeStateStatus: "DIRTY",
-          reviewDecision: gate?.reviewDecision ?? null,
-          baseRefName: local.base,
-          url: gate?.url ?? null,
-          isInMergeQueue: false
-        };
-        const ciFailed2 = ciChecks.some((c) => c.bucket === "fail");
-        const review2 = (gate.reviewDecision ?? "").toUpperCase();
-        const hasReviewRow2 = review2 === "CHANGES_REQUESTED" || review2 === "REVIEW_REQUIRED";
-        const gateRows2 = buildMergeGateChecks(gate, {
-          suppressGenericBlocked: ciFailed2 || hasReviewRow2
-        }).map(
-          (row) => row.kind === "mergeability" && row.name === "Merge conflicts" ? {
-            ...row,
-            description: `${row.description ?? ""}${fileHint}`.trim()
-          } : row
-        );
-        return [...gateRows2, ...ciChecks];
-      }
-      if (gate && (mergeable === "UNKNOWN" || mergeState === "UNKNOWN")) {
-        gate = {
-          ...gate,
-          mergeable: gate.mergeable === "UNKNOWN" ? "MERGEABLE" : gate.mergeable,
-          mergeStateStatus: gate.mergeStateStatus === "UNKNOWN" ? "CLEAN" : gate.mergeStateStatus
-        };
-      }
-    } catch {
-    }
-  }
+  const probed = await probeLocalMergeGate(cwd, gate);
+  gate = probed.gate;
+  const fileHint = probed.files.length > 0 ? ` Conflicting paths: ${probed.files.slice(0, 8).join(", ")}${probed.files.length > 8 ? "\u2026" : ""}.` : "";
   if (!gate) {
     return ciChecks;
   }
@@ -1684,7 +1695,12 @@ async function getPrChecks(cwd, selector) {
   const gateRows = buildMergeGateChecks(gate, {
     // Avoid duplicating "blocked" when CI failures or review rows already explain it.
     suppressGenericBlocked: ciFailed || hasReviewRow
-  });
+  }).map(
+    (row) => fileHint && row.kind === "mergeability" && row.name === "Merge conflicts" ? {
+      ...row,
+      description: `${row.description ?? ""}${fileHint}`.trim()
+    } : row
+  );
   return [...gateRows, ...ciChecks];
 }
 async function getPrMeta(cwd, selector) {
@@ -1694,7 +1710,7 @@ async function getPrMeta(cwd, selector) {
     "view",
     selector,
     "--json",
-    "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,isInMergeQueue,mergeStateStatus"
+    "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,isInMergeQueue,mergeStateStatus,mergeable"
   ];
   if (slug) viewArgs.push("--repo", slug);
   let { stdout, exitCode, stderr } = await gh(viewArgs, cwd, { reject: false });
@@ -1704,7 +1720,7 @@ async function getPrMeta(cwd, selector) {
       "view",
       selector,
       "--json",
-      "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,mergeStateStatus"
+      "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,mergeStateStatus,mergeable"
     ];
     if (slug) retry.push("--repo", slug);
     ({ stdout, exitCode, stderr } = await gh(retry, cwd, { reject: false }));
@@ -1715,16 +1731,28 @@ async function getPrMeta(cwd, selector) {
   }
   try {
     const view = JSON.parse(stdout);
+    const gate = {
+      mergeable: typeof view.mergeable === "string" && view.mergeable ? view.mergeable : null,
+      mergeStateStatus: typeof view.mergeStateStatus === "string" && view.mergeStateStatus ? view.mergeStateStatus : null,
+      reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
+      baseRefName: String(view.baseRefName ?? ""),
+      url: String(view.url ?? ""),
+      isInMergeQueue: parseInMergeQueue(view)
+    };
+    const probed = await probeLocalMergeGate(cwd, gate);
+    const resolved = probed.gate ?? gate;
     return {
       number: Number(view.number),
       title: String(view.title ?? ""),
       url: String(view.url ?? ""),
       state: String(view.state ?? ""),
       isDraft: Boolean(view.isDraft),
-      reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
-      baseRefName: String(view.baseRefName ?? ""),
+      reviewDecision: resolved.reviewDecision,
+      baseRefName: resolved.baseRefName || String(view.baseRefName ?? ""),
       headRefName: String(view.headRefName ?? ""),
-      isInMergeQueue: parseInMergeQueue(view)
+      isInMergeQueue: Boolean(resolved.isInMergeQueue),
+      mergeable: resolved.mergeable,
+      mergeStateStatus: resolved.mergeStateStatus
     };
   } catch {
     return null;
@@ -2192,7 +2220,9 @@ async function mergePr(cwd, selector, opts) {
   if (slug) args.push("--repo", slug);
   const { exitCode, stderr, stdout } = await gh(args, cwd, { reject: false });
   if (exitCode !== 0) {
-    throw new Error(stderr.trim() || stdout.trim() || "gh pr merge failed");
+    throw new Error(
+      formatMergePrError(stderr.trim() || stdout.trim() || "gh pr merge failed")
+    );
   }
   const after = await gh(viewArgs, cwd, { reject: false });
   if (after.exitCode === 0 && after.stdout.trim()) {
@@ -2353,6 +2383,8 @@ export {
   formatRateLimitResetHint,
   extractGhErrorDetail,
   formatGhLandError,
+  isPrNotMergeableError,
+  formatMergePrError,
   formatIpcInvokeError,
   appendIndexedGitConfig,
   githubAgentGitEnv,

package/dist/{chunk-FUUVPN4A.js → chunk-HBBXS2FR.js}

@@ -14,7 +14,7 @@ import {
 import {
   getGithubGitAuthMode,
   getGithubPat
-} from "./chunk-XKNBSYA7.js";
+} from "./chunk-UHGN4KCL.js";
 import {
   worktreesRoot
 } from "./chunk-7MV3RXSC.js";
@@ -884,6 +884,19 @@ function formatGhLandError(raw, opts) {
   }
   return detail || "Failed to create or update pull request";
 }
+function isPrNotMergeableError(text) {
+  return /not mergeable|cannot be cleanly created|cannot merge cleanly|Merge conflict|\bCONFLICTING\b|must be (updated|rebased)|branch is out of date|needs? to be (updated|rebased)|Resolve conflicts or update the branch/i.test(
+    text
+  );
+}
+function formatMergePrError(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) return "gh pr merge failed";
+  if (isPrNotMergeableError(trimmed)) {
+    return "This pull request cannot merge cleanly into the base branch. Resolve conflicts or update the branch, then retry.";
+  }
+  return extractGhErrorDetail(trimmed) || trimmed;
+}
 
 // src/git/git-auth-mode.ts
 var HTTPS_REWRITE = [
@@ -1566,6 +1579,41 @@ ${result.stderr}`;
   ].slice(0, 20) : [];
   return { conflicting, base: baseName, files };
 }
+async function probeLocalMergeGate(cwd, gate) {
+  const mergeable = (gate?.mergeable ?? "").toUpperCase();
+  const mergeState = (gate?.mergeStateStatus ?? "").toUpperCase();
+  const alreadyConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
+  const inQueue = gate ? prIsInMergeQueue(gate) : false;
+  if (alreadyConflicting || inQueue) return { gate, files: [] };
+  try {
+    const local = await detectLocalMergeConflicts(cwd, gate?.baseRefName ?? null);
+    if (local.conflicting) {
+      return {
+        gate: {
+          mergeable: "CONFLICTING",
+          mergeStateStatus: "DIRTY",
+          reviewDecision: gate?.reviewDecision ?? null,
+          baseRefName: local.base,
+          url: gate?.url ?? null,
+          isInMergeQueue: false
+        },
+        files: local.files
+      };
+    }
+    if (gate && (mergeable === "UNKNOWN" || mergeState === "UNKNOWN")) {
+      return {
+        gate: {
+          ...gate,
+          mergeable: gate.mergeable === "UNKNOWN" ? "MERGEABLE" : gate.mergeable,
+          mergeStateStatus: gate.mergeStateStatus === "UNKNOWN" ? "CLEAN" : gate.mergeStateStatus
+        },
+        files: []
+      };
+    }
+  } catch {
+  }
+  return { gate, files: [] };
+}
 async function getPrChecks(cwd, selector) {
   const slug = await resolveGithubRepoSlug(cwd);
   const args = [
@@ -1601,47 +1649,9 @@ async function getPrChecks(cwd, selector) {
     }
   }
   let gate = await fetchPrMergeGate(cwd, selector, slug);
-  const mergeable = (gate?.mergeable ?? "").toUpperCase();
-  const mergeState = (gate?.mergeStateStatus ?? "").toUpperCase();
-  const alreadyConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
-  const inQueue = gate ? prIsInMergeQueue(gate) : false;
-  const needsLocalProbe = !alreadyConflicting && !inQueue;
-  if (needsLocalProbe) {
-    try {
-      const local = await detectLocalMergeConflicts(cwd, gate?.baseRefName ?? null);
-      if (local.conflicting) {
-        const fileHint = local.files.length > 0 ? ` Conflicting paths: ${local.files.slice(0, 8).join(", ")}${local.files.length > 8 ? "\u2026" : ""}.` : "";
-        gate = {
-          mergeable: "CONFLICTING",
-          mergeStateStatus: "DIRTY",
-          reviewDecision: gate?.reviewDecision ?? null,
-          baseRefName: local.base,
-          url: gate?.url ?? null,
-          isInMergeQueue: false
-        };
-        const ciFailed2 = ciChecks.some((c) => c.bucket === "fail");
-        const review2 = (gate.reviewDecision ?? "").toUpperCase();
-        const hasReviewRow2 = review2 === "CHANGES_REQUESTED" || review2 === "REVIEW_REQUIRED";
-        const gateRows2 = buildMergeGateChecks(gate, {
-          suppressGenericBlocked: ciFailed2 || hasReviewRow2
-        }).map(
-          (row) => row.kind === "mergeability" && row.name === "Merge conflicts" ? {
-            ...row,
-            description: `${row.description ?? ""}${fileHint}`.trim()
-          } : row
-        );
-        return [...gateRows2, ...ciChecks];
-      }
-      if (gate && (mergeable === "UNKNOWN" || mergeState === "UNKNOWN")) {
-        gate = {
-          ...gate,
-          mergeable: gate.mergeable === "UNKNOWN" ? "MERGEABLE" : gate.mergeable,
-          mergeStateStatus: gate.mergeStateStatus === "UNKNOWN" ? "CLEAN" : gate.mergeStateStatus
-        };
-      }
-    } catch {
-    }
-  }
+  const probed = await probeLocalMergeGate(cwd, gate);
+  gate = probed.gate;
+  const fileHint = probed.files.length > 0 ? ` Conflicting paths: ${probed.files.slice(0, 8).join(", ")}${probed.files.length > 8 ? "\u2026" : ""}.` : "";
   if (!gate) {
     return ciChecks;
   }
@@ -1651,7 +1661,12 @@ async function getPrChecks(cwd, selector) {
   const gateRows = buildMergeGateChecks(gate, {
     // Avoid duplicating "blocked" when CI failures or review rows already explain it.
     suppressGenericBlocked: ciFailed || hasReviewRow
-  });
+  }).map(
+    (row) => fileHint && row.kind === "mergeability" && row.name === "Merge conflicts" ? {
+      ...row,
+      description: `${row.description ?? ""}${fileHint}`.trim()
+    } : row
+  );
   return [...gateRows, ...ciChecks];
 }
 async function getPrMeta(cwd, selector) {
@@ -1661,7 +1676,7 @@ async function getPrMeta(cwd, selector) {
     "view",
     selector,
     "--json",
-    "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,isInMergeQueue,mergeStateStatus"
+    "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,isInMergeQueue,mergeStateStatus,mergeable"
   ];
   if (slug) viewArgs.push("--repo", slug);
   let { stdout, exitCode, stderr } = await gh(viewArgs, cwd, { reject: false });
@@ -1671,7 +1686,7 @@ async function getPrMeta(cwd, selector) {
       "view",
       selector,
       "--json",
-      "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,mergeStateStatus"
+      "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,mergeStateStatus,mergeable"
     ];
     if (slug) retry.push("--repo", slug);
     ({ stdout, exitCode, stderr } = await gh(retry, cwd, { reject: false }));
@@ -1682,16 +1697,28 @@ async function getPrMeta(cwd, selector) {
   }
   try {
     const view = JSON.parse(stdout);
+    const gate = {
+      mergeable: typeof view.mergeable === "string" && view.mergeable ? view.mergeable : null,
+      mergeStateStatus: typeof view.mergeStateStatus === "string" && view.mergeStateStatus ? view.mergeStateStatus : null,
+      reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
+      baseRefName: String(view.baseRefName ?? ""),
+      url: String(view.url ?? ""),
+      isInMergeQueue: parseInMergeQueue(view)
+    };
+    const probed = await probeLocalMergeGate(cwd, gate);
+    const resolved = probed.gate ?? gate;
     return {
       number: Number(view.number),
       title: String(view.title ?? ""),
       url: String(view.url ?? ""),
       state: String(view.state ?? ""),
       isDraft: Boolean(view.isDraft),
-      reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
-      baseRefName: String(view.baseRefName ?? ""),
+      reviewDecision: resolved.reviewDecision,
+      baseRefName: resolved.baseRefName || String(view.baseRefName ?? ""),
       headRefName: String(view.headRefName ?? ""),
-      isInMergeQueue: parseInMergeQueue(view)
+      isInMergeQueue: Boolean(resolved.isInMergeQueue),
+      mergeable: resolved.mergeable,
+      mergeStateStatus: resolved.mergeStateStatus
     };
   } catch {
     return null;
@@ -2159,7 +2186,9 @@ async function mergePr(cwd, selector, opts) {
   if (slug) args.push("--repo", slug);
   const { exitCode, stderr, stdout } = await gh(args, cwd, { reject: false });
   if (exitCode !== 0) {
-    throw new Error(stderr.trim() || stdout.trim() || "gh pr merge failed");
+    throw new Error(
+      formatMergePrError(stderr.trim() || stdout.trim() || "gh pr merge failed")
+    );
   }
   const after = await gh(viewArgs, cwd, { reject: false });
   if (after.exitCode === 0 && after.stdout.trim()) {