@sideboard-ai/core 0.1.81 → 0.1.84

package/dist/index.cjs

@@ -385,6 +385,41 @@ var init_paths = __esm({
   }
 });
 
+// src/hook/nested-electron-env.ts
+function isNestedElectronEnvKey(key) {
+  return NESTED_ELECTRON_ENV_PREFIXES.some((prefix) => key.startsWith(prefix));
+}
+function stripNestedElectronEnv(env) {
+  const out = { ...env };
+  for (const key of Object.keys(out)) {
+    if (isNestedElectronEnvKey(key)) delete out[key];
+  }
+  return out;
+}
+function wrapElectronAsNodeLaunch(file, args) {
+  if (process.platform === "win32") return { file, args };
+  return {
+    file: "/bin/sh",
+    args: ["-c", STRIP_NESTED_ELECTRON_THEN_EXEC, "sh", file, ...args]
+  };
+}
+function isStrippedElectronLaunch(command, args) {
+  return command === "/bin/sh" && Boolean(args?.[1]?.includes("ELECTRON_RUN_AS_NODE") && args[1].includes("unset"));
+}
+var NESTED_ELECTRON_ENV_PREFIXES, STRIP_NESTED_ELECTRON_THEN_EXEC;
+var init_nested_electron_env = __esm({
+  "src/hook/nested-electron-env.ts"() {
+    "use strict";
+    NESTED_ELECTRON_ENV_PREFIXES = ["ELECTRON_", "CHROME_"];
+    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/private-file.ts
 function writePrivateFile(path2, contents) {
   (0, import_node_fs3.mkdirSync)((0, import_node_path4.dirname)(path2), { recursive: true });
@@ -1499,7 +1534,7 @@ function applyAppEnvironment(target = process.env, settings = loadAppSettings())
 }
 function childEnvWithAppSettings(extra) {
   const settings = loadAppSettings();
-  const env = { ...process.env };
+  const env = stripNestedElectronEnv({ ...process.env });
   applyAppEnvironment(env, settings);
   if (extra) {
     for (const [k, v] of Object.entries(extra)) {
@@ -1520,6 +1555,7 @@ var init_app_settings = __esm({
     import_node_os3 = require("os");
     import_node_path6 = require("path");
     init_thinking_effort();
+    init_nested_electron_env();
     init_paths();
     init_private_file();
     init_secret_vault();
@@ -2852,11 +2888,25 @@ function formatGhLandError(raw, opts) {
   }
   return detail || "Failed to create or update pull request";
 }
+function isPrNotMergeableError(text3) {
+  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(
+    text3
+  );
+}
+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);
 }
 var init_gh_errors = __esm({
@@ -3839,6 +3889,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 = [
@@ -3874,47 +3959,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;
   }
@@ -3924,7 +3971,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) {
@@ -3934,7 +3986,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 });
@@ -3944,7 +3996,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 }));
@@ -3955,16 +4007,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;
@@ -4432,7 +4496,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()) {
@@ -4769,6 +4835,7 @@ var init_coordinator_prompt = __esm({
       "- 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",
@@ -4788,7 +4855,11 @@ var init_coordinator_prompt = __esm({
       '- 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."
@@ -5620,20 +5691,36 @@ function pushTurnStderr(tail, line, maxLines = 12) {
   tail.push(trimmed);
   while (tail.length > maxLines) tail.shift();
 }
+function looksLikeMinifiedJsDump(line) {
+  if (line.length < 200) return false;
+  return /yield Promise\.all/.test(line) || /\(0,[A-Za-z$]\.\w+\)/.test(line) || /CURSOR_RIPGREP_PATH/.test(line);
+}
+function looksLikeNestedElectronCrash(line) {
+  return /HasCustomHostObject|ElectronInitializeICUandStartNode/i.test(line);
+}
+function clipStderr(text3, maxChars) {
+  const trimmed = text3.trim();
+  if (trimmed.length <= maxChars) return trimmed;
+  return trimmed.slice(0, maxChars);
+}
 function summarizeTurnStderr(tail, maxChars = 500) {
   if (tail.length === 0) return "";
+  const cursorStartup = [...tail].reverse().find((line) => /cursor startup failed:/i.test(line));
+  if (cursorStartup) return clipStderr(cursorStartup, maxChars);
+  if (tail.some(looksLikeNestedElectronCrash)) return NESTED_ELECTRON_SUMMARY;
   const moduleMissing = [...tail].reverse().find((line) => /cannot find module/i.test(line));
-  if (moduleMissing) {
-    return moduleMissing.length <= maxChars ? moduleMissing : moduleMissing.slice(0, maxChars);
+  if (moduleMissing) return clipStderr(moduleMissing, maxChars);
+  const useful = tail.filter((line) => !looksLikeMinifiedJsDump(line));
+  if (useful.length === 0 && tail.some(looksLikeMinifiedJsDump)) {
+    return MINIFIED_DUMP_SUMMARY;
   }
-  const joined = tail.slice(-6).join("\n").trim();
-  if (joined.length <= maxChars) return joined;
-  return joined.slice(joined.length - maxChars);
+  const joined = (useful.length ? useful : tail).slice(-6).join("\n").trim();
+  return clipStderr(joined, maxChars);
 }
 function looksLikeInvalidAgentSession(text3) {
   const lower = text3.trim().toLowerCase();
   if (!lower) return false;
-  return /session not found/.test(lower) || /no conversation found/.test(lower) || /conversation .+ not found/.test(lower) || /thread .+ not found/.test(lower) || /unknown session/.test(lower) || /invalid session/.test(lower) || /session .+ (missing|expired|deleted|gone)/.test(lower) || /cannot resume/.test(lower) || /failed to (load|resume|open) session/.test(lower);
+  return /session not found/.test(lower) || /no conversation found/.test(lower) || /conversation .+ not found/.test(lower) || /thread .+ not found/.test(lower) || /unknown session/.test(lower) || /invalid session/.test(lower) || /session .+ (missing|expired|deleted|gone)/.test(lower) || /cannot resume/.test(lower) || /failed to (load|resume|open) session/.test(lower) || /corrupt local agent checkpoint/.test(lower) || /missing root blob/.test(lower) || /\bagent\b.{0,120}\bnot found\b/.test(lower);
 }
 function looksLikeAgentFailureMessage(text3) {
   const lower = text3.trim().toLowerCase();
@@ -5673,6 +5760,12 @@ function humanizeAgentFailDetail(detail) {
   if (/context.*(too long|exceed)|prompt is too long|conversation too long/.test(lower)) {
     return `${raw} \u2014 start a new chat or compact context, then retry.`;
   }
+  if (/hascustomhostobject|electroninitializeicuandstartnode|nested chromium/i.test(lower)) {
+    return `${raw} \u2014 retry the turn; if it keeps failing, pick another agent.`;
+  }
+  if (/corrupt local agent checkpoint|missing root blob|truncated crash dump/.test(lower)) {
+    return `${raw} \u2014 retry the turn (Sideboard will start a fresh Cursor session).`;
+  }
   return raw;
 }
 function formatTurnExitError(exitCode, stderrSummary) {
@@ -5688,11 +5781,13 @@ function formatTurnExitError(exitCode, stderrSummary) {
   if (looksLikeAgentFailureMessage(raw)) return detail;
   return `exit ${code}: ${detail}`;
 }
-var NODE_VERSION_FOOTER;
+var NODE_VERSION_FOOTER, NESTED_ELECTRON_SUMMARY, MINIFIED_DUMP_SUMMARY;
 var init_error_detail = __esm({
   "src/agents/error-detail.ts"() {
     "use strict";
     NODE_VERSION_FOOTER = /^Node\.js v\d+/i;
+    NESTED_ELECTRON_SUMMARY = "Cursor local agent crashed at Electron startup (nested Chromium / HasCustomHostObject)";
+    MINIFIED_DUMP_SUMMARY = "Cursor local agent crashed during startup (truncated crash dump)";
   }
 });
 
@@ -6136,6 +6231,18 @@ var init_profile = __esm({
 function isAsarPath(filePath) {
   return /\.asar([/\\]|$)/.test(filePath);
 }
+function applyNodeLaunch(launch, args) {
+  if (!launch.env.ELECTRON_RUN_AS_NODE) {
+    return { file: launch.file, args, env: launch.env };
+  }
+  const wrapped = wrapElectronAsNodeLaunch(launch.file, args);
+  if (process.platform === "win32") {
+    return { file: wrapped.file, args: wrapped.args, env: launch.env };
+  }
+  const env = { ...launch.env };
+  delete env.ELECTRON_RUN_AS_NODE;
+  return { file: wrapped.file, args: wrapped.args, env };
+}
 async function resolveNodeLaunch(scriptPath) {
   if (isAsarPath(scriptPath)) {
     return {
@@ -6156,6 +6263,7 @@ async function resolveNodeLaunch(scriptPath) {
 var init_node_launch = __esm({
   "src/agents/node-launch.ts"() {
     "use strict";
+    init_nested_electron_env();
     init_run();
   }
 });
@@ -6282,11 +6390,11 @@ async function resolveSideboardMcpServer() {
   if (entry) {
     const isCli = /[/\\]cli[/\\]dist[/\\]index\.js$/.test(entry);
     const scriptArgs = isCli ? [entry, "mcp"] : [entry];
-    const launch = await resolveNodeLaunch(entry);
+    const launch = applyNodeLaunch(await resolveNodeLaunch(entry), scriptArgs);
     return {
       name: "sideboard",
       command: launch.file,
-      args: scriptArgs,
+      args: launch.args,
       ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
     };
   }
@@ -6332,10 +6440,19 @@ async function buildInjectedMcpServers(opts) {
 function toCursorMcpServers(servers) {
   const out = {};
   for (const s of servers) {
+    const env = s.env ? { ...s.env } : void 0;
+    if (env) delete env.ELECTRON_RUN_AS_NODE;
+    let command = s.command;
+    let args = s.args;
+    if (process.platform !== "win32" && !isStrippedElectronLaunch(command, args)) {
+      const wrapped = wrapElectronAsNodeLaunch(command, args ?? []);
+      command = wrapped.file;
+      args = wrapped.args;
+    }
     out[s.name] = {
-      command: s.command,
-      ...s.args ? { args: s.args } : {},
-      ...s.env ? { env: s.env } : {}
+      command,
+      ...args && args.length > 0 ? { args } : {},
+      ...env && Object.keys(env).length > 0 ? { env } : {}
     };
   }
   return out;
@@ -6405,6 +6522,7 @@ var init_injected_mcp = __esm({
     init_app_settings();
     init_paths();
     init_node_launch();
+    init_nested_electron_env();
     import_meta = {};
     SIDEBOARD_MCP_ALLOWED_TOOLS = [
       "mcp__sideboard",
@@ -7498,10 +7616,13 @@ var init_cursor = __esm({
         };
         const runner = cursorRunnerPath();
         const isTs = runner.endsWith(".ts");
-        const launch = await resolveNodeLaunch(runner);
+        const launch = applyNodeLaunch(
+          await resolveNodeLaunch(runner),
+          isTs ? ["--import", "tsx", runner] : [runner]
+        );
         return {
           file: launch.file,
-          args: isTs ? ["--import", "tsx", runner] : [runner],
+          args: launch.args,
           cwd: thread.worktreePath,
           stdin: JSON.stringify(req),
           env: {
@@ -8575,6 +8696,7 @@ __export(index_exports, {
   REVIEW_REQUEST_NAME: () => REVIEW_REQUEST_NAME,
   REVIEW_REQUEST_PATH: () => REVIEW_REQUEST_PATH,
   REVIEW_REQUEST_PREFILL: () => REVIEW_REQUEST_PREFILL,
+  REVIEW_REQUEST_TEMPLATE: () => REVIEW_REQUEST_TEMPLATE,
   SIDEBOARD_FORCE_STOP: () => SIDEBOARD_FORCE_STOP,
   SIDEBOARD_MCP_ALLOWED_TOOLS: () => SIDEBOARD_MCP_ALLOWED_TOOLS,
   SIDEBOARD_MCP_PROFILE_ENV: () => SIDEBOARD_MCP_PROFILE_ENV,
@@ -8723,9 +8845,11 @@ __export(index_exports, {
   formatGhLandError: () => formatGhLandError,
   formatGitAuthModeDirective: () => formatGitAuthModeDirective,
   formatIpcInvokeError: () => formatIpcInvokeError,
+  formatMergePrError: () => formatMergePrError,
   formatMessagesAsTranscript: () => formatMessagesAsTranscript,
   formatPlanQuestionAnswers: () => formatPlanQuestionAnswers,
   formatPlanQuestionsForChat: () => formatPlanQuestionsForChat,
+  formatProcessGuideDirective: () => formatProcessGuideDirective,
   formatRateLimitResetHint: () => formatRateLimitResetHint,
   formatRenameBranchDirective: () => formatRenameBranchDirective,
   formatSlackExternalReplyPrompt: () => formatSlackExternalReplyPrompt,
@@ -8733,6 +8857,7 @@ __export(index_exports, {
   formatSlackRepliesForTurn: () => formatSlackRepliesForTurn,
   formatSlackSignedReply: () => formatSlackSignedReply,
   formatTranscriptMarkdown: () => formatTranscriptMarkdown,
+  formatUiReminder: () => formatUiReminder,
   formatWorkspaceInventory: () => formatWorkspaceInventory,
   formatWorktreeDirective: () => formatWorktreeDirective,
   formatWorktreeReminder: () => formatWorktreeReminder,
@@ -8807,6 +8932,7 @@ __export(index_exports, {
   isOrchestratorThread: () => isOrchestratorThread,
   isPidAlive: () => isPidAlive,
   isPlaceholderBranch: () => isPlaceholderBranch,
+  isPrNotMergeableError: () => isPrNotMergeableError,
   isPresentPlanToolName: () => isPresentPlanToolName,
   isSessionQuotaLimit: () => isSessionQuotaLimit,
   isSideboardScratchPath: () => isSideboardScratchPath,
@@ -9073,7 +9199,8 @@ function agentGitPrompt(action, opts) {
       return "Commit, push, and open a PR in the browser.";
     case "resolve-conflicts": {
       const base = opts?.prBase?.trim().replace(/^refs\/heads\//, "");
-      return base ? `Merge origin/${base} into this branch. Then push.` : "Fix merge conflicts.";
+      const named = base ? ` (${base})` : "";
+      return `Merge the remote branch${named} into your branch and resolve conflicts. Then, commit and push your changes.`;
     }
     case "merge":
       return "Merge PR.";
@@ -10249,7 +10376,7 @@ function formatWorktreeDirective(thread, opts) {
     '- "Fix CI: <name>." \u2192 investigate that failing check, fix it, commit, and push.'
   );
   lines.push(
-    '- "Update the branch." / "Fix merge conflicts." / "Merge origin/<base> into this branch. Then push." \u2192 sync with the PR base (merge or rebase), resolve conflicts carefully, commit, and push until the PR is mergeable.'
+    '- "Merge the remote branch (<base>) into your branch and resolve conflicts. Then, commit and push your changes." \u2192 fetch the PR base, merge it into this branch, resolve conflicts carefully, commit, and push until the PR is mergeable.'
   );
   lines.push(
     '- "Address review comments." \u2192 read PR review feedback, make the requested changes, commit, and push.'
@@ -10257,11 +10384,22 @@ function formatWorktreeDirective(thread, opts) {
   lines.push(
     '- "Merge PR." \u2192 merge this thread\'s open pull request on GitHub (this phrase is the explicit ask). If `gh stack view` shows a stack, use `gh stack merge`; otherwise `gh pr merge` (respect repo defaults / squash vs merge). Do not force-push main/master or merge locally into the main checkout.'
   );
+  lines.push("");
+  lines.push(formatProcessGuideDirective());
   return lines.join("\n");
 }
 function formatWorktreeReminder() {
   return "Sideboard worktree: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout.";
 }
+function formatProcessGuideDirective() {
+  return [
+    "Process guides (recurring work only):",
+    "- If `.claude/skills/graph-engineering/SKILL.md` exists, follow it (`/graph-engineering`) for migrations, ports, batch fixes, and other fan-out. Judge first; state on disk; grow the rulebook; do not patch around it.",
+    "- If this same shape of work will happen again, write `.claude/skills/<kebab-name>/SKILL.md` in this worktree (Claude Code project skill). Sideboard `/name`, Claude Code, and `attach` all load that path. Do not leave the method only in chat.",
+    "- Do not write new skills under `.sideboard/skills` \u2014 native agents do not scan it. Point Codex/OpenCode at the file from `AGENTS.md`. Optional: symlink `.cursor/skills/<name>` to the Claude skill.",
+    "- Skip a guide for a one-off. If a matching skill exists, follow it. Same miss twice \u2192 edit the skill (or `.sideboard/review.md`), do not patch around it."
+  ].join("\n");
+}
 function formatArtifactDirective() {
   return [
     "Sideboard side column (desktop UI):",
@@ -10279,9 +10417,22 @@ function formatArtifactDirective() {
     "Files / media browser (CMS file manager column):",
     "4) Call Sideboard MCP `present_files` with optional title, path, and datasource (brightsy|memory).",
     "   Opens the Files column for browse/upload/pick. Do NOT say a file manager UI is missing.",
-    "Never say artifacts, CMS UI, or the Files column are unavailable. Prefer present_schema for list/edit/publish; present_files for storage UI; html fences for standalone pages."
+    "Multiple-choice questions (any mode \u2014 not only Plan):",
+    "5) Call Sideboard MCP `ask_user` when the user should pick from predefined options (approach forks, requirements, which API). First write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it). Include a description on every option. After calling, stop and wait for their next message with answers. Do not ask multiple-choice questions as plain chat bullets \u2014 use ask_user so Sideboard shows the composer picker.",
+    "Never say artifacts, CMS UI, or the Files column are unavailable. Prefer present_schema for list/edit/publish; present_files for storage UI; html fences for standalone pages; ask_user for predefined-option questions."
   ].join("\n");
 }
+function formatUiReminder() {
+  return [
+    "Sideboard side column (important):",
+    "There is no claude.ai Artifact tool here \u2014 that is normal.",
+    "HTML/SVG/markdown: ```html fence or MCP present_artifact.",
+    "CMS forms/tables: MCP present_schema (Brightsy resource_id or inline schema+schemaUi).",
+    "Files column: MCP present_files (brightsy account storage or memory).",
+    "Do not say artifacts/CMS UI are unavailable.",
+    "Multiple-choice questions: MCP ask_user (composer picker, any mode). Explain options in chat first, then wait for answers."
+  ].join(" ");
+}
 var FILES_BY_AGENT = {
   claude: [
     "CLAUDE.md",
@@ -10395,6 +10546,8 @@ var import_node_path18 = require("path");
 var import_execa3 = require("execa");
 var import_node_readline2 = require("readline");
 init_settings();
+init_nested_electron_env();
+init_nested_electron_env();
 var PORT_RANGE_SIZE = 10;
 function matchSimpleGlob(pattern, name) {
   const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*").replace(/\?/g, ".");
@@ -10478,16 +10631,6 @@ async function captureLoginEnv() {
   cachedLoginEnv = { ...process.env };
   return { ...cachedLoginEnv };
 }
-var NESTED_ELECTRON_ENV_PREFIXES = ["ELECTRON_", "CHROME_"];
-function stripNestedElectronEnv(env) {
-  const out = { ...env };
-  for (const key of Object.keys(out)) {
-    if (NESTED_ELECTRON_ENV_PREFIXES.some((prefix) => key.startsWith(prefix))) {
-      delete out[key];
-    }
-  }
-  return out;
-}
 function buildWorkspaceScriptEnv(opts, baseEnv) {
   const env = stripNestedElectronEnv({
     ...baseEnv ?? process.env
@@ -14278,6 +14421,10 @@ File: src/client/frontends/desktop/core/UserData.ts
 
 **Approve** \u2014 Diff is scoped, behavior looks correct, and there are no blocking issues. Safe to merge.
 </example>
+
+## Growing the rules
+
+If a blocking issue is a missing or ambiguous repo rule that will recur, say so and propose one sentence for \`.sideboard/review.md\` or a \`.claude/skills/<name>/SKILL.md\`. Do not only patch this diff when the same miss will happen again. New skills go under \`.claude/skills\` (Claude Code / attach) \u2014 not \`.sideboard/skills\`.
 `;
 
 // src/review/request-review.ts
@@ -15078,14 +15225,7 @@ var Orchestrator = class {
         SLACK_REPLY_FORMATTING
       ].join("\n") : null
     ].filter(Boolean).join("\n") : null;
-    const artifactReminder = thread.agent !== "brightsy" ? [
-      "Sideboard side column (important):",
-      "There is no claude.ai Artifact tool here \u2014 that is normal.",
-      "HTML/SVG/markdown: ```html fence or MCP present_artifact.",
-      "CMS forms/tables: MCP present_schema (Brightsy resource_id or inline schema+schemaUi).",
-      "Files column: MCP present_files (brightsy account storage or memory).",
-      "Do not say artifacts/CMS UI are unavailable."
-    ].join(" ") : null;
+    const artifactReminder = thread.agent !== "brightsy" ? formatUiReminder() : null;
     const worktreeReminder = thread.agent !== "brightsy" && !isOrchestratorThread(thread) ? formatWorktreeReminder() : null;
     const slackReplyContext = formatSlackRepliesForTurn(
       pendingSlackExternalReplies(thread.messages)
@@ -15224,7 +15364,7 @@ var Orchestrator = class {
       }
       let lastStderr = summarizeTurnStderr(stderrTail);
       let detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
-      if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && looksLikeInvalidAgentSession(detail) && this.requireThread(threadId).sessionId && this.requireThread(threadId).agent !== "cursor" && this.requireThread(threadId).agent !== "brightsy") {
+      if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && looksLikeInvalidAgentSession(detail) && this.requireThread(threadId).sessionId && this.requireThread(threadId).agent !== "brightsy") {
         updateThread(threadId, { sessionId: null });
         pushTurnStderr(
           stderrTail,
@@ -15779,7 +15919,9 @@ var Orchestrator = class {
       reviewDecision: null,
       baseRefName: "",
       headRefName: "",
-      isInMergeQueue: false
+      isInMergeQueue: false,
+      mergeable: null,
+      mergeStateStatus: null
     };
     await this.persistPrMetaAndMaybeArchive(thread, metaLike);
     return { url: metaLike.url, state };
@@ -17141,7 +17283,7 @@ async function startMcpServer() {
   );
   server.tool(
     "ask_user",
-    "Ask the user clarifying multiple-choice questions in Sideboard\u2019s composer (plan mode). Before calling, write a short chat message explaining the decision and what each option means. Include a description on every option. Use for approach forks and requirements \u2014 not for \u201Cis the plan ready?\u201D. After calling, stop and wait for their next message with answers.",
+    "Ask the user clarifying multiple-choice questions in Sideboard\u2019s composer (any mode \u2014 not only Plan). Before calling, write a short chat message explaining the decision and what each option means. Include a description on every option. Use when the user should pick from predefined options (approach forks, requirements, which API) \u2014 not for \u201Cis the plan ready?\u201D. After calling, stop and wait for their next message with answers.",
     {
       questions: import_zod3.z.array(
         import_zod3.z.object({
@@ -20018,6 +20160,7 @@ async function startSlackRelayServer(opts) {
   REVIEW_REQUEST_NAME,
   REVIEW_REQUEST_PATH,
   REVIEW_REQUEST_PREFILL,
+  REVIEW_REQUEST_TEMPLATE,
   SIDEBOARD_FORCE_STOP,
   SIDEBOARD_MCP_ALLOWED_TOOLS,
   SIDEBOARD_MCP_PROFILE_ENV,
@@ -20166,9 +20309,11 @@ async function startSlackRelayServer(opts) {
   formatGhLandError,
   formatGitAuthModeDirective,
   formatIpcInvokeError,
+  formatMergePrError,
   formatMessagesAsTranscript,
   formatPlanQuestionAnswers,
   formatPlanQuestionsForChat,
+  formatProcessGuideDirective,
   formatRateLimitResetHint,
   formatRenameBranchDirective,
   formatSlackExternalReplyPrompt,
@@ -20176,6 +20321,7 @@ async function startSlackRelayServer(opts) {
   formatSlackRepliesForTurn,
   formatSlackSignedReply,
   formatTranscriptMarkdown,
+  formatUiReminder,
   formatWorkspaceInventory,
   formatWorktreeDirective,
   formatWorktreeReminder,
@@ -20250,6 +20396,7 @@ async function startSlackRelayServer(opts) {
   isOrchestratorThread,
   isPidAlive,
   isPlaceholderBranch,
+  isPrNotMergeableError,
   isPresentPlanToolName,
   isSessionQuotaLimit,
   isSideboardScratchPath,