@sideboard-ai/core 0.1.192 → 0.1.194

package/dist/index.cjs

@@ -274,9 +274,12 @@ function parseSettingsFile(path2, 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,
@@ -302,9 +305,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,
@@ -428,7 +434,8 @@ function getRepoSetupInfo(worktreePath, repoPath) {
   return {
     hasConfig: hasWorkspaceHook(worktreePath, repoPath) || cursor || Boolean(convention),
     hasSetupScript,
-    configLabel
+    configLabel,
+    ...settings?.prompts ? { prompts: settings.prompts } : {}
   };
 }
 var import_node_fs3, import_node_os, import_node_path3, import_smol_toml;
@@ -955,6 +962,32 @@ var init_secret_vault = __esm({
   }
 });
 
+// src/git/branch-prefix.ts
+var branch_prefix_exports = {};
+__export(branch_prefix_exports, {
+  examplePrefixedBranch: () => examplePrefixedBranch,
+  resolveGitBranchPrefix: () => resolveGitBranchPrefix,
+  sanitizeGitBranchPrefix: () => sanitizeGitBranchPrefix
+});
+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;
+}
+var init_branch_prefix = __esm({
+  "src/git/branch-prefix.ts"() {
+    "use strict";
+  }
+});
+
 // src/store/issue-source-labels.ts
 function issueSourceLabel(source) {
   if (source && source in ISSUE_SOURCE_LABELS) {
@@ -1023,6 +1056,7 @@ __export(app_settings_exports, {
   getGithubPat: () => getGithubPat,
   getIssueSource: () => getIssueSource,
   getLinearApiKey: () => getLinearApiKey,
+  gitBranchPrefixSetting: () => gitBranchPrefixSetting,
   harnessEnvKey: () => harnessEnvKey,
   isAbleTimeConnected: () => isAbleTimeConnected,
   isIssueSourceConnected: () => isIssueSourceConnected,
@@ -1398,6 +1432,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;
   }
@@ -2251,6 +2289,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;
   }
@@ -2311,6 +2356,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);
 }
@@ -2456,6 +2504,7 @@ var init_app_settings = __esm({
     init_paths();
     init_private_file();
     init_secret_vault();
+    init_branch_prefix();
     init_issue_source_labels();
     init_account_profile();
     HARNESS_ENV_KEYS = {
@@ -7783,7 +7832,7 @@ var init_coordinator_prompt = __esm({
       "- 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:",
@@ -14176,87 +14225,6 @@ var init_spawn = __esm({
   }
 });
 
-// src/land/pr-metadata.ts
-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)
-  };
-}
-var GENERIC_TITLE_RE;
-var init_pr_metadata = __esm({
-  "src/land/pr-metadata.ts"() {
-    "use strict";
-    init_run();
-    GENERIC_TITLE_RE = /^(sideboard:|thread\/|wip\b|tmp\b|update\b|changes?\b|misc\b|stuff\b)/i;
-  }
-});
-
 // src/git/agent-git-actions.ts
 function agentGitPrompt(action, opts) {
   switch (action) {
@@ -14277,6 +14245,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);
+}
 function gitActionExpansion(action, base) {
   switch (action) {
     case "commit-push":
@@ -19505,6 +19486,87 @@ var init_diff = __esm({
   }
 });
 
+// src/land/pr-metadata.ts
+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)
+  };
+}
+var GENERIC_TITLE_RE;
+var init_pr_metadata = __esm({
+  "src/land/pr-metadata.ts"() {
+    "use strict";
+    init_run();
+    GENERIC_TITLE_RE = /^(sideboard:|thread\/|wip\b|tmp\b|update\b|changes?\b|misc\b|stuff\b)/i;
+  }
+});
+
 // src/land/land.ts
 async function previewLand(thread) {
   if (thread.sourceIsFork) {
@@ -20035,13 +20097,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.`
     ] : [],
@@ -20247,6 +20310,7 @@ var init_instructions = __esm({
     import_node_fs50 = require("fs");
     import_node_path47 = require("path");
     init_git_auth_mode();
+    init_branch_prefix();
     init_worktree_labels();
     init_detached_job_path();
     PR_GOAL_RE = /greptile|\bci\b.*\b(green|pass)|checks?\s+(pass|green)|until\s+.*\b(pass|green|merge|clean)|\bfix ci\b|watch[- ]fix[- ]push/i;
@@ -20948,7 +21012,6 @@ var init_orchestrator = __esm({
     init_spawn();
     init_agents();
     init_worktree();
-    init_pr_metadata();
     init_stack();
     init_agent_git_actions();
     init_pr_merge_archive();
@@ -21736,7 +21799,7 @@ var init_orchestrator = __esm({
         }
         const isBrightsy = fresh.agent === "brightsy";
         const isOrchestration = isOrchestratorThread(fresh);
-        const { autoRenameBranchEnabled: autoRenameBranchEnabled2, getGithubGitAuthMode: getGithubGitAuthMode2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
+        const { autoRenameBranchEnabled: autoRenameBranchEnabled2, getGithubGitAuthMode: getGithubGitAuthMode2, gitBranchPrefixSetting: gitBranchPrefixSetting2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
         const gitAuthMode = getGithubGitAuthMode2();
         const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
           githubSlug: await resolveGithubRepoSlug(fresh.worktreePath).catch(
@@ -21772,9 +21835,16 @@ var init_orchestrator = __esm({
           }
         }
         const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
-        const renameBranchDirective = !isBrightsy && !isOrchestration && autoRenameBranchEnabled2() ? formatRenameBranchDirective(fresh, {
-          customPrompt: settings?.prompts?.renameBranch
-        }) : null;
+        let renameBranchDirective = null;
+        if (!isBrightsy && !isOrchestration && autoRenameBranchEnabled2()) {
+          const { resolveGitBranchPrefix: resolveGitBranchPrefix2 } = await Promise.resolve().then(() => (init_branch_prefix(), branch_prefix_exports));
+          renameBranchDirective = formatRenameBranchDirective(fresh, {
+            customPrompt: settings?.prompts?.renameBranch,
+            branchPrefix: resolveGitBranchPrefix2({
+              setting: gitBranchPrefixSetting2()
+            })
+          });
+        }
         let seed = null;
         if (!fresh.sessionId) {
           const prior = fresh.messages.slice(0, -1);
@@ -22804,9 +22874,9 @@ var init_orchestrator = __esm({
         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)) {
@@ -22824,17 +22894,6 @@ var init_orchestrator = __esm({
             "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 {
@@ -22843,42 +22902,18 @@ var init_orchestrator = __esm({
           } 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);
@@ -23494,6 +23529,7 @@ __export(index_exports, {
   estimateMessageChars: () => estimateMessageChars,
   estimateOccupancyTokens: () => estimateOccupancyTokens,
   estimateThreadChars: () => estimateThreadChars,
+  examplePrefixedBranch: () => examplePrefixedBranch,
   expandComposerPrompt: () => expandComposerPrompt,
   extractBrightsyContextSummary: () => extractBrightsyContextSummary,
   extractGhErrorDetail: () => extractGhErrorDetail,
@@ -23606,6 +23642,7 @@ __export(index_exports, {
   ghHeadRef: () => ghHeadRef,
   ghRepoSelectArgs: () => ghRepoSelectArgs,
   git: () => git,
+  gitBranchPrefixSetting: () => gitBranchPrefixSetting,
   githubAgentGitEnv: () => githubAgentGitEnv,
   githubHttpsInsteadOfEntries: () => githubHttpsInsteadOfEntries,
   githubRelationEditFlag: () => githubRelationEditFlag,
@@ -23854,6 +23891,7 @@ __export(index_exports, {
   resolveEffectiveIssueSource: () => resolveEffectiveIssueSource,
   resolveFilesToCopy: () => resolveFilesToCopy,
   resolveGhAuthToken: () => resolveGhAuthToken,
+  resolveGitBranchPrefix: () => resolveGitBranchPrefix,
   resolveGitDirsForLockRecovery: () => resolveGitDirsForLockRecovery,
   resolveGitHubIssueRepo: () => resolveGitHubIssueRepo,
   resolveGithubAgentToken: () => resolveGithubAgentToken,
@@ -23876,6 +23914,7 @@ __export(index_exports, {
   resolveReviewGuidelines: () => resolveReviewGuidelines,
   resolveScheduleThreadId: () => resolveScheduleThreadId,
   resolveSendFollowUp: () => resolveSendFollowUp,
+  resolveSidebarGitPrompt: () => resolveSidebarGitPrompt,
   resolveSlackListenMode: () => resolveSlackListenMode,
   resolveThreadDefaults: () => resolveThreadDefaults,
   resolveThreadEffort: () => resolveThreadEffort,
@@ -23895,6 +23934,7 @@ __export(index_exports, {
   runSlackRelayClient: () => runSlackRelayClient,
   runWorkspaceSetup: () => runWorkspaceSetup,
   sameWorktreePath: () => sameWorktreePath,
+  sanitizeGitBranchPrefix: () => sanitizeGitBranchPrefix,
   sanitizeMcpServerName: () => sanitizeMcpServerName,
   saveAbleTimeConnection: () => saveAbleTimeConnection,
   saveAppSettings: () => saveAppSettings,
@@ -24040,6 +24080,7 @@ init_gh_errors();
 init_git_auth_mode();
 init_worktree();
 init_stack();
+init_branch_prefix();
 init_agent_git_actions();
 
 // src/integrations/github.ts
@@ -29183,7 +29224,7 @@ async function startMcpServer() {
     );
     server.tool(
       "ask_git",
-      "Commit & push, open a draft PR, mark ready for review, 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` even when origin is SSH / Settings \u2192 Git is SSH). When dirty, steers the worktree agent to commit (Settings \u2192 Follow-up, default interrupt now); then wait_for_turn (loop while stillRunning). Do not start a checks loop on a plain push \u2014 only if the user gave a goal (Greptile 5/5, CI green). Pass a worktree thread ref (not the orchestrator). action=ready-for-review and action=merge only when the user explicitly asked (or clicked the desktop button). Do not run git or gh from the orchestration cwd. If this tool errors that the GraphQL/PR body is too long, the branch is already pushed \u2014 have the worktree agent retry `gh pr create --body-file` with a short description (GitHub limit 65,536 characters). Do not invent SSH/auth failures from that error.",
+      "Commit & push, open a draft PR, mark ready for review, resolve conflicts, or merge \u2014 same prompts as the desktop git buttons (including Resolve). Always steers the worktree agent; does not push or open the PR locally. Then wait_for_turn (loop while stillRunning). Do not start a checks loop on a plain push \u2014 only if the user gave a goal (Greptile 5/5, CI green). Pass a worktree thread ref (not the orchestrator). action=ready-for-review and action=merge only when the user explicitly asked (or clicked the desktop button). Do not run git or gh from the orchestration cwd.",
       {
         ref: import_zod9.z.string().describe("Worktree thread id/ref"),
         action: import_zod9.z.enum(AGENT_GIT_ACTIONS).describe(
@@ -32104,6 +32145,7 @@ init_outbound_watch();
   estimateMessageChars,
   estimateOccupancyTokens,
   estimateThreadChars,
+  examplePrefixedBranch,
   expandComposerPrompt,
   extractBrightsyContextSummary,
   extractGhErrorDetail,
@@ -32216,6 +32258,7 @@ init_outbound_watch();
   ghHeadRef,
   ghRepoSelectArgs,
   git,
+  gitBranchPrefixSetting,
   githubAgentGitEnv,
   githubHttpsInsteadOfEntries,
   githubRelationEditFlag,
@@ -32464,6 +32507,7 @@ init_outbound_watch();
   resolveEffectiveIssueSource,
   resolveFilesToCopy,
   resolveGhAuthToken,
+  resolveGitBranchPrefix,
   resolveGitDirsForLockRecovery,
   resolveGitHubIssueRepo,
   resolveGithubAgentToken,
@@ -32486,6 +32530,7 @@ init_outbound_watch();
   resolveReviewGuidelines,
   resolveScheduleThreadId,
   resolveSendFollowUp,
+  resolveSidebarGitPrompt,
   resolveSlackListenMode,
   resolveThreadDefaults,
   resolveThreadEffort,
@@ -32505,6 +32550,7 @@ init_outbound_watch();
   runSlackRelayClient,
   runWorkspaceSetup,
   sameWorktreePath,
+  sanitizeGitBranchPrefix,
   sanitizeMcpServerName,
   saveAbleTimeConnection,
   saveAppSettings,