@sideboard-ai/core 0.1.191 → 0.1.193

package/dist/mcp/run-stdio.cjs

@@ -269,9 +269,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,
@@ -297,9 +300,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,
@@ -2980,6 +2986,18 @@ var init_teams = __esm({
 });
 
 // src/git/worktree-labels.ts
+var worktree_labels_exports = {};
+__export(worktree_labels_exports, {
+  branchDisplayLabel: () => branchDisplayLabel,
+  isPlaceholderBranch: () => isPlaceholderBranch,
+  normalizeWorktreePath: () => normalizeWorktreePath,
+  threadDisplayLabel: () => threadDisplayLabel,
+  ticketSlugForBranch: () => ticketSlugForBranch,
+  worktreeDisplayLabel: () => worktreeDisplayLabel,
+  worktreeDisplayLabelForGroup: () => worktreeDisplayLabelForGroup,
+  worktreeNameFromPath: () => worktreeNameFromPath,
+  worktreeSlugForTicket: () => worktreeSlugForTicket
+});
 function normalizeWorktreePath(worktreePath) {
   const trimmed = (worktreePath ?? "").replace(/\/+$/, "") || "/";
   const absolute = trimmed.startsWith("/");
@@ -3434,6 +3452,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) ?? sanitizeGitBranchPrefix(opts.githubLogin);
+}
+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) {
@@ -3502,6 +3546,7 @@ __export(app_settings_exports, {
   getGithubPat: () => getGithubPat,
   getIssueSource: () => getIssueSource,
   getLinearApiKey: () => getLinearApiKey,
+  gitBranchPrefixSetting: () => gitBranchPrefixSetting,
   harnessEnvKey: () => harnessEnvKey,
   isAbleTimeConnected: () => isAbleTimeConnected,
   isIssueSourceConnected: () => isIssueSourceConnected,
@@ -3877,6 +3922,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;
   }
@@ -4730,6 +4779,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;
   }
@@ -4790,6 +4846,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);
 }
@@ -4935,6 +4994,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 = {
@@ -7973,8 +8033,8 @@ var init_coordinator_prompt = __esm({
       "- start_board_card \u2014 same as create_thread for a ticket/PR/named branch (attaches issue text when resolvable). Then send_to_thread.",
       "- fork_worktree \u2014 fork a worktree chat into a NEW git worktree + chat (transcript attached); optional agent; leave model unset (Auto) unless you have a reason. Not for orchestration chats.",
       "- fork_chat \u2014 fork a worktree chat (same worktree tab) OR a Global orchestration chat (new orchestration tab); optional agent; leave model unset (Auto) unless you have a reason. Remote coordinators: use this to continue another orchestration chat on a different agent after session limits.",
-      "- send_to_thread \u2014 queue a prompt (start/continue a chat turn). force_stop: true only to replace a wrong in-flight request \u2014 never to check in, resume after a halt notice, or because wait_for_turn returned stillRunning (that kills the child mid-thought)",
-      "- wait_for_turn / get_turn_result \u2014 wait for and read the agent reply (includes last-turn usage / costUsd when the child agent reported it). wait_for_turn returns within ~45s even if the child is still working (MCP clients kill longer tool calls). stillRunning is the source of truth \u2014 if it is false, the child is not working; do not tell the user it is running or \u201Cwaiting for a gate,\u201D even if status still says running/queued. If stillRunning is true, progress is a live snapshot of tools/thinking \u2014 call wait_for_turn again. status=queued with no lastActivityAt means the child has not started yet (concurrency cap) \u2014 keep waiting; do not force_stop or send a check-in. Do not send \u201Care you stuck?\u201D or assume a hang while lastActivityAt is recent. If stillRunning stays true across many waits with the same lastActivityAt, the child is stuck \u2014 tell the user; do not invent a gate. On status error, lastError (and text) is the failure \u2014 switch agent, tell the user, or retry; do not treat empty text as success. On status stopped or broken (or incomplete=true), the child was interrupted or died \u2014 resume with send_to_thread or tell the user; never treat stopped as a finished turn. Sideboard also injects a notice into this chat when a child stops unexpectedly.",
+      "- send_to_thread \u2014 steer a prompt (start/continue a chat turn; Settings \u2192 Follow-up, default steer: interrupt and start now). force_stop: true only to replace a wrong in-flight request and clear the inbox \u2014 never to check in, resume after a halt notice, or because wait_for_turn returned stillRunning (that interrupts the child mid-thought)",
+      "- wait_for_turn / get_turn_result \u2014 wait for and read the agent reply (includes last-turn usage / costUsd when the child agent reported it). wait_for_turn returns within ~45s even if the child is still working (MCP clients kill longer tool calls). stillRunning is the source of truth \u2014 if it is false, the child is not working; do not tell the user it is running or \u201Cwaiting for a gate,\u201D even if status still says running/queued. If stillRunning is true, progress is a live snapshot of tools/thinking \u2014 call wait_for_turn again. status=queued with no lastActivityAt means the child has not started yet (concurrency cap) \u2014 keep waiting; do not force_stop or send_to_thread a check-in (that steers / interrupts). Do not send \u201Care you stuck?\u201D or assume a hang while lastActivityAt is recent. If stillRunning stays true across many waits with the same lastActivityAt, the child is stuck \u2014 tell the user; do not invent a gate. On status error, lastError (and text) is the failure \u2014 switch agent, tell the user, or retry; do not treat empty text as success. On status stopped or broken (or incomplete=true), the child was interrupted or died \u2014 resume with send_to_thread or tell the user; never treat stopped as a finished turn. Sideboard also injects a notice into this chat when a child stops unexpectedly.",
       "- stop_thread \u2014 force-stop: kill in-flight turn AND clear queued prompts (do not leave stale queue after an interrupt)",
       "- archive_thread / restore_thread \u2014 archive (tears down worktree when last tab) or restore",
       "Setup / run:",
@@ -7984,7 +8044,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 queues 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:",
@@ -12431,87 +12491,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) {
@@ -12532,6 +12511,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":
@@ -14303,8 +14295,8 @@ var init_wait_for_turn = __esm({
   "src/mcp/wait-for-turn.ts"() {
     "use strict";
     MCP_WAIT_FOR_TURN_MAX_MS = 45e3;
-    MCP_WAIT_STILL_RUNNING_HINT = "Child is still working. Call wait_for_turn again. Do not send a check-in prompt or assume a hang while progress is updating.";
-    MCP_WAIT_QUEUED_HINT = "Child is queued waiting for a concurrency slot \u2014 it has not started yet. Call wait_for_turn again. Do not send a check-in prompt, force_stop, or assume it failed to start.";
+    MCP_WAIT_STILL_RUNNING_HINT = "Child is still working. Call wait_for_turn again. Do not send_to_thread a check-in (that steers / interrupts) or assume a hang while progress is updating.";
+    MCP_WAIT_QUEUED_HINT = "Child is queued waiting for a concurrency slot \u2014 it has not started yet. Call wait_for_turn again. Do not send_to_thread a check-in (that steers / interrupts), force_stop, or assume it failed to start.";
     MCP_WAIT_STOPPED_HINT = "Child was stopped before the turn finished. Do not treat this as success. send_to_thread to resume, or tell the user.";
     MCP_WAIT_BROKEN_HINT = "Child worktree is broken (missing on disk). Tell the user \u2014 do not treat this as success.";
     MCP_WAIT_ERROR_HINT = "Child turn failed. lastError/text is the failure \u2014 switch agent, tell the user, or retry. Do not treat empty text as success.";
@@ -17785,6 +17777,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) {
@@ -18315,13 +18388,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.`
     ] : [],
@@ -18505,6 +18579,7 @@ var init_instructions = __esm({
     import_node_fs48 = require("fs");
     import_node_path45 = 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;
@@ -19337,6 +19412,64 @@ var init_schedule_runner = __esm({
   }
 });
 
+// src/integrations/github.ts
+var github_exports = {};
+__export(github_exports, {
+  getGitHubStatus: () => getGitHubStatus,
+  refreshGitHubAuth: () => refreshGitHubAuth
+});
+async function getGitHubStatus() {
+  const which = await run("which", ["gh"], { reject: false });
+  if (which.exitCode !== 0 || !which.stdout.trim()) {
+    return {
+      connected: false,
+      login: null,
+      hosts: [],
+      reason: "gh CLI not found on PATH"
+    };
+  }
+  const loginResult = await run(
+    "gh",
+    ["api", "user", "--jq", ".login"],
+    { reject: false }
+  );
+  if (loginResult.exitCode === 0 && loginResult.stdout.trim()) {
+    return {
+      connected: true,
+      login: loginResult.stdout.trim(),
+      hosts: ["github.com"],
+      reason: null
+    };
+  }
+  const status = await run("gh", ["auth", "status"], { reject: false });
+  const text7 = `${status.stdout}
+${status.stderr}`;
+  const loginMatch = text7.match(/Logged in to ([^\s]+) account (\S+)/i) ?? text7.match(/Logged in to ([^\s]+) as (\S+)/i);
+  if (loginMatch) {
+    return {
+      connected: true,
+      login: loginMatch[2].replace(/['"]/g, ""),
+      hosts: [loginMatch[1]],
+      reason: null
+    };
+  }
+  return {
+    connected: false,
+    login: null,
+    hosts: [],
+    reason: status.stderr.trim() || status.stdout.trim() || "Not logged in to GitHub (run: gh auth login)"
+  };
+}
+async function refreshGitHubAuth() {
+  return getGitHubStatus();
+}
+var init_github = __esm({
+  "src/integrations/github.ts"() {
+    "use strict";
+    init_run();
+  }
+});
+
 // src/agents/cursor-store.ts
 function cursorSdkStoreDir(threadId) {
   const root = (0, import_node_path49.join)(appDataDir(), CURSOR_SDK_STORE_DIR);
@@ -19459,6 +19592,7 @@ __export(orchestrator_exports, {
   Orchestrator: () => Orchestrator,
   getOrchestrator: () => getOrchestrator,
   isPidAlive: () => isPidAlive,
+  resolveOrchChildFollowUp: () => resolveOrchChildFollowUp,
   resolveSendFollowUp: () => resolveSendFollowUp,
   startOrchestration: () => startOrchestration,
   waitForPidExit: () => waitForPidExit
@@ -19489,6 +19623,10 @@ function resolveSendFollowUp(thread, requested) {
   if (requested === "steer" || requested === "queue") return requested;
   return isOrchestratorThread(thread) ? followUpBehavior() : "queue";
 }
+function resolveOrchChildFollowUp(requested) {
+  if (requested === "steer" || requested === "queue") return requested;
+  return followUpBehavior();
+}
 function writeLiveStatus(threadId, status, lastError) {
   const latest = readThread(threadId);
   if (!latest || latest.status === "archived") return latest;
@@ -19571,7 +19709,6 @@ var init_orchestrator = __esm({
     init_spawn();
     init_agents();
     init_worktree();
-    init_pr_metadata();
     init_stack();
     init_agent_git_actions();
     init_pr_merge_archive();
@@ -20359,7 +20496,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(
@@ -20395,9 +20532,26 @@ 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 { isPlaceholderBranch: isPlaceholderBranch2 } = await Promise.resolve().then(() => (init_worktree_labels(), worktree_labels_exports));
+          let githubLogin = null;
+          if (isPlaceholderBranch2(fresh.branchName, fresh.worktreePath) && !gitBranchPrefixSetting2()) {
+            try {
+              const { getGitHubStatus: getGitHubStatus2 } = await Promise.resolve().then(() => (init_github(), github_exports));
+              githubLogin = (await getGitHubStatus2()).login;
+            } catch {
+            }
+          }
+          const { resolveGitBranchPrefix: resolveGitBranchPrefix2 } = await Promise.resolve().then(() => (init_branch_prefix(), branch_prefix_exports));
+          renameBranchDirective = formatRenameBranchDirective(fresh, {
+            customPrompt: settings?.prompts?.renameBranch,
+            branchPrefix: resolveGitBranchPrefix2({
+              setting: gitBranchPrefixSetting2(),
+              githubLogin
+            })
+          });
+        }
         let seed = null;
         if (!fresh.sessionId) {
           const prior = fresh.messages.slice(0, -1);
@@ -21427,9 +21581,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, queue 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)) {
@@ -21447,17 +21601,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 {
@@ -21466,40 +21609,18 @@ var init_orchestrator = __esm({
           } catch {
           }
         }
-        return this.send(threadRef, agentGitPrompt(action, { prBase }));
-      }
-      /** Push origin (gh HTTPS fallback) and create/update the PR when requested. */
-      async pushAndMaybeOpenPr(thread, action) {
-        const cwd = thread.worktreePath;
-        const branch = await currentBranch(cwd);
-        await pushBranch(cwd, branch);
-        if (action === "commit-push") return;
-        const base = await resolveDefaultBranch(thread.repoPath);
-        const meta = await suggestPrMetadata(cwd, {
-          base,
-          fallbackTitle: thread.prTitle ?? thread.title
-        });
-        const url = await createOrUpdatePr(cwd, {
-          title: meta.title,
-          body: meta.body,
-          base,
-          head: branch,
-          draft: action === "create-draft",
-          web: action === "create-web"
-        });
-        if (!url) return;
-        const patch = {
-          prUrl: url,
-          prTitle: meta.title,
-          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);
@@ -22054,7 +22175,7 @@ function parseProjectTitles(raw) {
 }
 async function listGitHubIssueProjects(number, cwd, repoArgs) {
   const result = await gh(
-    ["issue", "view", String(number), ...repoArgs, "--json", "projectItems,projects"],
+    ["issue", "view", String(number), ...repoArgs, "--json", "projectItems"],
     cwd,
     { reject: false }
   );
@@ -22443,6 +22564,16 @@ query SideboardLabels($first: Int!) {
   }
 }
 `;
+var TEAM_LABELS_QUERY = `
+query SideboardTeamLabels($id: String!, $first: Int!, $after: String) {
+  team(id: $id) {
+    labels(first: $first, after: $after) {
+      nodes { id name }
+      pageInfo { hasNextPage endCursor }
+    }
+  }
+}
+`;
 var PROJECTS_QUERY = `
 query SideboardProjects($first: Int!, $filter: ProjectFilter) {
   projects(first: $first, filter: $filter) {
@@ -22816,15 +22947,38 @@ function formatRelationList(relations) {
   if (!relations.length) return "(none)";
   return relations.map((r) => `${r.type} ${r.issue.identifier || r.issue.id}`).join(", ");
 }
-async function listLinearLabels(opts) {
-  const json = await linearGraphql(LABELS_QUERY, { first: 250 }, opts);
-  return (json.issueLabels?.nodes ?? []).flatMap((node) => {
+function mapLabelNodes(nodes) {
+  return (nodes ?? []).flatMap((node) => {
     const id = String(node.id ?? "").trim();
     const name = String(node.name ?? "").trim();
     if (!id) return [];
     return [{ id, name }];
   });
 }
+async function listLinearWorkspaceLabels(opts) {
+  const json = await linearGraphql(LABELS_QUERY, { first: 250 }, opts);
+  return mapLabelNodes(json.issueLabels?.nodes);
+}
+async function listLinearLabels(opts) {
+  const teamId = opts?.teamId?.trim();
+  if (teamId) {
+    const out = [];
+    let after;
+    for (let page = 0; page < 4; page++) {
+      const json = await linearGraphql(
+        TEAM_LABELS_QUERY,
+        after ? { id: teamId, first: 250, after } : { id: teamId, first: 250 },
+        opts
+      );
+      const conn = json.team?.labels;
+      out.push(...mapLabelNodes(conn?.nodes));
+      if (!conn?.pageInfo?.hasNextPage || !conn.pageInfo.endCursor) break;
+      after = conn.pageInfo.endCursor;
+    }
+    if (out.length) return out;
+  }
+  return listLinearWorkspaceLabels(opts);
+}
 async function listLinearProjects(filter, opts) {
   const json = await linearGraphql(PROJECTS_QUERY, { first: 50, filter: filter ?? {} }, opts);
   return (json.projects?.nodes ?? []).flatMap((node) => {
@@ -23113,7 +23267,7 @@ async function updateLinearIssue(input, opts) {
   }
   const addRelations = input.relations?.length ? input.relations : void 0;
   const removeRelations = input.removeRelations?.length ? input.removeRelations : void 0;
-  const needsIssue = Boolean(input.state?.trim()) || input.cycle !== void 0 || Boolean(addRelations) || Boolean(removeRelations);
+  const needsIssue = Boolean(input.state?.trim()) || input.cycle !== void 0 || input.labels !== void 0 || Boolean(addRelations) || Boolean(removeRelations);
   const existing = needsIssue ? await getLinearIssue(issueId, opts) : void 0;
   if (input.state?.trim()) {
     const { teams } = await listLinearTeams(opts);
@@ -23148,7 +23302,10 @@ async function updateLinearIssue(input, opts) {
     mutationInput.priority = normalizePriority(input.priority);
   }
   if (input.labels !== void 0) {
-    mutationInput.labelIds = await resolveLinearLabelIds(input.labels, opts);
+    mutationInput.labelIds = await resolveLinearLabelIds(input.labels, {
+      ...opts,
+      teamId: existing?.team?.id
+    });
   }
   if (input.project !== void 0) {
     mutationInput.projectId = await resolveLinearProjectId(input.project, opts);
@@ -25330,51 +25487,7 @@ async function getHomeBoardInputs(workspaces, opts) {
 
 // src/mcp/server.ts
 init_home_board();
-
-// src/integrations/github.ts
-init_run();
-async function getGitHubStatus() {
-  const which = await run("which", ["gh"], { reject: false });
-  if (which.exitCode !== 0 || !which.stdout.trim()) {
-    return {
-      connected: false,
-      login: null,
-      hosts: [],
-      reason: "gh CLI not found on PATH"
-    };
-  }
-  const loginResult = await run(
-    "gh",
-    ["api", "user", "--jq", ".login"],
-    { reject: false }
-  );
-  if (loginResult.exitCode === 0 && loginResult.stdout.trim()) {
-    return {
-      connected: true,
-      login: loginResult.stdout.trim(),
-      hosts: ["github.com"],
-      reason: null
-    };
-  }
-  const status = await run("gh", ["auth", "status"], { reject: false });
-  const text7 = `${status.stdout}
-${status.stderr}`;
-  const loginMatch = text7.match(/Logged in to ([^\s]+) account (\S+)/i) ?? text7.match(/Logged in to ([^\s]+) as (\S+)/i);
-  if (loginMatch) {
-    return {
-      connected: true,
-      login: loginMatch[2].replace(/['"]/g, ""),
-      hosts: [loginMatch[1]],
-      reason: null
-    };
-  }
-  return {
-    connected: false,
-    login: null,
-    hosts: [],
-    reason: status.stderr.trim() || status.stdout.trim() || "Not logged in to GitHub (run: gh auth login)"
-  };
-}
+init_github();
 
 // src/mcp/create-thread-agent.ts
 init_cursor();
@@ -26009,7 +26122,7 @@ async function startMcpServer() {
     );
     server.tool(
       "send_to_thread",
-      'Queue a prompt on a worktree thread chat (runs under concurrency cap). Use after create_thread to start or continue a conversation. For commit/push/PR, prefer ask_git (canonical desktop-button phrases). Send "Merge PR." / ask_git merge only when the user explicitly asked to merge. force_stop=true kills the in-flight turn and clears the queue before this prompt \u2014 only when the current request is wrong and must be replaced. Do not force_stop to check in, resume after a halt notice, or because wait_for_turn returned stillRunning; that stops the child mid-thought. Call wait_for_turn again instead.',
+      'Steer a prompt on a worktree thread chat (Settings \u2192 Follow-up, default steer: interrupt and start now, skip the inbox). Use after create_thread to start or continue a conversation. For commit/push/PR, prefer ask_git (canonical desktop-button phrases). Send "Merge PR." / ask_git merge only when the user explicitly asked to merge. force_stop=true kills the in-flight turn and clears the queue before this prompt \u2014 only when the current request is wrong and must be replaced. Do not send_to_thread to check in, resume after a halt notice, or because wait_for_turn returned stillRunning; that interrupts the child mid-thought. Call wait_for_turn again instead.',
       {
         ref: import_zod9.z.string(),
         prompt: import_zod9.z.string(),
@@ -26022,7 +26135,9 @@ async function startMcpServer() {
             orch.stop(ref, { clearQueue: true, notifyParent: false });
           }
         }
-        const thread = await orch.send(ref, prompt);
+        const thread = await orch.send(ref, prompt, {
+          followUp: resolveOrchChildFollowUp()
+        });
         return mcpJson({
           id: thread.id,
           status: thread.status,
@@ -26033,7 +26148,7 @@ async function startMcpServer() {
     );
     server.tool(
       "wait_for_turn",
-      "Wait until the thread finishes its current/queued turn, or return early with a live progress snapshot. MCP clients often kill tools around 60s, so this returns within 45s even while the child is still working. stillRunning is the source of truth \u2014 if false, the child is not working (do not say it is waiting for a gate). If stillRunning is true, progress is tools/thinking (or \u201Cqueued, waiting for a concurrency slot\u201D if it has not started). Call wait_for_turn again. Do not send a check-in prompt, force_stop, or assume a hang. On status error, lastError/text is the failure. On status stopped or broken, the child did not finish \u2014 resume with send_to_thread or tell the user; do not treat that as success. When finished, usage is the last agent turn\u2019s tokens + costUsd (when the provider reported cost).",
+      "Wait until the thread finishes its current/queued turn, or return early with a live progress snapshot. MCP clients often kill tools around 60s, so this returns within 45s even while the child is still working. stillRunning is the source of truth \u2014 if false, the child is not working (do not say it is waiting for a gate). If stillRunning is true, progress is tools/thinking (or \u201Cqueued, waiting for a concurrency slot\u201D if it has not started). Call wait_for_turn again. Do not send_to_thread a check-in (that steers / interrupts), force_stop, or assume a hang. On status error, lastError/text is the failure. On status stopped or broken, the child did not finish \u2014 resume with send_to_thread or tell the user; do not treat that as success. When finished, usage is the last agent turn\u2019s tokens + costUsd (when the provider reported cost).",
       {
         ref: import_zod9.z.string(),
         timeoutMs: import_zod9.z.number().optional()
@@ -26190,7 +26305,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, queues the worktree agent to commit; 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(