@sideboard-ai/core 0.1.77 → 0.1.81

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-75U65MBE.js";
+} from "./chunk-K553XK7M.js";
 import {
   BRIGHTSY_MCP_ALLOWED_TOOLS,
   CLAUDE_MODEL_CATALOG,
@@ -13,12 +13,14 @@ import {
   SIDEBOARD_MCP_ALLOWED_TOOLS,
   SIDEBOARD_MCP_PROFILE_ENV,
   allAdapters,
+  applyTurnUsage,
   brightsyAdapter,
   brightsyMcpAllowedTools,
   buildCachedUserContent,
   buildClaudeStreamJsonUserMessage,
   claudeAdapter,
   codexAdapter,
+  contextTokens,
   countCacheControlBlocks,
   cursorAdapter,
   decodeBrightsyTarget,
@@ -26,6 +28,7 @@ import {
   encodeBrightsyTarget,
   findInvalidCacheControlTtlOrder,
   flattenTurnInput,
+  fromInclusiveInputUsage,
   getAdapter,
   getAgentSetupInfo,
   installAgent,
@@ -41,6 +44,7 @@ import {
   loginAgent,
   mcpAllowTools,
   mcpAuthWarnings,
+  mergeUsage,
   normalizeTurnInput,
   openInSystemTerminal,
   opencodeAdapter,
@@ -50,6 +54,7 @@ import {
   permissionMode,
   prepareTerminalCommand,
   promptMentionsBrightsy,
+  requestOccupancy,
   resolveCursorModelId,
   resolveLoginCommand,
   resolveQuotaFallbackAgent,
@@ -57,8 +62,9 @@ import {
   shouldInjectBrightsyMcp,
   sideboardMcpProfile,
   threadRequestsBrightsyMcp,
+  totalTokens,
   writeInjectedMcpConfig
-} from "./chunk-QD37IILI.js";
+} from "./chunk-XNECBC6T.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -85,7 +91,7 @@ import {
   parseForceStopMessage,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-VERLUKN2.js";
+} from "./chunk-6F2TQFJE.js";
 import {
   COORDINATOR_TOOL_PLAYBOOK,
   SLACK_REPLY_FORMATTING,
@@ -94,7 +100,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-EEKSZTMU.js";
+} from "./chunk-CQBQWX73.js";
 import {
   brightsyConfigPath,
   brightsyMcpServerName,
@@ -129,66 +135,6 @@ import {
   pushTurnStderr,
   summarizeTurnStderr
 } from "./chunk-SEOICVGB.js";
-import {
-  HARNESS_ENV_KEYS,
-  appSettingsPath,
-  applyAppEnvironment,
-  autoArchiveOnMergeEnabled,
-  autoCleanupOrphansEnabled,
-  autoRenameBranchEnabled,
-  autoRunAfterSetupEnabled,
-  brightsyCloudConnectAgent,
-  brightsyCloudConnectEnabled,
-  brightsyInjectWorktreeMcpEnabled,
-  caffeinateWhileCloudConnectEnabled,
-  caffeinateWhileRunningEnabled,
-  caffeinateWhileSlackListenEnabled,
-  childEnvWithAppSettings,
-  claudeChromeEnabled,
-  claudeUserSettingsPath,
-  deleteBranchOnPurgeEnabled,
-  disconnectLinearConnection,
-  ensureSlackDeviceIdentity,
-  getDefaultAgent,
-  getDefaultEffort,
-  getDefaultFast,
-  getDefaultModel,
-  getIssueSource,
-  getLinearApiKey,
-  harnessEnvKey,
-  isLinearConnected,
-  isSecureFileEncrypted,
-  loadAppSettings,
-  maxConcurrentAgents,
-  orchestrationQuotaFallbackAgent,
-  orchestrationQuotaOnLimit,
-  persistVaultKeyInKeychain,
-  readKeychainVaultKey,
-  readSecureJson,
-  resolveAgentExecutable,
-  resolveClaudeExecutable,
-  resolveEffectiveIssueSource,
-  resolveNewThreadOptions,
-  resolveThreadDefaults,
-  resolveVaultKey,
-  saveAppSettings,
-  saveLinearOAuth,
-  secureFileUnlocksWith,
-  setVaultMasterKey,
-  slackAppLevelToken,
-  slackListenEnabled,
-  toPublicAppSettings,
-  updateAdvancedSettings,
-  updateAgentExecutable,
-  updateAppEnvironment,
-  updateBrightsySettings,
-  updateClaudeSettings,
-  updateCodexSettings,
-  updateDefaultsSettings,
-  updateIntegrationsSettings,
-  updateOpencodeSettings,
-  writeSecureJson
-} from "./chunk-W7YOTDVO.js";
 import {
   caffeinateHoldPath,
   getCaffeinateHold,
@@ -196,14 +142,13 @@ import {
   releaseCaffeinateHoldForThread,
   setCaffeinateHold
 } from "./chunk-MFF2RE3I.js";
-import {
-  writePrivateFile
-} from "./chunk-JT7R45JB.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   addPrStackLayer,
   allocateTeamName,
   allocateTeamSlug,
+  appendIndexedGitConfig,
+  applyGithubGitAuthEnv,
   branchDisplayLabel,
   checkoutPrStackLayer,
   collectTakenTeamSlugs,
@@ -218,6 +163,7 @@ import {
   extractGhErrorDetail,
   fetchPrHead,
   formatGhLandError,
+  formatGitAuthModeDirective,
   formatIpcInvokeError,
   formatRateLimitResetHint,
   getPr,
@@ -227,6 +173,7 @@ import {
   getPrStack,
   ghHeadRef,
   ghRepoSelectArgs,
+  githubAgentGitEnv,
   initPrStack,
   isDirty,
   isGhRateLimitError,
@@ -261,13 +208,79 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-MF2YMEGD.js";
+} from "./chunk-YVVXWWCC.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
   attachmentsGitignoreBody,
   isWorkspaceScratchPath
 } from "./chunk-FKOIHGKV.js";
+import {
+  GITHUB_GIT_AUTH_MODES,
+  HARNESS_ENV_KEYS,
+  appSettingsPath,
+  applyAppEnvironment,
+  autoArchiveOnMergeEnabled,
+  autoCleanupOrphansEnabled,
+  autoRenameBranchEnabled,
+  autoRunAfterSetupEnabled,
+  brightsyCloudConnectAgent,
+  brightsyCloudConnectEnabled,
+  brightsyInjectWorktreeMcpEnabled,
+  caffeinateWhileCloudConnectEnabled,
+  caffeinateWhileRunningEnabled,
+  caffeinateWhileSlackListenEnabled,
+  childEnvWithAppSettings,
+  claudeChromeEnabled,
+  claudeUserSettingsPath,
+  deleteBranchOnPurgeEnabled,
+  disconnectLinearConnection,
+  ensureSlackDeviceIdentity,
+  getDefaultAgent,
+  getDefaultEffort,
+  getDefaultFast,
+  getDefaultModel,
+  getGithubGitAuthMode,
+  getGithubPat,
+  getIssueSource,
+  getLinearApiKey,
+  harnessEnvKey,
+  isLinearConnected,
+  isSecureFileEncrypted,
+  loadAppSettings,
+  maxConcurrentAgents,
+  orchestrationQuotaFallbackAgent,
+  orchestrationQuotaOnLimit,
+  persistVaultKeyInKeychain,
+  readKeychainVaultKey,
+  readSecureJson,
+  resolveAgentExecutable,
+  resolveClaudeExecutable,
+  resolveEffectiveIssueSource,
+  resolveNewThreadOptions,
+  resolveThreadDefaults,
+  resolveVaultKey,
+  saveAppSettings,
+  saveLinearOAuth,
+  secureFileUnlocksWith,
+  setVaultMasterKey,
+  slackAppLevelToken,
+  slackListenEnabled,
+  toPublicAppSettings,
+  updateAdvancedSettings,
+  updateAgentExecutable,
+  updateAppEnvironment,
+  updateBrightsySettings,
+  updateClaudeSettings,
+  updateCodexSettings,
+  updateDefaultsSettings,
+  updateIntegrationsSettings,
+  updateOpencodeSettings,
+  writeSecureJson
+} from "./chunk-IFPN6TER.js";
+import {
+  writePrivateFile
+} from "./chunk-JT7R45JB.js";
 import {
   appendMessage,
   createEmptyThread,
@@ -1075,8 +1088,8 @@ function toolDetail(name, input) {
   if (!input) return void 0;
   const command = str(input.command) ?? str(input.cmd);
   if (command) return command;
-  const path = str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
-  if (path) return path;
+  const path2 = str(input.file_path) ?? str(input.path) ?? str(input.filePath) ?? str(input.filename);
+  if (path2) return path2;
   const pattern = str(input.pattern) ?? str(input.glob) ?? str(input.glob_pattern);
   if (pattern) return pattern;
   const query = str(input.query) ?? str(input.prompt);
@@ -1120,12 +1133,12 @@ function toolDescription(name, input) {
     return "Run shell command";
   }
   if (/edit|write|apply/i.test(name)) {
-    const path = str(input.file_path) ?? str(input.path);
-    return path ? `Edit ${path.split("/").pop()}` : "Edit file";
+    const path2 = str(input.file_path) ?? str(input.path);
+    return path2 ? `Edit ${path2.split("/").pop()}` : "Edit file";
   }
   if (/read/i.test(name)) {
-    const path = str(input.file_path) ?? str(input.path);
-    return path ? `Read ${path.split("/").pop()}` : "Read file";
+    const path2 = str(input.file_path) ?? str(input.path);
+    return path2 ? `Read ${path2.split("/").pop()}` : "Read file";
   }
   if (/grep/i.test(name)) return "Search files";
   if (/glob/i.test(name)) return "Find files";
@@ -1289,41 +1302,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) };
-}
-function totalTokens(u) {
-  return u.inputTokens + u.outputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWriteTokens ?? 0);
-}
-function contextTokens(u) {
-  if (u.lastRequestTokens != null && u.lastRequestTokens > 0) return u.lastRequestTokens;
-  return requestOccupancy(u);
-}
-
 // src/agents/spawn.ts
 async function spawnAgentTurn(thread, input, onEvent) {
   ensureAgentPath();
@@ -1332,9 +1310,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-YNMNO4CL.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-DZM4ZFGU.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-LLFJUO2R.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-JQF72JKX.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -1351,8 +1329,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,
@@ -1487,6 +1470,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."
   );
@@ -1494,7 +1479,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(
@@ -1532,7 +1517,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");
 }
@@ -1575,10 +1560,11 @@ var FILES_BY_AGENT = {
 var MAX_CHARS_PER_FILE = 48e3;
 function loadAgentInstructions(worktreePath, agent) {
   const candidates = FILES_BY_AGENT[agent] ?? FILES_BY_AGENT.claude;
-  const seen = /* @__PURE__ */ new Set();
+  const seenPaths = /* @__PURE__ */ new Set();
+  const seenBodies = /* @__PURE__ */ new Set();
   const out = [];
   for (const rel of candidates) {
-    if (seen.has(rel)) continue;
+    if (seenPaths.has(rel)) continue;
     const abs = join(worktreePath, rel);
     if (!existsSync(abs)) continue;
     try {
@@ -1590,7 +1576,10 @@ function loadAgentInstructions(worktreePath, agent) {
 
 \u2026(truncated)`;
       }
-      seen.add(rel);
+      const body = content.trim().replace(/\r\n/g, "\n");
+      if (seenBodies.has(body)) continue;
+      seenPaths.add(rel);
+      seenBodies.add(body);
       out.push({ relativePath: rel, content });
     } catch {
     }
@@ -1672,9 +1661,9 @@ function matchSimpleGlob(pattern, name) {
   return new RegExp(`^${escaped}$`).test(name);
 }
 function readWorktreeInclude(repoPath) {
-  const path = join2(repoPath, ".worktreeinclude");
-  if (!existsSync2(path)) return [];
-  return readFileSync2(path, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
+  const path2 = join2(repoPath, ".worktreeinclude");
+  if (!existsSync2(path2)) return [];
+  return readFileSync2(path2, "utf8").split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
 }
 function resolveFilesToCopy(repoPath) {
   const fromInclude = readWorktreeInclude(repoPath);
@@ -1749,8 +1738,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];
@@ -1975,10 +1976,10 @@ import { join as join3 } from "path";
 import { execa as execa3 } from "execa";
 import { createInterface as createInterface3 } from "readline";
 function loadCursorWorktreesJson(rootPath) {
-  const path = join3(rootPath, ".cursor", "worktrees.json");
-  if (!existsSync3(path)) return null;
+  const path2 = join3(rootPath, ".cursor", "worktrees.json");
+  if (!existsSync3(path2)) return null;
   try {
-    return JSON.parse(readFileSync3(path, "utf8"));
+    return JSON.parse(readFileSync3(path2, "utf8"));
   } catch {
     return null;
   }
@@ -2079,9 +2080,9 @@ function parseNameStatus(stdout) {
   const out = [];
   for (const line of stdout.split("\n").filter(Boolean)) {
     const [status, ...pathParts] = line.split("	");
-    const path = pathParts[pathParts.length - 1];
-    if (!status || !path) continue;
-    out.push({ status: status[0] ?? status, path });
+    const path2 = pathParts[pathParts.length - 1];
+    if (!status || !path2) continue;
+    out.push({ status: status[0] ?? status, path: path2 });
   }
   return out;
 }
@@ -2089,12 +2090,12 @@ function parseNumstat(stdout) {
   const map = /* @__PURE__ */ new Map();
   for (const line of stdout.split("\n").filter(Boolean)) {
     const [addRaw, delRaw, ...pathParts] = line.split("	");
-    const path = pathParts[pathParts.length - 1];
-    if (!path) continue;
+    const path2 = pathParts[pathParts.length - 1];
+    if (!path2) continue;
     const additions = addRaw === "-" ? 0 : Number(addRaw);
     const deletions = delRaw === "-" ? 0 : Number(delRaw);
     if (!Number.isFinite(additions) && !Number.isFinite(deletions)) continue;
-    map.set(path, {
+    map.set(path2, {
       additions: Number.isFinite(additions) ? additions : 0,
       deletions: Number.isFinite(deletions) ? deletions : 0
     });
@@ -2171,70 +2172,70 @@ function splitCombinedDiff(stdout) {
   }
   return map;
 }
-function syntheticAddPatch(path, content, maxHunk) {
+function syntheticAddPatch(path2, content, maxHunk) {
   const lines = content.split("\n");
   const body = lines.map((l) => `+${l}`).join("\n");
-  const header = `diff --git a/${path} b/${path}
+  const header = `diff --git a/${path2} b/${path2}
 new file mode 100644
 --- /dev/null
-+++ b/${path}
++++ b/${path2}
 @@ -0,0 +1,${lines.length} @@
 `;
   return {
-    path,
+    path: path2,
     status: "A",
     patch: capPatch(`${header}${body}`, maxHunk),
     additions: lines.length,
     deletions: 0
   };
 }
-async function untrackedPatch(worktreePath, path, maxHunk) {
-  const abs = join4(worktreePath, path);
+async function untrackedPatch(worktreePath, path2, maxHunk) {
+  const abs = join4(worktreePath, path2);
   try {
     const st = statSync2(abs);
     if (st.isFile() && st.size > maxHunk) {
       const buf = readFileSync4(abs).subarray(0, maxHunk);
-      return syntheticAddPatch(path, buf.toString("utf8"), maxHunk);
+      return syntheticAddPatch(path2, buf.toString("utf8"), maxHunk);
     }
   } catch {
   }
   const { stdout: patch } = await git(
-    ["diff", "--no-ext-diff", "--no-color", "--no-index", "--", "/dev/null", path],
+    ["diff", "--no-ext-diff", "--no-color", "--no-index", "--", "/dev/null", path2],
     worktreePath,
     { reject: false, timeoutMs: 4e3 }
   );
-  const normalized = patch.replace(/^diff --git a\/.+? b\/.+?$/m, `diff --git a/${path} b/${path}`).replace(/^--- .*$/m, "--- /dev/null").replace(/^\+\+\+ .*$/m, `+++ b/${path}`);
+  const normalized = patch.replace(/^diff --git a\/.+? b\/.+?$/m, `diff --git a/${path2} b/${path2}`).replace(/^--- .*$/m, "--- /dev/null").replace(/^\+\+\+ .*$/m, `+++ b/${path2}`);
   const addLines = normalized.split("\n").filter((l) => l.startsWith("+") && !l.startsWith("+++")).length;
   return {
-    path,
+    path: path2,
     status: "A",
     patch: capPatch(normalized, maxHunk),
     additions: addLines,
     deletions: 0
   };
 }
-async function listUntrackedPaths(worktreePath, path) {
+async function listUntrackedPaths(worktreePath, path2) {
   const args = ["ls-files", "-z", "--others", "--exclude-standard"];
-  if (path) args.push("--", path);
+  if (path2) args.push("--", path2);
   const { stdout } = await git(args, worktreePath, { reject: false });
   return stdout.split("\0").filter(Boolean).filter((p) => !isSideboardScratchPath(p));
 }
 async function listUntrackedFiles(worktreePath, maxHunk, paths) {
   const list = paths ?? await listUntrackedPaths(worktreePath);
   if (list.length === 0) return [];
-  return Promise.all(list.map((path) => untrackedPatch(worktreePath, path, maxHunk)));
+  return Promise.all(list.map((path2) => untrackedPatch(worktreePath, path2, maxHunk)));
 }
 function untrackedStubs(paths) {
-  return paths.map((path) => ({
-    path,
+  return paths.map((path2) => ({
+    path: path2,
     status: "A",
     patch: "",
     additions: 0,
     deletions: 0
   }));
 }
-function pathspec(path) {
-  return path ? ["--", path] : [];
+function pathspec(path2) {
+  return path2 ? ["--", path2] : [];
 }
 function gitDiff(args, cwd, opts) {
   return git(["diff", "--no-ext-diff", "--no-color", ...args], cwd, {
@@ -2242,7 +2243,7 @@ function gitDiff(args, cwd, opts) {
     timeoutMs: opts?.timeoutMs
   });
 }
-function fileFromPatch(path, patch, maxHunk) {
+function fileFromPatch(path2, patch, maxHunk) {
   let status = "M";
   if (/^new file mode /m.test(patch) || /^--- \/dev\/null/m.test(patch)) {
     status = "A";
@@ -2254,15 +2255,15 @@ function fileFromPatch(path, patch, maxHunk) {
   const additions = patch.split("\n").filter((l) => l.startsWith("+") && !l.startsWith("+++")).length;
   const deletions = patch.split("\n").filter((l) => l.startsWith("-") && !l.startsWith("---")).length;
   return {
-    path,
+    path: path2,
     status,
     patch: capPatch(patch, maxHunk),
     additions,
     deletions
   };
 }
-async function gitDiffParts(worktreePath, diffArgs, includePatches, path) {
-  const extra = pathspec(path);
+async function gitDiffParts(worktreePath, diffArgs, includePatches, path2) {
+  const extra = pathspec(path2);
   if (includePatches) {
     const diff = await gitDiff([...diffArgs, ...extra], worktreePath, {
       timeoutMs: 4e3
@@ -2300,17 +2301,17 @@ function filesFromDiff(nameStatus, numstat, combinedDiff, maxHunk) {
   const patches = splitCombinedDiff(combinedDiff);
   if (!nameStatus.trim() && patches.size > 0) {
     return [...patches.entries()].map(
-      ([path, patch]) => fileFromPatch(path, patch, maxHunk)
+      ([path2, patch]) => fileFromPatch(path2, patch, maxHunk)
     );
   }
   const counts = parseNumstat(numstat);
   const files = [];
-  for (const { status, path } of parseNameStatus(nameStatus)) {
-    const n = counts.get(path);
+  for (const { status, path: path2 } of parseNameStatus(nameStatus)) {
+    const n = counts.get(path2);
     files.push({
-      path,
+      path: path2,
       status,
-      patch: capPatch(patches.get(path) ?? "", maxHunk),
+      patch: capPatch(patches.get(path2) ?? "", maxHunk),
       additions: n?.additions,
       deletions: n?.deletions
     });
@@ -2394,7 +2395,7 @@ function emptyPathDiff(scope, base, hasLastTurnBase, commitSha = null) {
   };
 }
 async function getPathDiff(worktreePath, repoPath, opts) {
-  const { path, scope, commitSha, lastTurnBase, hasLastTurnBase, includePatches, maxHunk } = opts;
+  const { path: path2, scope, commitSha, lastTurnBase, hasLastTurnBase, includePatches, maxHunk } = opts;
   if (scope === "last_turn" && !lastTurnBase) {
     return emptyPathDiff(scope, "last turn", false);
   }
@@ -2433,7 +2434,7 @@ async function getPathDiff(worktreePath, repoPath, opts) {
     labelBase = "HEAD";
   }
   const diff = await gitDiff(
-    includePatches ? [...diffArgs, "--", path] : ["--name-status", ...diffArgs, "--", path],
+    includePatches ? [...diffArgs, "--", path2] : ["--name-status", ...diffArgs, "--", path2],
     worktreePath,
     { timeoutMs: 4e3 }
   );
@@ -2441,8 +2442,8 @@ async function getPathDiff(worktreePath, repoPath, opts) {
   if (includePatches) {
     const parsed = filesFromDiff("", "", diff.stdout, maxHunk);
     for (const file of parsed) filesMap.set(file.path, file);
-    if (diff.stdout.trim() && !filesMap.has(path)) {
-      filesMap.set(path, fileFromPatch(path, diff.stdout, maxHunk));
+    if (diff.stdout.trim() && !filesMap.has(path2)) {
+      filesMap.set(path2, fileFromPatch(path2, diff.stdout, maxHunk));
     }
   } else {
     for (const file of filesFromDiff(diff.stdout, "", "", maxHunk)) {
@@ -2450,7 +2451,7 @@ async function getPathDiff(worktreePath, repoPath, opts) {
     }
   }
   if (filesMap.size === 0) {
-    const maybe = await listUntrackedPaths(worktreePath, path);
+    const maybe = await listUntrackedPaths(worktreePath, path2);
     if (maybe.length > 0) {
       const extra = includePatches ? await listUntrackedFiles(worktreePath, maxHunk, maybe) : untrackedStubs(maybe);
       for (const file of extra) filesMap.set(file.path, file);
@@ -3473,8 +3474,8 @@ function splitForCompaction(messages, thresholds = {}) {
 function formatToolPart(t, detail) {
   if (detail === "summary") {
     const label = t.description || t.detail || t.name;
-    const path = t.filePath ? ` (${t.filePath})` : "";
-    return `- ${t.name}: ${label}${path}`;
+    const path2 = t.filePath ? ` (${t.filePath})` : "";
+    return `- ${t.name}: ${label}${path2}`;
   }
   const lines = [`#### Tool: ${t.name}`, `Status: ${t.status}`];
   if (t.description) lines.push(`Description: ${t.description}`);
@@ -3812,7 +3813,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-XJV6J3K2.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-UQ7D6U6L.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -4355,7 +4356,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-O3U5BENH.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QLRCOXAY.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -4606,10 +4607,10 @@ function storePath() {
   return join8(appDataDir(), "slack-reply-to.json");
 }
 function readStore() {
-  const path = storePath();
-  if (!existsSync10(path)) return {};
+  const path2 = storePath();
+  if (!existsSync10(path2)) return {};
   try {
-    const parsed = isSecureFileEncrypted(path) ? readSecureJson(path) : JSON.parse(readFileSync8(path, "utf8"));
+    const parsed = isSecureFileEncrypted(path2) ? readSecureJson(path2) : JSON.parse(readFileSync8(path2, "utf8"));
     return parsed?.targets && typeof parsed.targets === "object" ? parsed.targets : {};
   } catch {
     return {};
@@ -4632,12 +4633,12 @@ function storePath2() {
 }
 function readStore2() {
   try {
-    const path = storePath2();
-    const wasEncrypted = isSecureFileEncrypted(path);
-    const parsed = readSecureJson(path);
+    const path2 = storePath2();
+    const wasEncrypted = isSecureFileEncrypted(path2);
+    const parsed = readSecureJson(path2);
     const workspaces = Array.isArray(parsed?.workspaces) ? parsed.workspaces : [];
     if (workspaces.length > 0 && !wasEncrypted && resolveVaultKey()) {
-      writeSecureJson(path, { workspaces });
+      writeSecureJson(path2, { workspaces });
     }
     return workspaces;
   } catch {
@@ -4773,10 +4774,10 @@ function tsNewer(a, b) {
   return Number(a) > Number(b);
 }
 function readStore3() {
-  const path = storePath3();
-  if (!existsSync11(path)) return [];
+  const path2 = storePath3();
+  if (!existsSync11(path2)) return [];
   try {
-    const parsed = isSecureFileEncrypted(path) ? readSecureJson(path) : JSON.parse(readFileSync9(path, "utf8"));
+    const parsed = isSecureFileEncrypted(path2) ? readSecureJson(path2) : JSON.parse(readFileSync9(path2, "utf8"));
     return Array.isArray(parsed?.watches) ? parsed.watches : [];
   } catch {
     return [];
@@ -5140,8 +5141,8 @@ function shouldAutoArchiveOnPrMerge(opts) {
 // src/git/orphan-cleanup.ts
 import { existsSync as existsSync12, readdirSync as readdirSync4, statSync as statSync5 } from "fs";
 import { join as join11 } from "path";
-function isSideboardWorktreePath(path) {
-  return path.includes("/.sideboard/worktrees/") || path.includes("/sideboard/workspaces/");
+function isSideboardWorktreePath(path2) {
+  return path2.includes("/.sideboard/worktrees/") || path2.includes("/sideboard/workspaces/");
 }
 async function findOrphanWorktrees(repoPaths) {
   const threads = listThreads({ includeArchived: true });
@@ -5166,18 +5167,18 @@ async function findOrphanWorktrees(repoPaths) {
     try {
       const wts = await listWorktrees(repoPath);
       for (const wt of wts) {
-        const path = wt.path.replace(/\/$/, "");
-        if (!isSideboardWorktreePath(path)) continue;
-        if (known.has(path)) continue;
-        if (seen.has(path)) continue;
-        seen.add(path);
+        const path2 = wt.path.replace(/\/$/, "");
+        if (!isSideboardWorktreePath(path2)) continue;
+        if (known.has(path2)) continue;
+        if (seen.has(path2)) continue;
+        seen.add(path2);
         let mtimeMs = 0;
         try {
-          mtimeMs = statSync5(path).mtimeMs;
+          mtimeMs = statSync5(path2).mtimeMs;
         } catch {
           mtimeMs = 0;
         }
-        orphans.push({ path, repoPath, mtimeMs });
+        orphans.push({ path: path2, repoPath, mtimeMs });
       }
     } catch {
     }
@@ -5186,17 +5187,17 @@ async function findOrphanWorktrees(repoPaths) {
       if (existsSync12(root)) {
         for (const entry of readdirSync4(root, { withFileTypes: true })) {
           if (!entry.isDirectory()) continue;
-          const path = join11(root, entry.name).replace(/\/$/, "");
-          if (known.has(path) || seen.has(path)) continue;
-          if (!existsSync12(join11(path, ".git"))) continue;
-          seen.add(path);
+          const path2 = join11(root, entry.name).replace(/\/$/, "");
+          if (known.has(path2) || seen.has(path2)) continue;
+          if (!existsSync12(join11(path2, ".git"))) continue;
+          seen.add(path2);
           let mtimeMs = 0;
           try {
-            mtimeMs = statSync5(path).mtimeMs;
+            mtimeMs = statSync5(path2).mtimeMs;
           } catch {
             mtimeMs = Date.now();
           }
-          orphans.push({ path, repoPath, mtimeMs });
+          orphans.push({ path: path2, repoPath, mtimeMs });
         }
       }
     } catch {
@@ -5579,9 +5580,9 @@ function ensureReviewRequestFile(worktreePath) {
   const localAbs = join13(worktreePath, REVIEW_REQUEST_PATH);
   const localContent = readTextIfPresent(localAbs) ?? readTextIfPresent(join13(worktreePath, LEGACY_REVIEW_REQUEST_PATH));
   if (localContent && !shouldRefreshReviewRequestTemplate(localContent)) {
-    const path = existsSync14(localAbs) ? REVIEW_REQUEST_PATH : LEGACY_REVIEW_REQUEST_PATH;
+    const path2 = existsSync14(localAbs) ? REVIEW_REQUEST_PATH : LEGACY_REVIEW_REQUEST_PATH;
     return {
-      path,
+      path: path2,
       name: REVIEW_REQUEST_NAME,
       content: localContent,
       source: "local"
@@ -5597,13 +5598,13 @@ function ensureReviewRequestFile(worktreePath) {
   };
 }
 function buildReviewRequestAttachment(content, opts) {
-  const path = opts?.path ?? REVIEW_REQUEST_PATH;
-  const name = opts?.name ?? (path === REPO_REVIEW_PATH ? REPO_REVIEW_NAME : REVIEW_REQUEST_NAME);
+  const path2 = opts?.path ?? REVIEW_REQUEST_PATH;
+  const name = opts?.name ?? (path2 === REPO_REVIEW_PATH ? REPO_REVIEW_NAME : REVIEW_REQUEST_NAME);
   return {
     id: randomUUID4(),
     name,
     kind: "file",
-    path,
+    path: path2,
     content
   };
 }
@@ -5872,7 +5873,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled: autoCleanupOrphansEnabled2 } = await import("./app-settings-3TLA2EJ7.js");
+      const { autoCleanupOrphansEnabled: autoCleanupOrphansEnabled2 } = await import("./app-settings-6IOQYGBK.js");
       if (autoCleanupOrphansEnabled2() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -6029,7 +6030,7 @@ var Orchestrator = class {
   }
   async finishCreateThread(threadId, prompt) {
     await this.runSetupAfterCreate(threadId);
-    const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await import("./app-settings-3TLA2EJ7.js");
+    const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await import("./app-settings-6IOQYGBK.js");
     if (autoRunAfterSetupEnabled2()) {
       try {
         await this.startDev(threadId);
@@ -6307,14 +6308,16 @@ var Orchestrator = class {
     }
     const isBrightsy = fresh.agent === "brightsy";
     const isOrchestration = isOrchestratorThread(fresh);
+    const { autoRenameBranchEnabled: autoRenameBranchEnabled2, getGithubGitAuthMode: getGithubGitAuthMode2 } = await import("./app-settings-6IOQYGBK.js");
+    const gitAuthMode = getGithubGitAuthMode2();
     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: autoRenameBranchEnabled2 } = await import("./app-settings-3TLA2EJ7.js");
     const renameBranchDirective = !isBrightsy && !isOrchestration && autoRenameBranchEnabled2() ? formatRenameBranchDirective(fresh, {
       customPrompt: settings?.prompts?.renameBranch
     }) : null;
@@ -7020,7 +7023,7 @@ var Orchestrator = class {
         updateThread(thread.id, { title: meta.title });
       }
     }
-    const { autoArchiveOnMergeEnabled: autoArchiveOnMergeEnabled2 } = await import("./app-settings-3TLA2EJ7.js");
+    const { autoArchiveOnMergeEnabled: autoArchiveOnMergeEnabled2 } = await import("./app-settings-6IOQYGBK.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -7151,8 +7154,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)) {
@@ -7170,6 +7174,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 {
@@ -7180,6 +7188,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 = {};
@@ -7275,7 +7311,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-O3U5BENH.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QLRCOXAY.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -7297,7 +7333,7 @@ var Orchestrator = class {
         await runArchiveScript(thread.repoPath, thread.worktreePath);
       } catch {
       }
-      const { deleteBranchOnPurgeEnabled: deleteBranchOnPurgeEnabled2 } = await import("./app-settings-3TLA2EJ7.js");
+      const { deleteBranchOnPurgeEnabled: deleteBranchOnPurgeEnabled2 } = await import("./app-settings-6IOQYGBK.js");
       const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled2();
       await removeWorktree(thread.repoPath, thread.worktreePath, {
         deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -7318,7 +7354,7 @@ var Orchestrator = class {
       return restored2;
     }
     if (!existsSync15(thread.worktreePath)) {
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-VOCH3WS3.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-5VLLFI5W.js");
       const { execa: execa6 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
@@ -7427,7 +7463,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-VOCH3WS3.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-5VLLFI5W.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return createThread({
@@ -7745,9 +7781,9 @@ function labelGithubUrl(url) {
     return null;
   }
   if (!/(^|\.)github\.com$/i.test(parsed.hostname)) return null;
-  const path = parsed.pathname;
+  const path2 = parsed.pathname;
   const hash = parsed.hash || "";
-  const pr = path.match(/\/([^/]+)\/([^/]+)\/pull\/(\d+)/i);
+  const pr = path2.match(/\/([^/]+)\/([^/]+)\/pull\/(\d+)/i);
   if (pr) {
     const n = pr[3];
     if (/#discussion_r\d+/i.test(hash) || /#pullrequestreview-\d+/i.test(hash)) {
@@ -7758,11 +7794,11 @@ function labelGithubUrl(url) {
     }
     return { kind: "pr", label: `PR #${n}`, url: raw };
   }
-  const issueComment = path.match(/\/([^/]+)\/([^/]+)\/issues\/(\d+)/i);
+  const issueComment = path2.match(/\/([^/]+)\/([^/]+)\/issues\/(\d+)/i);
   if (issueComment && /#issuecomment-\d+/i.test(hash)) {
     return { kind: "comment", label: `Issue #${issueComment[3]} comment`, url: raw };
   }
-  const blob = path.match(/\/([^/]+)\/([^/]+)\/blob\/[^/]+\/(.+)$/i);
+  const blob = path2.match(/\/([^/]+)\/([^/]+)\/blob\/[^/]+\/(.+)$/i);
   if (blob) {
     const filePath = decodeURIComponent(blob[3]);
     const fileName = filePath.split("/").pop() || filePath;
@@ -8179,7 +8215,7 @@ function withTimeout(promise, ms, label) {
 async function startMcpServer() {
   const orch = getOrchestrator();
   try {
-    const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-3TLA2EJ7.js");
+    const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-6IOQYGBK.js");
     orch.setMaxConcurrent(maxConcurrentAgents2());
   } catch {
   }
@@ -8324,10 +8360,10 @@ async function startMcpServer() {
         const t = orch.getThread(thread_id.trim());
         if (t?.worktreePath?.trim()) root = t.worktreePath;
       }
-      const path = writePlanFile2(root, content);
+      const path2 = writePlanFile2(root, content);
       const payload = {
         ok: true,
-        path,
+        path: path2,
         title: title?.trim() || "Plan",
         message: "Plan saved to .context/attachments/plan.md and shown in Sideboard chat for approval."
       };
@@ -8389,7 +8425,7 @@ async function startMcpServer() {
   registerLinearTools(server);
   if (sideboardMcpProfile() !== "worktree") {
     const { getCaffeinateHold: getCaffeinateHold2, setCaffeinateHold: setCaffeinateHold2 } = await import("./caffeinate-hold-EAZNWJBE.js");
-    const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults: resolveThreadDefaults2 } = await import("./app-settings-3TLA2EJ7.js");
+    const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults: resolveThreadDefaults2 } = await import("./app-settings-6IOQYGBK.js");
     const accountDefaults = resolveThreadDefaults2();
     const accountDefaultsHint = `Account defaults: agent=${accountDefaults.agent}, model=${accountDefaults.model?.trim() || "Auto"}, effort=${accountDefaults.effort}`;
     server.tool(
@@ -8547,7 +8583,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(),
@@ -8643,7 +8679,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);
@@ -8751,7 +8787,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(
@@ -9052,7 +9088,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);
@@ -9219,9 +9255,9 @@ var BrightsySideboardApi = class {
   get endpoint() {
     return (this.cfg.endpoint || "https://brightsy.ai").replace(/\/$/, "");
   }
-  async request(path, init = {}) {
+  async request(path2, init = {}) {
     await this.refreshIfNeeded();
-    const url = `${this.endpoint}${path}`;
+    const url = `${this.endpoint}${path2}`;
     const headers = {
       Authorization: `Bearer ${this.cfg.access_token}`,
       Accept: "application/json"
@@ -10809,6 +10845,83 @@ var SlackRelayHub = class {
 // src/slack/relay-server.ts
 import { createServer as createServer3 } from "http";
 import { WebSocketServer } from "ws";
+
+// src/slack/relay-static.ts
+import { createReadStream } from "fs";
+import { stat } from "fs/promises";
+import path from "path";
+var TYPES = {
+  ".css": "text/css; charset=utf-8",
+  ".html": "text/html; charset=utf-8",
+  ".ico": "image/x-icon",
+  ".jpeg": "image/jpeg",
+  ".jpg": "image/jpeg",
+  ".js": "text/javascript; charset=utf-8",
+  ".json": "application/json; charset=utf-8",
+  ".png": "image/png",
+  ".svg": "image/svg+xml",
+  ".txt": "text/plain; charset=utf-8",
+  ".webp": "image/webp",
+  ".woff2": "font/woff2"
+};
+function requestHostname(req) {
+  const raw = req.headers.host ?? "";
+  return raw.split(":")[0]?.toLowerCase() ?? "";
+}
+function hostnameAllowed(host, allowed) {
+  if (!allowed || allowed.length === 0) return true;
+  return allowed.includes(host);
+}
+function resolveStaticPath(root, requestUrl) {
+  let pathname;
+  try {
+    pathname = decodeURIComponent(new URL(requestUrl, "http://relay.local").pathname);
+  } catch {
+    return null;
+  }
+  if (!pathname.startsWith("/") || pathname.includes("\0")) return null;
+  const rootResolved = path.resolve(root);
+  const candidate = path.resolve(rootResolved, `.${pathname}`);
+  if (candidate !== rootResolved && !candidate.startsWith(rootResolved + path.sep)) {
+    return null;
+  }
+  return candidate;
+}
+async function fileSize(file) {
+  try {
+    const st = await stat(file);
+    return st.isFile() ? st.size : null;
+  } catch {
+    return null;
+  }
+}
+function sendFile(req, res, file, size) {
+  const ext = path.extname(file).toLowerCase();
+  res.writeHead(200, {
+    "Content-Type": TYPES[ext] ?? "application/octet-stream",
+    "Content-Length": size,
+    "Cache-Control": ext === ".html" ? "no-cache" : "public, max-age=3600"
+  });
+  if (req.method === "HEAD") {
+    res.end();
+    return true;
+  }
+  createReadStream(file).pipe(res);
+  return true;
+}
+async function tryServeStatic(req, res, root) {
+  if (req.method !== "GET" && req.method !== "HEAD") return false;
+  const candidate = resolveStaticPath(root, req.url || "/");
+  if (!candidate) return false;
+  const direct = await fileSize(candidate);
+  if (direct != null) return sendFile(req, res, candidate, direct);
+  const asIndex = path.join(candidate, "index.html");
+  const indexSize = await fileSize(asIndex);
+  if (indexSize != null) return sendFile(req, res, asIndex, indexSize);
+  return false;
+}
+
+// src/slack/relay-server.ts
 function sendHtml(res, status, title, body) {
   res.writeHead(status, { "Content-Type": "text/html; charset=utf-8" });
   res.end(slackOAuthHtmlPage(title, body));
@@ -10907,7 +11020,26 @@ async function startSlackRelayServer(opts) {
       const reqUrl = req.url || "/";
       if (await handleCallback(reqUrl, res)) return;
       if (handleResult(reqUrl, res)) return;
-      if (req.url === "/health" || req.url === "/") {
+      if (req.url === "/health") {
+        sendJson(res, 200, {
+          ok: true,
+          service: "sideboard-slack-relay",
+          sessions: hub.listSessions().length,
+          oauth: Boolean(clientSecret)
+        });
+        return;
+      }
+      const hostname = requestHostname(req);
+      const canonical = (opts.canonicalSiteHost ?? "www.sideboard.cloud").toLowerCase();
+      if (opts.redirectHosts?.includes(hostname) && hostname !== canonical) {
+        res.writeHead(301, { Location: `https://${canonical}${reqUrl}` });
+        res.end();
+        return;
+      }
+      if (opts.staticRoot && hostnameAllowed(hostname, opts.staticHosts) && await tryServeStatic(req, res, opts.staticRoot)) {
+        return;
+      }
+      if (req.url === "/") {
         sendJson(res, 200, {
           ok: true,
           service: "sideboard-slack-relay",
@@ -11016,6 +11148,7 @@ export {
   CONTEXT_MIN_MESSAGES,
   COORDINATOR_TOOL_PLAYBOOK,
   FAMOUS_SOCCER_TEAMS,
+  GITHUB_GIT_AUTH_MODES,
   GLOBAL_WORKSPACE_ID,
   HARNESS_ENV_KEYS,
   LEGACY_ATTACHMENTS_DIR,
@@ -11065,10 +11198,12 @@ export {
   allocateTeamSlug,
   appDataDir,
   appSettingsPath,
+  appendIndexedGitConfig,
   appendMessage,
   applyAgentEvent,
   applyAppEnvironment,
   applyCompaction,
+  applyGithubGitAuthEnv,
   applyThreadIntoMain,
   applyTurnUsage,
   assertOrchestratorCapableAgent,
@@ -11183,6 +11318,7 @@ export {
   formatBrightsyFetchError,
   formatFetchError,
   formatGhLandError,
+  formatGitAuthModeDirective,
   formatIpcInvokeError,
   formatMessagesAsTranscript,
   formatPlanQuestionAnswers,
@@ -11197,6 +11333,7 @@ export {
   formatWorkspaceInventory,
   formatWorktreeDirective,
   formatWorktreeReminder,
+  fromInclusiveInputUsage,
   getAdapter,
   getAgentSetupInfo,
   getBrightsySession,
@@ -11209,6 +11346,8 @@ export {
   getDiff,
   getDiffSummary,
   getGitHubStatus,
+  getGithubGitAuthMode,
+  getGithubPat,
   getIssueSource,
   getLinearApiKey,
   getLinearAuthToken,
@@ -11227,6 +11366,7 @@ export {
   ghHeadRef,
   ghRepoSelectArgs,
   git,
+  githubAgentGitEnv,
   globalAgentCwd,
   handleSlackInbound,
   harnessEnvKey,
@@ -11449,6 +11589,7 @@ export {
   startSlackOAuth,
   startSlackRelayServer,
   stripBrightsyNdjsonNoise,
+  stripNestedElectronEnv,
   submitPrStack,
   suggestSlug,
   summarizeConversation,