@sideboard-ai/core 0.1.192 → 0.1.194

package/dist/{chunk-IEEAVWAP.js → chunk-SALM35KD.js}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-AN3THU7F.js";
 import {
   appDataDir
-} from "./chunk-EFVFB2AH.js";
+} from "./chunk-WFUDY6PC.js";
 import {
   run
 } from "./chunk-UFHNSFAS.js";
@@ -18,7 +18,7 @@ import { join } from "path";
 
 // src/brightsy/accounts.ts
 async function loadConnectedTeams() {
-  const { listConnectedBrightsyTeams: listConnectedBrightsyTeams2 } = await import("./connected-teams-ON2KIKQX.js");
+  const { listConnectedBrightsyTeams: listConnectedBrightsyTeams2 } = await import("./connected-teams-WK47ATT7.js");
   return listConnectedBrightsyTeams2();
 }
 async function runBrightsyTeamsJson(args) {
@@ -47,14 +47,14 @@ async function listBrightsyAccounts() {
 async function getBrightsySession() {
   try {
     const { ensureBrightsyLocalConfigFresh: ensureBrightsyLocalConfigFresh2 } = await import("./oauth-6ZQ4Q4XN.js");
-    const { ensureConnectedBrightsyTeamTokens: ensureConnectedBrightsyTeamTokens2 } = await import("./connected-teams-ON2KIKQX.js");
+    const { ensureConnectedBrightsyTeamTokens: ensureConnectedBrightsyTeamTokens2 } = await import("./connected-teams-WK47ATT7.js");
     await ensureBrightsyLocalConfigFresh2();
     await ensureConnectedBrightsyTeamTokens2();
     loadBrightsyConfig();
     const data = await runBrightsyTeamsJson([]);
     const accounts = Array.isArray(data.teams) ? data.teams : [];
     const active = data.active ?? accounts.find((a) => a.active) ?? null;
-    const { ensureCliTeamTracked: ensureCliTeamTracked2 } = await import("./connected-teams-ON2KIKQX.js");
+    const { ensureCliTeamTracked: ensureCliTeamTracked2 } = await import("./connected-teams-WK47ATT7.js");
     const connectedTeams = ensureCliTeamTracked2(
       active ? { id: active.id, slug: active.slug, name: active.name } : void 0
     );
@@ -94,7 +94,7 @@ async function performBrightsyAccountSwitch(accountIdOrSlug) {
   return { cfg, target: data.active };
 }
 async function switchBrightsyAccount(accountIdOrSlug) {
-  const { connectBrightsyTeam: connectBrightsyTeam2 } = await import("./connected-teams-ON2KIKQX.js");
+  const { connectBrightsyTeam: connectBrightsyTeam2 } = await import("./connected-teams-WK47ATT7.js");
   await connectBrightsyTeam2(accountIdOrSlug);
   return getBrightsySession();
 }

package/dist/{chunk-FZ3G5TXM.js → chunk-VRPPFKAO.js}

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 
+import {
+  releaseCaffeinateHoldForThread
+} from "./chunk-YWI3IBP2.js";
 import {
   PLAN_MODE_INSTRUCTION,
   applyAgentEvent,
@@ -33,15 +36,7 @@ import {
   summarizeTurnStderr,
   toolDescription,
   turnFailChatText
-} from "./chunk-WHD4JNTN.js";
-import {
-  extractPresentedPlan,
-  readPlanFile,
-  writePlanFile
-} from "./chunk-JFOPOMK7.js";
-import {
-  releaseCaffeinateHoldForThread
-} from "./chunk-OCQPTUR7.js";
+} from "./chunk-6H2XPPPR.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -64,7 +59,12 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-7NSXGL6L.js";
+} from "./chunk-6YTI2HBG.js";
+import {
+  extractPresentedPlan,
+  readPlanFile,
+  writePlanFile
+} from "./chunk-JFOPOMK7.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -114,7 +114,7 @@ import {
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath,
   worktreeSlugForTicket
-} from "./chunk-XBLN52RZ.js";
+} from "./chunk-DP4TKAMZ.js";
 import {
   ATTACHMENTS_DIR,
   DETACHED_JOBS_DIR,
@@ -132,7 +132,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-GOZ6T3AG.js";
+} from "./chunk-CJFBSQIB.js";
 import {
   ensureWorktreeSideboardIgnored
 } from "./chunk-SYFVUF2C.js";
@@ -168,7 +168,7 @@ import {
   stripNestedElectronEnv,
   updateAdvancedSettings,
   writeSecureJson
-} from "./chunk-OKZFTOM2.js";
+} from "./chunk-AH6WIBLY.js";
 import {
   writePrivateFile
 } from "./chunk-NSTQ6QKD.js";
@@ -184,7 +184,11 @@ import {
   threadsDir,
   workspaceSettingsSourceLabel,
   worktreesRoot
-} from "./chunk-JTJHOYCU.js";
+} from "./chunk-EQNRWDLN.js";
+import {
+  examplePrefixedBranch,
+  sanitizeGitBranchPrefix
+} from "./chunk-FJZWM2ON.js";
 
 // src/orchestrator/orchestrator.ts
 import { EventEmitter } from "events";
@@ -402,7 +406,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-4G76BOHH.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-A5KF2335.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -795,9 +799,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-2BVCJUAL.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-SNJ2Z6SL.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-PNUDN4DW.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-LYKS3YNG.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -912,80 +916,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",
@@ -1014,6 +944,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) {
@@ -3585,7 +3528,7 @@ async function createThread(input, _onSetupLine) {
   });
   await requireAgent(resolved.agent);
   if (input.cowboy) {
-    const { cowboyModeEnabled } = await import("./app-settings-74HBAAH7.js");
+    const { cowboyModeEnabled } = await import("./app-settings-J775CYOO.js");
     if (!cowboyModeEnabled()) {
       throw new Error(
         "Cowboy mode is off. Enable it in Settings \u2192 Advanced."
@@ -3643,7 +3586,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-53T7G667.js");
+      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-HR6P4GJH.js");
       const task = await ensureAbleTimeTask({
         title: title?.trim() || "Untitled work",
         description: input.prompt?.trim() || void 0
@@ -4155,7 +4098,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-OY7D5RPU.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-UTOYGBYB.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-N5X5I422.js");
   await ensureWorktreeSideboardIgnored2(input.worktreePath);
@@ -5377,6 +5320,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) {
@@ -5874,13 +5891,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.`
     ] : [],
@@ -6458,7 +6476,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-4G76BOHH.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-A5KF2335.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -6733,7 +6751,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("./app-settings-74HBAAH7.js");
+      const { autoCleanupOrphansEnabled } = await import("./app-settings-J775CYOO.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -7012,7 +7030,7 @@ var Orchestrator = class {
     }
     await setup;
     if (skipSetup) return;
-    const { autoRunAfterSetupEnabled } = await import("./app-settings-74HBAAH7.js");
+    const { autoRunAfterSetupEnabled } = await import("./app-settings-J775CYOO.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -7335,7 +7353,7 @@ var Orchestrator = class {
     }
     const isBrightsy = fresh.agent === "brightsy";
     const isOrchestration = isOrchestratorThread(fresh);
-    const { autoRenameBranchEnabled, getGithubGitAuthMode } = await import("./app-settings-74HBAAH7.js");
+    const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-J775CYOO.js");
     const gitAuthMode = getGithubGitAuthMode();
     const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
       githubSlug: await resolveGithubRepoSlug(fresh.worktreePath).catch(
@@ -7371,9 +7389,16 @@ 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 { resolveGitBranchPrefix } = await import("./branch-prefix-7DTIUJT2.js");
+      renameBranchDirective = formatRenameBranchDirective(fresh, {
+        customPrompt: settings?.prompts?.renameBranch,
+        branchPrefix: resolveGitBranchPrefix({
+          setting: gitBranchPrefixSetting()
+        })
+      });
+    }
     let seed = null;
     if (!fresh.sessionId) {
       const prior = fresh.messages.slice(0, -1);
@@ -7468,7 +7493,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-L5MD6MBO.js");
+          const { recoverFinishedCursorRun } = await import("./cursor-recover-TXVTLAMA.js");
           for (let i = 0; i < 8; i++) {
             const recovered = recoverFinishedCursorRun({
               agentId: sessionId,
@@ -8261,7 +8286,7 @@ var Orchestrator = class {
         updateThread(thread.id, { title: meta.title });
       }
     }
-    const { autoArchiveOnMergeEnabled } = await import("./app-settings-74HBAAH7.js");
+    const { autoArchiveOnMergeEnabled } = await import("./app-settings-J775CYOO.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -8403,9 +8428,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)) {
@@ -8423,17 +8448,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 {
@@ -8442,42 +8456,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);
@@ -8588,7 +8578,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-OY7D5RPU.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-UTOYGBYB.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -8615,7 +8605,7 @@ var Orchestrator = class {
           await runArchiveScript(thread.repoPath, thread.worktreePath);
         } catch {
         }
-        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-74HBAAH7.js");
+        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-J775CYOO.js");
         const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
         await removeWorktree(thread.repoPath, thread.worktreePath, {
           deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -8630,7 +8620,7 @@ var Orchestrator = class {
       throw new Error("Thread is not archived");
     }
     if (isGlobalThread(thread)) {
-      const { globalAgentCwd } = await import("./paths-RRCLNSJB.js");
+      const { globalAgentCwd } = await import("./paths-C2VERLAE.js");
       updateThread(thread.id, { worktreePath: globalAgentCwd() });
       const restored2 = setStatus(thread.id, "idle");
       this.emit({ type: "status_changed", threadId: restored2.id, status: restored2.status });
@@ -8642,7 +8632,7 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-7LOSSD7G.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-R43JOR4V.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -8752,7 +8742,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-7LOSSD7G.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-R43JOR4V.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -8762,7 +8752,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-ZL6GDIDP.js");
+  const { updateThread: upd } = await import("./thread-store-CO77HV2K.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal

package/dist/chunk-WDRMZKVB.js

@@ -0,0 +1,20 @@
+// src/git/branch-prefix.ts
+function sanitizeGitBranchPrefix(raw) {
+  const first = (raw ?? "").trim().replace(/^\/+|\/+$/g, "").split("/")[0] ?? "";
+  const slug = first.toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 39);
+  return slug || null;
+}
+function resolveGitBranchPrefix(opts) {
+  return sanitizeGitBranchPrefix(opts.setting);
+}
+function examplePrefixedBranch(prefix, ticket) {
+  const head = sanitizeGitBranchPrefix(prefix);
+  const slug = ticket?.trim() ? `${ticket.trim()}-eng-fix-thing` : "bb-1234-eng-fix-thing";
+  return head ? `${head}/${slug}` : slug;
+}
+
+export {
+  sanitizeGitBranchPrefix,
+  resolveGitBranchPrefix,
+  examplePrefixedBranch
+};

package/dist/{chunk-EFVFB2AH.js → chunk-WFUDY6PC.js}

@@ -194,9 +194,12 @@ function parseSettingsFile(path, source) {
   const prompts = {
     renameBranch: typeof promptsRaw.rename_branch === "string" ? promptsRaw.rename_branch : void 0,
     createPr: typeof promptsRaw.create_pr === "string" ? promptsRaw.create_pr : void 0,
-    general: typeof promptsRaw.general === "string" ? promptsRaw.general : void 0
+    general: typeof promptsRaw.general === "string" ? promptsRaw.general : void 0,
+    resolveMergeConflicts: typeof promptsRaw.resolve_merge_conflicts === "string" ? promptsRaw.resolve_merge_conflicts : void 0
   };
-  const hasPrompts = Boolean(prompts.renameBranch || prompts.createPr || prompts.general);
+  const hasPrompts = Boolean(
+    prompts.renameBranch || prompts.createPr || prompts.general || prompts.resolveMergeConflicts
+  );
   return {
     source,
     setup,
@@ -222,9 +225,12 @@ function mergeSettings(base, overlay) {
   const prompts = {
     renameBranch: overlay.prompts?.renameBranch ?? base.prompts?.renameBranch,
     createPr: overlay.prompts?.createPr ?? base.prompts?.createPr,
-    general: overlay.prompts?.general ?? base.prompts?.general
+    general: overlay.prompts?.general ?? base.prompts?.general,
+    resolveMergeConflicts: overlay.prompts?.resolveMergeConflicts ?? base.prompts?.resolveMergeConflicts
   };
-  const hasPrompts = Boolean(prompts.renameBranch || prompts.createPr || prompts.general);
+  const hasPrompts = Boolean(
+    prompts.renameBranch || prompts.createPr || prompts.general || prompts.resolveMergeConflicts
+  );
   return {
     source: overlay.source,
     setup: overlay.setup ?? base.setup,
@@ -348,7 +354,8 @@ function getRepoSetupInfo(worktreePath, repoPath) {
   return {
     hasConfig: hasWorkspaceHook(worktreePath, repoPath) || cursor || Boolean(convention),
     hasSetupScript,
-    configLabel
+    configLabel,
+    ...settings?.prompts ? { prompts: settings.prompts } : {}
   };
 }
 

package/dist/{chunk-OCQPTUR7.js → chunk-YWI3IBP2.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-NSTQ6QKD.js";
 import {
   appDataDir
-} from "./chunk-JTJHOYCU.js";
+} from "./chunk-EQNRWDLN.js";
 
 // src/store/caffeinate-hold.ts
 import { spawn } from "child_process";

package/dist/{connected-teams-WOYCH7FR.js → connected-teams-PU4AMFNA.js}

@@ -9,11 +9,11 @@ import {
   ensureConnectedBrightsyTeamTokens,
   getConnectedBrightsyTeamsRaw,
   listConnectedBrightsyTeams
-} from "./chunk-HVIEYTUK.js";
+} from "./chunk-3OHR73VK.js";
 import "./chunk-Y4MIXGPA.js";
 import "./chunk-VKQGAWHY.js";
 import "./chunk-FNQNJOHY.js";
-import "./chunk-JTJHOYCU.js";
+import "./chunk-EQNRWDLN.js";
 export {
   applyConnectedTeamToCli,
   brightsyMcpServerName,

package/dist/{connected-teams-ON2KIKQX.js → connected-teams-WK47ATT7.js}

@@ -7,10 +7,10 @@ import {
   ensureConnectedBrightsyTeamTokens,
   getConnectedBrightsyTeamsRaw,
   listConnectedBrightsyTeams
-} from "./chunk-IEEAVWAP.js";
+} from "./chunk-SALM35KD.js";
 import "./chunk-AN3THU7F.js";
 import "./chunk-N7WZ6NIN.js";
-import "./chunk-EFVFB2AH.js";
+import "./chunk-WFUDY6PC.js";
 import "./chunk-UFHNSFAS.js";
 export {
   applyConnectedTeamToCli,