@sideboard-ai/core 0.1.192 → 0.1.193

package/dist/{chunk-NF6ENGHS.js → chunk-EQXXGOMD.js}

@@ -1,8 +1,3 @@
-import {
-  extractPresentedPlan,
-  readPlanFile,
-  writePlanFile
-} from "./chunk-DJU54RYW.js";
 import {
   PLAN_MODE_INSTRUCTION,
   allAdapters,
@@ -24,7 +19,12 @@ import {
   stripBrightsyNdjsonNoise,
   sumUsageList,
   toolDescription
-} from "./chunk-TWSCTJCR.js";
+} from "./chunk-MQC2VA5U.js";
+import {
+  extractPresentedPlan,
+  readPlanFile,
+  writePlanFile
+} from "./chunk-DJU54RYW.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -47,10 +47,9 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-VV7UT3E2.js";
+} from "./chunk-4OVCJPVI.js";
 import {
   addPrStackLayer,
-  allocateTeamName,
   allocateTeamSlug,
   canonicalizeRepoPath,
   commitAll,
@@ -73,13 +72,11 @@ import {
   getPrStack,
   initPrStack,
   isDirty,
-  isPlaceholderBranch,
   isSideboardScratchPath,
   listWorktrees,
   markPrReady,
   mergeAgentGitAuthEnv,
   mergePr,
-  normalizeWorktreePath,
   originGhRepoEnv,
   pushBranch,
   removeWorktree,
@@ -90,20 +87,17 @@ import {
   resolvePrSelector,
   resolvePrSelectors,
   resolveRepoRoot,
-  takenSlugsFromThread,
-  threadDisplayLabel,
-  ticketSlugForBranch,
-  withRepoGitLock,
-  worktreeDisplayLabelForGroup,
-  worktreeNameFromPath,
-  worktreeSlugForTicket
-} from "./chunk-WXKXSZN4.js";
+  withRepoGitLock
+} from "./chunk-BIKCWYRP.js";
 import {
   ATTACHMENTS_DIR,
   DETACHED_JOBS_DIR,
   LEGACY_ATTACHMENTS_DIR,
   LEGACY_DETACHED_JOBS_DIR
 } from "./chunk-6K64FJDD.js";
+import {
+  ensureWorktreeSideboardIgnored
+} from "./chunk-QQKDGPUI.js";
 import {
   httpFetch
 } from "./chunk-N7WZ6NIN.js";
@@ -124,7 +118,15 @@ import {
   shouldRetryFailedAgentTurn,
   summarizeTurnStderr,
   turnFailChatText
-} from "./chunk-FY64F2ZQ.js";
+} from "./chunk-7AJ7OZZF.js";
+import {
+  clearStaleIndexLocks,
+  enrichPathWithNpmGlobalBin,
+  ensureAgentPath,
+  git,
+  resolveGitDirsForLockRecovery,
+  run
+} from "./chunk-UFHNSFAS.js";
 import {
   assertOrchestratorCapableAgent,
   childEnvWithAppSettings,
@@ -149,13 +151,17 @@ import {
   saveAppSettings,
   updateAdvancedSettings,
   writeSecureJson
-} from "./chunk-J7LQVLFQ.js";
+} from "./chunk-BWRS6GAS.js";
 import {
   stripNestedElectronEnv
 } from "./chunk-4TR3HZFT.js";
+import {
+  examplePrefixedBranch,
+  sanitizeGitBranchPrefix
+} from "./chunk-7SNJMKD6.js";
 import {
   releaseCaffeinateHoldForThread
-} from "./chunk-AO35MGOE.js";
+} from "./chunk-4TYXWPAJ.js";
 import {
   writePrivateFile
 } from "./chunk-JT7R45JB.js";
@@ -170,7 +176,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-TCQAFTSV.js";
+} from "./chunk-KJBYIIJU.js";
 import {
   appDataDir,
   findConventionSetup,
@@ -183,18 +189,18 @@ import {
   threadsDir,
   workspaceSettingsSourceLabel,
   worktreesRoot
-} from "./chunk-EFVFB2AH.js";
-import {
-  ensureWorktreeSideboardIgnored
-} from "./chunk-QQKDGPUI.js";
+} from "./chunk-WFUDY6PC.js";
 import {
-  clearStaleIndexLocks,
-  enrichPathWithNpmGlobalBin,
-  ensureAgentPath,
-  git,
-  resolveGitDirsForLockRecovery,
-  run
-} from "./chunk-UFHNSFAS.js";
+  allocateTeamName,
+  isPlaceholderBranch,
+  normalizeWorktreePath,
+  takenSlugsFromThread,
+  threadDisplayLabel,
+  ticketSlugForBranch,
+  worktreeDisplayLabelForGroup,
+  worktreeNameFromPath,
+  worktreeSlugForTicket
+} from "./chunk-RCWHL4TK.js";
 
 // src/orchestrator/orchestrator.ts
 import { EventEmitter } from "events";
@@ -467,7 +473,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-LWEZ74RK.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-4KI6VIFG.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -801,9 +807,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-JTBBH2K5.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-MMK5UFUZ.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-S4HHFSLI.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-WB65HIZ3.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -918,80 +924,6 @@ 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",
@@ -1020,6 +952,19 @@ function agentGitPrompt(action, opts) {
       return "Merge PR.";
   }
 }
+function resolveSidebarGitPrompt(action, opts) {
+  if (action === "create-pr" || action === "create-draft" || action === "create-web") {
+    const custom = opts?.createPr?.trim();
+    if (custom) return custom;
+    return agentGitPrompt(action === "create-pr" ? "create-draft" : action);
+  }
+  if (action === "resolve-conflicts") {
+    const custom = opts?.resolveMergeConflicts?.trim();
+    if (custom) return custom;
+    return agentGitPrompt("resolve-conflicts", opts);
+  }
+  return agentGitPrompt(action, opts);
+}
 var RESOLVE_CONFLICTS_RE = /^Merge the remote branch(?: \(([^)]+)\))? into your branch and resolve conflicts\. Then, commit and push your changes\.$/;
 function gitActionExpansion(action, base) {
   switch (action) {
@@ -3714,7 +3659,7 @@ async function createThread(input, _onSetupLine) {
   });
   await requireAgent(resolved.agent);
   if (input.cowboy) {
-    const { cowboyModeEnabled } = await import("./app-settings-663VQWUV.js");
+    const { cowboyModeEnabled } = await import("./app-settings-LO7UFHQ6.js");
     if (!cowboyModeEnabled()) {
       throw new Error(
         "Cowboy mode is off. Enable it in Settings \u2192 Advanced."
@@ -3772,7 +3717,7 @@ async function createThread(input, _onSetupLine) {
   let sourceIsFork = false;
   if (!input.cowboy && sourceType === "branch" && (!sourceRef || sourceRef === "HEAD" || sourceRef === "default")) {
     if (isAbleTimeConnected() && getIssueSource() === "abletime") {
-      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-JFMBCSIQ.js");
+      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-QHKWGTBY.js");
       const task = await ensureAbleTimeTask({
         title: title?.trim() || "Untitled work",
         description: input.prompt?.trim() || void 0
@@ -3874,7 +3819,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-TXGQIK2E.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-MN4GSQTL.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -4296,7 +4241,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-ZYPME3YD.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-KPJS7GLY.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-X54WSOXM.js");
   await ensureWorktreeSideboardIgnored2(input.worktreePath);
@@ -5531,6 +5476,80 @@ 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) {
@@ -6028,13 +6047,14 @@ function formatRenameBranchDirective(thread, opts) {
   if (!isPlaceholderBranch(thread.branchName, thread.worktreePath)) return null;
   const dir = worktreeNameFromPath(thread.worktreePath);
   const ticket = thread.sourceType === "ticket" ? ticketSlugForBranch(thread.sourceRef ?? "") : null;
-  const example = ticket ? `\`feat/${ticket}-dark-mode\` or \`fix/${ticket}-panel-width\`` : "`fix/panel-width` or `feat/dark-mode`";
+  const prefix = sanitizeGitBranchPrefix(opts?.branchPrefix);
+  const example = examplePrefixedBranch(prefix, ticket);
+  const shape = prefix ? `\`${prefix}/<ticket-or-task>-<short-kebab-description>\`` : "`<ticket-or-task>-<short-kebab-description>`";
   const lines = [
     "Branch naming (do this early in the turn):",
     `- Current branch \`${thread.branchName}\` is a temporary placeholder. The worktree folder \`${dir}\` is a stable nickname \u2014 do not rename or leave that directory.`,
-    `- Rename the git branch to a short kebab-case name that describes this task (what you are changing), e.g. ${example}:`,
+    `- Rename the git branch to ${shape}, e.g. \`${example}\`:`,
     "  `git branch -m <new-name>`",
-    "- Prefer Conventional Commits style prefixes when they fit (`fix/`, `feat/`, `chore/`, `docs/`).",
     ...ticket ? [
       `- Keep ticket \`${ticket}\` in the new branch name so the issue stays findable.`
     ] : [],
@@ -6805,7 +6825,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-LWEZ74RK.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-4KI6VIFG.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7080,7 +7100,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("./app-settings-663VQWUV.js");
+      const { autoCleanupOrphansEnabled } = await import("./app-settings-LO7UFHQ6.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -7359,7 +7379,7 @@ var Orchestrator = class {
     }
     await setup;
     if (skipSetup) return;
-    const { autoRunAfterSetupEnabled } = await import("./app-settings-663VQWUV.js");
+    const { autoRunAfterSetupEnabled } = await import("./app-settings-LO7UFHQ6.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -7682,7 +7702,7 @@ var Orchestrator = class {
     }
     const isBrightsy = fresh.agent === "brightsy";
     const isOrchestration = isOrchestratorThread(fresh);
-    const { autoRenameBranchEnabled, getGithubGitAuthMode } = await import("./app-settings-663VQWUV.js");
+    const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-LO7UFHQ6.js");
     const gitAuthMode = getGithubGitAuthMode();
     const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
       githubSlug: await resolveGithubRepoSlug(fresh.worktreePath).catch(
@@ -7718,9 +7738,26 @@ var Orchestrator = class {
       }
     }
     const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
-    const renameBranchDirective = !isBrightsy && !isOrchestration && autoRenameBranchEnabled() ? formatRenameBranchDirective(fresh, {
-      customPrompt: settings?.prompts?.renameBranch
-    }) : null;
+    let renameBranchDirective = null;
+    if (!isBrightsy && !isOrchestration && autoRenameBranchEnabled()) {
+      const { isPlaceholderBranch: isPlaceholderBranch2 } = await import("./worktree-labels-3XDS6O3U.js");
+      let githubLogin = null;
+      if (isPlaceholderBranch2(fresh.branchName, fresh.worktreePath) && !gitBranchPrefixSetting()) {
+        try {
+          const { getGitHubStatus } = await import("./github-IIF7AQNO.js");
+          githubLogin = (await getGitHubStatus()).login;
+        } catch {
+        }
+      }
+      const { resolveGitBranchPrefix } = await import("./branch-prefix-7F37FIPX.js");
+      renameBranchDirective = formatRenameBranchDirective(fresh, {
+        customPrompt: settings?.prompts?.renameBranch,
+        branchPrefix: resolveGitBranchPrefix({
+          setting: gitBranchPrefixSetting(),
+          githubLogin
+        })
+      });
+    }
     let seed = null;
     if (!fresh.sessionId) {
       const prior = fresh.messages.slice(0, -1);
@@ -7815,7 +7852,7 @@ var Orchestrator = class {
       if (!this.stoppedTurns.has(threadId) && this.requireThread(threadId).agent === "cursor" && exitCode !== 0 && !assistantText && parts.length === 0) {
         const sessionId = result.sessionId || this.requireThread(threadId).sessionId || "";
         if (sessionId) {
-          const { recoverFinishedCursorRun } = await import("./cursor-recover-NDMLLNYX.js");
+          const { recoverFinishedCursorRun } = await import("./cursor-recover-DTQAUDGO.js");
           for (let i = 0; i < 8; i++) {
             const recovered = recoverFinishedCursorRun({
               agentId: sessionId,
@@ -8608,7 +8645,7 @@ var Orchestrator = class {
         updateThread(thread.id, { title: meta.title });
       }
     }
-    const { autoArchiveOnMergeEnabled } = await import("./app-settings-663VQWUV.js");
+    const { autoArchiveOnMergeEnabled } = await import("./app-settings-LO7UFHQ6.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -8750,9 +8787,9 @@ var Orchestrator = class {
     return tab;
   }
   /**
-   * 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, steer the worktree agent to commit first.
+   * Desktop git buttons + MCP `ask_git`. Always queues the worktree agent
+   * with the action prompt (same path as Resolve). Repository `[prompts]`
+   * overrides apply when set.
    */
   async askGit(threadRef, action) {
     if (!AGENT_GIT_ACTIONS.includes(action)) {
@@ -8770,17 +8807,6 @@ 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)) {
-      try {
-        await this.pushAndMaybeOpenPr(thread, action);
-      } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        updateThread(thread.id, { lastError: message });
-        this.emit({ type: "error", threadId: thread.id, message });
-        throw err;
-      }
-      return this.requireThread(threadRef);
-    }
     let prBase;
     if (action === "resolve-conflicts") {
       try {
@@ -8789,42 +8815,18 @@ var Orchestrator = class {
       } catch {
       }
     }
-    return this.send(threadRef, agentGitPrompt(action, { prBase }), {
-      followUp: resolveOrchChildFollowUp()
-    });
-  }
-  /** 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,
-      prIsDraft: action === "create-draft"
-    };
-    try {
-      const fetched = await getPrMeta(cwd, url);
-      if (fetched?.title) patch.prTitle = fetched.title;
-      if (fetched) patch.prIsDraft = Boolean(fetched.isDraft);
-    } catch {
-    }
-    updateThread(thread.id, patch);
+    const settings = loadWorkspaceSettings(thread.worktreePath, thread.repoPath);
+    return this.send(
+      threadRef,
+      resolveSidebarGitPrompt(action, {
+        prBase,
+        createPr: settings?.prompts?.createPr,
+        resolveMergeConflicts: settings?.prompts?.resolveMergeConflicts
+      }),
+      {
+        followUp: resolveOrchChildFollowUp()
+      }
+    );
   }
   setThreadOptions(threadRef, patch) {
     const thread = this.requireThread(threadRef);
@@ -8935,7 +8937,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-ZYPME3YD.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-KPJS7GLY.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -8962,7 +8964,7 @@ var Orchestrator = class {
           await runArchiveScript(thread.repoPath, thread.worktreePath);
         } catch {
         }
-        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-663VQWUV.js");
+        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-LO7UFHQ6.js");
         const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
         await removeWorktree(thread.repoPath, thread.worktreePath, {
           deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -8977,7 +8979,7 @@ var Orchestrator = class {
       throw new Error("Thread is not archived");
     }
     if (isGlobalThread(thread)) {
-      const { globalAgentCwd } = await import("./paths-53TLA7VQ.js");
+      const { globalAgentCwd } = await import("./paths-LOXCISLX.js");
       updateThread(thread.id, { worktreePath: globalAgentCwd() });
       const restored2 = setStatus(thread.id, "idle");
       this.emit({ type: "status_changed", threadId: restored2.id, status: restored2.status });
@@ -8989,7 +8991,7 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-LPWTX2NA.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-UW6DNBIE.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -9099,7 +9101,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-LPWTX2NA.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-UW6DNBIE.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -9109,7 +9111,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-RXXNSRVO.js");
+  const { updateThread: upd } = await import("./thread-store-M4B52FUS.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal
@@ -9168,6 +9170,7 @@ export {
   spawnAgentTurn,
   AGENT_GIT_ACTIONS,
   agentGitPrompt,
+  resolveSidebarGitPrompt,
   CHARS_PER_CONTEXT_TOKEN,
   estimateMessageChars,
   estimateThreadChars,

package/dist/{chunk-7NSXGL6L.js → chunk-HIX2VDRE.js}

@@ -1,13 +1,10 @@
 #!/usr/bin/env node
 
 import {
-  allocateTeamName,
   ensureGhPreferOrigin,
   resolveGithubRepoSlug,
-  resolveRepoRoot,
-  takenSlugsFromThread,
-  teamSlugFromName
-} from "./chunk-XBLN52RZ.js";
+  resolveRepoRoot
+} from "./chunk-XPKKCFRT.js";
 import {
   ATTACHMENTS_DIR,
   attachmentsGitignoreBody
@@ -17,7 +14,12 @@ import {
   listThreads,
   updateThread,
   writeThread
-} from "./chunk-GOZ6T3AG.js";
+} from "./chunk-CJFBSQIB.js";
+import {
+  allocateTeamName,
+  takenSlugsFromThread,
+  teamSlugFromName
+} from "./chunk-64QSHOKV.js";
 import {
   assertOrchestratorCapableAgent,
   formatAccountProfilePlaybookLine,
@@ -30,12 +32,12 @@ import {
   resolveThreadDefaults,
   resolveViewerProfile,
   resolveViewerProfileForRepo
-} from "./chunk-OKZFTOM2.js";
+} from "./chunk-KORE4WOF.js";
 import {
   appDataDir,
   globalAgentCwd,
   sideboardReposDir
-} from "./chunk-JTJHOYCU.js";
+} from "./chunk-EQNRWDLN.js";
 
 // src/store/workspaces.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
@@ -361,7 +363,7 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   "- get_diff \u2014 compact diff summary",
   "- get_pr_checks \u2014 snapshot of a worktree thread's PR checks (null = no PR). Use this to inspect status. If the user gave a goal, the worktree agent watches with `gh pr checks --watch` \u2014 do not poll for the human.",
   '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .claude/skills/review/SKILL.md when present, else .context/review.md copied from .sideboard/review.md / stock; sends "Review changes in this workspace."); then wait_for_turn (loop while stillRunning) / get_turn_result on the returned id. The review stays in that chat so they can read it and type next steps \u2014 do not tell the child to comment or update the PR or ticket.',
-  "- ask_git \u2014 commit & push, open a draft PR, mark ready for review, resolve conflicts, or merge. When the worktree is clean, Sideboard pushes / opens the PR itself. When dirty, it steers the worktree agent \u2014 then wait_for_turn (loop while stillRunning). Prefer this over paraphrasing. If ask_git / get_thread lastError says the GraphQL/PR body is too long, the branch is already pushed \u2014 send_to_thread so the worktree agent runs `gh pr create --body-file` with a short description. Do not invent SSH or auth failures from that error. If the user gave a goal (Greptile 5/5, CI green), send_to_thread that goal so the worktree agent enters the watch-fix-push loop \u2014 do not tell the human to poll.",
+  "- ask_git \u2014 commit & push, open a draft PR, mark ready for review, resolve conflicts, or merge \u2014 same prompts as the desktop git buttons (Resolve, Create PR, \u2026). Always steers the worktree agent; then wait_for_turn (loop while stillRunning). Prefer this over paraphrasing. If the user gave a goal (Greptile 5/5, CI green), send_to_thread that goal so the worktree agent enters the watch-fix-push loop \u2014 do not tell the human to poll.",
   '- 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.", "Ready for review.", "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:",