@sideboard-ai/core 0.1.79 → 0.1.83

package/dist/mcp/run-stdio.cjs

@@ -31,6 +31,43 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
+// 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 dropNestedElectronEnvFromProcess(env = process.env) {
+  for (const key of Object.keys(env)) {
+    if (isNestedElectronEnvKey(key)) delete env[key];
+  }
+}
+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]
+  };
+}
+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/hook/settings.ts
 function expandHome(path) {
   if (path.startsWith("~/") || path === "~") {
@@ -1649,6 +1686,19 @@ 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;
+}
 var init_gh_errors = __esm({
   "src/git/gh-errors.ts"() {
     "use strict";
@@ -2855,7 +2905,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)) {
@@ -2876,6 +2926,7 @@ var init_app_settings = __esm({
     import_node_os4 = require("os");
     import_node_path10 = require("path");
     init_thinking_effort();
+    init_nested_electron_env();
     init_paths();
     init_private_file();
     init_secret_vault();
@@ -3615,6 +3666,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 = [
@@ -3650,47 +3736,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;
   }
@@ -3700,7 +3748,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) {
@@ -3710,7 +3763,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 });
@@ -3720,7 +3773,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 }));
@@ -3731,16 +3784,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;
@@ -4208,7 +4273,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()) {
@@ -4489,7 +4556,7 @@ function coordinatorTurnReminder(opts) {
     goal ? `- Goal / title: ${goal}` : null,
     accountDefaultsPlaybookLine(),
     `- For "what's going on": call list_threads (and list_workspaces if needed). Summarize fleet status \u2014 do not ls/git-status this synthetic home.`,
-    "- Existing repo: create_thread on a repoPath \u2192 send_to_thread \u2192 wait_for_turn. Land with ask_git (commit-push / create-draft / merge) on the child, then wait_for_turn \u2014 never git/gh from this cwd.",
+    "- Existing repo: create_thread on a repoPath \u2192 send_to_thread \u2192 wait_for_turn. Commit/push/draft PR with ask_git on the child, then wait_for_turn \u2014 never git/gh from this cwd. Call ask_git merge only if the user explicitly asked to merge.",
     "- New repo: Bash (clone or gh repo create under ~/sideboard/repos/<name>) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 ask_git create-draft.",
     "- When naming threads for the user, link them as `[Title](sideboard://thread/<id>)`.",
     "- If they will wait on Slack or leave the Mac, call set_caffeinate enabled=true. When they say they are done / wrapping up / going to sleep, call set_caffeinate enabled=false. Closing this chat also turns it off."
@@ -4543,9 +4610,9 @@ function ensureGlobalCoordinatorCwd(opts) {
     orchId ? `Pass parentThreadId="${orchId}" (or omit it). Never invent another parentThreadId.` : "Pass `parentThreadId` for children (this chat's id from the turn reminder).",
     "Omit `agent` / `model` on `create_thread` unless you have a reason to override Account defaults.",
     "Never pass `agent=codex` when you yourself are Codex \u2014 nested Codex deadlocks on shared ~/.codex locks. Omit agent (Account default) or use cursor/claude.",
-    "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 ask_git create-draft \u2192 wait_for_turn \u2192 (when ready) ask_git merge \u2192 wait_for_turn.",
+    "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 ask_git create-draft \u2192 wait_for_turn. Merge only if the user explicitly asked (`ask_git` merge).",
     "Typical flow (new app): Bash create/clone under repos dir \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 ask_git create-draft.",
-    "Always ask worktree agents to commit, push, open draft PRs, and merge (`ask_git` / `send_to_thread`). The worktree agent runs git/gh; never merge from this orchestration cwd."
+    "Always ask worktree agents to commit, push, and open draft PRs (`ask_git` / `send_to_thread`). Tell them to merge only when the user explicitly asked. The worktree agent runs git/gh; never merge from this orchestration cwd."
   ].join("\n");
   try {
     (0, import_node_fs11.writeFileSync)((0, import_node_path12.join)(dir, "CLAUDE.md"), `${body}
@@ -4558,7 +4625,6 @@ function ensureGlobalCoordinatorCwd(opts) {
 }
 function coordinatorSystemPrompt(opts) {
   const audience = opts.audience ?? "cloud";
-  const reposDir = sideboardReposDir();
   const intro = audience === "cloud" ? [
     "You are a Sideboard coordinator responding to a request from a Brightsy cloud agent (Discord, Teams, or other chat).",
     "Your reply will be sent back to that cloud agent \u2014 be concise and actionable."
@@ -4576,14 +4642,8 @@ function coordinatorSystemPrompt(opts) {
     ...intro,
     "You operate across ALL registered workspaces below.",
     "You have no project git home \u2014 this process cwd is synthetic and empty on purpose.",
-    COORDINATOR_TOOL_PLAYBOOK,
-    accountDefaultsPlaybookLine(),
-    coordinatorGreenfieldPlaybook(reposDir),
-    "When creating threads, pass the correct repoPath for the target workspace.",
+    "Follow AGENTS.md / CLAUDE.md in this cwd for the fleet playbook (they are the same document).",
     `YOUR orchestration thread id is ${opts.parentId} \u2014 pass parentThreadId="${opts.parentId}" on create_thread, or omit parentThreadId (Sideboard binds it). Never invent a uuid.`,
-    "Omit agent/model on create_thread unless you need to override Account defaults.",
-    "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 ask_git create-draft \u2192 wait_for_turn \u2192 (when ready) ask_git merge \u2192 wait_for_turn. Never target upstream. Never git/gh from this orchestration cwd.",
-    "Typical flow (new app): Bash under repos dir (clone or gh repo create) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 ask_git create-draft.",
     `Goal: ${opts.goal}`,
     "Registered workspaces:",
     formatWorkspaceInventory(opts.workspaces)
@@ -4610,6 +4670,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",
@@ -4628,7 +4689,12 @@ var init_coordinator_prompt = __esm({
       "- get_diff \u2014 compact diff summary",
       '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .sideboard/review.md when present, else local guidelines; sends "Review changes in this workspace."); then wait_for_turn / get_turn_result on the returned id',
       "- ask_git \u2014 commit & push, open a draft PR, resolve conflicts, or merge. When the worktree is clean, Sideboard pushes / opens the PR itself. When dirty, it queues the worktree agent \u2014 then wait_for_turn. Prefer this over paraphrasing.",
-      '- 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.',
+      '- 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.", "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."
@@ -5065,6 +5131,51 @@ var init_connected_teams = __esm({
   }
 });
 
+// src/agents/usage.ts
+function sumOptional(a, b) {
+  if (a == null && b == null) return void 0;
+  return (a ?? 0) + (b ?? 0);
+}
+function fromInclusiveInputUsage(opts) {
+  const totalInput = Number(opts.inputTokens) || 0;
+  const outputTokens = Number(opts.outputTokens) || 0;
+  const cached = Number(opts.cachedInputTokens) || 0;
+  if (!totalInput && !outputTokens) return null;
+  const cacheReadTokens = cached > 0 ? Math.min(cached, totalInput) : 0;
+  return {
+    inputTokens: Math.max(0, totalInput - cacheReadTokens),
+    outputTokens,
+    cacheReadTokens: cacheReadTokens || void 0
+  };
+}
+function requestOccupancy(u) {
+  return u.inputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWriteTokens ?? 0);
+}
+function mergeUsage(a, b) {
+  return {
+    inputTokens: (a?.inputTokens ?? 0) + b.inputTokens,
+    outputTokens: (a?.outputTokens ?? 0) + b.outputTokens,
+    cacheReadTokens: sumOptional(a?.cacheReadTokens, b.cacheReadTokens),
+    cacheWriteTokens: sumOptional(a?.cacheWriteTokens, b.cacheWriteTokens),
+    lastRequestTokens: b.lastRequestTokens ?? a?.lastRequestTokens
+  };
+}
+function applyTurnUsage(current, incoming, scope = "request") {
+  if (scope === "turn") {
+    return {
+      ...incoming,
+      lastRequestTokens: current?.lastRequestTokens ?? requestOccupancy(incoming)
+    };
+  }
+  const merged = mergeUsage(current, incoming);
+  return { ...merged, lastRequestTokens: requestOccupancy(incoming) };
+}
+var init_usage = __esm({
+  "src/agents/usage.ts"() {
+    "use strict";
+  }
+});
+
 // src/agents/brightsy-targets.ts
 function encodeBrightsyTarget(type, id, accountId) {
   if (accountId) return `team:${accountId}:${type}:${id}`;
@@ -5129,15 +5240,11 @@ var init_turn_input = __esm({
 // src/agents/brightsy.ts
 function usageFromBrightsy(usage) {
   if (!usage) return null;
-  const inputTokens = Number(usage.prompt_tokens ?? 0);
-  const outputTokens = Number(usage.completion_tokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
-  const cached = Number(usage.prompt_tokens_details?.cached_tokens ?? 0);
-  return {
-    inputTokens,
-    outputTokens,
-    cacheReadTokens: cached || void 0
-  };
+  return fromInclusiveInputUsage({
+    inputTokens: Number(usage.prompt_tokens ?? 0),
+    outputTokens: Number(usage.completion_tokens ?? 0),
+    cachedInputTokens: Number(usage.prompt_tokens_details?.cached_tokens ?? 0)
+  });
 }
 function parseBrightsyCliLine(line) {
   const trimmed = line.trim();
@@ -5353,6 +5460,7 @@ var init_brightsy = __esm({
     init_connected_teams();
     init_config();
     init_app_settings();
+    init_usage();
     init_brightsy_targets();
     init_error_detail();
     init_turn_input();
@@ -5492,6 +5600,13 @@ 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);
+  return { file: wrapped.file, args: wrapped.args, env: launch.env };
+}
 async function resolveNodeLaunch(scriptPath) {
   if (isAsarPath(scriptPath)) {
     return {
@@ -5512,6 +5627,7 @@ async function resolveNodeLaunch(scriptPath) {
 var init_node_launch = __esm({
   "src/agents/node-launch.ts"() {
     "use strict";
+    init_nested_electron_env();
     init_run();
   }
 });
@@ -5638,11 +5754,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 } : {}
     };
   }
@@ -6232,14 +6348,11 @@ async function listCodexModels() {
 }
 function usageFromCodex(usage) {
   if (!usage) return null;
-  const inputTokens = Number(usage.input_tokens ?? 0);
-  const outputTokens = Number(usage.output_tokens ?? 0) + Number(usage.reasoning_output_tokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
-  return {
-    inputTokens,
-    outputTokens,
-    cacheReadTokens: usage.cached_input_tokens ? Number(usage.cached_input_tokens) : void 0
-  };
+  return fromInclusiveInputUsage({
+    inputTokens: Number(usage.input_tokens ?? 0),
+    outputTokens: Number(usage.output_tokens ?? 0),
+    cachedInputTokens: Number(usage.cached_input_tokens ?? 0)
+  });
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
@@ -6299,6 +6412,7 @@ var init_codex = __esm({
     init_app_settings();
     init_global_workspace();
     init_error_detail();
+    init_usage();
     init_injected_mcp();
     init_turn_input();
     init_types();
@@ -6849,10 +6963,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: {
@@ -8141,6 +8258,9 @@ var init_cursor_recover = __esm({
   }
 });
 
+// src/mcp/run-stdio.ts
+init_nested_electron_env();
+
 // src/mcp/server.ts
 var import_mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
 var import_stdio = require("@modelcontextprotocol/sdk/server/stdio.js");
@@ -8899,36 +9019,7 @@ function normalizeParseResult(parsed) {
 
 // src/agents/spawn.ts
 init_path();
-
-// src/agents/usage.ts
-function sumOptional(a, b) {
-  if (a == null && b == null) return void 0;
-  return (a ?? 0) + (b ?? 0);
-}
-function requestOccupancy(u) {
-  return u.inputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWriteTokens ?? 0);
-}
-function mergeUsage(a, b) {
-  return {
-    inputTokens: (a?.inputTokens ?? 0) + b.inputTokens,
-    outputTokens: (a?.outputTokens ?? 0) + b.outputTokens,
-    cacheReadTokens: sumOptional(a?.cacheReadTokens, b.cacheReadTokens),
-    cacheWriteTokens: sumOptional(a?.cacheWriteTokens, b.cacheWriteTokens),
-    lastRequestTokens: b.lastRequestTokens ?? a?.lastRequestTokens
-  };
-}
-function applyTurnUsage(current, incoming, scope = "request") {
-  if (scope === "turn") {
-    return {
-      ...incoming,
-      lastRequestTokens: current?.lastRequestTokens ?? requestOccupancy(incoming)
-    };
-  }
-  const merged = mergeUsage(current, incoming);
-  return { ...merged, lastRequestTokens: requestOccupancy(incoming) };
-}
-
-// src/agents/spawn.ts
+init_usage();
 async function spawnAgentTurn(thread, input, onEvent) {
   ensureAgentPath();
   if (!thread.worktreePath?.trim()) {
@@ -9145,7 +9236,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.";
@@ -9173,6 +9265,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, ".");
@@ -9256,16 +9350,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
@@ -10416,6 +10500,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
@@ -12553,7 +12641,7 @@ function formatWorktreeDirective(thread, opts) {
     "- Prefer a concise imperative title (Conventional Commits style when it fits: feat:/fix:/chore:/docs:). Body should summarize intent, key changes, and test notes."
   );
   lines.push(
-    "- Commit with messages that state the purpose of the change (same standard as the PR). Stay on this thread branch. Never push directly to main/master or merge locally into the main checkout. When asked to merge the PR, use GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
+    "- Commit with messages that state the purpose of the change (same standard as the PR). Stay on this thread branch. Never push directly to main/master or merge locally into the main checkout. Do not merge the PR unless this turn is a Merge PR request or the user explicitly asked. When merging, use GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
   );
   if (thread.prUrl) {
     lines.push(
@@ -12585,19 +12673,30 @@ 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.'
   );
   lines.push(
-    '- "Merge PR." \u2192 merge this thread\'s open pull request on GitHub. If `gh stack view` shows a stack, use `gh stack merge`; otherwise `gh pr merge` (respect repo defaults / squash vs merge). Do not force-push main/master or merge locally into the main checkout.'
+    '- "Merge PR." \u2192 merge this thread\'s open pull request on GitHub (this phrase is the explicit ask). If `gh stack view` shows a stack, use `gh stack merge`; otherwise `gh pr merge` (respect repo defaults / squash vs merge). Do not force-push main/master or merge locally into the main checkout.'
   );
+  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):",
@@ -12615,9 +12714,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(" ");
+}
 
 // src/orchestrator/orchestrator.ts
 init_types();
@@ -13161,14 +13273,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)
@@ -13862,7 +13967,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 };
@@ -15536,7 +15643,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({
@@ -15799,7 +15906,7 @@ async function startMcpServer() {
     );
     server.tool(
       "send_to_thread",
-      "Queue a prompt on a worktree thread chat (runs under concurrency cap). Use after create_thread to start or continue a conversation. For commit/push/PR/merge, prefer ask_git (canonical desktop-button phrases). Set force_stop=true to interrupt an in-flight/queued turn (kill + clear queue) before queueing this prompt \u2014 use when the thread is mid-turn or has stale queued prompts you need to replace.",
+      'Queue a prompt on a worktree thread chat (runs under concurrency cap). Use after create_thread to start or continue a conversation. For commit/push/PR, prefer ask_git (canonical desktop-button phrases). Send "Merge PR." / ask_git merge only when the user explicitly asked to merge. Set force_stop=true to interrupt an in-flight/queued turn (kill + clear queue) before queueing this prompt \u2014 use when the thread is mid-turn or has stale queued prompts you need to replace.',
       {
         ref: import_zod3.z.string(),
         prompt: import_zod3.z.string(),
@@ -15895,7 +16002,7 @@ async function startMcpServer() {
     );
     server.tool(
       "archive_thread",
-      "Archive a thread (stops agent/dev, runs archive script, removes worktree when last chat tab). Coordinators commit, push, open PRs, and merge only by asking the worktree agent (ask_git).",
+      "Archive a thread (stops agent/dev, runs archive script, removes worktree when last chat tab). Coordinators commit, push, and open PRs by asking the worktree agent (ask_git). Merge only when the user explicitly asked.",
       { ref: import_zod3.z.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
@@ -16003,7 +16110,7 @@ async function startMcpServer() {
     );
     server.tool(
       "ask_git",
-      "Commit & push, open a draft PR, resolve conflicts, or merge \u2014 same actions as the desktop git buttons. When the worktree is clean, Sideboard pushes / opens the PR itself (HTTPS via `gh` if SSH is missing). When dirty, queues the worktree agent to commit; then wait_for_turn. Pass a worktree thread ref (not the orchestrator). Do not run git or gh from the orchestration cwd.",
+      "Commit & push, open a draft PR, resolve conflicts, or merge \u2014 same actions as the desktop git buttons. When the worktree is clean, Sideboard pushes / opens the PR itself (HTTPS via `gh` if SSH is missing). When dirty, queues the worktree agent to commit; then wait_for_turn. Pass a worktree thread ref (not the orchestrator). action=merge only when the user explicitly asked to merge that PR. Do not run git or gh from the orchestration cwd.",
       {
         ref: import_zod3.z.string().describe("Worktree thread id/ref"),
         action: import_zod3.z.enum(AGENT_GIT_ACTIONS).describe(
@@ -16304,7 +16411,7 @@ async function startMcpServer() {
     );
     server.tool(
       "get_pr_stack",
-      "Load the GitHub PR stack for a thread worktree (`gh stack view --json`). Returns null JSON when the branch is not stacked. Prefer this before ask_git merge on stacked PRs.",
+      "Load the GitHub PR stack for a thread worktree (`gh stack view --json`). Returns null JSON when the branch is not stacked. Prefer this before ask_git merge on stacked PRs (and only merge when the user explicitly asked).",
       { ref: import_zod3.z.string() },
       async ({ ref }) => {
         const stack = await orch.getPrStack(ref);
@@ -16450,6 +16557,7 @@ async function startMcpServer() {
 }
 
 // src/mcp/run-stdio.ts
+dropNestedElectronEnvFromProcess();
 startMcpServer().catch((err) => {
   console.error(err);
   process.exitCode = 1;