@sideboard-ai/core 0.1.77 → 0.1.81

package/dist/mcp/run-stdio.js

@@ -2,6 +2,7 @@
 
 import {
   PLAN_MODE_INSTRUCTION,
+  applyTurnUsage,
   fallbackTurnFailDetail,
   formatTurnExitError,
   getAdapter,
@@ -16,14 +17,14 @@ import {
   resolveQuotaFallbackAgent,
   sideboardMcpProfile,
   summarizeTurnStderr
-} from "../chunk-2FJI5JXX.js";
+} from "../chunk-4AVU4QXO.js";
 import "../chunk-VROPG6QF.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "../chunk-2ZIPJRJE.js";
+} from "../chunk-TDJ43HUD.js";
 import {
   extractPresentedPlan,
   readPlanFile,
@@ -41,14 +42,14 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "../chunk-GWTLKXXP.js";
+} from "../chunk-P5VDPGAN.js";
 import {
   SLACK_REPLY_FORMATTING,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "../chunk-XJNCWYFR.js";
+} from "../chunk-4HJK57XU.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -57,9 +58,11 @@ import {
   createExistingBranchWorktree,
   createOrUpdatePr,
   createThreadWorktree,
+  currentBranch,
   detectGhStack,
   fetchPrHead,
   formatGhLandError,
+  formatGitAuthModeDirective,
   getPr,
   getPrChecks,
   getPrDetails,
@@ -85,7 +88,7 @@ import {
   takenSlugsFromThread,
   threadDisplayLabel,
   worktreeNameFromPath
-} from "../chunk-OE7YBB5X.js";
+} from "../chunk-FUUVPN4A.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
@@ -125,7 +128,7 @@ import {
   saveLinearOAuth,
   updateAdvancedSettings,
   writeSecureJson
-} from "../chunk-PTJJIQK7.js";
+} from "../chunk-XKNBSYA7.js";
 import {
   writePrivateFile
 } from "../chunk-NSTQ6QKD.js";
@@ -880,34 +883,6 @@ function normalizeParseResult(parsed) {
   return Array.isArray(parsed) ? parsed : [parsed];
 }
 
-// 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
 async function spawnAgentTurn(thread, input, onEvent) {
   ensureAgentPath();
@@ -916,9 +891,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-TWHMYLTZ.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-NUMUJRWG.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-MRCMMRSF.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-NYNEFKIV.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -935,8 +910,13 @@ async function spawnAgentTurn(thread, input, onEvent) {
   }
   const env = childEnvWithAppSettings(cmd.env);
   if (!isOrchestratorThread(thread)) {
-    const originEnv = await originGhRepoEnv(thread.worktreePath).catch(() => ({}));
-    Object.assign(env, originEnv);
+    try {
+      const originEnv = await originGhRepoEnv(thread.worktreePath, { env });
+      Object.assign(env, originEnv);
+    } catch (err) {
+      const detail = err instanceof Error ? err.message : String(err);
+      console.warn(`[sideboard] originGhRepoEnv failed (${thread.worktreePath}): ${detail}`);
+    }
   }
   const child = execa(cmd.file, cmd.args, {
     cwd: cmd.cwd,
@@ -1020,6 +1000,80 @@ async function spawnAgentTurn(thread, input, onEvent) {
   };
 }
 
+// src/land/pr-metadata.ts
+var GENERIC_TITLE_RE = /^(sideboard:|thread\/|wip\b|tmp\b|update\b|changes?\b|misc\b|stuff\b)/i;
+function looksGeneric(title) {
+  const t = title.trim();
+  if (!t) return true;
+  if (t.length < 4) return true;
+  if (GENERIC_TITLE_RE.test(t)) return true;
+  if (!/[\s:/\-_]/.test(t) && t.length <= 24) return true;
+  return false;
+}
+function truncateTitle(title, max = 72) {
+  const t = title.trim().replace(/\s+/g, " ");
+  if (t.length <= max) return t;
+  return `${t.slice(0, max - 1).trimEnd()}\u2026`;
+}
+function titleFromPaths(paths) {
+  if (paths.length === 0) return null;
+  const top = paths.slice(0, 3).map((p) => p.replace(/\/$/, ""));
+  if (paths.length === 1) return truncateTitle(`Update ${top[0]}`);
+  if (paths.length <= 3) return truncateTitle(`Update ${top.join(", ")}`);
+  return truncateTitle(`Update ${top[0]} and ${paths.length - 1} more files`);
+}
+async function suggestPrMetadata(worktreePath, opts) {
+  const [{ stdout: logOut }, { stdout: nameStatus }, { stdout: statOut }] = await Promise.all([
+    git(["log", "--format=%s", `${opts.base}..HEAD`], worktreePath, {
+      reject: false
+    }),
+    git(["diff", "--name-only", `${opts.base}...HEAD`], worktreePath, {
+      reject: false
+    }),
+    git(["diff", "--stat", `${opts.base}...HEAD`], worktreePath, {
+      reject: false
+    })
+  ]);
+  const { stdout: dirtyNames } = await git(["diff", "--name-only", "HEAD"], worktreePath, {
+    reject: false
+  });
+  const { stdout: untracked } = await git(
+    ["ls-files", "--others", "--exclude-standard"],
+    worktreePath,
+    { reject: false }
+  );
+  const subjects = logOut.split("\n").map((s) => s.trim()).filter(Boolean);
+  const paths = [
+    ...new Set(
+      [...nameStatus.split("\n"), ...dirtyNames.split("\n"), ...untracked.split("\n")].map((p) => p.trim()).filter(Boolean)
+    )
+  ].sort((a, b) => a.localeCompare(b));
+  const meaningfulSubjects = subjects.filter((s) => !looksGeneric(s));
+  const fallback = opts.fallbackTitle?.trim() || null;
+  const fallbackOk = fallback && !looksGeneric(fallback) ? fallback : null;
+  const title = truncateTitle(
+    meaningfulSubjects[0] ?? fallbackOk ?? titleFromPaths(paths) ?? "Sideboard changes"
+  );
+  const commitMessage = meaningfulSubjects[0] ?? fallbackOk ?? titleFromPaths(paths) ?? `sideboard: ${title}`;
+  const summaryLines = meaningfulSubjects.length > 0 ? meaningfulSubjects.slice(0, 12).map((s) => `- ${s}`) : paths.slice(0, 20).map((p) => `- \`${p}\``);
+  const bodyParts = [
+    "## Summary",
+    summaryLines.length > 0 ? summaryLines.join("\n") : "- Changes landed via Sideboard.",
+    ""
+  ];
+  if (statOut.trim()) {
+    bodyParts.push("## Diff", "```", statOut.trim(), "```", "");
+  }
+  if (opts.sourceLabel) {
+    bodyParts.push(`_Landed via Sideboard from ${opts.sourceLabel}_`);
+  }
+  return {
+    title,
+    body: bodyParts.join("\n").trim() + "\n",
+    commitMessage: truncateTitle(commitMessage, 72)
+  };
+}
+
 // src/git/agent-git-actions.ts
 var AGENT_GIT_ACTIONS = [
   "commit-push",
@@ -1154,8 +1208,20 @@ 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 = { ...baseEnv ?? process.env };
+  const env = stripNestedElectronEnv({
+    ...baseEnv ?? process.env
+  });
   const name = opts.workspaceName ?? basename(opts.worktreePath);
   const ports = opts.ports ?? [];
   const primary = ports[0];
@@ -1759,7 +1825,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("../agents-LKUHPPEQ.js");
+  const { getAdapter: getAdapter2 } = await import("../agents-EBKJ55PN.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2623,7 +2689,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-GQ4XKBD3.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-SUU2GO3A.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -3842,80 +3908,6 @@ async function getDiffSummary(worktreePath, repoPath, opts) {
   };
 }
 
-// src/land/pr-metadata.ts
-var GENERIC_TITLE_RE = /^(sideboard:|thread\/|wip\b|tmp\b|update\b|changes?\b|misc\b|stuff\b)/i;
-function looksGeneric(title) {
-  const t = title.trim();
-  if (!t) return true;
-  if (t.length < 4) return true;
-  if (GENERIC_TITLE_RE.test(t)) return true;
-  if (!/[\s:/\-_]/.test(t) && t.length <= 24) return true;
-  return false;
-}
-function truncateTitle(title, max = 72) {
-  const t = title.trim().replace(/\s+/g, " ");
-  if (t.length <= max) return t;
-  return `${t.slice(0, max - 1).trimEnd()}\u2026`;
-}
-function titleFromPaths(paths) {
-  if (paths.length === 0) return null;
-  const top = paths.slice(0, 3).map((p) => p.replace(/\/$/, ""));
-  if (paths.length === 1) return truncateTitle(`Update ${top[0]}`);
-  if (paths.length <= 3) return truncateTitle(`Update ${top.join(", ")}`);
-  return truncateTitle(`Update ${top[0]} and ${paths.length - 1} more files`);
-}
-async function suggestPrMetadata(worktreePath, opts) {
-  const [{ stdout: logOut }, { stdout: nameStatus }, { stdout: statOut }] = await Promise.all([
-    git(["log", "--format=%s", `${opts.base}..HEAD`], worktreePath, {
-      reject: false
-    }),
-    git(["diff", "--name-only", `${opts.base}...HEAD`], worktreePath, {
-      reject: false
-    }),
-    git(["diff", "--stat", `${opts.base}...HEAD`], worktreePath, {
-      reject: false
-    })
-  ]);
-  const { stdout: dirtyNames } = await git(["diff", "--name-only", "HEAD"], worktreePath, {
-    reject: false
-  });
-  const { stdout: untracked } = await git(
-    ["ls-files", "--others", "--exclude-standard"],
-    worktreePath,
-    { reject: false }
-  );
-  const subjects = logOut.split("\n").map((s) => s.trim()).filter(Boolean);
-  const paths = [
-    ...new Set(
-      [...nameStatus.split("\n"), ...dirtyNames.split("\n"), ...untracked.split("\n")].map((p) => p.trim()).filter(Boolean)
-    )
-  ].sort((a, b) => a.localeCompare(b));
-  const meaningfulSubjects = subjects.filter((s) => !looksGeneric(s));
-  const fallback = opts.fallbackTitle?.trim() || null;
-  const fallbackOk = fallback && !looksGeneric(fallback) ? fallback : null;
-  const title = truncateTitle(
-    meaningfulSubjects[0] ?? fallbackOk ?? titleFromPaths(paths) ?? "Sideboard changes"
-  );
-  const commitMessage = meaningfulSubjects[0] ?? fallbackOk ?? titleFromPaths(paths) ?? `sideboard: ${title}`;
-  const summaryLines = meaningfulSubjects.length > 0 ? meaningfulSubjects.slice(0, 12).map((s) => `- ${s}`) : paths.slice(0, 20).map((p) => `- \`${p}\``);
-  const bodyParts = [
-    "## Summary",
-    summaryLines.length > 0 ? summaryLines.join("\n") : "- Changes landed via Sideboard.",
-    ""
-  ];
-  if (statOut.trim()) {
-    bodyParts.push("## Diff", "```", statOut.trim(), "```", "");
-  }
-  if (opts.sourceLabel) {
-    bodyParts.push(`_Landed via Sideboard from ${opts.sourceLabel}_`);
-  }
-  return {
-    title,
-    body: bodyParts.join("\n").trim() + "\n",
-    commitMessage: truncateTitle(commitMessage, 72)
-  };
-}
-
 // src/land/land.ts
 async function previewLand(thread) {
   if (thread.sourceIsFork) {
@@ -4459,6 +4451,8 @@ function formatWorktreeDirective(thread, opts) {
   lines.push(
     "- Push with `git push -u origin HEAD` (or the current branch name). Do not `git push upstream`."
   );
+  lines.push("");
+  lines.push(formatGitAuthModeDirective(opts?.gitAuthMode ?? "auto"));
   lines.push(
     "- Derive the PR title and body from what the changes actually do and why \u2014 inspect the diff/commits and the user request. Do not use the soccer-team worktree nickname or placeholder branch as the PR title."
   );
@@ -4466,7 +4460,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(
@@ -4504,7 +4498,7 @@ function formatWorktreeDirective(thread, opts) {
     '- "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.'
   );
   return lines.join("\n");
 }
@@ -4663,7 +4657,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("../app-settings-P42Z3VOB.js");
+      const { autoCleanupOrphansEnabled } = await import("../app-settings-NILNWNNQ.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -4820,7 +4814,7 @@ var Orchestrator = class {
   }
   async finishCreateThread(threadId, prompt) {
     await this.runSetupAfterCreate(threadId);
-    const { autoRunAfterSetupEnabled } = await import("../app-settings-P42Z3VOB.js");
+    const { autoRunAfterSetupEnabled } = await import("../app-settings-NILNWNNQ.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -5098,14 +5092,16 @@ var Orchestrator = class {
     }
     const isBrightsy = fresh.agent === "brightsy";
     const isOrchestration = isOrchestratorThread(fresh);
+    const { autoRenameBranchEnabled, getGithubGitAuthMode } = await import("../app-settings-NILNWNNQ.js");
+    const gitAuthMode = getGithubGitAuthMode();
     const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
       githubSlug: await resolveGithubRepoSlug(fresh.worktreePath).catch(
         () => null
-      )
+      ),
+      gitAuthMode
     });
     const artifactDirective = isBrightsy ? null : formatArtifactDirective();
     const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
-    const { autoRenameBranchEnabled } = await import("../app-settings-P42Z3VOB.js");
     const renameBranchDirective = !isBrightsy && !isOrchestration && autoRenameBranchEnabled() ? formatRenameBranchDirective(fresh, {
       customPrompt: settings?.prompts?.renameBranch
     }) : null;
@@ -5811,7 +5807,7 @@ var Orchestrator = class {
         updateThread(thread.id, { title: meta.title });
       }
     }
-    const { autoArchiveOnMergeEnabled } = await import("../app-settings-P42Z3VOB.js");
+    const { autoArchiveOnMergeEnabled } = await import("../app-settings-NILNWNNQ.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -5942,8 +5938,9 @@ var Orchestrator = class {
     return tab;
   }
   /**
-   * Queue a desktop-git-button prompt on a worktree agent (commit/push/PR/merge).
-   * Orchestrators use this instead of running git/gh from the synthetic home.
+   * Desktop git buttons + MCP `ask_git`.
+   * When the worktree is clean, push / open the PR here (HTTPS via `gh` if SSH
+   * is missing). When dirty, queue the worktree agent to commit first.
    */
   async askGit(threadRef, action) {
     if (!AGENT_GIT_ACTIONS.includes(action)) {
@@ -5961,6 +5958,10 @@ var Orchestrator = class {
         "No pull request linked. Ask the worktree agent to open a draft PR first (ask_git create-draft)."
       );
     }
+    if ((action === "commit-push" || action === "create-draft" || action === "create-web") && thread.worktreePath?.trim() && !await isDirty(thread.worktreePath)) {
+      await this.pushAndMaybeOpenPr(thread, action);
+      return this.requireThread(threadRef);
+    }
     let prBase;
     if (action === "resolve-conflicts") {
       try {
@@ -5971,6 +5972,34 @@ var Orchestrator = class {
     }
     return this.send(threadRef, agentGitPrompt(action, { prBase }));
   }
+  /** Push origin (gh HTTPS fallback) and create/update the PR when requested. */
+  async pushAndMaybeOpenPr(thread, action) {
+    const cwd = thread.worktreePath;
+    const branch = await currentBranch(cwd);
+    await pushBranch(cwd, branch);
+    if (action === "commit-push") return;
+    const base = await resolveDefaultBranch(thread.repoPath);
+    const meta = await suggestPrMetadata(cwd, {
+      base,
+      fallbackTitle: thread.prTitle ?? thread.title
+    });
+    const url = await createOrUpdatePr(cwd, {
+      title: meta.title,
+      body: meta.body,
+      base,
+      head: branch,
+      draft: action === "create-draft",
+      web: action === "create-web"
+    });
+    if (!url) return;
+    const patch = { prUrl: url, prTitle: meta.title };
+    try {
+      const fetched = await getPrMeta(cwd, url);
+      if (fetched?.title) patch.prTitle = fetched.title;
+    } catch {
+    }
+    updateThread(thread.id, patch);
+  }
   setThreadOptions(threadRef, patch) {
     const thread = this.requireThread(threadRef);
     const next = {};
@@ -6066,7 +6095,7 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-GQ4XKBD3.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-SUU2GO3A.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -6088,7 +6117,7 @@ var Orchestrator = class {
         await runArchiveScript(thread.repoPath, thread.worktreePath);
       } catch {
       }
-      const { deleteBranchOnPurgeEnabled } = await import("../app-settings-P42Z3VOB.js");
+      const { deleteBranchOnPurgeEnabled } = await import("../app-settings-NILNWNNQ.js");
       const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
       await removeWorktree(thread.repoPath, thread.worktreePath, {
         deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -6109,7 +6138,7 @@ var Orchestrator = class {
       return restored2;
     }
     if (!existsSync15(thread.worktreePath)) {
-      const { createThreadWorktree: createThreadWorktree2 } = await import("../worktree-KWXHMKRN.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("../worktree-UNSOCYZU.js");
       const { execa: execa6 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
@@ -7280,7 +7309,7 @@ function withTimeout(promise, ms, label) {
 async function startMcpServer() {
   const orch = getOrchestrator();
   try {
-    const { maxConcurrentAgents } = await import("../app-settings-P42Z3VOB.js");
+    const { maxConcurrentAgents } = await import("../app-settings-NILNWNNQ.js");
     orch.setMaxConcurrent(maxConcurrentAgents());
   } catch {
   }
@@ -7490,7 +7519,7 @@ async function startMcpServer() {
   registerLinearTools(server);
   if (sideboardMcpProfile() !== "worktree") {
     const { getCaffeinateHold, setCaffeinateHold } = await import("../caffeinate-hold-OHAUWOA6.js");
-    const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults } = await import("../app-settings-P42Z3VOB.js");
+    const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults } = await import("../app-settings-NILNWNNQ.js");
     const accountDefaults = resolveThreadDefaults();
     const accountDefaultsHint = `Account defaults: agent=${accountDefaults.agent}, model=${accountDefaults.model?.trim() || "Auto"}, effort=${accountDefaults.effort}`;
     server.tool(
@@ -7648,7 +7677,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: z3.string(),
         prompt: z3.string(),
@@ -7744,7 +7773,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: z3.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
@@ -7852,7 +7881,7 @@ async function startMcpServer() {
     );
     server.tool(
       "ask_git",
-      "Tell a worktree agent to commit & push, open a draft PR, resolve conflicts, or merge the linked PR \u2014 same short prompts as the desktop git buttons. The worktree agent runs git/gh (`gh pr merge`); this only queues the prompt. Pass a worktree thread ref (not the orchestrator). Then wait_for_turn / get_turn_result. 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: z3.string().describe("Worktree thread id/ref"),
         action: z3.enum(AGENT_GIT_ACTIONS).describe(
@@ -8153,7 +8182,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: z3.string() },
       async ({ ref }) => {
         const stack = await orch.getPrStack(ref);

package/dist/{workspaces-O3U5BENH.js → workspaces-QLRCOXAY.js}

@@ -4,13 +4,13 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-75U65MBE.js";
-import "./chunk-VERLUKN2.js";
-import "./chunk-EEKSZTMU.js";
-import "./chunk-W7YOTDVO.js";
-import "./chunk-JT7R45JB.js";
-import "./chunk-MF2YMEGD.js";
+} from "./chunk-K553XK7M.js";
+import "./chunk-6F2TQFJE.js";
+import "./chunk-CQBQWX73.js";
+import "./chunk-YVVXWWCC.js";
 import "./chunk-FKOIHGKV.js";
+import "./chunk-IFPN6TER.js";
+import "./chunk-JT7R45JB.js";
 import "./chunk-FWJYLBO6.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-M37RITA6.js";

package/dist/{workspaces-GQ4XKBD3.js → workspaces-SUU2GO3A.js}

@@ -6,14 +6,14 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-2ZIPJRJE.js";
-import "./chunk-GWTLKXXP.js";
-import "./chunk-XJNCWYFR.js";
-import "./chunk-OE7YBB5X.js";
+} from "./chunk-TDJ43HUD.js";
+import "./chunk-P5VDPGAN.js";
+import "./chunk-4HJK57XU.js";
+import "./chunk-FUUVPN4A.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-7FD7COKE.js";
 import "./chunk-AE5VBOFE.js";
-import "./chunk-PTJJIQK7.js";
+import "./chunk-XKNBSYA7.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";

package/dist/{worktree-VOCH3WS3.js → worktree-5VLLFI5W.js}

@@ -18,6 +18,7 @@ import {
   getPrMeta,
   ghHeadRef,
   ghRepoSelectArgs,
+  githubAgentGitEnv,
   isDirty,
   isPlaceholderBranch,
   isSideboardScratchPath,
@@ -43,8 +44,10 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-MF2YMEGD.js";
+} from "./chunk-YVVXWWCC.js";
 import "./chunk-FKOIHGKV.js";
+import "./chunk-IFPN6TER.js";
+import "./chunk-JT7R45JB.js";
 import "./chunk-FWJYLBO6.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-M37RITA6.js";
@@ -69,6 +72,7 @@ export {
   getPrMeta,
   ghHeadRef,
   ghRepoSelectArgs,
+  githubAgentGitEnv,
   isDirty,
   isPlaceholderBranch,
   isSideboardScratchPath,

package/dist/{worktree-KWXHMKRN.js → worktree-UNSOCYZU.js}

@@ -20,6 +20,7 @@ import {
   getPrMeta,
   ghHeadRef,
   ghRepoSelectArgs,
+  githubAgentGitEnv,
   isDirty,
   isPlaceholderBranch,
   isSideboardScratchPath,
@@ -45,10 +46,12 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-OE7YBB5X.js";
+} from "./chunk-FUUVPN4A.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-7FD7COKE.js";
 import "./chunk-AE5VBOFE.js";
+import "./chunk-XKNBSYA7.js";
+import "./chunk-NSTQ6QKD.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";
 export {
@@ -71,6 +74,7 @@ export {
   getPrMeta,
   ghHeadRef,
   ghRepoSelectArgs,
+  githubAgentGitEnv,
   isDirty,
   isPlaceholderBranch,
   isSideboardScratchPath,

package/package.json

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