@sideboard-ai/core 0.1.192 → 0.1.194

package/dist/{abletime-53T7G667.js → abletime-HR6P4GJH.js}

@@ -17,12 +17,13 @@ import {
   toAbleTimeIssueInfo,
   updateAbleTimeTask,
   verifyAbleTimeConnection
-} from "./chunk-UBQIELFS.js";
+} from "./chunk-KTHRWHA3.js";
 import "./chunk-VKQGAWHY.js";
-import "./chunk-OKZFTOM2.js";
+import "./chunk-AH6WIBLY.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-KGZBYWZ3.js";
-import "./chunk-JTJHOYCU.js";
+import "./chunk-EQNRWDLN.js";
+import "./chunk-FJZWM2ON.js";
 export {
   ableTimeDependencyTarget,
   commentAbleTimeTask,

package/dist/{abletime-JFMBCSIQ.js → abletime-JINF5KJV.js}

@@ -15,13 +15,14 @@ import {
   toAbleTimeIssueInfo,
   updateAbleTimeTask,
   verifyAbleTimeConnection
-} from "./chunk-4M2AK3O5.js";
+} from "./chunk-E37JHCO3.js";
 import "./chunk-N7WZ6NIN.js";
-import "./chunk-J7LQVLFQ.js";
+import "./chunk-S5GLSRLP.js";
 import "./chunk-4TR3HZFT.js";
+import "./chunk-WDRMZKVB.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-77WWLBCI.js";
-import "./chunk-EFVFB2AH.js";
+import "./chunk-WFUDY6PC.js";
 export {
   ableTimeDependencyTarget,
   commentAbleTimeTask,

package/dist/agents/cursor-runner.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   cursorSdkStoreDir
-} from "../chunk-WLPXZFRE.js";
+} from "../chunk-7J72QJOM.js";
 import {
   createAgentStreamCoalescer
 } from "../chunk-AXQ4ZWHK.js";
@@ -12,11 +12,11 @@ import {
   ensureCursorRipgrepPath,
   fetchCursorTurnCostUsd,
   formatUnknownDetail
-} from "../chunk-FY64F2ZQ.js";
+} from "../chunk-NLHFAMC2.js";
 import {
   dropNestedElectronEnvFromProcess
 } from "../chunk-4TR3HZFT.js";
-import "../chunk-EFVFB2AH.js";
+import "../chunk-WFUDY6PC.js";
 import "../chunk-UFHNSFAS.js";
 
 // src/agents/cursor-runner.ts

package/dist/{agents-TXGQIK2E.js → agents-OXDDPH2O.js}

@@ -32,11 +32,12 @@ import {
   resolveLoginCommand,
   resolveQuotaFallbackAgent,
   whichOnPath
-} from "./chunk-TWSCTJCR.js";
-import "./chunk-VV7UT3E2.js";
-import "./chunk-WXKXSZN4.js";
+} from "./chunk-2X6RGKLI.js";
+import "./chunk-HZTHWU6A.js";
+import "./chunk-S4QCBBXS.js";
 import "./chunk-6K64FJDD.js";
-import "./chunk-IEEAVWAP.js";
+import "./chunk-QQKDGPUI.js";
+import "./chunk-SALM35KD.js";
 import "./chunk-AN3THU7F.js";
 import "./chunk-N7WZ6NIN.js";
 import {
@@ -44,19 +45,19 @@ import {
   parseCursorRunnerLine,
   preferredCursorCostCents,
   turnCostUsdFromCursorUsage
-} from "./chunk-FY64F2ZQ.js";
+} from "./chunk-NLHFAMC2.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-J7LQVLFQ.js";
+} from "./chunk-S5GLSRLP.js";
 import "./chunk-4TR3HZFT.js";
+import "./chunk-WDRMZKVB.js";
 import "./chunk-JT7R45JB.js";
-import "./chunk-TCQAFTSV.js";
+import "./chunk-KJBYIIJU.js";
 import "./chunk-77WWLBCI.js";
-import "./chunk-EFVFB2AH.js";
-import "./chunk-QQKDGPUI.js";
+import "./chunk-WFUDY6PC.js";
 import {
   conductorBundledBinDir,
   enrichPathWithNpmGlobalBin,

package/dist/{agents-T5VBB6X3.js → agents-WQL7SZY6.js}

@@ -38,14 +38,14 @@ import {
   resolveQuotaFallbackAgent,
   turnCostUsdFromCursorUsage,
   whichOnPath
-} from "./chunk-WHD4JNTN.js";
-import "./chunk-HVIEYTUK.js";
+} from "./chunk-6H2XPPPR.js";
+import "./chunk-6YTI2HBG.js";
+import "./chunk-3OHR73VK.js";
 import "./chunk-Y4MIXGPA.js";
 import "./chunk-VKQGAWHY.js";
-import "./chunk-7NSXGL6L.js";
-import "./chunk-XBLN52RZ.js";
+import "./chunk-DP4TKAMZ.js";
 import "./chunk-D6JWYJ4P.js";
-import "./chunk-GOZ6T3AG.js";
+import "./chunk-CJFBSQIB.js";
 import "./chunk-SYFVUF2C.js";
 import {
   conductorBundledBinDir,
@@ -61,10 +61,11 @@ import {
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
   isOrchestratorCapableAgent
-} from "./chunk-OKZFTOM2.js";
+} from "./chunk-AH6WIBLY.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-KGZBYWZ3.js";
-import "./chunk-JTJHOYCU.js";
+import "./chunk-EQNRWDLN.js";
+import "./chunk-FJZWM2ON.js";
 export {
   CLAUDE_MODEL_CATALOG,
   ORCHESTRATOR_AGENT_KINDS,

package/dist/{app-settings-663VQWUV.js → app-settings-5KHVKJKO.js}

@@ -44,6 +44,7 @@ import {
   getGithubPat,
   getIssueSource,
   getLinearApiKey,
+  gitBranchPrefixSetting,
   harnessEnvKey,
   isAbleTimeConnected,
   isIssueSourceConnected,
@@ -83,11 +84,12 @@ import {
   updateOpencodeSettings,
   updateProjectProfileSettings,
   writeViewerContext
-} from "./chunk-J7LQVLFQ.js";
+} from "./chunk-S5GLSRLP.js";
 import "./chunk-4TR3HZFT.js";
+import "./chunk-WDRMZKVB.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-77WWLBCI.js";
-import "./chunk-EFVFB2AH.js";
+import "./chunk-WFUDY6PC.js";
 export {
   FOLLOW_UP_BEHAVIORS,
   GITHUB_GIT_AUTH_MODES,
@@ -134,6 +136,7 @@ export {
   getGithubPat,
   getIssueSource,
   getLinearApiKey,
+  gitBranchPrefixSetting,
   harnessEnvKey,
   isAbleTimeConnected,
   isIssueSourceConnected,

package/dist/{app-settings-74HBAAH7.js → app-settings-J775CYOO.js}

@@ -46,6 +46,7 @@ import {
   getGithubPat,
   getIssueSource,
   getLinearApiKey,
+  gitBranchPrefixSetting,
   harnessEnvKey,
   isAbleTimeConnected,
   isIssueSourceConnected,
@@ -85,10 +86,11 @@ import {
   updateOpencodeSettings,
   updateProjectProfileSettings,
   writeViewerContext
-} from "./chunk-OKZFTOM2.js";
+} from "./chunk-AH6WIBLY.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-KGZBYWZ3.js";
-import "./chunk-JTJHOYCU.js";
+import "./chunk-EQNRWDLN.js";
+import "./chunk-FJZWM2ON.js";
 export {
   FOLLOW_UP_BEHAVIORS,
   GITHUB_GIT_AUTH_MODES,
@@ -135,6 +137,7 @@ export {
   getGithubPat,
   getIssueSource,
   getLinearApiKey,
+  gitBranchPrefixSetting,
   harnessEnvKey,
   isAbleTimeConnected,
   isIssueSourceConnected,

package/dist/branch-prefix-7DTIUJT2.js

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+
+import {
+  examplePrefixedBranch,
+  resolveGitBranchPrefix,
+  sanitizeGitBranchPrefix
+} from "./chunk-FJZWM2ON.js";
+export {
+  examplePrefixedBranch,
+  resolveGitBranchPrefix,
+  sanitizeGitBranchPrefix
+};

package/dist/branch-prefix-N3KTCRCE.js

@@ -0,0 +1,10 @@
+import {
+  examplePrefixedBranch,
+  resolveGitBranchPrefix,
+  sanitizeGitBranchPrefix
+} from "./chunk-WDRMZKVB.js";
+export {
+  examplePrefixedBranch,
+  resolveGitBranchPrefix,
+  sanitizeGitBranchPrefix
+};

package/dist/{caffeinate-hold-SK2QISPE.js → caffeinate-hold-22VFDPSO.js}

@@ -5,9 +5,9 @@ import {
   releaseCaffeinateHoldForThread,
   setCaffeinateHold,
   setCaffeinateHoldHooks
-} from "./chunk-AO35MGOE.js";
+} from "./chunk-4TYXWPAJ.js";
 import "./chunk-JT7R45JB.js";
-import "./chunk-EFVFB2AH.js";
+import "./chunk-WFUDY6PC.js";
 export {
   caffeinateHoldPath,
   getCaffeinateHold,

package/dist/{caffeinate-hold-DBKMRZZO.js → caffeinate-hold-OK4JJ5PP.js}

@@ -7,9 +7,9 @@ import {
   releaseCaffeinateHoldForThread,
   setCaffeinateHold,
   setCaffeinateHoldHooks
-} from "./chunk-OCQPTUR7.js";
+} from "./chunk-YWI3IBP2.js";
 import "./chunk-NSTQ6QKD.js";
-import "./chunk-JTJHOYCU.js";
+import "./chunk-EQNRWDLN.js";
 export {
   caffeinateHoldPath,
   getCaffeinateHold,

package/dist/{chunk-TWSCTJCR.js → chunk-2X6RGKLI.js}

@@ -1,18 +1,18 @@
 import {
   isOrchestratorThread
-} from "./chunk-VV7UT3E2.js";
+} from "./chunk-HZTHWU6A.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-WXKXSZN4.js";
+} from "./chunk-S4QCBBXS.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens
-} from "./chunk-IEEAVWAP.js";
+} from "./chunk-SALM35KD.js";
 import {
   loadBrightsyConfig
 } from "./chunk-AN3THU7F.js";
@@ -29,7 +29,7 @@ import {
   packagedMcpStdioPath,
   parseCursorRunnerLine,
   resolveNodeLaunch
-} from "./chunk-FY64F2ZQ.js";
+} from "./chunk-NLHFAMC2.js";
 import {
   claudeChromeEnabled,
   isAbleTimeConnected,
@@ -37,14 +37,14 @@ import {
   loadAppSettings,
   resolveAgentExecutable,
   resolveClaudeExecutable
-} from "./chunk-J7LQVLFQ.js";
+} from "./chunk-S5GLSRLP.js";
 import {
   isElectronLikeCommand,
   unwrapStrippedElectronLaunch
 } from "./chunk-4TR3HZFT.js";
 import {
   appDataDir
-} from "./chunk-EFVFB2AH.js";
+} from "./chunk-WFUDY6PC.js";
 import {
   enrichPathWithNpmGlobalBin,
   isConductorBundledCli,
@@ -1908,7 +1908,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-JTBBH2K5.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-4QX6UEOY.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,

package/dist/{chunk-HVIEYTUK.js → chunk-3OHR73VK.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-FNQNJOHY.js";
 import {
   appDataDir
-} from "./chunk-JTJHOYCU.js";
+} from "./chunk-EQNRWDLN.js";
 
 // src/brightsy/connected-teams.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";

package/dist/{chunk-AO35MGOE.js → chunk-4TYXWPAJ.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-JT7R45JB.js";
 import {
   appDataDir
-} from "./chunk-EFVFB2AH.js";
+} from "./chunk-WFUDY6PC.js";
 
 // src/store/caffeinate-hold.ts
 import { spawn } from "child_process";

package/dist/{chunk-WHD4JNTN.js → chunk-6H2XPPPR.js}

@@ -1,23 +1,23 @@
 #!/usr/bin/env node
 
+import {
+  isOrchestratorThread
+} from "./chunk-6YTI2HBG.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens
-} from "./chunk-HVIEYTUK.js";
+} from "./chunk-3OHR73VK.js";
 import {
   loadBrightsyConfig
 } from "./chunk-Y4MIXGPA.js";
-import {
-  isOrchestratorThread
-} from "./chunk-7NSXGL6L.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-XBLN52RZ.js";
+} from "./chunk-DP4TKAMZ.js";
 import {
   enrichPathWithNpmGlobalBin,
   isConductorBundledCli,
@@ -35,10 +35,10 @@ import {
   resolveClaudeExecutable,
   unwrapStrippedElectronLaunch,
   wrapElectronAsNodeLaunch
-} from "./chunk-OKZFTOM2.js";
+} from "./chunk-AH6WIBLY.js";
 import {
   appDataDir
-} from "./chunk-JTJHOYCU.js";
+} from "./chunk-EQNRWDLN.js";
 
 // src/agents/brightsy.ts
 import { existsSync } from "fs";
@@ -2390,7 +2390,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-2BVCJUAL.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-SNJ2Z6SL.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,

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

@@ -7,7 +7,7 @@ import {
   resolveRepoRoot,
   takenSlugsFromThread,
   teamSlugFromName
-} from "./chunk-XBLN52RZ.js";
+} from "./chunk-DP4TKAMZ.js";
 import {
   ATTACHMENTS_DIR,
   attachmentsGitignoreBody
@@ -17,7 +17,7 @@ import {
   listThreads,
   updateThread,
   writeThread
-} from "./chunk-GOZ6T3AG.js";
+} from "./chunk-CJFBSQIB.js";
 import {
   assertOrchestratorCapableAgent,
   formatAccountProfilePlaybookLine,
@@ -30,12 +30,12 @@ import {
   resolveThreadDefaults,
   resolveViewerProfile,
   resolveViewerProfileForRepo
-} from "./chunk-OKZFTOM2.js";
+} from "./chunk-AH6WIBLY.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 +361,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:",

package/dist/{chunk-WLPXZFRE.js → chunk-7J72QJOM.js}

@@ -1,6 +1,6 @@
 import {
   appDataDir
-} from "./chunk-EFVFB2AH.js";
+} from "./chunk-WFUDY6PC.js";
 
 // src/agents/cursor-store.ts
 import { join } from "path";

package/dist/{chunk-OKZFTOM2.js → chunk-AH6WIBLY.js}

@@ -9,7 +9,10 @@ import {
 } from "./chunk-KGZBYWZ3.js";
 import {
   appDataDir
-} from "./chunk-JTJHOYCU.js";
+} from "./chunk-EQNRWDLN.js";
+import {
+  sanitizeGitBranchPrefix
+} from "./chunk-FJZWM2ON.js";
 
 // src/store/app-settings.ts
 import { randomUUID } from "crypto";
@@ -751,6 +754,10 @@ function normalizeAdvanced(raw) {
   if (typeof source.autoRenameBranch === "boolean") {
     out.autoRenameBranch = source.autoRenameBranch;
   }
+  if (typeof source.branchPrefix === "string") {
+    const prefix = sanitizeGitBranchPrefix(source.branchPrefix);
+    if (prefix) out.branchPrefix = prefix;
+  }
   if (typeof source.autoRunAfterSetup === "boolean") {
     out.autoRunAfterSetup = source.autoRunAfterSetup;
   }
@@ -1617,6 +1624,13 @@ function updateAdvancedSettings(patch) {
   if (typeof patch.autoRenameBranch === "boolean") {
     advanced.autoRenameBranch = patch.autoRenameBranch;
   }
+  if (patch.branchPrefix === null || patch.branchPrefix === "") {
+    delete advanced.branchPrefix;
+  } else if (typeof patch.branchPrefix === "string") {
+    const prefix = sanitizeGitBranchPrefix(patch.branchPrefix);
+    if (prefix) advanced.branchPrefix = prefix;
+    else delete advanced.branchPrefix;
+  }
   if (typeof patch.autoRunAfterSetup === "boolean") {
     advanced.autoRunAfterSetup = patch.autoRunAfterSetup;
   }
@@ -1677,6 +1691,9 @@ function updateAdvancedSettings(patch) {
 function autoRenameBranchEnabled(settings = loadAppSettings()) {
   return settings.advanced.autoRenameBranch !== false;
 }
+function gitBranchPrefixSetting(settings = loadAppSettings()) {
+  return sanitizeGitBranchPrefix(settings.advanced.branchPrefix);
+}
 function autoRunAfterSetupEnabled(settings = loadAppSettings()) {
   return Boolean(settings.advanced.autoRunAfterSetup);
 }
@@ -1891,6 +1908,7 @@ export {
   brightsyCloudConnectAgent,
   updateAdvancedSettings,
   autoRenameBranchEnabled,
+  gitBranchPrefixSetting,
   autoRunAfterSetupEnabled,
   caffeinateWhileRunningEnabled,
   caffeinateWhileSlackListenEnabled,

package/dist/{chunk-GOZ6T3AG.js → chunk-CJFBSQIB.js}

@@ -7,7 +7,7 @@ import {
   threadFilePath,
   threadLockPath,
   threadsDir
-} from "./chunk-JTJHOYCU.js";
+} from "./chunk-EQNRWDLN.js";
 
 // src/store/thread-store.ts
 import { randomUUID } from "crypto";

package/dist/{chunk-XBLN52RZ.js → chunk-DP4TKAMZ.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-D6JWYJ4P.js";
 import {
   listThreads
-} from "./chunk-GOZ6T3AG.js";
+} from "./chunk-CJFBSQIB.js";
 import {
   ensureWorktreeSideboardIgnored
 } from "./chunk-SYFVUF2C.js";
@@ -22,10 +22,10 @@ import {
 import {
   getGithubGitAuthMode,
   getGithubPat
-} from "./chunk-OKZFTOM2.js";
+} from "./chunk-AH6WIBLY.js";
 import {
   worktreesRoot
-} from "./chunk-JTJHOYCU.js";
+} from "./chunk-EQNRWDLN.js";
 
 // src/git/worktree.ts
 import { randomBytes } from "crypto";

package/dist/{chunk-4M2AK3O5.js → chunk-E37JHCO3.js}

@@ -6,7 +6,7 @@ import {
   getAbleTimeHost,
   isAbleTimeConnected,
   saveAbleTimeConnection
-} from "./chunk-J7LQVLFQ.js";
+} from "./chunk-S5GLSRLP.js";
 
 // src/integrations/abletime-mcp.ts
 var DEFAULT_ABLETIME_HOST = "https://track.abletime.com";

package/dist/{chunk-JTJHOYCU.js → chunk-EQNRWDLN.js}

@@ -187,9 +187,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,
@@ -215,9 +218,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,

package/dist/chunk-FJZWM2ON.js

@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+
+
+// 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-VV7UT3E2.js → chunk-HZTHWU6A.js}

@@ -5,7 +5,7 @@ import {
   resolveRepoRoot,
   takenSlugsFromThread,
   teamSlugFromName
-} from "./chunk-WXKXSZN4.js";
+} from "./chunk-S4QCBBXS.js";
 import {
   ATTACHMENTS_DIR,
   attachmentsGitignoreBody
@@ -22,18 +22,18 @@ import {
   resolveThreadDefaults,
   resolveViewerProfile,
   resolveViewerProfileForRepo
-} from "./chunk-J7LQVLFQ.js";
+} from "./chunk-S5GLSRLP.js";
 import {
   createEmptyThread,
   listThreads,
   updateThread,
   writeThread
-} from "./chunk-TCQAFTSV.js";
+} from "./chunk-KJBYIIJU.js";
 import {
   appDataDir,
   globalAgentCwd,
   sideboardReposDir
-} from "./chunk-EFVFB2AH.js";
+} from "./chunk-WFUDY6PC.js";
 
 // src/store/workspaces.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
@@ -406,7 +406,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:",

package/dist/{chunk-TCQAFTSV.js → chunk-KJBYIIJU.js}

@@ -5,7 +5,7 @@ import {
   threadFilePath,
   threadLockPath,
   threadsDir
-} from "./chunk-EFVFB2AH.js";
+} from "./chunk-WFUDY6PC.js";
 
 // src/store/thread-store.ts
 import { randomUUID } from "crypto";

package/dist/{chunk-UBQIELFS.js → chunk-KTHRWHA3.js}

@@ -8,7 +8,7 @@ import {
   getAbleTimeHost,
   isAbleTimeConnected,
   saveAbleTimeConnection
-} from "./chunk-OKZFTOM2.js";
+} from "./chunk-AH6WIBLY.js";
 
 // src/integrations/abletime-mcp.ts
 var DEFAULT_ABLETIME_HOST = "https://track.abletime.com";

package/dist/{chunk-FY64F2ZQ.js → chunk-NLHFAMC2.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-4TR3HZFT.js";
 import {
   appDataDir
-} from "./chunk-EFVFB2AH.js";
+} from "./chunk-WFUDY6PC.js";
 import {
   run
 } from "./chunk-UFHNSFAS.js";