contribute-now 0.6.2-dev.38e14f5 → 0.6.2-dev.967437a

package/dist/index.js

@@ -7059,6 +7059,9 @@ function configExists(cwd = process.cwd()) {
 var VALID_WORKFLOWS = ["clean-flow", "github-flow", "git-flow"];
 var VALID_ROLES = ["maintainer", "contributor"];
 var VALID_CONVENTIONS = ["conventional", "clean-commit", "none"];
+function isAIEnabled(config, cliNoAI = false) {
+  return config.aiEnabled !== false && !cliNoAI;
+}
 function readConfig(cwd = process.cwd()) {
   const path = getConfigPath(cwd);
   if (!existsSync(path))
@@ -7101,7 +7104,10 @@ function readConfig(cwd = process.cwd()) {
       console.error("Invalid .contributerc.json: all branchPrefixes must be non-empty strings.");
       return null;
     }
-    return parsed;
+    return {
+      ...parsed,
+      aiEnabled: parsed.aiEnabled !== false
+    };
   } catch {
     return null;
   }
@@ -7149,7 +7155,8 @@ function getDefaultConfig() {
     upstream: "upstream",
     origin: "origin",
     branchPrefixes: ["feature", "fix", "docs", "chore", "test", "refactor"],
-    commitConvention: "clean-commit"
+    commitConvention: "clean-commit",
+    aiEnabled: true
   };
 }
 
@@ -8756,6 +8763,7 @@ var LogEngine = {
 
 // src/utils/logger.ts
 var import_picocolors = __toESM(require_picocolors(), 1);
+var PROJECT_DISPLAY_NAME = "Contribute Now";
 LogEngine.configure({
   mode: LogMode.INFO,
   format: {
@@ -8776,9 +8784,10 @@ function warn(msg, emoji = "⚠️") {
 function info(msg, emoji = "ℹ️") {
   LogEngine.info(msg, undefined, { emoji });
 }
-function heading(msg) {
+function projectHeading(command, emoji) {
+  const prefix = emoji ? `${import_picocolors.default.bold(emoji)} ` : "";
   console.log(`
-${import_picocolors.default.bold(msg)}`);
+${prefix}${import_picocolors.default.bold(import_picocolors.default.cyan(PROJECT_DISPLAY_NAME))} ${import_picocolors.default.dim("—")} ${import_picocolors.default.bold(command)}`);
 }
 
 // src/utils/workflow.ts
@@ -8871,7 +8880,7 @@ var branch_default = defineCommand({
     const currentBranch = await getCurrentBranch();
     const showRemoteOnly = args.remote;
     const showAll = args.all;
-    heading("\uD83C\uDF3F branches");
+    projectHeading("branch", "\uD83C\uDF3F");
     console.log();
     if (!showRemoteOnly) {
       const localBranches = await getLocalBranches();
@@ -8981,6 +8990,9 @@ function groupByRemote(branches) {
 }
 
 // src/commands/clean.ts
+var import_picocolors8 = __toESM(require_picocolors(), 1);
+
+// src/utils/branchPrompt.ts
 var import_picocolors7 = __toESM(require_picocolors(), 1);
 
 // src/utils/branch.ts
@@ -10103,12 +10115,12 @@ async function multiSelectPrompt(message, choices) {
 init_dist();
 var CONVENTIONAL_COMMIT_SYSTEM_PROMPT = `Git commit message generator. Format: <type>[!][(<scope>)]: <description>
 Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
-Rules: breaking (!) only for feat/fix/refactor/perf; imperative mood; max 72 chars; lowercase start; scope optional camelCase/kebab-case. Return ONLY the message line.
+Rules: breaking (!) only for feat/fix/refactor/perf; imperative mood; max 72 chars; lowercase start; scope optional camelCase/kebab-case. Do NOT use backticks, quotes, or markdown formatting around filenames, functions, or identifiers. Return ONLY the message line.
 Examples: feat: add user auth | fix(auth): resolve token expiry | feat!: redesign auth API`;
 var CLEAN_COMMIT_SYSTEM_PROMPT = `Git commit message generator. EXACT format: <emoji> <type>[!][ (<scope>)]: <description>
 Spacing: EMOJI SPACE TYPE [SPACE OPENPAREN SCOPE CLOSEPAREN] COLON SPACE DESCRIPTION
 Types: \uD83D\uDCE6 new, \uD83D\uDD27 update, \uD83D\uDDD1️ remove, \uD83D\uDD12 security, ⚙️ setup, ☕ chore, \uD83E\uDDEA test, \uD83D\uDCD6 docs, \uD83D\uDE80 release
-Rules: breaking (!) only for new/update/remove/security; imperative mood; max 72 chars; lowercase start; scope optional. Return ONLY the message line.
+Rules: breaking (!) only for new/update/remove/security; imperative mood; max 72 chars; lowercase start; scope optional. Do NOT use backticks, quotes, or markdown formatting around filenames, functions, or identifiers. Return ONLY the message line.
 Correct: \uD83D\uDCE6 new: add user auth | \uD83D\uDD27 update (api): improve error handling | ⚙️ setup (ci): configure github actions
 WRONG: ⚙️setup(ci): ... | \uD83D\uDD27 update(api): ... ← always space before scope parenthesis`;
 function getGroupingSystemPrompt(convention) {
@@ -10133,6 +10145,7 @@ Rules:
 - Each group should represent ONE logical change
 - Every file must appear in exactly one group
 - Commit messages must follow the convention, be concise, imperative, max 72 chars
+- Do not use backticks, quotes, or markdown formatting in commit messages
 - Order groups so foundational changes come first (types, utils) and consumers come after
 - Return ONLY the JSON array, nothing else`;
 }
@@ -10253,7 +10266,7 @@ ${truncated}
   return result.length > maxTotalChars ? `${result.slice(0, maxTotalChars - 15)}
 ...(truncated)` : result;
 }
-async function checkCopilotAvailable() {
+async function checkCopilotAvailable2() {
   try {
     const client = await getManagedClient();
     try {
@@ -10351,6 +10364,9 @@ function extractJson(raw) {
   }
   return text;
 }
+function sanitizeGeneratedCommitMessage(message) {
+  return message.replace(/`+/g, "").replace(/\s+/g, " ").trim();
+}
 async function generateCommitMessage(diff, stagedFiles, model, convention = "clean-commit", context) {
   try {
     const isLarge = stagedFiles.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD;
@@ -10368,7 +10384,7 @@ Files (${stagedFiles.length}): ${stagedFiles.join(", ")}
 Diff:
 ${diffContent}${multiFileHint}${squashHint}`;
     const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model, isLarge ? COPILOT_LONG_TIMEOUT_MS : COPILOT_TIMEOUT_MS);
-    return result?.trim() ?? null;
+    return result ? sanitizeGeneratedCommitMessage(result) : null;
   } catch {
     return null;
   }
@@ -10415,6 +10431,40 @@ ${conflictDiff.slice(0, 4000)}`;
     return null;
   }
 }
+function normalizeCommitGroups(changedFiles, groups) {
+  const changedSet = new Set(changedFiles);
+  const assignedFiles = new Set;
+  const unknownFiles = new Set;
+  const duplicateFiles = new Set;
+  const normalizedGroups = groups.map((group) => {
+    const uniqueFiles = new Set;
+    const files = [];
+    for (const file of group.files) {
+      if (!changedSet.has(file)) {
+        unknownFiles.add(file);
+        continue;
+      }
+      if (uniqueFiles.has(file) || assignedFiles.has(file)) {
+        duplicateFiles.add(file);
+        continue;
+      }
+      uniqueFiles.add(file);
+      assignedFiles.add(file);
+      files.push(file);
+    }
+    return {
+      ...group,
+      files
+    };
+  }).filter((group) => group.files.length > 0);
+  const unassignedFiles = changedFiles.filter((file) => !assignedFiles.has(file));
+  return {
+    groups: normalizedGroups,
+    unknownFiles: [...unknownFiles],
+    duplicateFiles: [...duplicateFiles],
+    unassignedFiles
+  };
+}
 async function generateCommitGroups(files, diffs, model, convention = "clean-commit") {
   const isLarge = files.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD;
   const diffContent = isLarge ? createCompactDiff(files, diffs) : diffs.slice(0, 6000);
@@ -10455,7 +10505,10 @@ ${diffContent}${largeHint}`;
       throw new Error("AI returned groups with invalid structure (missing files or message)");
     }
   }
-  return groups;
+  return groups.map((group) => ({
+    ...group,
+    message: sanitizeGeneratedCommitMessage(group.message)
+  }));
 }
 async function generateCommitGroupsInBatches(files, diffs, model, convention = "clean-commit") {
   const batchSize = BATCH_CONFIG.FALLBACK_BATCH_SIZE;
@@ -10490,7 +10543,11 @@ NOTE: Processing batch ${batchNum}/${totalBatches} of a large changeset. Group o
             const batchFileSet = new Set(batchFiles);
             const filteredFiles = group.files.filter((f3) => batchFileSet.has(f3));
             if (filteredFiles.length > 0) {
-              allGroups.push({ ...group, files: filteredFiles });
+              allGroups.push({
+                ...group,
+                files: filteredFiles,
+                message: sanitizeGeneratedCommitMessage(group.message)
+              });
             }
           }
         }
@@ -10533,7 +10590,7 @@ ${diffContent}`;
       return groups;
     return groups.map((g3, i2) => ({
       files: g3.files,
-      message: typeof parsed[i2]?.message === "string" ? parsed[i2].message : g3.message
+      message: typeof parsed[i2]?.message === "string" ? sanitizeGeneratedCommitMessage(parsed[i2].message) : g3.message
     }));
   } catch {
     return groups;
@@ -10550,12 +10607,160 @@ Files: ${files.join(", ")}
 Diff:
 ${diffContent}`;
     const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model);
-    return result?.trim() ?? null;
+    return result ? sanitizeGeneratedCommitMessage(result) : null;
   } catch {
     return null;
   }
 }
 
+// src/utils/spinner.ts
+var import_picocolors6 = __toESM(require_picocolors(), 1);
+var FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+function createSpinner(text) {
+  let frameIdx = 0;
+  let currentText = text;
+  let stopped = false;
+  const clearLine = () => {
+    process.stderr.write("\r\x1B[K");
+  };
+  const render = () => {
+    if (stopped)
+      return;
+    const frame = import_picocolors6.default.cyan(FRAMES[frameIdx % FRAMES.length]);
+    clearLine();
+    process.stderr.write(`${frame} ${currentText}`);
+    frameIdx++;
+  };
+  const timer = setInterval(render, 80);
+  render();
+  const stop = () => {
+    if (stopped)
+      return;
+    stopped = true;
+    clearInterval(timer);
+    clearLine();
+  };
+  return {
+    update(newText) {
+      currentText = newText;
+    },
+    success(msg) {
+      stop();
+      process.stderr.write(`${import_picocolors6.default.green("✔")} ${msg}
+`);
+    },
+    fail(msg) {
+      stop();
+      process.stderr.write(`${import_picocolors6.default.red("✖")} ${msg}
+`);
+    },
+    stop() {
+      stop();
+    }
+  };
+}
+
+// src/utils/branchPrompt.ts
+async function promptForBranchName(options) {
+  const promptMessage = options.promptMessage ?? "What are you going to work on?";
+  let branchInput = options.initialValue?.trim() ?? "";
+  while (!branchInput) {
+    branchInput = (await inputPrompt(promptMessage)).trim();
+    if (branchInput)
+      break;
+    warn("A branch name or description is required.");
+    const action = await selectPrompt("What would you like to do?", ["Try again", "Cancel"]);
+    if (action === "Cancel")
+      return null;
+  }
+  let branchName = branchInput;
+  const useAI = options.useAI !== false && looksLikeNaturalLanguage(branchInput);
+  if (useAI) {
+    const copilotError = await checkCopilotAvailable2();
+    if (copilotError) {
+      warn(`AI unavailable: ${copilotError}`);
+    } else {
+      while (true) {
+        const spinner = createSpinner("Generating branch name suggestion...");
+        const suggested = await suggestBranchName(branchInput, options.model);
+        if (suggested) {
+          spinner.success("Branch name suggestion ready.");
+          console.log(`
+  ${import_picocolors7.default.dim("AI suggestion:")} ${import_picocolors7.default.bold(import_picocolors7.default.cyan(suggested))}`);
+          const action2 = await selectPrompt("What would you like to do with this branch name?", [
+            "Use this suggestion",
+            "Try again with AI",
+            "Enter branch name manually",
+            "Use my original description",
+            "Cancel"
+          ]);
+          if (action2 === "Use this suggestion") {
+            branchName = suggested;
+            break;
+          }
+          if (action2 === "Try again with AI") {
+            continue;
+          }
+          if (action2 === "Enter branch name manually") {
+            branchName = (await inputPrompt("Enter branch name", branchInput)).trim();
+            break;
+          }
+          if (action2 === "Use my original description") {
+            branchName = branchInput;
+            break;
+          }
+          return null;
+        }
+        spinner.fail("AI did not return a branch name suggestion.");
+        const action = await selectPrompt("AI could not generate a branch name. What would you like to do?", [
+          "Try again with AI",
+          "Enter branch name manually",
+          "Use my original description",
+          "Cancel"
+        ]);
+        if (action === "Try again with AI") {
+          continue;
+        }
+        if (action === "Enter branch name manually") {
+          branchName = (await inputPrompt("Enter branch name", branchInput)).trim();
+          break;
+        }
+        if (action === "Use my original description") {
+          branchName = branchInput;
+          break;
+        }
+        return null;
+      }
+    }
+  }
+  while (true) {
+    if (!branchName) {
+      branchName = (await inputPrompt("Enter branch name", branchInput)).trim();
+      if (!branchName) {
+        const action = await selectPrompt("What would you like to do?", ["Try again", "Cancel"]);
+        if (action === "Cancel")
+          return null;
+        continue;
+      }
+    }
+    if (!hasPrefix(branchName, options.branchPrefixes)) {
+      const prefix = await selectPrompt(`Choose a branch type for ${import_picocolors7.default.bold(branchName)}:`, options.branchPrefixes);
+      branchName = formatBranchName(prefix, branchName);
+    }
+    if (!isValidBranchName(branchName)) {
+      warn("Invalid branch name. Use only alphanumeric characters, dots, hyphens, underscores, and slashes.");
+      branchName = (await inputPrompt("Enter branch name", branchName)).trim();
+      continue;
+    }
+    if (await branchExists(branchName)) {
+      warn(`Branch ${import_picocolors7.default.bold(branchName)} already exists. Choose a different name.`);
+      branchName = (await inputPrompt("Enter branch name", branchName)).trim();
+      continue;
+    }
+    return branchName;
+  }
+}
+
 // src/utils/gh.ts
 import { execFile as execFileCb2 } from "node:child_process";
 function run2(args) {
@@ -10694,53 +10899,6 @@ async function getMergedPRForBranch(headBranch) {
   }
 }
 
-// src/utils/spinner.ts
-var import_picocolors6 = __toESM(require_picocolors(), 1);
-var FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-function createSpinner(text) {
-  let frameIdx = 0;
-  let currentText = text;
-  let stopped = false;
-  const clearLine = () => {
-    process.stderr.write("\r\x1B[K");
-  };
-  const render = () => {
-    if (stopped)
-      return;
-    const frame = import_picocolors6.default.cyan(FRAMES[frameIdx % FRAMES.length]);
-    clearLine();
-    process.stderr.write(`${frame} ${currentText}`);
-    frameIdx++;
-  };
-  const timer = setInterval(render, 80);
-  render();
-  const stop = () => {
-    if (stopped)
-      return;
-    stopped = true;
-    clearInterval(timer);
-    clearLine();
-  };
-  return {
-    update(newText) {
-      currentText = newText;
-    },
-    success(msg) {
-      stop();
-      process.stderr.write(`${import_picocolors6.default.green("✔")} ${msg}
-`);
-    },
-    fail(msg) {
-      stop();
-      process.stderr.write(`${import_picocolors6.default.red("✖")} ${msg}
-`);
-    },
-    stop() {
-      stop();
-    }
-  };
-}
-
 // src/commands/clean.ts
 async function handleCurrentBranchDeletion(currentBranch, baseBranch, config) {
   if (!config)
@@ -10753,44 +10911,22 @@ async function handleCurrentBranchDeletion(currentBranch, baseBranch, config) {
       warn("You have uncommitted changes in your working tree.");
     }
     if (localWork.unpushedCommits > 0) {
-      warn(`You have ${import_picocolors7.default.bold(String(localWork.unpushedCommits))} local commit${localWork.unpushedCommits !== 1 ? "s" : ""} not pushed.`);
+      warn(`You have ${import_picocolors8.default.bold(String(localWork.unpushedCommits))} local commit${localWork.unpushedCommits !== 1 ? "s" : ""} not pushed.`);
     }
     const SAVE_NEW_BRANCH = "Save changes to a new branch";
     const DISCARD = "Discard all changes and clean up";
     const CANCEL = "Skip this branch";
-    const action = await selectPrompt(`${import_picocolors7.default.bold(currentBranch)} has local changes. What would you like to do?`, [SAVE_NEW_BRANCH, DISCARD, CANCEL]);
+    const action = await selectPrompt(`${import_picocolors8.default.bold(currentBranch)} has local changes. What would you like to do?`, [SAVE_NEW_BRANCH, DISCARD, CANCEL]);
     if (action === CANCEL)
       return "skipped";
     if (action === SAVE_NEW_BRANCH) {
       if (!config)
         return "skipped";
-      info(import_picocolors7.default.dim("Tip: Describe what you're going to work on in plain English and we'll generate a branch name."));
-      const description = await inputPrompt("What are you going to work on?");
-      let newBranchName = description;
-      if (looksLikeNaturalLanguage(description)) {
-        const spinner = createSpinner("Generating branch name suggestion...");
-        const suggested = await suggestBranchName(description);
-        if (suggested) {
-          spinner.success("Branch name suggestion ready.");
-          console.log(`
-  ${import_picocolors7.default.dim("AI suggestion:")} ${import_picocolors7.default.bold(import_picocolors7.default.cyan(suggested))}`);
-          const accepted = await confirmPrompt(`Use ${import_picocolors7.default.bold(suggested)} as your branch name?`);
-          newBranchName = accepted ? suggested : await inputPrompt("Enter branch name", description);
-        } else {
-          spinner.fail("AI did not return a suggestion.");
-          newBranchName = await inputPrompt("Enter branch name", description);
-        }
-      }
-      if (!hasPrefix(newBranchName, config.branchPrefixes)) {
-        const prefix = await selectPrompt(`Choose a branch type for ${import_picocolors7.default.bold(newBranchName)}:`, config.branchPrefixes);
-        newBranchName = formatBranchName(prefix, newBranchName);
-      }
-      if (!isValidBranchName(newBranchName)) {
-        error("Invalid branch name. Use only alphanumeric characters, dots, hyphens, underscores, and slashes.");
-        return "skipped";
-      }
-      if (await branchExists(newBranchName)) {
-        error(`Branch ${import_picocolors7.default.bold(newBranchName)} already exists. Choose a different name.`);
+      const newBranchName = await promptForBranchName({
+        branchPrefixes: config.branchPrefixes,
+        useAI: isAIEnabled(config)
+      });
+      if (!newBranchName) {
         return "skipped";
       }
       const renameResult = await renameBranch(currentBranch, newBranchName);
@@ -10798,7 +10934,7 @@ async function handleCurrentBranchDeletion(currentBranch, baseBranch, config) {
         error(`Failed to rename branch: ${renameResult.stderr}`);
         return "skipped";
       }
-      success(`Renamed ${import_picocolors7.default.bold(currentBranch)} → ${import_picocolors7.default.bold(newBranchName)}`);
+      success(`Renamed ${import_picocolors8.default.bold(currentBranch)} → ${import_picocolors8.default.bold(newBranchName)}`);
       const syncSource2 = getSyncSource(config);
       await fetchRemote(syncSource2.remote);
       const savedUpstreamRef = await getUpstreamRef();
@@ -10806,10 +10942,10 @@ async function handleCurrentBranchDeletion(currentBranch, baseBranch, config) {
       if (rebaseResult.exitCode !== 0) {
         await rebaseAbort();
         warn("Rebase had conflicts — aborted to keep the repo in a clean state.");
-        info(`Your work is saved on ${import_picocolors7.default.bold(newBranchName)}. After cleanup, rebase manually:`, "");
-        info(`  ${import_picocolors7.default.bold(`git checkout ${newBranchName} && git rebase ${syncSource2.ref}`)}`, "");
+        info(`Your work is saved on ${import_picocolors8.default.bold(newBranchName)}. After cleanup, rebase manually:`, "");
+        info(`  ${import_picocolors8.default.bold(`git checkout ${newBranchName} && git rebase ${syncSource2.ref}`)}`, "");
       } else {
-        success(`Rebased ${import_picocolors7.default.bold(newBranchName)} onto ${import_picocolors7.default.bold(syncSource2.ref)}.`);
+        success(`Rebased ${import_picocolors8.default.bold(newBranchName)} onto ${import_picocolors8.default.bold(syncSource2.ref)}.`);
       }
       const coResult2 = await checkoutBranch(baseBranch);
       if (coResult2.exitCode !== 0) {
@@ -10817,12 +10953,12 @@ async function handleCurrentBranchDeletion(currentBranch, baseBranch, config) {
         return "saved";
       }
       await updateLocalBranch(baseBranch, syncSource2.ref);
-      success(`Synced ${import_picocolors7.default.bold(baseBranch)} with ${import_picocolors7.default.bold(syncSource2.ref)}.`);
+      success(`Synced ${import_picocolors8.default.bold(baseBranch)} with ${import_picocolors8.default.bold(syncSource2.ref)}.`);
       return "saved";
     }
   }
   const syncSource = getSyncSource(config);
-  info(`Switching to ${import_picocolors7.default.bold(baseBranch)} and syncing...`);
+  info(`Switching to ${import_picocolors8.default.bold(baseBranch)} and syncing...`);
   await fetchRemote(syncSource.remote);
   await resetHard("HEAD");
   const coResult = await checkoutBranch(baseBranch);
@@ -10831,7 +10967,7 @@ async function handleCurrentBranchDeletion(currentBranch, baseBranch, config) {
     return "skipped";
   }
   await updateLocalBranch(baseBranch, syncSource.ref);
-  success(`Synced ${import_picocolors7.default.bold(baseBranch)} with ${import_picocolors7.default.bold(syncSource.ref)}.`);
+  success(`Synced ${import_picocolors8.default.bold(baseBranch)} with ${import_picocolors8.default.bold(syncSource.ref)}.`);
   return "switched";
 }
 var clean_default = defineCommand({
@@ -10861,7 +10997,7 @@ var clean_default = defineCommand({
     const { origin } = config;
     const baseBranch = getBaseBranch(config);
     let currentBranch = await getCurrentBranch();
-    heading("\uD83E\uDDF9 contrib clean");
+    projectHeading("clean", "\uD83E\uDDF9");
     info(`Pruning ${origin} remote refs...`);
     const pruneResult = await pruneRemote(origin);
     if (pruneResult.exitCode === 0) {
@@ -10881,21 +11017,21 @@ var clean_default = defineCommand({
       if (ghInstalled && ghAuthed) {
         const mergedPR = await getMergedPRForBranch(currentBranch);
         if (mergedPR) {
-          warn(`PR #${mergedPR.number} (${import_picocolors7.default.bold(mergedPR.title)}) has already been merged.`);
-          info(`Link: ${import_picocolors7.default.underline(mergedPR.url)}`, "");
+          warn(`PR #${mergedPR.number} (${import_picocolors8.default.bold(mergedPR.title)}) has already been merged.`);
+          info(`Link: ${import_picocolors8.default.underline(mergedPR.url)}`, "");
           goneCandidates.push(currentBranch);
         }
       }
     }
     if (mergedCandidates.length > 0) {
       console.log(`
-${import_picocolors7.default.bold("Merged branches to delete:")}`);
+${import_picocolors8.default.bold("Merged branches to delete:")}`);
       for (const b2 of mergedCandidates) {
-        const marker = b2 === currentBranch ? import_picocolors7.default.yellow(" (current)") : "";
-        console.log(`  ${import_picocolors7.default.dim("•")} ${b2}${marker}`);
+        const marker = b2 === currentBranch ? import_picocolors8.default.yellow(" (current)") : "";
+        console.log(`  ${import_picocolors8.default.dim("•")} ${b2}${marker}`);
       }
       console.log();
-      const ok = args.yes || await confirmPrompt(`Delete ${import_picocolors7.default.bold(String(mergedCandidates.length))} merged branch${mergedCandidates.length !== 1 ? "es" : ""}?`);
+      const ok = args.yes || await confirmPrompt(`Delete ${import_picocolors8.default.bold(String(mergedCandidates.length))} merged branch${mergedCandidates.length !== 1 ? "es" : ""}?`);
       if (ok) {
         for (const branch of mergedCandidates) {
           if (branch === currentBranch) {
@@ -10912,7 +11048,7 @@ ${import_picocolors7.default.bold("Merged branches to delete:")}`);
           }
           const result = await deleteBranch(branch);
           if (result.exitCode === 0) {
-            success(`  Deleted ${import_picocolors7.default.bold(branch)}`);
+            success(`  Deleted ${import_picocolors8.default.bold(branch)}`);
           } else {
             warn(`  Failed to delete ${branch}: ${result.stderr.trim()}`);
           }
@@ -10923,13 +11059,13 @@ ${import_picocolors7.default.bold("Merged branches to delete:")}`);
     }
     if (goneCandidates.length > 0) {
       console.log(`
-${import_picocolors7.default.bold("Stale branches (remote deleted, likely squash-merged):")}`);
+${import_picocolors8.default.bold("Stale branches (remote deleted, likely squash-merged):")}`);
       for (const b2 of goneCandidates) {
-        const marker = b2 === currentBranch ? import_picocolors7.default.yellow(" (current)") : "";
-        console.log(`  ${import_picocolors7.default.dim("•")} ${b2}${marker}`);
+        const marker = b2 === currentBranch ? import_picocolors8.default.yellow(" (current)") : "";
+        console.log(`  ${import_picocolors8.default.dim("•")} ${b2}${marker}`);
       }
       console.log();
-      const ok = args.yes || await confirmPrompt(`Delete ${import_picocolors7.default.bold(String(goneCandidates.length))} stale branch${goneCandidates.length !== 1 ? "es" : ""}?`);
+      const ok = args.yes || await confirmPrompt(`Delete ${import_picocolors8.default.bold(String(goneCandidates.length))} stale branch${goneCandidates.length !== 1 ? "es" : ""}?`);
       if (ok) {
         for (const branch of goneCandidates) {
           if (branch === currentBranch) {
@@ -10946,7 +11082,7 @@ ${import_picocolors7.default.bold("Stale branches (remote deleted, likely squash
           }
           const result = await forceDeleteBranch(branch);
           if (result.exitCode === 0) {
-            success(`  Deleted ${import_picocolors7.default.bold(branch)}`);
+            success(`  Deleted ${import_picocolors8.default.bold(branch)}`);
           } else {
             warn(`  Failed to delete ${branch}: ${result.stderr.trim()}`);
           }
@@ -10961,13 +11097,13 @@ ${import_picocolors7.default.bold("Stale branches (remote deleted, likely squash
     const finalBranch = await getCurrentBranch();
     if (finalBranch && protectedBranches.has(finalBranch)) {
       console.log();
-      info(`You're on ${import_picocolors7.default.bold(finalBranch)}. Run ${import_picocolors7.default.bold("contrib start")} to begin a new feature.`);
+      info(`You're on ${import_picocolors8.default.bold(finalBranch)}. Run ${import_picocolors8.default.bold("contrib start")} to begin a new feature.`);
     }
   }
 });
 
 // src/commands/commit.ts
-var import_picocolors8 = __toESM(require_picocolors(), 1);
+var import_picocolors9 = __toESM(require_picocolors(), 1);
 
 // src/utils/convention.ts
 var CLEAN_COMMIT_PATTERN = /^(📦|🔧|🗑\uFE0F?|🔒|⚙\uFE0F?|☕|🧪|📖|🚀) (new|update|remove|security|setup|chore|test|docs|release)(!?)( \([a-zA-Z0-9][a-zA-Z0-9-]*\))?: .{1,72}$/u;
@@ -10986,17 +11122,24 @@ var CONVENTION_FORMAT_HINTS = {
   conventional: [
     "Format: <type>[!][(<scope>)]: <description>",
     "Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert",
-    "Examples: feat: add login page | fix(auth): resolve token expiry | docs: update README"
+    "Examples: feat: add login page | fix(auth): resolve token expiry | docs: update README",
+    "Do not use backticks or markdown formatting in the message."
   ],
   "clean-commit": [
     "Format: <emoji> <type>[!][(<scope>)]: <description>",
     "Types: \uD83D\uDCE6 new | \uD83D\uDD27 update | \uD83D\uDDD1️ remove | \uD83D\uDD12 security | ⚙️ setup | ☕ chore | \uD83E\uDDEA test | \uD83D\uDCD6 docs | \uD83D\uDE80 release",
-    "Examples: \uD83D\uDCE6 new: user auth | \uD83D\uDD27 update (api): improve errors | ⚙️ setup (ci): add workflow"
+    "Examples: \uD83D\uDCE6 new: user auth | \uD83D\uDD27 update (api): improve errors | ⚙️ setup (ci): add workflow",
+    "Do not use backticks or markdown formatting in the message."
   ]
 };
+function hasUnsupportedCommitMessageChars(message) {
+  return message.includes("`");
+}
 function validateCommitMessage(message, convention) {
   if (convention === "none")
     return true;
+  if (hasUnsupportedCommitMessageChars(message))
+    return false;
   if (convention === "clean-commit")
     return CLEAN_COMMIT_PATTERN.test(message);
   if (convention === "conventional")
@@ -11008,6 +11151,7 @@ function getValidationError(convention) {
     return [];
   return [
     `Commit message does not follow ${CONVENTION_LABELS[convention]} format.`,
+    "Do not use backticks or markdown formatting in commit messages.",
     ...CONVENTION_FORMAT_HINTS[convention]
   ];
 }
@@ -11045,8 +11189,13 @@ var commit_default = defineCommand({
       error("No .contributerc.json found. Run `contrib setup` first.");
       process.exit(1);
     }
-    heading("\uD83D\uDCBE contrib commit");
+    projectHeading("commit", "\uD83D\uDCBE");
+    const aiEnabled = isAIEnabled(config, args["no-ai"]);
     if (args.group) {
+      if (!aiEnabled) {
+        error("AI group commit is unavailable because AI is disabled. Re-run without --group or enable AI in .contributerc.json.");
+        process.exit(1);
+      }
       await runGroupCommit(args.model, config);
       return;
     }
@@ -11058,9 +11207,9 @@ var commit_default = defineCommand({
         process.exit(1);
       }
       console.log(`
-${import_picocolors8.default.bold("Changed files:")}`);
+${import_picocolors9.default.bold("Changed files:")}`);
       for (const f3 of changedFiles) {
-        console.log(`  ${import_picocolors8.default.dim("•")} ${f3}`);
+        console.log(`  ${import_picocolors9.default.dim("•")} ${f3}`);
       }
       const stageAction = await selectPrompt("No staged changes. How would you like to stage?", [
         "Stage all changes",
@@ -11102,8 +11251,8 @@ ${import_picocolors8.default.bold("Changed files:")}`);
       const dirs = new Set(stagedFiles.map((f3) => f3.split("/")[0]));
       if (dirs.size > 1) {
         console.log();
-        warn(`You're staging ${import_picocolors8.default.bold(String(stagedFiles.length))} files across ${import_picocolors8.default.bold(String(dirs.size))} directories in a single commit.`);
-        info(import_picocolors8.default.dim("Large commits mixing different topics make history harder to read and bisect. " + "For cleaner history, consider splitting into atomic commits."));
+        warn(`You're staging ${import_picocolors9.default.bold(String(stagedFiles.length))} files across ${import_picocolors9.default.bold(String(dirs.size))} directories in a single commit.`);
+        info(import_picocolors9.default.dim("Large commits mixing different topics make history harder to read and bisect. " + "For cleaner history, consider splitting into atomic commits."));
         const choice = await selectPrompt("How would you like to proceed?", [
           "Continue as single commit",
           "Switch to group mode (AI splits into atomic commits)",
@@ -11119,9 +11268,9 @@ ${import_picocolors8.default.bold("Changed files:")}`);
       }
     }
     let commitMessage = null;
-    const useAI = !args["no-ai"];
+    const useAI = aiEnabled;
     if (useAI) {
-      const [copilotError, diff] = await Promise.all([checkCopilotAvailable(), getStagedDiff()]);
+      const [copilotError, diff] = await Promise.all([checkCopilotAvailable2(), getStagedDiff()]);
       if (copilotError) {
         warn(`AI unavailable: ${copilotError}`);
         warn("Falling back to manual commit message entry.");
@@ -11132,7 +11281,7 @@ ${import_picocolors8.default.bold("Changed files:")}`);
         if (commitMessage) {
           spinner.success("AI commit message generated.");
           console.log(`
-  ${import_picocolors8.default.dim("AI suggestion:")} ${import_picocolors8.default.bold(import_picocolors8.default.cyan(commitMessage))}`);
+  ${import_picocolors9.default.dim("AI suggestion:")} ${import_picocolors9.default.bold(import_picocolors9.default.cyan(commitMessage))}`);
         } else {
           spinner.fail("AI did not return a commit message.");
           warn("Falling back to manual entry.");
@@ -11158,7 +11307,7 @@ ${import_picocolors8.default.bold("Changed files:")}`);
         if (regen) {
           spinner.success("Commit message regenerated.");
           console.log(`
-  ${import_picocolors8.default.dim("AI suggestion:")} ${import_picocolors8.default.bold(import_picocolors8.default.cyan(regen))}`);
+  ${import_picocolors9.default.dim("AI suggestion:")} ${import_picocolors9.default.bold(import_picocolors9.default.cyan(regen))}`);
           const ok = await confirmPrompt("Use this message?");
           finalMessage = ok ? regen : await inputPrompt("Enter commit message manually");
         } else {
@@ -11173,7 +11322,7 @@ ${import_picocolors8.default.bold("Changed files:")}`);
       if (convention2 !== "none") {
         console.log();
         for (const hint of CONVENTION_FORMAT_HINTS[convention2]) {
-          console.log(import_picocolors8.default.dim(hint));
+          console.log(import_picocolors9.default.dim(hint));
         }
         console.log();
       }
@@ -11197,12 +11346,21 @@ ${import_picocolors8.default.bold("Changed files:")}`);
       error(`Failed to commit: ${result.stderr}`);
       process.exit(1);
     }
-    success(`Committed: ${import_picocolors8.default.bold(finalMessage)}`);
+    success(`Committed: ${import_picocolors9.default.bold(finalMessage)}`);
   }
 });
+function getFallbackGroupMessage(convention) {
+  if (convention === "conventional") {
+    return "chore: commit remaining changes";
+  }
+  if (convention === "clean-commit") {
+    return "☕ chore: commit remaining changes";
+  }
+  return "commit remaining changes";
+}
 async function runGroupCommit(model, config) {
   const [copilotError, changedFiles] = await Promise.all([
-    checkCopilotAvailable(),
+    checkCopilotAvailable2(),
     getChangedFiles()
   ]);
   if (copilotError) {
@@ -11214,9 +11372,9 @@ async function runGroupCommit(model, config) {
     process.exit(1);
   }
   console.log(`
-${import_picocolors8.default.bold("Changed files:")}`);
+${import_picocolors9.default.bold("Changed files:")}`);
   for (const f3 of changedFiles) {
-    console.log(`  ${import_picocolors8.default.dim("•")} ${f3}`);
+    console.log(`  ${import_picocolors9.default.dim("•")} ${f3}`);
   }
   const spinner = createSpinner(changedFiles.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD ? `Asking AI to group ${changedFiles.length} file(s) into logical commits (using optimized batching)...` : `Asking AI to group ${changedFiles.length} file(s) into logical commits...`);
   const diffs = await getFullDiffForFiles(changedFiles);
@@ -11237,15 +11395,25 @@ ${import_picocolors8.default.bold("Changed files:")}`);
     error("AI could not produce commit groups. Try committing files manually.");
     process.exit(1);
   }
-  const changedSet = new Set(changedFiles);
-  for (const group of groups) {
-    const invalid = group.files.filter((f3) => !changedSet.has(f3));
-    if (invalid.length > 0) {
-      warn(`AI suggested unknown file(s): ${invalid.join(", ")} — removed from group.`);
-    }
-    group.files = group.files.filter((f3) => changedSet.has(f3));
+  const normalized = normalizeCommitGroups(changedFiles, groups);
+  if (normalized.unknownFiles.length > 0) {
+    warn(`AI suggested unknown file(s): ${normalized.unknownFiles.join(", ")} — removed from groups.`);
+  }
+  if (normalized.duplicateFiles.length > 0) {
+    warn(`AI assigned duplicate file(s) across groups: ${normalized.duplicateFiles.join(", ")} — keeping the first assignment only.`);
+  }
+  let validGroups = normalized.groups;
+  if (normalized.unassignedFiles.length > 0) {
+    warn(`AI left ${normalized.unassignedFiles.length} file(s) ungrouped: ${normalized.unassignedFiles.join(", ")}. Creating a fallback group.`);
+    const fallbackMessage = await regenerateGroupMessage(normalized.unassignedFiles, diffs, model, config.commitConvention) ?? getFallbackGroupMessage(config.commitConvention);
+    validGroups = [
+      ...validGroups,
+      {
+        files: normalized.unassignedFiles,
+        message: fallbackMessage
+      }
+    ];
   }
-  let validGroups = groups.filter((g3) => g3.files.length > 0);
   if (validGroups.length === 0) {
     error("No valid groups remain after validation. Try committing files manually.");
     process.exit(1);
@@ -11254,13 +11422,13 @@ ${import_picocolors8.default.bold("Changed files:")}`);
   let commitAll = false;
   while (!proceedToCommit) {
     console.log(`
-${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit group(s):`)}
+${import_picocolors9.default.bold(`AI suggested ${validGroups.length} commit group(s):`)}
 `);
     for (let i2 = 0;i2 < validGroups.length; i2++) {
       const g3 = validGroups[i2];
-      console.log(`  ${import_picocolors8.default.cyan(`Group ${i2 + 1}:`)} ${import_picocolors8.default.bold(g3.message)}`);
+      console.log(`  ${import_picocolors9.default.cyan(`Group ${i2 + 1}:`)} ${import_picocolors9.default.bold(g3.message)}`);
       for (const f3 of g3.files) {
-        console.log(`    ${import_picocolors8.default.dim("•")} ${f3}`);
+        console.log(`    ${import_picocolors9.default.dim("•")} ${f3}`);
       }
       console.log();
     }
@@ -11291,7 +11459,17 @@ ${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit gro
   if (commitAll) {
     for (let i2 = 0;i2 < validGroups.length; i2++) {
       const group = validGroups[i2];
-      const stageResult = await stageFiles(group.files);
+      const remainingChangedFiles = new Set(await getChangedFiles());
+      const stageableFiles = group.files.filter((file) => remainingChangedFiles.has(file));
+      const skippedFiles = group.files.filter((file) => !remainingChangedFiles.has(file));
+      if (skippedFiles.length > 0) {
+        warn(`Group ${i2 + 1} file(s) no longer have changes: ${skippedFiles.join(", ")}`);
+      }
+      if (stageableFiles.length === 0) {
+        warn(`Skipped group ${i2 + 1}: no files remain to commit.`);
+        continue;
+      }
+      const stageResult = await stageFiles(stageableFiles);
       if (stageResult.exitCode !== 0) {
         error(`Failed to stage group ${i2 + 1}: ${stageResult.stderr}`);
         continue;
@@ -11300,20 +11478,20 @@ ${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit gro
       if (commitResult.exitCode !== 0) {
         const detail = (commitResult.stderr || commitResult.stdout).trim();
         error(`Failed to commit group ${i2 + 1}: ${detail}`);
-        await unstageFiles(group.files);
+        await unstageFiles(stageableFiles);
         continue;
       }
       committed++;
-      success(`Committed group ${i2 + 1}: ${import_picocolors8.default.bold(group.message)}`);
+      success(`Committed group ${i2 + 1}: ${import_picocolors9.default.bold(group.message)}`);
     }
   } else {
     for (let i2 = 0;i2 < validGroups.length; i2++) {
       const group = validGroups[i2];
-      console.log(import_picocolors8.default.bold(`
+      console.log(import_picocolors9.default.bold(`
 ── Group ${i2 + 1}/${validGroups.length} ──`));
-      console.log(`  ${import_picocolors8.default.cyan(group.message)}`);
+      console.log(`  ${import_picocolors9.default.cyan(group.message)}`);
       for (const f3 of group.files) {
-        console.log(`  ${import_picocolors8.default.dim("•")} ${f3}`);
+        console.log(`  ${import_picocolors9.default.dim("•")} ${f3}`);
       }
       let message = group.message;
       let actionDone = false;
@@ -11335,7 +11513,7 @@ ${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit gro
           if (newMsg) {
             message = newMsg;
             group.message = newMsg;
-            regenSpinner.success(`New message: ${import_picocolors8.default.bold(message)}`);
+            regenSpinner.success(`New message: ${import_picocolors9.default.bold(message)}`);
           } else {
             regenSpinner.fail("AI could not generate a new message. Keeping current one.");
           }
@@ -11360,7 +11538,18 @@ ${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit gro
             continue;
           }
         }
-        const stageResult = await stageFiles(group.files);
+        const remainingChangedFiles = new Set(await getChangedFiles());
+        const stageableFiles = group.files.filter((file) => remainingChangedFiles.has(file));
+        const skippedFiles = group.files.filter((file) => !remainingChangedFiles.has(file));
+        if (skippedFiles.length > 0) {
+          warn(`Group ${i2 + 1} file(s) no longer have changes: ${skippedFiles.join(", ")}`);
+        }
+        if (stageableFiles.length === 0) {
+          warn(`Skipped group ${i2 + 1}: no files remain to commit.`);
+          actionDone = true;
+          continue;
+        }
+        const stageResult = await stageFiles(stageableFiles);
         if (stageResult.exitCode !== 0) {
           error(`Failed to stage group ${i2 + 1}: ${stageResult.stderr}`);
           actionDone = true;
@@ -11370,12 +11559,12 @@ ${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit gro
         if (commitResult.exitCode !== 0) {
           const detail = (commitResult.stderr || commitResult.stdout).trim();
           error(`Failed to commit group ${i2 + 1}: ${detail}`);
-          await unstageFiles(group.files);
+          await unstageFiles(stageableFiles);
           actionDone = true;
           continue;
         }
         committed++;
-        success(`Committed group ${i2 + 1}: ${import_picocolors8.default.bold(message)}`);
+        success(`Committed group ${i2 + 1}: ${import_picocolors9.default.bold(message)}`);
         actionDone = true;
       }
     }
@@ -11391,11 +11580,11 @@ ${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit gro
 
 // src/commands/doctor.ts
 import { execFile as execFileCb3 } from "node:child_process";
-var import_picocolors9 = __toESM(require_picocolors(), 1);
+var import_picocolors10 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.6.2-dev.38e14f5",
+  version: "0.6.2-dev.967437a",
   description: "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   type: "module",
   bin: {
@@ -11486,16 +11675,16 @@ async function getRepoInfoFromRemote(remote = "origin") {
 }
 
 // src/commands/doctor.ts
-var PASS = `  ${import_picocolors9.default.green("✔")} `;
-var FAIL = `  ${import_picocolors9.default.red("✗")} `;
-var WARN = `  ${import_picocolors9.default.yellow("⚠")} `;
+var PASS = `  ${import_picocolors10.default.green("✔")} `;
+var FAIL = `  ${import_picocolors10.default.red("✗")} `;
+var WARN = `  ${import_picocolors10.default.yellow("⚠")} `;
 function printReport(report) {
   for (const section of report.sections) {
     console.log(`
-  ${import_picocolors9.default.bold(import_picocolors9.default.underline(section.title))}`);
+  ${import_picocolors10.default.bold(import_picocolors10.default.underline(section.title))}`);
     for (const check of section.checks) {
       const prefix = check.ok ? check.warning ? WARN : PASS : FAIL;
-      const text = check.detail ? `${check.label} ${import_picocolors9.default.dim(`— ${check.detail}`)}` : check.label;
+      const text = check.detail ? `${check.label} ${import_picocolors10.default.dim(`— ${check.detail}`)}` : check.label;
       console.log(`${prefix}${text}`);
     }
   }
@@ -11758,20 +11947,20 @@ var doctor_default = defineCommand({
       console.log(toJson(report));
       return;
     }
-    heading("\uD83E\uDE7A contribute-now doctor");
+    projectHeading("doctor", "\uD83E\uDE7A");
     printReport(report);
     const total = report.sections.flatMap((s2) => s2.checks);
     const failures = total.filter((c3) => !c3.ok);
     const warnings = total.filter((c3) => c3.ok && c3.warning);
     if (failures.length === 0 && warnings.length === 0) {
-      console.log(`  ${import_picocolors9.default.green("All checks passed!")} No issues detected.
+      console.log(`  ${import_picocolors10.default.green("All checks passed!")} No issues detected.
 `);
     } else {
       if (failures.length > 0) {
-        console.log(`  ${import_picocolors9.default.red(`${failures.length} issue${failures.length !== 1 ? "s" : ""} found.`)}`);
+        console.log(`  ${import_picocolors10.default.red(`${failures.length} issue${failures.length !== 1 ? "s" : ""} found.`)}`);
       }
       if (warnings.length > 0) {
-        console.log(`  ${import_picocolors9.default.yellow(`${warnings.length} warning${warnings.length !== 1 ? "s" : ""}.`)}`);
+        console.log(`  ${import_picocolors10.default.yellow(`${warnings.length} warning${warnings.length !== 1 ? "s" : ""}.`)}`);
       }
       console.log();
     }
@@ -11781,7 +11970,7 @@ var doctor_default = defineCommand({
 // src/commands/hook.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync3, rmSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { join as join4 } from "node:path";
-var import_picocolors10 = __toESM(require_picocolors(), 1);
+var import_picocolors11 = __toESM(require_picocolors(), 1);
 var HOOK_MARKER = "# managed by contribute-now";
 function getHooksDir(cwd = process.cwd()) {
   return join4(cwd, ".git", "hooks");
@@ -11806,13 +11995,13 @@ esac
 
 # Detect available package runner
 if command -v contrib >/dev/null 2>&1; then
-  contrib validate "$commit_msg"
+  contrib validate --file "$commit_msg_file"
 elif command -v bunx >/dev/null 2>&1; then
-  bunx contrib validate "$commit_msg"
+  bunx contrib validate --file "$commit_msg_file"
 elif command -v pnpx >/dev/null 2>&1; then
-  pnpx contrib validate "$commit_msg"
+  pnpx contrib validate --file "$commit_msg_file"
 elif command -v npx >/dev/null 2>&1; then
-  npx contrib validate "$commit_msg"
+  npx contrib validate --file "$commit_msg_file"
 else
   echo "Warning: No package runner found. Skipping commit message validation."
   exit 0
@@ -11849,7 +12038,7 @@ var hook_default = defineCommand({
   }
 });
 async function installHook() {
-  heading("\uD83E\uDE9D hook install");
+  projectHeading("hook install", "\uD83E\uDE9D");
   const config = readConfig();
   if (!config) {
     error("No .contributerc.json found. Run `contrib setup` first.");
@@ -11877,12 +12066,12 @@ async function installHook() {
   }
   writeFileSync3(hookPath, generateHookScript(), { mode: 493 });
   success(`commit-msg hook installed.`);
-  info(`Convention: ${import_picocolors10.default.bold(CONVENTION_LABELS[config.commitConvention])}`, "");
-  info(`Path: ${import_picocolors10.default.dim(hookPath)}`, "");
+  info(`Convention: ${import_picocolors11.default.bold(CONVENTION_LABELS[config.commitConvention])}`, "");
+  info(`Path: ${import_picocolors11.default.dim(hookPath)}`, "");
   warn("Note: hooks can be bypassed with `git commit --no-verify`.");
 }
 async function uninstallHook() {
-  heading("\uD83E\uDE9D hook uninstall");
+  projectHeading("hook uninstall", "\uD83E\uDE9D");
   const hookPath = getHookPath();
   if (!existsSync4(hookPath)) {
     info("No commit-msg hook found. Nothing to uninstall.");
@@ -11898,7 +12087,7 @@ async function uninstallHook() {
 }
 
 // src/commands/log.ts
-var import_picocolors11 = __toESM(require_picocolors(), 1);
+var import_picocolors12 = __toESM(require_picocolors(), 1);
 var log_default = defineCommand({
   meta: {
     name: "log",
@@ -11968,14 +12157,14 @@ var log_default = defineCommand({
         usingFallback = true;
       }
     }
-    heading("\uD83D\uDCDC commit log");
+    projectHeading("log", "\uD83D\uDCDC");
     printModeHeader(mode, currentBranch, compareRef, usingFallback);
     if (mode === "local" || mode === "remote") {
       if (!compareRef) {
         console.log();
-        console.log(import_picocolors11.default.yellow("  ⚠ Could not determine a comparison branch."));
-        console.log(import_picocolors11.default.dim("    No upstream tracking set and no remote base branch found."));
-        console.log(import_picocolors11.default.dim(`    Use ${import_picocolors11.default.bold("contrib log --full")} to see the full commit history instead.`));
+        console.log(import_picocolors12.default.yellow("  ⚠ Could not determine a comparison branch."));
+        console.log(import_picocolors12.default.dim("    No upstream tracking set and no remote base branch found."));
+        console.log(import_picocolors12.default.dim(`    Use ${import_picocolors12.default.bold("contrib log --full")} to see the full commit history instead.`));
         console.log();
         printGuidance();
         return;
@@ -12017,26 +12206,26 @@ async function resolveBaseBranchRef(config) {
 }
 function printModeHeader(mode, currentBranch, compareRef, usingFallback = false) {
   const branch = currentBranch ?? "HEAD";
-  const fallbackNote = usingFallback ? import_picocolors11.default.yellow(" (no upstream — comparing against base branch)") : "";
+  const fallbackNote = usingFallback ? import_picocolors12.default.yellow(" (no upstream — comparing against base branch)") : "";
   console.log();
   switch (mode) {
     case "local":
-      console.log(import_picocolors11.default.dim(`  mode: ${import_picocolors11.default.bold("local")} — unpushed commits on ${import_picocolors11.default.bold(branch)}`) + fallbackNote);
+      console.log(import_picocolors12.default.dim(`  mode: ${import_picocolors12.default.bold("local")} — unpushed commits on ${import_picocolors12.default.bold(branch)}`) + fallbackNote);
       if (compareRef) {
-        console.log(import_picocolors11.default.dim(`  comparing: ${import_picocolors11.default.bold(compareRef)} ➜ ${import_picocolors11.default.bold("HEAD")}`));
+        console.log(import_picocolors12.default.dim(`  comparing: ${import_picocolors12.default.bold(compareRef)} ➜ ${import_picocolors12.default.bold("HEAD")}`));
       }
       break;
     case "remote":
-      console.log(import_picocolors11.default.dim(`  mode: ${import_picocolors11.default.bold("remote")} — commits on remote not yet pulled into ${import_picocolors11.default.bold(branch)}`) + fallbackNote);
+      console.log(import_picocolors12.default.dim(`  mode: ${import_picocolors12.default.bold("remote")} — commits on remote not yet pulled into ${import_picocolors12.default.bold(branch)}`) + fallbackNote);
       if (compareRef) {
-        console.log(import_picocolors11.default.dim(`  comparing: ${import_picocolors11.default.bold("HEAD")} ➜ ${import_picocolors11.default.bold(compareRef)}`));
+        console.log(import_picocolors12.default.dim(`  comparing: ${import_picocolors12.default.bold("HEAD")} ➜ ${import_picocolors12.default.bold(compareRef)}`));
       }
       break;
     case "full":
-      console.log(import_picocolors11.default.dim(`  mode: ${import_picocolors11.default.bold("full")} — complete commit history for ${import_picocolors11.default.bold(branch)}`));
+      console.log(import_picocolors12.default.dim(`  mode: ${import_picocolors12.default.bold("full")} — complete commit history for ${import_picocolors12.default.bold(branch)}`));
       break;
     case "all":
-      console.log(import_picocolors11.default.dim(`  mode: ${import_picocolors11.default.bold("all")} — commits across all branches`));
+      console.log(import_picocolors12.default.dim(`  mode: ${import_picocolors12.default.bold("all")} — commits across all branches`));
       break;
   }
 }
@@ -12062,7 +12251,7 @@ async function renderScopedLog(options) {
     }
     console.log();
     for (const entry of entries) {
-      const hashStr = import_picocolors11.default.yellow(entry.hash);
+      const hashStr = import_picocolors12.default.yellow(entry.hash);
       const refsStr = entry.refs ? ` ${colorizeRefs(entry.refs, protectedBranches, currentBranch)}` : "";
       const subjectStr = colorizeSubject(entry.subject);
       console.log(`  ${hashStr}${refsStr} ${subjectStr}`);
@@ -12073,9 +12262,9 @@ async function renderScopedLog(options) {
 function printEmptyState(mode) {
   console.log();
   if (mode === "local") {
-    console.log(import_picocolors11.default.dim("  No local unpushed commits — you're up to date with remote!"));
+    console.log(import_picocolors12.default.dim("  No local unpushed commits — you're up to date with remote!"));
   } else {
-    console.log(import_picocolors11.default.dim("  No remote-only commits — your local branch is up to date!"));
+    console.log(import_picocolors12.default.dim("  No remote-only commits — your local branch is up to date!"));
   }
   console.log();
 }
@@ -12084,7 +12273,7 @@ async function renderFullLog(options) {
   if (showGraph) {
     const lines = await getLogGraph({ count, all, branch: targetBranch });
     if (lines.length === 0) {
-      console.log(import_picocolors11.default.dim("  No commits found."));
+      console.log(import_picocolors12.default.dim("  No commits found."));
       console.log();
       return false;
     }
@@ -12095,13 +12284,13 @@ async function renderFullLog(options) {
   } else {
     const entries = await getLogEntries({ count, all, branch: targetBranch });
     if (entries.length === 0) {
-      console.log(import_picocolors11.default.dim("  No commits found."));
+      console.log(import_picocolors12.default.dim("  No commits found."));
       console.log();
       return false;
     }
     console.log();
     for (const entry of entries) {
-      const hashStr = import_picocolors11.default.yellow(entry.hash);
+      const hashStr = import_picocolors12.default.yellow(entry.hash);
       const refsStr = entry.refs ? ` ${colorizeRefs(entry.refs, protectedBranches, currentBranch)}` : "";
       const subjectStr = colorizeSubject(entry.subject);
       console.log(`  ${hashStr}${refsStr} ${subjectStr}`);
@@ -12113,42 +12302,42 @@ function printFooter(mode, count, targetBranch) {
   console.log();
   switch (mode) {
     case "local":
-      console.log(import_picocolors11.default.dim(`  Showing up to ${count} unpushed commits`));
+      console.log(import_picocolors12.default.dim(`  Showing up to ${count} unpushed commits`));
       break;
     case "remote":
-      console.log(import_picocolors11.default.dim(`  Showing up to ${count} remote-only commits`));
+      console.log(import_picocolors12.default.dim(`  Showing up to ${count} remote-only commits`));
       break;
     case "full":
-      console.log(import_picocolors11.default.dim(`  Showing ${count} most recent commits${targetBranch ? ` (${targetBranch})` : ""}`));
+      console.log(import_picocolors12.default.dim(`  Showing ${count} most recent commits${targetBranch ? ` (${targetBranch})` : ""}`));
       break;
     case "all":
-      console.log(import_picocolors11.default.dim(`  Showing ${count} most recent commits (all branches)`));
+      console.log(import_picocolors12.default.dim(`  Showing ${count} most recent commits (all branches)`));
       break;
   }
 }
 function printGuidance() {
   console.log();
-  console.log(import_picocolors11.default.dim("  ─── quick guide ───"));
-  console.log(import_picocolors11.default.dim(`  ${import_picocolors11.default.bold("contrib log")}            local unpushed commits (default)`));
-  console.log(import_picocolors11.default.dim(`  ${import_picocolors11.default.bold("contrib log --remote")}   commits on remote not yet pulled`));
-  console.log(import_picocolors11.default.dim(`  ${import_picocolors11.default.bold("contrib log --full")}     full history for the current branch`));
-  console.log(import_picocolors11.default.dim(`  ${import_picocolors11.default.bold("contrib log --all")}      commits across all branches`));
-  console.log(import_picocolors11.default.dim(`  ${import_picocolors11.default.bold("contrib log -n 50")}      change the commit limit (default: 20)`));
-  console.log(import_picocolors11.default.dim(`  ${import_picocolors11.default.bold("contrib log -b dev")}     view log for a specific branch`));
-  console.log(import_picocolors11.default.dim(`  ${import_picocolors11.default.bold("contrib log --no-graph")} flat list without graph lines`));
+  console.log(import_picocolors12.default.dim("  ─── quick guide ───"));
+  console.log(import_picocolors12.default.dim(`  ${import_picocolors12.default.bold("contrib log")}            local unpushed commits (default)`));
+  console.log(import_picocolors12.default.dim(`  ${import_picocolors12.default.bold("contrib log --remote")}   commits on remote not yet pulled`));
+  console.log(import_picocolors12.default.dim(`  ${import_picocolors12.default.bold("contrib log --full")}     full history for the current branch`));
+  console.log(import_picocolors12.default.dim(`  ${import_picocolors12.default.bold("contrib log --all")}      commits across all branches`));
+  console.log(import_picocolors12.default.dim(`  ${import_picocolors12.default.bold("contrib log -n 50")}      change the commit limit (default: 20)`));
+  console.log(import_picocolors12.default.dim(`  ${import_picocolors12.default.bold("contrib log -b dev")}     view log for a specific branch`));
+  console.log(import_picocolors12.default.dim(`  ${import_picocolors12.default.bold("contrib log --no-graph")} flat list without graph lines`));
   console.log();
 }
 function colorizeGraphLine(line, protectedBranches, currentBranch) {
   const match = line.match(/^([|/\\*\s_.-]*)([a-f0-9]{7,12})(\s+\(([^)]+)\))?\s*(.*)/);
   if (!match) {
-    return import_picocolors11.default.cyan(line);
+    return import_picocolors12.default.cyan(line);
   }
   const [, graphPart = "", hash, , refs, subject = ""] = match;
   const parts = [];
   if (graphPart) {
     parts.push(colorizeGraphChars(graphPart));
   }
-  parts.push(import_picocolors11.default.yellow(hash));
+  parts.push(import_picocolors12.default.yellow(hash));
   if (refs) {
     parts.push(` (${colorizeRefs(refs, protectedBranches, currentBranch)})`);
   }
@@ -12159,15 +12348,15 @@ function colorizeGraphChars(graphPart) {
   return graphPart.split("").map((ch) => {
     switch (ch) {
       case "*":
-        return import_picocolors11.default.green(ch);
+        return import_picocolors12.default.green(ch);
       case "|":
-        return import_picocolors11.default.cyan(ch);
+        return import_picocolors12.default.cyan(ch);
       case "/":
       case "\\":
-        return import_picocolors11.default.cyan(ch);
+        return import_picocolors12.default.cyan(ch);
       case "-":
       case "_":
-        return import_picocolors11.default.cyan(ch);
+        return import_picocolors12.default.cyan(ch);
       default:
         return ch;
     }
@@ -12179,45 +12368,45 @@ function colorizeRefs(refs, protectedBranches, currentBranch) {
     if (trimmed.startsWith("HEAD ->") || trimmed === "HEAD") {
       const branchName = trimmed.replace("HEAD -> ", "");
       if (trimmed === "HEAD") {
-        return import_picocolors11.default.bold(import_picocolors11.default.cyan("HEAD"));
+        return import_picocolors12.default.bold(import_picocolors12.default.cyan("HEAD"));
       }
-      return `${import_picocolors11.default.bold(import_picocolors11.default.cyan("HEAD"))} ${import_picocolors11.default.dim("->")} ${colorizeRefName(branchName, protectedBranches, currentBranch)}`;
+      return `${import_picocolors12.default.bold(import_picocolors12.default.cyan("HEAD"))} ${import_picocolors12.default.dim("->")} ${colorizeRefName(branchName, protectedBranches, currentBranch)}`;
     }
     if (trimmed.startsWith("tag:")) {
-      return import_picocolors11.default.bold(import_picocolors11.default.magenta(trimmed));
+      return import_picocolors12.default.bold(import_picocolors12.default.magenta(trimmed));
     }
     return colorizeRefName(trimmed, protectedBranches, currentBranch);
-  }).join(import_picocolors11.default.dim(", "));
+  }).join(import_picocolors12.default.dim(", "));
 }
 function colorizeRefName(name, protectedBranches, currentBranch) {
   const isRemote = name.includes("/");
   const localName = isRemote ? name.split("/").slice(1).join("/") : name;
   if (protectedBranches.includes(localName)) {
-    return isRemote ? import_picocolors11.default.bold(import_picocolors11.default.red(name)) : import_picocolors11.default.bold(import_picocolors11.default.red(name));
+    return isRemote ? import_picocolors12.default.bold(import_picocolors12.default.red(name)) : import_picocolors12.default.bold(import_picocolors12.default.red(name));
   }
   if (localName === currentBranch) {
-    return import_picocolors11.default.bold(import_picocolors11.default.green(name));
+    return import_picocolors12.default.bold(import_picocolors12.default.green(name));
   }
   if (isRemote) {
-    return import_picocolors11.default.blue(name);
+    return import_picocolors12.default.blue(name);
   }
-  return import_picocolors11.default.green(name);
+  return import_picocolors12.default.green(name);
 }
 function colorizeSubject(subject) {
   const emojiMatch = subject.match(/^((?:\p{Emoji_Presentation}|\p{Emoji}\uFE0F)+\s*)/u);
   if (emojiMatch) {
     const emoji = emojiMatch[1];
     const rest = subject.slice(emoji.length);
-    return `${emoji}${import_picocolors11.default.white(rest)}`;
+    return `${emoji}${import_picocolors12.default.white(rest)}`;
   }
   if (subject.startsWith("Merge ")) {
-    return import_picocolors11.default.dim(subject);
+    return import_picocolors12.default.dim(subject);
   }
-  return import_picocolors11.default.white(subject);
+  return import_picocolors12.default.white(subject);
 }
 
 // src/commands/save.ts
-var import_picocolors12 = __toESM(require_picocolors(), 1);
+var import_picocolors13 = __toESM(require_picocolors(), 1);
 import { execFile as execFileCb4 } from "node:child_process";
 function gitRun(args) {
   return new Promise((resolve2) => {
@@ -12279,7 +12468,7 @@ var save_default = defineCommand({
   }
 });
 async function handleSave(message) {
-  heading("\uD83D\uDCBE contrib save");
+  projectHeading("save", "\uD83D\uDCBE");
   const currentBranch = await getCurrentBranch();
   const label = message ?? `work-in-progress on ${currentBranch ?? "unknown"}`;
   const stashMsg = `contrib-save: ${label}`;
@@ -12292,11 +12481,11 @@ async function handleSave(message) {
     info("No uncommitted changes to save.");
     return;
   }
-  success(`Saved: ${import_picocolors12.default.dim(label)}`);
-  info(`Use ${import_picocolors12.default.bold("contrib save --restore")} to bring them back.`, "");
+  success(`Saved: ${import_picocolors13.default.dim(label)}`);
+  info(`Use ${import_picocolors13.default.bold("contrib save --restore")} to bring them back.`, "");
 }
 async function handleRestore() {
-  heading("\uD83D\uDCBE contrib save --restore");
+  projectHeading("save --restore", "\uD83D\uDCBE");
   const stashes = await getStashList();
   if (stashes.length === 0) {
     info("No saved changes found.");
@@ -12309,7 +12498,7 @@ async function handleRestore() {
       warn("You may have conflicts. Resolve them and run `git stash drop` when done.");
       process.exit(1);
     }
-    success(`Restored: ${import_picocolors12.default.dim(stashes[0].message)}`);
+    success(`Restored: ${import_picocolors13.default.dim(stashes[0].message)}`);
     return;
   }
   const choices = stashes.map((s2) => `${s2.index}  ${s2.message}`);
@@ -12322,10 +12511,10 @@ async function handleRestore() {
     process.exit(1);
   }
   const match = stashes.find((s2) => String(s2.index) === idx);
-  success(`Restored: ${import_picocolors12.default.dim(match?.message ?? "saved changes")}`);
+  success(`Restored: ${import_picocolors13.default.dim(match?.message ?? "saved changes")}`);
 }
 async function handleList() {
-  heading("\uD83D\uDCBE contrib save --list");
+  projectHeading("save --list", "\uD83D\uDCBE");
   const stashes = await getStashList();
   if (stashes.length === 0) {
     info("No saved changes.");
@@ -12333,16 +12522,16 @@ async function handleList() {
   }
   console.log();
   for (const s2 of stashes) {
-    const idx = import_picocolors12.default.dim(`[${s2.index}]`);
+    const idx = import_picocolors13.default.dim(`[${s2.index}]`);
     const msg = s2.message;
     console.log(`  ${idx}  ${msg}`);
   }
   console.log();
-  info(`Use ${import_picocolors12.default.bold("contrib save --restore")} to bring changes back.`, "");
-  info(`Use ${import_picocolors12.default.bold("contrib save --drop")} to discard saved changes.`, "");
+  info(`Use ${import_picocolors13.default.bold("contrib save --restore")} to bring changes back.`, "");
+  info(`Use ${import_picocolors13.default.bold("contrib save --drop")} to discard saved changes.`, "");
 }
 async function handleDrop() {
-  heading("\uD83D\uDCBE contrib save --drop");
+  projectHeading("save --drop", "\uD83D\uDCBE");
   const stashes = await getStashList();
   if (stashes.length === 0) {
     info("No saved changes to drop.");
@@ -12357,7 +12546,7 @@ async function handleDrop() {
     process.exit(1);
   }
   const match = stashes.find((s2) => String(s2.index) === idx);
-  success(`Dropped: ${import_picocolors12.default.dim(match?.message ?? "saved changes")}`);
+  success(`Dropped: ${import_picocolors13.default.dim(match?.message ?? "saved changes")}`);
 }
 async function getStashList() {
   const result = await gitRun(["stash", "list"]);
@@ -12374,7 +12563,7 @@ async function getStashList() {
 }
 
 // src/commands/setup.ts
-var import_picocolors13 = __toESM(require_picocolors(), 1);
+var import_picocolors14 = __toESM(require_picocolors(), 1);
 async function shouldContinueSetupWithExistingConfig(options) {
   const {
     existingConfig,
@@ -12422,7 +12611,7 @@ var setup_default = defineCommand({
       error("Not inside a git repository. Run this command from within a git repo.");
       process.exit(1);
     }
-    heading("\uD83D\uDD27 contribute-now setup");
+    projectHeading("setup", "\uD83D\uDD27");
     const existingConfig = readConfig();
     const shouldContinue = await shouldContinueSetupWithExistingConfig({
       existingConfig,
@@ -12447,7 +12636,7 @@ var setup_default = defineCommand({
       workflow = "github-flow";
     else if (workflowChoice.startsWith("Git Flow"))
       workflow = "git-flow";
-    info(`Workflow: ${import_picocolors13.default.bold(WORKFLOW_DESCRIPTIONS[workflow])}`);
+    info(`Workflow: ${import_picocolors14.default.bold(WORKFLOW_DESCRIPTIONS[workflow])}`);
     const conventionChoice = await selectPrompt("Which commit convention should this project use?", [
       `${CONVENTION_DESCRIPTIONS["clean-commit"]} (recommended)`,
       CONVENTION_DESCRIPTIONS.conventional,
@@ -12458,6 +12647,7 @@ var setup_default = defineCommand({
       commitConvention = "conventional";
     else if (conventionChoice.includes("No commit"))
       commitConvention = "none";
+    const enableAI = await confirmPrompt("Enable AI-assisted features like commit messages, branch naming, PR text, and conflict guidance?");
     const remotes = await getRemotes();
     if (remotes.length === 0) {
       error("No git remotes found. Add a remote first (e.g., git remote add origin <url>).");
@@ -12511,15 +12701,15 @@ var setup_default = defineCommand({
       detectedRole = roleChoice;
       detectionSource = "user selection";
     } else {
-      info(`Detected role: ${import_picocolors13.default.bold(detectedRole)} (via ${detectionSource})`);
-      const confirmed = await confirmPrompt(`Role detected as ${import_picocolors13.default.bold(detectedRole)}. Is this correct?`);
+      info(`Detected role: ${import_picocolors14.default.bold(detectedRole)} (via ${detectionSource})`);
+      const confirmed = await confirmPrompt(`Role detected as ${import_picocolors14.default.bold(detectedRole)}. Is this correct?`);
       if (!confirmed) {
         const roleChoice = await selectPrompt("Select your role:", ["maintainer", "contributor"]);
         detectedRole = roleChoice;
       }
     }
     const defaultConfig = getDefaultConfig();
-    info(import_picocolors13.default.dim("Tip: press Enter to keep the default branch name shown in each prompt."));
+    info(import_picocolors14.default.dim("Tip: press Enter to keep the default branch name shown in each prompt."));
     const mainBranchDefault = defaultConfig.mainBranch;
     const mainBranch = await inputPrompt(`Main branch name (default: ${mainBranchDefault} — press Enter to keep)`, mainBranchDefault);
     let devBranch;
@@ -12545,7 +12735,7 @@ var setup_default = defineCommand({
             error("Setup cannot continue without the upstream remote for contributors.");
             process.exit(1);
           }
-          success(`Added remote ${import_picocolors13.default.bold(upstreamRemote)} → ${upstreamUrl}`);
+          success(`Added remote ${import_picocolors14.default.bold(upstreamRemote)} → ${upstreamUrl}`);
         } else {
           error("An upstream remote URL is required for contributors.");
           info("Add it manually: git remote add upstream <url>", "");
@@ -12561,22 +12751,23 @@ var setup_default = defineCommand({
       upstream: upstreamRemote,
       origin: originRemote,
       branchPrefixes: defaultConfig.branchPrefixes,
-      commitConvention
+      commitConvention,
+      aiEnabled: enableAI
     };
     writeConfig(config);
     success(`Config written to .contributerc.json`);
     const syncRemote = config.role === "contributor" ? config.upstream : config.origin;
-    info(`Fetching ${import_picocolors13.default.bold(syncRemote)} to verify branch configuration...`, "");
+    info(`Fetching ${import_picocolors14.default.bold(syncRemote)} to verify branch configuration...`, "");
     await fetchRemote(syncRemote);
     const mainRef = `${syncRemote}/${config.mainBranch}`;
     if (!await refExists(mainRef)) {
-      warn(`Main branch ref ${import_picocolors13.default.bold(mainRef)} not found on remote.`);
+      warn(`Main branch ref ${import_picocolors14.default.bold(mainRef)} not found on remote.`);
       warn("Config was saved — verify the branch name and re-run setup if needed.");
     }
     if (config.devBranch) {
       const devRef = `${syncRemote}/${config.devBranch}`;
       if (!await refExists(devRef)) {
-        warn(`Dev branch ref ${import_picocolors13.default.bold(devRef)} not found on remote.`);
+        warn(`Dev branch ref ${import_picocolors14.default.bold(devRef)} not found on remote.`);
         warn("Config was saved — verify the branch name and re-run setup if needed.");
       }
     }
@@ -12584,31 +12775,33 @@ var setup_default = defineCommand({
       info("Added .contributerc.json to .gitignore to avoid committing personal config.");
     }
     console.log();
-    info(`Workflow: ${import_picocolors13.default.bold(WORKFLOW_DESCRIPTIONS[config.workflow])}`);
-    info(`Convention: ${import_picocolors13.default.bold(CONVENTION_DESCRIPTIONS[config.commitConvention])}`);
-    info(`Role: ${import_picocolors13.default.bold(config.role)}`);
+    info(`Workflow: ${import_picocolors14.default.bold(WORKFLOW_DESCRIPTIONS[config.workflow])}`);
+    info(`Convention: ${import_picocolors14.default.bold(CONVENTION_DESCRIPTIONS[config.commitConvention])}`);
+    info(`AI: ${import_picocolors14.default.bold(isAIEnabled(config) ? "enabled" : "disabled")}`);
+    info(`Role: ${import_picocolors14.default.bold(config.role)}`);
     if (config.devBranch) {
-      info(`Main: ${import_picocolors13.default.bold(config.mainBranch)} | Dev: ${import_picocolors13.default.bold(config.devBranch)}`);
+      info(`Main: ${import_picocolors14.default.bold(config.mainBranch)} | Dev: ${import_picocolors14.default.bold(config.devBranch)}`);
     } else {
-      info(`Main: ${import_picocolors13.default.bold(config.mainBranch)}`);
+      info(`Main: ${import_picocolors14.default.bold(config.mainBranch)}`);
     }
-    info(`Origin: ${import_picocolors13.default.bold(config.origin)}${config.role === "contributor" ? ` | Upstream: ${import_picocolors13.default.bold(config.upstream)}` : ""}`);
+    info(`Origin: ${import_picocolors14.default.bold(config.origin)}${config.role === "contributor" ? ` | Upstream: ${import_picocolors14.default.bold(config.upstream)}` : ""}`);
   }
 });
 function logConfigSummary(config) {
-  info(`Workflow: ${import_picocolors13.default.bold(WORKFLOW_DESCRIPTIONS[config.workflow])}`);
-  info(`Convention: ${import_picocolors13.default.bold(CONVENTION_DESCRIPTIONS[config.commitConvention])}`);
-  info(`Role: ${import_picocolors13.default.bold(config.role)}`);
+  info(`Workflow: ${import_picocolors14.default.bold(WORKFLOW_DESCRIPTIONS[config.workflow])}`);
+  info(`Convention: ${import_picocolors14.default.bold(CONVENTION_DESCRIPTIONS[config.commitConvention])}`);
+  info(`AI: ${import_picocolors14.default.bold(isAIEnabled(config) ? "enabled" : "disabled")}`);
+  info(`Role: ${import_picocolors14.default.bold(config.role)}`);
   if (config.devBranch) {
-    info(`Main: ${import_picocolors13.default.bold(config.mainBranch)} | Dev: ${import_picocolors13.default.bold(config.devBranch)}`);
+    info(`Main: ${import_picocolors14.default.bold(config.mainBranch)} | Dev: ${import_picocolors14.default.bold(config.devBranch)}`);
   } else {
-    info(`Main: ${import_picocolors13.default.bold(config.mainBranch)}`);
+    info(`Main: ${import_picocolors14.default.bold(config.mainBranch)}`);
   }
-  info(`Origin: ${import_picocolors13.default.bold(config.origin)}${config.role === "contributor" ? ` | Upstream: ${import_picocolors13.default.bold(config.upstream)}` : ""}`);
+  info(`Origin: ${import_picocolors14.default.bold(config.origin)}${config.role === "contributor" ? ` | Upstream: ${import_picocolors14.default.bold(config.upstream)}` : ""}`);
 }
 
 // src/commands/start.ts
-var import_picocolors14 = __toESM(require_picocolors(), 1);
+var import_picocolors15 = __toESM(require_picocolors(), 1);
 var start_default = defineCommand({
   meta: {
     name: "start",
@@ -12648,57 +12841,28 @@ var start_default = defineCommand({
     const { branchPrefixes } = config;
     const baseBranch = getBaseBranch(config);
     const syncSource = getSyncSource(config);
-    let branchName = args.name;
-    heading("\uD83C\uDF3F contrib start");
+    let branchName = args.name?.trim();
+    projectHeading("start", "\uD83C\uDF3F");
+    branchName = await promptForBranchName({
+      initialValue: branchName,
+      branchPrefixes,
+      useAI: isAIEnabled(config, args["no-ai"]),
+      model: args.model
+    });
     if (!branchName) {
-      branchName = await inputPrompt("What are you going to work on?");
-      if (!branchName || branchName.trim().length === 0) {
-        error("A branch name or description is required.");
-        process.exit(1);
-      }
-      branchName = branchName.trim();
-    }
-    const useAI = !args["no-ai"] && looksLikeNaturalLanguage(branchName);
-    if (useAI) {
-      const spinner = createSpinner("Generating branch name suggestion...");
-      const suggested = await suggestBranchName(branchName, args.model);
-      if (suggested) {
-        spinner.success("Branch name suggestion ready.");
-        console.log(`
-  ${import_picocolors14.default.dim("AI suggestion:")} ${import_picocolors14.default.bold(import_picocolors14.default.cyan(suggested))}`);
-        const accepted = await confirmPrompt(`Use ${import_picocolors14.default.bold(suggested)} as your branch name?`);
-        if (accepted) {
-          branchName = suggested;
-        } else {
-          branchName = await inputPrompt("Enter branch name", branchName);
-        }
-      } else {
-        spinner.fail("AI did not return a branch name suggestion.");
-      }
-    }
-    if (!hasPrefix(branchName, branchPrefixes)) {
-      const prefix = await selectPrompt(`Choose a branch type for ${import_picocolors14.default.bold(branchName)}:`, branchPrefixes);
-      branchName = formatBranchName(prefix, branchName);
-    }
-    if (!isValidBranchName(branchName)) {
-      error("Invalid branch name. Use only alphanumeric characters, dots, hyphens, underscores, and slashes.");
-      process.exit(1);
-    }
-    info(`Creating branch: ${import_picocolors14.default.bold(branchName)}`);
-    if (await branchExists(branchName)) {
-      error(`Branch ${import_picocolors14.default.bold(branchName)} already exists.`);
-      info(`  Use ${import_picocolors14.default.bold(`git checkout ${branchName}`)} to switch to it, or choose a different name.`, "");
-      process.exit(1);
+      warn("Start cancelled.");
+      process.exit(0);
     }
+    info(`Creating branch: ${import_picocolors15.default.bold(branchName)}`);
     await fetchRemote(syncSource.remote);
     if (!await refExists(syncSource.ref)) {
-      warn(`Remote ref ${import_picocolors14.default.bold(syncSource.ref)} not found. Creating branch from local ${import_picocolors14.default.bold(baseBranch)}.`);
+      warn(`Remote ref ${import_picocolors15.default.bold(syncSource.ref)} not found. Creating branch from local ${import_picocolors15.default.bold(baseBranch)}.`);
     }
     const currentBranch = await getCurrentBranch();
     if (currentBranch === baseBranch && await refExists(syncSource.ref)) {
       const ahead = await countCommitsAhead(baseBranch, syncSource.ref);
       if (ahead > 0) {
-        warn(`You are on ${import_picocolors14.default.bold(baseBranch)} with ${import_picocolors14.default.bold(String(ahead))} local commit${ahead > 1 ? "s" : ""} not in ${import_picocolors14.default.bold(syncSource.ref)}.`);
+        warn(`You are on ${import_picocolors15.default.bold(baseBranch)} with ${import_picocolors15.default.bold(String(ahead))} local commit${ahead > 1 ? "s" : ""} not in ${import_picocolors15.default.bold(syncSource.ref)}.`);
         info("  Syncing will discard those commits. Consider backing them up first (e.g. create a branch).");
         const proceed = await confirmPrompt("Discard local commits and sync to remote?");
         if (!proceed) {
@@ -12715,10 +12879,10 @@ var start_default = defineCommand({
           error(`Failed to create branch: ${result2.stderr}`);
           process.exit(1);
         }
-        success(`Created ${import_picocolors14.default.bold(branchName)} from ${import_picocolors14.default.bold(syncSource.ref)}`);
+        success(`Created ${import_picocolors15.default.bold(branchName)} from ${import_picocolors15.default.bold(syncSource.ref)}`);
         return;
       }
-      error(`Failed to update ${import_picocolors14.default.bold(baseBranch)}: ${updateResult.stderr}`);
+      error(`Failed to update ${import_picocolors15.default.bold(baseBranch)}: ${updateResult.stderr}`);
       info("Make sure your base branch exists locally or the remote ref is available.", "");
       process.exit(1);
     }
@@ -12727,12 +12891,12 @@ var start_default = defineCommand({
       error(`Failed to create branch: ${result.stderr}`);
       process.exit(1);
     }
-    success(`Created ${import_picocolors14.default.bold(branchName)} from latest ${import_picocolors14.default.bold(baseBranch)}`);
+    success(`Created ${import_picocolors15.default.bold(branchName)} from latest ${import_picocolors15.default.bold(baseBranch)}`);
   }
 });
 
 // src/commands/status.ts
-var import_picocolors15 = __toESM(require_picocolors(), 1);
+var import_picocolors16 = __toESM(require_picocolors(), 1);
 var status_default = defineCommand({
   meta: {
     name: "status",
@@ -12748,9 +12912,9 @@ var status_default = defineCommand({
       error("No .contributerc.json found. Run `contrib setup` first.");
       process.exit(1);
     }
-    heading("\uD83D\uDCCA contribute-now status");
-    console.log(`  ${import_picocolors15.default.dim("Workflow:")} ${import_picocolors15.default.bold(WORKFLOW_DESCRIPTIONS[config.workflow])}`);
-    console.log(`  ${import_picocolors15.default.dim("Role:")} ${import_picocolors15.default.bold(config.role)}`);
+    projectHeading("status", "\uD83D\uDCCA");
+    console.log(`  ${import_picocolors16.default.dim("Workflow:")} ${import_picocolors16.default.bold(WORKFLOW_DESCRIPTIONS[config.workflow])}`);
+    console.log(`  ${import_picocolors16.default.dim("Role:")} ${import_picocolors16.default.bold(config.role)}`);
     console.log();
     await fetchAll();
     const currentBranch = await getCurrentBranch();
@@ -12759,7 +12923,7 @@ var status_default = defineCommand({
     const isContributor = config.role === "contributor";
     const [dirty, fileStatus] = await Promise.all([hasUncommittedChanges(), getFileStatus()]);
     if (dirty) {
-      console.log(`  ${import_picocolors15.default.yellow("⚠")}  ${import_picocolors15.default.yellow("Uncommitted changes in working tree")}`);
+      console.log(`  ${import_picocolors16.default.yellow("⚠")}  ${import_picocolors16.default.yellow("Uncommitted changes in working tree")}`);
       console.log();
     }
     const mainRemote = `${origin}/${mainBranch}`;
@@ -12778,16 +12942,16 @@ var status_default = defineCommand({
     if (isFeatureBranch) {
       const branchDiv = await getDivergence(currentBranch, baseBranch);
       const branchLine = formatStatus(currentBranch, baseBranch, branchDiv.ahead, branchDiv.behind);
-      console.log(branchLine + import_picocolors15.default.dim(` (current ${import_picocolors15.default.green("*")})`));
+      console.log(branchLine + import_picocolors16.default.dim(` (current ${import_picocolors16.default.green("*")})`));
       branchStatus = await detectBranchStatus(currentBranch, baseBranch);
       if (branchStatus.merged) {
-        console.log(`  ${import_picocolors15.default.green("✓")}  ${import_picocolors15.default.green("Branch merged")} — ${import_picocolors15.default.dim(branchStatus.mergedReason ?? "all commits reachable from base")}`);
+        console.log(`  ${import_picocolors16.default.green("✓")}  ${import_picocolors16.default.green("Branch merged")} — ${import_picocolors16.default.dim(branchStatus.mergedReason ?? "all commits reachable from base")}`);
       }
       if (branchStatus.stale) {
-        console.log(`  ${import_picocolors15.default.yellow("⏳")}  ${import_picocolors15.default.yellow("Branch is stale")} — ${import_picocolors15.default.dim(`last commit ${branchStatus.staleDaysAgo} days ago`)}`);
+        console.log(`  ${import_picocolors16.default.yellow("⏳")}  ${import_picocolors16.default.yellow("Branch is stale")} — ${import_picocolors16.default.dim(`last commit ${branchStatus.staleDaysAgo} days ago`)}`);
       }
     } else if (currentBranch) {
-      console.log(import_picocolors15.default.dim(`  (on ${import_picocolors15.default.bold(currentBranch)} branch)`));
+      console.log(import_picocolors16.default.dim(`  (on ${import_picocolors16.default.bold(currentBranch)} branch)`));
     }
     let branchesAligned = true;
     {
@@ -12817,20 +12981,20 @@ var status_default = defineCommand({
         }
         branchesAligned = groups.size === 1;
         console.log();
-        console.log(`  ${import_picocolors15.default.bold("\uD83D\uDD17 Branch Alignment")}`);
+        console.log(`  ${import_picocolors16.default.bold("\uD83D\uDD17 Branch Alignment")}`);
         for (const [hash, names] of groups) {
           const short = hash.slice(0, 7);
-          const nameStr = names.map((n2) => import_picocolors15.default.bold(n2)).join(import_picocolors15.default.dim(" · "));
-          console.log(`     ${import_picocolors15.default.yellow(short)} ${import_picocolors15.default.dim("──")} ${nameStr}`);
+          const nameStr = names.map((n2) => import_picocolors16.default.bold(n2)).join(import_picocolors16.default.dim(" · "));
+          console.log(`     ${import_picocolors16.default.yellow(short)} ${import_picocolors16.default.dim("──")} ${nameStr}`);
           const subject = await getCommitSubject(hash);
           if (subject) {
-            console.log(`                ${import_picocolors15.default.dim(subject)}`);
+            console.log(`                ${import_picocolors16.default.dim(subject)}`);
           }
         }
         if (branchesAligned) {
-          console.log(`     ${import_picocolors15.default.green("✓")} ${import_picocolors15.default.green("All branches aligned")} ${import_picocolors15.default.dim("— ready to start")}`);
+          console.log(`     ${import_picocolors16.default.green("✓")} ${import_picocolors16.default.green("All branches aligned")} ${import_picocolors16.default.dim("— ready to start")}`);
         } else {
-          console.log(`     ${import_picocolors15.default.yellow("⚠")} ${import_picocolors15.default.yellow("Branches are not fully aligned")}`);
+          console.log(`     ${import_picocolors16.default.yellow("⚠")} ${import_picocolors16.default.yellow("Branches are not fully aligned")}`);
         }
       }
     }
@@ -12838,70 +13002,70 @@ var status_default = defineCommand({
     if (hasFiles) {
       console.log();
       if (fileStatus.staged.length > 0) {
-        console.log(`  ${import_picocolors15.default.green("Staged for commit:")}`);
+        console.log(`  ${import_picocolors16.default.green("Staged for commit:")}`);
         for (const { file, status } of fileStatus.staged) {
-          console.log(`    ${import_picocolors15.default.green("+")} ${import_picocolors15.default.dim(`${status}:`)} ${file}`);
+          console.log(`    ${import_picocolors16.default.green("+")} ${import_picocolors16.default.dim(`${status}:`)} ${file}`);
         }
       }
       if (fileStatus.modified.length > 0) {
-        console.log(`  ${import_picocolors15.default.yellow("Unstaged changes:")}`);
+        console.log(`  ${import_picocolors16.default.yellow("Unstaged changes:")}`);
         for (const { file, status } of fileStatus.modified) {
-          console.log(`    ${import_picocolors15.default.yellow("~")} ${import_picocolors15.default.dim(`${status}:`)} ${file}`);
+          console.log(`    ${import_picocolors16.default.yellow("~")} ${import_picocolors16.default.dim(`${status}:`)} ${file}`);
         }
       }
       if (fileStatus.untracked.length > 0) {
-        console.log(`  ${import_picocolors15.default.red("Untracked files:")}`);
+        console.log(`  ${import_picocolors16.default.red("Untracked files:")}`);
         for (const file of fileStatus.untracked) {
-          console.log(`    ${import_picocolors15.default.red("?")} ${file}`);
+          console.log(`    ${import_picocolors16.default.red("?")} ${file}`);
         }
       }
     } else if (!dirty) {
-      console.log(`  ${import_picocolors15.default.green("✓")}  ${import_picocolors15.default.dim("Working tree clean")}`);
+      console.log(`  ${import_picocolors16.default.green("✓")}  ${import_picocolors16.default.dim("Working tree clean")}`);
     }
     const tips = [];
     if (!branchesAligned) {
-      tips.push(`Run ${import_picocolors15.default.bold("contrib sync")} to align your local branches with the remote`);
+      tips.push(`Run ${import_picocolors16.default.bold("contrib sync")} to align your local branches with the remote`);
     }
     if (fileStatus.staged.length > 0) {
-      tips.push(`Run ${import_picocolors15.default.bold("contrib commit")} to commit staged changes`);
+      tips.push(`Run ${import_picocolors16.default.bold("contrib commit")} to commit staged changes`);
     }
     if (fileStatus.modified.length > 0 || fileStatus.untracked.length > 0) {
-      tips.push(`Run ${import_picocolors15.default.bold("contrib commit")} to stage and commit changes`);
+      tips.push(`Run ${import_picocolors16.default.bold("contrib commit")} to stage and commit changes`);
     }
     if (isFeatureBranch && branchStatus) {
       if (branchStatus.merged) {
-        tips.push(`Run ${import_picocolors15.default.bold("contrib clean")} to delete this merged branch`);
+        tips.push(`Run ${import_picocolors16.default.bold("contrib clean")} to delete this merged branch`);
       } else if (branchStatus.stale) {
-        tips.push(`Run ${import_picocolors15.default.bold("contrib sync")} to rebase on latest changes, or ${import_picocolors15.default.bold("contrib clean")} if no longer needed`);
+        tips.push(`Run ${import_picocolors16.default.bold("contrib sync")} to rebase on latest changes, or ${import_picocolors16.default.bold("contrib clean")} if no longer needed`);
       } else if (fileStatus.staged.length === 0 && fileStatus.modified.length === 0 && fileStatus.untracked.length === 0) {
         const branchDiv = await getDivergence(currentBranch, `${origin}/${currentBranch}`);
         if (branchDiv.ahead > 0) {
-          tips.push(`Run ${import_picocolors15.default.bold("contrib submit")} to push and create/update your PR`);
+          tips.push(`Run ${import_picocolors16.default.bold("contrib submit")} to push and create/update your PR`);
         }
       }
     }
     if (tips.length > 0) {
       console.log();
-      console.log(`  ${import_picocolors15.default.dim("\uD83D\uDCA1 Tip:")}`);
+      console.log(`  ${import_picocolors16.default.dim("\uD83D\uDCA1 Tip:")}`);
       for (const tip of tips) {
-        console.log(`     ${import_picocolors15.default.dim(tip)}`);
+        console.log(`     ${import_picocolors16.default.dim(tip)}`);
       }
     }
     console.log();
   }
 });
 function formatStatus(branch, base, ahead, behind) {
-  const label = import_picocolors15.default.bold(branch.padEnd(20));
+  const label = import_picocolors16.default.bold(branch.padEnd(20));
   if (ahead === 0 && behind === 0) {
-    return `  ${import_picocolors15.default.green("✓")}  ${label} ${import_picocolors15.default.dim(`in sync with ${base}`)}`;
+    return `  ${import_picocolors16.default.green("✓")}  ${label} ${import_picocolors16.default.dim(`in sync with ${base}`)}`;
   }
   if (ahead > 0 && behind === 0) {
-    return `  ${import_picocolors15.default.yellow("↑")}  ${label} ${import_picocolors15.default.yellow(`${ahead} commit${ahead !== 1 ? "s" : ""} ahead of ${base}`)}`;
+    return `  ${import_picocolors16.default.yellow("↑")}  ${label} ${import_picocolors16.default.yellow(`${ahead} commit${ahead !== 1 ? "s" : ""} ahead of ${base}`)}`;
   }
   if (behind > 0 && ahead === 0) {
-    return `  ${import_picocolors15.default.red("↓")}  ${label} ${import_picocolors15.default.red(`${behind} commit${behind !== 1 ? "s" : ""} behind ${base}`)}`;
+    return `  ${import_picocolors16.default.red("↓")}  ${label} ${import_picocolors16.default.red(`${behind} commit${behind !== 1 ? "s" : ""} behind ${base}`)}`;
   }
-  return `  ${import_picocolors15.default.red("⚡")}  ${label} ${import_picocolors15.default.yellow(`${ahead} ahead`)}${import_picocolors15.default.dim(", ")}${import_picocolors15.default.red(`${behind} behind`)} ${import_picocolors15.default.dim(base)}`;
+  return `  ${import_picocolors16.default.red("⚡")}  ${label} ${import_picocolors16.default.yellow(`${ahead} ahead`)}${import_picocolors16.default.dim(", ")}${import_picocolors16.default.red(`${behind} behind`)} ${import_picocolors16.default.dim(base)}`;
 }
 var STALE_THRESHOLD_DAYS = 14;
 async function detectBranchStatus(branch, baseBranch) {
@@ -12947,34 +13111,45 @@ async function detectBranchStatus(branch, baseBranch) {
 }
 
 // src/commands/submit.ts
-var import_picocolors16 = __toESM(require_picocolors(), 1);
+var import_picocolors17 = __toESM(require_picocolors(), 1);
 async function performSquashMerge(origin, baseBranch, featureBranch, options) {
-  info(`Checking out ${import_picocolors16.default.bold(baseBranch)}...`);
+  info(`Checking out ${import_picocolors17.default.bold(baseBranch)}...`);
   const coResult = await checkoutBranch(baseBranch);
   if (coResult.exitCode !== 0) {
     error(`Failed to checkout ${baseBranch}: ${coResult.stderr}`);
     process.exit(1);
   }
-  info(`Squash merging ${import_picocolors16.default.bold(featureBranch)} into ${import_picocolors16.default.bold(baseBranch)}...`);
+  info(`Squash merging ${import_picocolors17.default.bold(featureBranch)} into ${import_picocolors17.default.bold(baseBranch)}...`);
   const mergeResult = await mergeSquash(featureBranch);
   if (mergeResult.exitCode !== 0) {
     error(`Squash merge failed: ${mergeResult.stderr}`);
     process.exit(1);
   }
   let message = options?.defaultMsg;
-  if (!message) {
-    const copilotError = await checkCopilotAvailable();
+  if (!message && options?.useAI !== false) {
+    const copilotError = await checkCopilotAvailable2();
     if (!copilotError) {
-      const spinner = createSpinner("Generating AI commit message for squash merge...");
-      const [stagedDiff, stagedFiles] = await Promise.all([getStagedDiff(), getStagedFiles()]);
-      const aiMsg = await generateCommitMessage(stagedDiff, stagedFiles, options?.model, options?.convention ?? "clean-commit", "squash-merge");
-      if (aiMsg) {
-        message = aiMsg;
-        spinner.success("AI commit message generated.");
-        console.log(`
-  ${import_picocolors16.default.dim("AI suggestion:")} ${import_picocolors16.default.bold(import_picocolors16.default.cyan(message))}`);
-      } else {
+      while (!message) {
+        const spinner = createSpinner("Generating AI commit message for squash merge...");
+        const [stagedDiff, stagedFiles] = await Promise.all([getStagedDiff(), getStagedFiles()]);
+        const aiMsg = await generateCommitMessage(stagedDiff, stagedFiles, options?.model, options?.convention ?? "clean-commit", "squash-merge");
+        if (aiMsg) {
+          message = aiMsg;
+          spinner.success("AI commit message generated.");
+          console.log(`
+  ${import_picocolors17.default.dim("AI suggestion:")} ${import_picocolors17.default.bold(import_picocolors17.default.cyan(message))}`);
+          break;
+        }
         spinner.fail("AI did not return a commit message.");
+        const retryAction = await selectPrompt("AI could not generate a commit message. What would you like to do?", ["Try again with AI", "Write manually", "Cancel"]);
+        if (retryAction === "Try again with AI") {
+          continue;
+        }
+        if (retryAction === "Cancel") {
+          warn("Squash merge commit cancelled.");
+          process.exit(0);
+        }
+        break;
       }
     } else {
       warn(`AI unavailable: ${copilotError}`);
@@ -12983,12 +13158,11 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
   let finalMsg = null;
   if (message) {
     while (!finalMsg) {
-      const action = await selectPrompt("What would you like to do?", [
-        "Accept this message",
-        "Edit this message",
-        "Regenerate",
-        "Write manually"
-      ]);
+      const actions = ["Accept this message", "Edit this message", "Write manually"];
+      if (options?.useAI !== false) {
+        actions.splice(2, 0, "Regenerate");
+      }
+      const action = await selectPrompt("What would you like to do?", actions);
       if (action === "Accept this message") {
         finalMsg = message;
       } else if (action === "Edit this message") {
@@ -13001,10 +13175,10 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
           message = regen;
           spinner.success("Commit message regenerated.");
           console.log(`
-  ${import_picocolors16.default.dim("AI suggestion:")} ${import_picocolors16.default.bold(import_picocolors16.default.cyan(regen))}`);
+  ${import_picocolors17.default.dim("AI suggestion:")} ${import_picocolors17.default.bold(import_picocolors17.default.cyan(regen))}`);
         } else {
           spinner.fail("Regeneration failed.");
-          finalMsg = await inputPrompt("Enter commit message");
+          continue;
         }
       } else {
         finalMsg = await inputPrompt("Enter commit message");
@@ -13018,13 +13192,13 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
     error(`Commit failed: ${commitResult.stderr}`);
     process.exit(1);
   }
-  info(`Pushing ${import_picocolors16.default.bold(baseBranch)} to ${origin}...`);
+  info(`Pushing ${import_picocolors17.default.bold(baseBranch)} to ${origin}...`);
   const pushResult = await pushBranch(origin, baseBranch);
   if (pushResult.exitCode !== 0) {
     error(`Failed to push ${baseBranch}: ${pushResult.stderr}`);
     process.exit(1);
   }
-  info(`Deleting local branch ${import_picocolors16.default.bold(featureBranch)}...`);
+  info(`Deleting local branch ${import_picocolors17.default.bold(featureBranch)}...`);
   const delLocal = await forceDeleteBranch(featureBranch);
   if (delLocal.exitCode !== 0) {
     warn(`Could not delete local branch: ${delLocal.stderr.trim()}`);
@@ -13032,14 +13206,14 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
   const remoteBranchRef = `${origin}/${featureBranch}`;
   const remoteExists = await branchExists(remoteBranchRef);
   if (remoteExists) {
-    info(`Deleting remote branch ${import_picocolors16.default.bold(featureBranch)}...`);
+    info(`Deleting remote branch ${import_picocolors17.default.bold(featureBranch)}...`);
     const delRemote = await deleteRemoteBranch(origin, featureBranch);
     if (delRemote.exitCode !== 0) {
       warn(`Could not delete remote branch: ${delRemote.stderr.trim()}`);
     }
   }
-  success(`Squash merged ${import_picocolors16.default.bold(featureBranch)} into ${import_picocolors16.default.bold(baseBranch)} and pushed.`);
-  info(`Run ${import_picocolors16.default.bold("contrib start")} to begin a new feature.`, "");
+  success(`Squash merged ${import_picocolors17.default.bold(featureBranch)} into ${import_picocolors17.default.bold(baseBranch)} and pushed.`);
+  info(`Run ${import_picocolors17.default.bold("contrib start")} to begin a new feature.`, "");
 }
 var submit_default = defineCommand({
   meta: {
@@ -13052,6 +13226,18 @@ var submit_default = defineCommand({
       description: "Create PR as draft",
       default: false
     },
+    pullrequest: {
+      type: "boolean",
+      alias: "pr",
+      description: "Submit directly to PR flow without prompting for mode",
+      default: false
+    },
+    local: {
+      type: "boolean",
+      alias: "l",
+      description: "Squash merge locally without PR (maintainers only)",
+      default: false
+    },
     "no-ai": {
       type: "boolean",
       description: "Skip AI PR description generation",
@@ -13074,6 +13260,7 @@ var submit_default = defineCommand({
       process.exit(1);
     }
     const { origin } = config;
+    const aiEnabled = isAIEnabled(config, args["no-ai"]);
     const baseBranch = getBaseBranch(config);
     const protectedBranches = getProtectedBranches(config);
     const currentBranch = await getCurrentBranch();
@@ -13082,8 +13269,8 @@ var submit_default = defineCommand({
       process.exit(1);
     }
     if (protectedBranches.includes(currentBranch)) {
-      heading("\uD83D\uDE80 contrib submit");
-      warn(`You're on ${import_picocolors16.default.bold(currentBranch)}, which is a protected branch. PRs should come from feature branches.`);
+      projectHeading("submit", "\uD83D\uDE80");
+      warn(`You're on ${import_picocolors17.default.bold(currentBranch)}, which is a protected branch. PRs should come from feature branches.`);
       await fetchAll();
       const remoteRef = `${origin}/${currentBranch}`;
       const localWork = await hasLocalWork(origin, currentBranch);
@@ -13092,11 +13279,11 @@ var submit_default = defineCommand({
       const hasAnything = hasCommits || dirty;
       if (!hasAnything) {
         error("No local changes or commits to move. Switch to a feature branch first.");
-        info(`  Run ${import_picocolors16.default.bold("contrib start")} to create a new feature branch.`, "");
+        info(`  Run ${import_picocolors17.default.bold("contrib start")} to create a new feature branch.`, "");
         process.exit(1);
       }
       if (hasCommits) {
-        info(`Found ${import_picocolors16.default.bold(String(localWork.unpushedCommits))} unpushed commit${localWork.unpushedCommits !== 1 ? "s" : ""} on ${import_picocolors16.default.bold(currentBranch)}.`);
+        info(`Found ${import_picocolors17.default.bold(String(localWork.unpushedCommits))} unpushed commit${localWork.unpushedCommits !== 1 ? "s" : ""} on ${import_picocolors17.default.bold(currentBranch)}.`);
       }
       if (dirty) {
         info("You also have uncommitted changes in the working tree.");
@@ -13112,58 +13299,35 @@ var submit_default = defineCommand({
         info("No changes made. You are still on your current branch.");
         return;
       }
-      info(import_picocolors16.default.dim("Tip: Describe what you're going to work on in plain English and we'll generate a branch name."));
-      const description = await inputPrompt("What are you going to work on?");
-      let newBranchName = description;
-      if (looksLikeNaturalLanguage(description)) {
-        const copilotError = await checkCopilotAvailable();
-        if (!copilotError) {
-          const spinner = createSpinner("Generating branch name suggestion...");
-          const suggested = await suggestBranchName(description, args.model);
-          if (suggested) {
-            spinner.success("Branch name suggestion ready.");
-            console.log(`
-  ${import_picocolors16.default.dim("AI suggestion:")} ${import_picocolors16.default.bold(import_picocolors16.default.cyan(suggested))}`);
-            const accepted = await confirmPrompt(`Use ${import_picocolors16.default.bold(suggested)} as your branch name?`);
-            newBranchName = accepted ? suggested : await inputPrompt("Enter branch name", description);
-          } else {
-            spinner.fail("AI did not return a suggestion.");
-            newBranchName = await inputPrompt("Enter branch name", description);
-          }
-        }
-      }
-      if (!hasPrefix(newBranchName, config.branchPrefixes)) {
-        const prefix = await selectPrompt(`Choose a branch type for ${import_picocolors16.default.bold(newBranchName)}:`, config.branchPrefixes);
-        newBranchName = formatBranchName(prefix, newBranchName);
-      }
-      if (!isValidBranchName(newBranchName)) {
-        error("Invalid branch name. Use only alphanumeric characters, dots, hyphens, underscores, and slashes.");
-        process.exit(1);
-      }
-      if (await branchExists(newBranchName)) {
-        error(`Branch ${import_picocolors16.default.bold(newBranchName)} already exists. Choose a different name.`);
-        process.exit(1);
+      const newBranchName = await promptForBranchName({
+        branchPrefixes: config.branchPrefixes,
+        useAI: aiEnabled,
+        model: args.model
+      });
+      if (!newBranchName) {
+        info("No changes made. You are still on your current branch.");
+        return;
       }
       const branchResult = await createBranch(newBranchName);
       if (branchResult.exitCode !== 0) {
         error(`Failed to create branch: ${branchResult.stderr}`);
         process.exit(1);
       }
-      success(`Created ${import_picocolors16.default.bold(newBranchName)} with your changes.`);
+      success(`Created ${import_picocolors17.default.bold(newBranchName)} with your changes.`);
       await updateLocalBranch(currentBranch, remoteRef);
-      info(`Reset ${import_picocolors16.default.bold(currentBranch)} back to ${import_picocolors16.default.bold(remoteRef)} — no damage done.`, "");
+      info(`Reset ${import_picocolors17.default.bold(currentBranch)} back to ${import_picocolors17.default.bold(remoteRef)} — no damage done.`, "");
       console.log();
-      success(`You're now on ${import_picocolors16.default.bold(newBranchName)} with all your work intact.`);
-      info(`Run ${import_picocolors16.default.bold("contrib submit")} again to push and create your PR.`, "");
+      success(`You're now on ${import_picocolors17.default.bold(newBranchName)} with all your work intact.`);
+      info(`Run ${import_picocolors17.default.bold("contrib submit")} again to push and create your PR.`, "");
       return;
     }
-    heading("\uD83D\uDE80 contrib submit");
+    projectHeading("submit", "\uD83D\uDE80");
     const ghInstalled = await checkGhInstalled();
     const ghAuthed = ghInstalled && await checkGhAuth();
     if (ghInstalled && ghAuthed) {
       const mergedPR = await getMergedPRForBranch(currentBranch);
       if (mergedPR) {
-        warn(`PR #${mergedPR.number} (${import_picocolors16.default.bold(mergedPR.title)}) was already merged.`);
+        warn(`PR #${mergedPR.number} (${import_picocolors17.default.bold(mergedPR.title)}) was already merged.`);
         const localWork = await hasLocalWork(origin, currentBranch);
         const hasWork = localWork.uncommitted || localWork.unpushedCommits > 0;
         if (hasWork) {
@@ -13171,7 +13335,7 @@ var submit_default = defineCommand({
             warn("You have uncommitted changes in your working tree.");
           }
           if (localWork.unpushedCommits > 0) {
-            warn(`You have ${import_picocolors16.default.bold(String(localWork.unpushedCommits))} local commit${localWork.unpushedCommits !== 1 ? "s" : ""} not in the merged PR.`);
+            warn(`You have ${import_picocolors17.default.bold(String(localWork.unpushedCommits))} local commit${localWork.unpushedCommits !== 1 ? "s" : ""} not in the merged PR.`);
           }
           const SAVE_NEW_BRANCH = "Save changes to a new branch";
           const DISCARD = "Discard all changes and clean up";
@@ -13182,46 +13346,26 @@ var submit_default = defineCommand({
             return;
           }
           if (action === SAVE_NEW_BRANCH) {
-            info(import_picocolors16.default.dim("Tip: Describe what you're going to work on in plain English and we'll generate a branch name."));
-            const description = await inputPrompt("What are you going to work on?");
-            let newBranchName = description;
-            if (!args["no-ai"] && looksLikeNaturalLanguage(description)) {
-              const spinner = createSpinner("Generating branch name suggestion...");
-              const suggested = await suggestBranchName(description, args.model);
-              if (suggested) {
-                spinner.success("Branch name suggestion ready.");
-                console.log(`
-  ${import_picocolors16.default.dim("AI suggestion:")} ${import_picocolors16.default.bold(import_picocolors16.default.cyan(suggested))}`);
-                const accepted = await confirmPrompt(`Use ${import_picocolors16.default.bold(suggested)} as your branch name?`);
-                newBranchName = accepted ? suggested : await inputPrompt("Enter branch name", description);
-              } else {
-                spinner.fail("AI did not return a suggestion.");
-                newBranchName = await inputPrompt("Enter branch name", description);
-              }
-            }
-            if (!hasPrefix(newBranchName, config.branchPrefixes)) {
-              const prefix = await selectPrompt(`Choose a branch type for ${import_picocolors16.default.bold(newBranchName)}:`, config.branchPrefixes);
-              newBranchName = formatBranchName(prefix, newBranchName);
-            }
-            if (!isValidBranchName(newBranchName)) {
-              error("Invalid branch name. Use only alphanumeric characters, dots, hyphens, underscores, and slashes.");
-              process.exit(1);
+            const newBranchName = await promptForBranchName({
+              branchPrefixes: config.branchPrefixes,
+              useAI: aiEnabled,
+              model: args.model
+            });
+            if (!newBranchName) {
+              info("No changes made. You are still on your current branch.");
+              return;
             }
             const staleUpstream = await getUpstreamRef();
             const staleUpstreamHash = staleUpstream ? await getCommitHash(staleUpstream) : null;
-            if (await branchExists(newBranchName)) {
-              error(`Branch ${import_picocolors16.default.bold(newBranchName)} already exists. Choose a different name.`);
-              process.exit(1);
-            }
             const renameResult = await renameBranch(currentBranch, newBranchName);
             if (renameResult.exitCode !== 0) {
               error(`Failed to rename branch: ${renameResult.stderr}`);
               process.exit(1);
             }
-            success(`Renamed ${import_picocolors16.default.bold(currentBranch)} → ${import_picocolors16.default.bold(newBranchName)}`);
+            success(`Renamed ${import_picocolors17.default.bold(currentBranch)} → ${import_picocolors17.default.bold(newBranchName)}`);
             await unsetUpstream();
             const syncSource2 = getSyncSource(config);
-            info(`Syncing ${import_picocolors16.default.bold(newBranchName)} with latest ${import_picocolors16.default.bold(baseBranch)}...`);
+            info(`Syncing ${import_picocolors17.default.bold(newBranchName)} with latest ${import_picocolors17.default.bold(baseBranch)}...`);
             await fetchRemote(syncSource2.remote);
             let rebaseResult;
             if (staleUpstreamHash) {
@@ -13232,17 +13376,17 @@ var submit_default = defineCommand({
             }
             if (rebaseResult.exitCode !== 0) {
               warn("Rebase encountered conflicts. Resolve them manually, then run:");
-              info(`  ${import_picocolors16.default.bold("git rebase --continue")}`, "");
+              info(`  ${import_picocolors17.default.bold("git rebase --continue")}`, "");
             } else {
-              success(`Rebased ${import_picocolors16.default.bold(newBranchName)} onto ${import_picocolors16.default.bold(syncSource2.ref)}.`);
+              success(`Rebased ${import_picocolors17.default.bold(newBranchName)} onto ${import_picocolors17.default.bold(syncSource2.ref)}.`);
             }
-            info(`All your changes are preserved. Run ${import_picocolors16.default.bold("contrib submit")} when ready to create a new PR.`, "");
+            info(`All your changes are preserved. Run ${import_picocolors17.default.bold("contrib submit")} when ready to create a new PR.`, "");
             return;
           }
           warn("Discarding local changes...");
         }
         const syncSource = getSyncSource(config);
-        info(`Switching to ${import_picocolors16.default.bold(baseBranch)} and syncing...`);
+        info(`Switching to ${import_picocolors17.default.bold(baseBranch)} and syncing...`);
         await fetchRemote(syncSource.remote);
         await resetHard("HEAD");
         const coResult = await checkoutBranch(baseBranch);
@@ -13251,23 +13395,23 @@ var submit_default = defineCommand({
           process.exit(1);
         }
         await updateLocalBranch(baseBranch, syncSource.ref);
-        success(`Synced ${import_picocolors16.default.bold(baseBranch)} with ${import_picocolors16.default.bold(syncSource.ref)}.`);
-        info(`Deleting stale branch ${import_picocolors16.default.bold(currentBranch)}...`);
+        success(`Synced ${import_picocolors17.default.bold(baseBranch)} with ${import_picocolors17.default.bold(syncSource.ref)}.`);
+        info(`Deleting stale branch ${import_picocolors17.default.bold(currentBranch)}...`);
         const delResult = await forceDeleteBranch(currentBranch);
         if (delResult.exitCode === 0) {
-          success(`Deleted ${import_picocolors16.default.bold(currentBranch)}.`);
+          success(`Deleted ${import_picocolors17.default.bold(currentBranch)}.`);
         } else {
           warn(`Could not delete branch: ${delResult.stderr.trim()}`);
         }
         console.log();
-        info(`You're now on ${import_picocolors16.default.bold(baseBranch)}. Run ${import_picocolors16.default.bold("contrib start")} to begin a new feature.`);
+        info(`You're now on ${import_picocolors17.default.bold(baseBranch)}. Run ${import_picocolors17.default.bold("contrib start")} to begin a new feature.`);
         return;
       }
     }
     if (ghInstalled && ghAuthed) {
       const existingPR = await getPRForBranch(currentBranch);
       if (existingPR) {
-        info(`Pushing ${import_picocolors16.default.bold(currentBranch)} to ${origin}...`);
+        info(`Pushing ${import_picocolors17.default.bold(currentBranch)} to ${origin}...`);
         const pushResult2 = await pushSetUpstream(origin, currentBranch);
         if (pushResult2.exitCode !== 0) {
           error(`Failed to push: ${pushResult2.stderr}`);
@@ -13278,8 +13422,8 @@ var submit_default = defineCommand({
           }
           process.exit(1);
         }
-        success(`Pushed changes to existing PR #${existingPR.number}: ${import_picocolors16.default.bold(existingPR.title)}`);
-        console.log(`  ${import_picocolors16.default.cyan(existingPR.url)}`);
+        success(`Pushed changes to existing PR #${existingPR.number}: ${import_picocolors17.default.bold(existingPR.title)}`);
+        console.log(`  ${import_picocolors17.default.cyan(existingPR.url)}`);
         return;
       }
     }
@@ -13287,7 +13431,7 @@ var submit_default = defineCommand({
     let prBody = null;
     async function tryGenerateAI() {
       const [copilotError, commits, diff] = await Promise.all([
-        checkCopilotAvailable(),
+        checkCopilotAvailable2(),
         getLog(baseBranch, "HEAD"),
         getLogDiff(baseBranch, "HEAD")
       ]);
@@ -13299,10 +13443,10 @@ var submit_default = defineCommand({
           prBody = result.body;
           spinner.success("PR description generated.");
           console.log(`
-  ${import_picocolors16.default.dim("AI title:")} ${import_picocolors16.default.bold(import_picocolors16.default.cyan(prTitle))}`);
+  ${import_picocolors17.default.dim("AI title:")} ${import_picocolors17.default.bold(import_picocolors17.default.cyan(prTitle))}`);
           console.log(`
-${import_picocolors16.default.dim("AI body preview:")}`);
-          console.log(import_picocolors16.default.dim(prBody.slice(0, 300) + (prBody.length > 300 ? "..." : "")));
+${import_picocolors17.default.dim("AI body preview:")}`);
+          console.log(import_picocolors17.default.dim(prBody.slice(0, 300) + (prBody.length > 300 ? "..." : "")));
         } else {
           spinner.fail("AI did not return a PR description.");
         }
@@ -13315,7 +13459,23 @@ ${import_picocolors16.default.dim("AI body preview:")}`);
     const REGENERATE = "Regenerate AI description";
     let submitAction = "cancel";
     const isMaintainer = config.role === "maintainer";
-    if (isMaintainer) {
+    if (args.pullrequest && args.local) {
+      error("Use only one submit mode flag at a time: --pullrequest/--pr/-pr or -l for local squash merge.");
+      process.exit(1);
+    }
+    if (args.local && !isMaintainer) {
+      error("The -l flag is only available for maintainers. Contributors must submit via PR.");
+      process.exit(1);
+    }
+    if (args.local) {
+      await performSquashMerge(origin, baseBranch, currentBranch, {
+        model: args.model,
+        convention: config.commitConvention,
+        useAI: aiEnabled
+      });
+      return;
+    }
+    if (isMaintainer && !args.pullrequest) {
       const maintainerChoice = await selectPrompt("How would you like to submit your changes?", ["Create a PR", SQUASH_LOCAL, CANCEL]);
       if (maintainerChoice === CANCEL) {
         warn("Submit cancelled.");
@@ -13324,12 +13484,13 @@ ${import_picocolors16.default.dim("AI body preview:")}`);
       if (maintainerChoice === SQUASH_LOCAL) {
         await performSquashMerge(origin, baseBranch, currentBranch, {
           model: args.model,
-          convention: config.commitConvention
+          convention: config.commitConvention,
+          useAI: aiEnabled
         });
         return;
       }
     }
-    if (!args["no-ai"]) {
+    if (aiEnabled) {
       await tryGenerateAI();
     }
     let actionResolved = false;
@@ -13368,7 +13529,7 @@ ${import_picocolors16.default.dim("AI body preview:")}`);
         }
       } else {
         const choices = [];
-        if (!args["no-ai"])
+        if (aiEnabled)
           choices.push(REGENERATE);
         choices.push("Write title & body manually", "Use gh --fill (auto-fill from commits)", CANCEL);
         const action = await selectPrompt("How would you like to create the PR?", choices);
@@ -13392,7 +13553,7 @@ ${import_picocolors16.default.dim("AI body preview:")}`);
       warn("Submit cancelled.");
       return;
     }
-    info(`Pushing ${import_picocolors16.default.bold(currentBranch)} to ${origin}...`);
+    info(`Pushing ${import_picocolors17.default.bold(currentBranch)} to ${origin}...`);
     const pushResult = await pushSetUpstream(origin, currentBranch);
     if (pushResult.exitCode !== 0) {
       error(`Failed to push: ${pushResult.stderr}`);
@@ -13411,7 +13572,7 @@ ${import_picocolors16.default.dim("AI body preview:")}`);
         const prUrl = `https://github.com/${repoInfo.owner}/${repoInfo.repo}/compare/${baseBranch}...${currentBranch}?expand=1`;
         console.log();
         info("Create your PR manually:", "");
-        console.log(`  ${import_picocolors16.default.cyan(prUrl)}`);
+        console.log(`  ${import_picocolors17.default.cyan(prUrl)}`);
       } else {
         info("gh CLI not available. Create your PR manually on GitHub.", "");
       }
@@ -13445,7 +13606,7 @@ ${import_picocolors16.default.dim("AI body preview:")}`);
 });
 
 // src/commands/switch.ts
-var import_picocolors17 = __toESM(require_picocolors(), 1);
+var import_picocolors18 = __toESM(require_picocolors(), 1);
 var switch_default = defineCommand({
   meta: {
     name: "switch",
@@ -13466,7 +13627,7 @@ var switch_default = defineCommand({
     const config = readConfig();
     const protectedBranches = config ? getProtectedBranches(config) : ["main", "master"];
     const currentBranch = await getCurrentBranch();
-    heading("\uD83D\uDD00 contrib switch");
+    projectHeading("switch", "\uD83D\uDD00");
     let targetBranch = args.name;
     if (!targetBranch) {
       const localBranches = await getLocalBranches();
@@ -13477,11 +13638,11 @@ var switch_default = defineCommand({
       const choices = localBranches.filter((b2) => b2.name !== currentBranch).map((b2) => {
         const labels = [];
         if (protectedBranches.includes(b2.name))
-          labels.push(import_picocolors17.default.red("protected"));
+          labels.push(import_picocolors18.default.red("protected"));
         if (b2.upstream)
-          labels.push(import_picocolors17.default.dim(`→ ${b2.upstream}`));
+          labels.push(import_picocolors18.default.dim(`→ ${b2.upstream}`));
         if (b2.gone)
-          labels.push(import_picocolors17.default.red("remote gone"));
+          labels.push(import_picocolors18.default.red("remote gone"));
         const suffix = labels.length > 0 ? `  ${labels.join(" · ")}` : "";
         return `${b2.name}${suffix}`;
       });
@@ -13493,7 +13654,7 @@ var switch_default = defineCommand({
       targetBranch = selected.split(/\s{2,}/)[0].trim();
     }
     if (targetBranch === currentBranch) {
-      info(`Already on ${import_picocolors17.default.bold(targetBranch)}.`);
+      info(`Already on ${import_picocolors18.default.bold(targetBranch)}.`);
       return;
     }
     if (await hasUncommittedChanges()) {
@@ -13512,7 +13673,7 @@ var switch_default = defineCommand({
       const stashMsg = `contrib-save: auto-save from ${currentBranch}`;
       try {
         await exec("git", ["stash", "push", "-m", stashMsg]);
-        info(`Saved changes: ${import_picocolors17.default.dim(stashMsg)}`);
+        info(`Saved changes: ${import_picocolors18.default.dim(stashMsg)}`);
       } catch {
         error("Failed to save changes. Please commit or save manually.");
         process.exit(1);
@@ -13528,9 +13689,9 @@ var switch_default = defineCommand({
         }
         process.exit(1);
       }
-      success(`Switched to ${import_picocolors17.default.bold(targetBranch)}`);
-      info(`Your changes from ${import_picocolors17.default.bold(currentBranch ?? "previous branch")} are saved.`, "");
-      info(`Use ${import_picocolors17.default.bold("contrib save --restore")} to bring them back.`, "");
+      success(`Switched to ${import_picocolors18.default.bold(targetBranch)}`);
+      info(`Your changes from ${import_picocolors18.default.bold(currentBranch ?? "previous branch")} are saved.`, "");
+      info(`Use ${import_picocolors18.default.bold("contrib save --restore")} to bring them back.`, "");
       return;
     }
     const result = await checkoutBranch(targetBranch);
@@ -13538,12 +13699,12 @@ var switch_default = defineCommand({
       error(`Failed to switch to ${targetBranch}: ${result.stderr}`);
       process.exit(1);
     }
-    success(`Switched to ${import_picocolors17.default.bold(targetBranch)}`);
+    success(`Switched to ${import_picocolors18.default.bold(targetBranch)}`);
   }
 });
 
 // src/commands/sync.ts
-var import_picocolors18 = __toESM(require_picocolors(), 1);
+var import_picocolors19 = __toESM(require_picocolors(), 1);
 var sync_default = defineCommand({
   meta: {
     name: "sync",
@@ -13582,7 +13743,7 @@ var sync_default = defineCommand({
       error("You have uncommitted changes. Please commit or stash them before syncing.");
       process.exit(1);
     }
-    heading(`\uD83D\uDD04 contrib sync (${workflow}, ${role})`);
+    projectHeading(`sync (${workflow}, ${role})`, "\uD83D\uDD04");
     const baseBranch = getBaseBranch(config);
     const syncSource = getSyncSource(config);
     info(`Fetching ${syncSource.remote}...`);
@@ -13595,24 +13756,24 @@ var sync_default = defineCommand({
       await fetchRemote(origin);
     }
     if (!await refExists(syncSource.ref)) {
-      error(`Remote ref ${import_picocolors18.default.bold(syncSource.ref)} does not exist.`);
+      error(`Remote ref ${import_picocolors19.default.bold(syncSource.ref)} does not exist.`);
       info("This can happen if the branch was renamed or deleted on the remote.", "");
-      info(`Check your config: the base branch may need updating via ${import_picocolors18.default.bold("contrib setup")}.`, "");
+      info(`Check your config: the base branch may need updating via ${import_picocolors19.default.bold("contrib setup")}.`, "");
       process.exit(1);
     }
     let allowMergeCommit = false;
     const div = await getDivergence(baseBranch, syncSource.ref);
     if (div.ahead > 0 || div.behind > 0) {
-      info(`${import_picocolors18.default.bold(baseBranch)} is ${import_picocolors18.default.yellow(`${div.ahead} ahead`)} and ${import_picocolors18.default.red(`${div.behind} behind`)} ${syncSource.ref}`);
+      info(`${import_picocolors19.default.bold(baseBranch)} is ${import_picocolors19.default.yellow(`${div.ahead} ahead`)} and ${import_picocolors19.default.red(`${div.behind} behind`)} ${syncSource.ref}`);
     } else {
-      info(`${import_picocolors18.default.bold(baseBranch)} is already in sync with ${syncSource.ref}`);
+      info(`${import_picocolors19.default.bold(baseBranch)} is already in sync with ${syncSource.ref}`);
     }
     if (div.ahead > 0) {
       const currentBranch = await getCurrentBranch();
       const protectedBranches = getProtectedBranches(config);
       const isOnProtected = currentBranch && protectedBranches.includes(currentBranch);
       if (isOnProtected) {
-        warn(`You have ${import_picocolors18.default.bold(String(div.ahead))} local commit${div.ahead !== 1 ? "s" : ""} on ${import_picocolors18.default.bold(baseBranch)} that aren't on the remote.`);
+        warn(`You have ${import_picocolors19.default.bold(String(div.ahead))} local commit${div.ahead !== 1 ? "s" : ""} on ${import_picocolors19.default.bold(baseBranch)} that aren't on the remote.`);
         info("Pulling now could create a merge commit, which breaks clean history.");
         console.log();
         const MOVE_BRANCH = "Move my commits to a new feature branch, then sync";
@@ -13628,44 +13789,21 @@ var sync_default = defineCommand({
           return;
         }
         if (action === MOVE_BRANCH) {
-          info(import_picocolors18.default.dim("Tip: Describe what you're going to work on in plain English and we'll generate a branch name."));
-          const description = await inputPrompt("What are you going to work on?");
-          let newBranchName = description;
-          if (!args["no-ai"] && looksLikeNaturalLanguage(description)) {
-            const copilotError = await checkCopilotAvailable();
-            if (!copilotError) {
-              const spinner = createSpinner("Generating branch name suggestion...");
-              const suggested = await suggestBranchName(description, args.model);
-              if (suggested) {
-                spinner.success("Branch name suggestion ready.");
-                console.log(`
-  ${import_picocolors18.default.dim("AI suggestion:")} ${import_picocolors18.default.bold(import_picocolors18.default.cyan(suggested))}`);
-                const accepted = await confirmPrompt(`Use ${import_picocolors18.default.bold(suggested)} as your branch name?`);
-                newBranchName = accepted ? suggested : await inputPrompt("Enter branch name", description);
-              } else {
-                spinner.fail("AI did not return a suggestion.");
-                newBranchName = await inputPrompt("Enter branch name", description);
-              }
-            }
-          }
-          if (!hasPrefix(newBranchName, config.branchPrefixes)) {
-            const prefix = await selectPrompt(`Choose a branch type for ${import_picocolors18.default.bold(newBranchName)}:`, config.branchPrefixes);
-            newBranchName = formatBranchName(prefix, newBranchName);
-          }
-          if (!isValidBranchName(newBranchName)) {
-            error("Invalid branch name. Use only alphanumeric characters, dots, hyphens, underscores, and slashes.");
-            process.exit(1);
-          }
-          if (await branchExists(newBranchName)) {
-            error(`Branch ${import_picocolors18.default.bold(newBranchName)} already exists. Choose a different name.`);
-            process.exit(1);
+          const newBranchName = await promptForBranchName({
+            branchPrefixes: config.branchPrefixes,
+            useAI: isAIEnabled(config, args["no-ai"]),
+            model: args.model
+          });
+          if (!newBranchName) {
+            info("No changes made.");
+            return;
           }
           const branchResult = await createBranch(newBranchName);
           if (branchResult.exitCode !== 0) {
             error(`Failed to create branch: ${branchResult.stderr}`);
             process.exit(1);
           }
-          success(`Created ${import_picocolors18.default.bold(newBranchName)} with your commits.`);
+          success(`Created ${import_picocolors19.default.bold(newBranchName)} with your commits.`);
           const coResult2 = await checkoutBranch(baseBranch);
           if (coResult2.exitCode !== 0) {
             error(`Failed to checkout ${baseBranch}: ${coResult2.stderr}`);
@@ -13673,11 +13811,11 @@ var sync_default = defineCommand({
           }
           const remoteRef = syncSource.ref;
           await updateLocalBranch(baseBranch, remoteRef);
-          success(`Reset ${import_picocolors18.default.bold(baseBranch)} to ${import_picocolors18.default.bold(remoteRef)}.`);
-          success(`${import_picocolors18.default.bold(baseBranch)} is now in sync with ${syncSource.ref}`);
+          success(`Reset ${import_picocolors19.default.bold(baseBranch)} to ${import_picocolors19.default.bold(remoteRef)}.`);
+          success(`${import_picocolors19.default.bold(baseBranch)} is now in sync with ${syncSource.ref}`);
           console.log();
-          info(`Your commits are safe on ${import_picocolors18.default.bold(newBranchName)}.`, "");
-          info(`Run ${import_picocolors18.default.bold(`git checkout ${newBranchName}`)} then ${import_picocolors18.default.bold("contrib update")} to rebase onto the synced ${import_picocolors18.default.bold(baseBranch)}.`, "");
+          info(`Your commits are safe on ${import_picocolors19.default.bold(newBranchName)}.`, "");
+          info(`Run ${import_picocolors19.default.bold(`git checkout ${newBranchName}`)} then ${import_picocolors19.default.bold("contrib update")} to rebase onto the synced ${import_picocolors19.default.bold(baseBranch)}.`, "");
           return;
         }
         allowMergeCommit = true;
@@ -13685,7 +13823,7 @@ var sync_default = defineCommand({
       }
     }
     if (!args.yes) {
-      const ok = await confirmPrompt(`This will pull ${import_picocolors18.default.bold(syncSource.ref)} into local ${import_picocolors18.default.bold(baseBranch)}.`);
+      const ok = await confirmPrompt(`This will pull ${import_picocolors19.default.bold(syncSource.ref)} into local ${import_picocolors19.default.bold(baseBranch)}.`);
       if (!ok)
         process.exit(0);
     }
@@ -13699,8 +13837,8 @@ var sync_default = defineCommand({
       if (allowMergeCommit) {
         error(`Pull failed: ${pullResult.stderr.trim()}`);
       } else {
-        error(`Fast-forward pull failed. Your local ${import_picocolors18.default.bold(baseBranch)} may have diverged.`);
-        info(`Use ${import_picocolors18.default.bold("contrib sync")} again and choose "Move my commits to a new feature branch" to fix this.`, "");
+        error(`Fast-forward pull failed. Your local ${import_picocolors19.default.bold(baseBranch)} may have diverged.`);
+        info(`Use ${import_picocolors19.default.bold("contrib sync")} again and choose "Move my commits to a new feature branch" to fix this.`, "");
       }
       process.exit(1);
     }
@@ -13708,7 +13846,7 @@ var sync_default = defineCommand({
     if (hasDevBranch(workflow) && role === "maintainer") {
       const mainDiv = await getDivergence(config.mainBranch, `${origin}/${config.mainBranch}`);
       if (mainDiv.behind > 0) {
-        info(`Also syncing ${import_picocolors18.default.bold(config.mainBranch)}...`);
+        info(`Also syncing ${import_picocolors19.default.bold(config.mainBranch)}...`);
         const mainCoResult = await checkoutBranch(config.mainBranch);
         if (mainCoResult.exitCode === 0) {
           const mainPullResult = await pullFastForwardOnly(origin, config.mainBranch);
@@ -13746,20 +13884,20 @@ var sync_default = defineCommand({
           groups.get(hash).push(name);
         }
         console.log();
-        console.log(`  ${import_picocolors18.default.bold("\uD83D\uDD17 Branch Alignment")}`);
+        console.log(`  ${import_picocolors19.default.bold("\uD83D\uDD17 Branch Alignment")}`);
         for (const [hash, names] of groups) {
           const short = hash.slice(0, 7);
-          const nameStr = names.map((n2) => import_picocolors18.default.bold(n2)).join(import_picocolors18.default.dim(" · "));
-          console.log(`     ${import_picocolors18.default.yellow(short)} ${import_picocolors18.default.dim("──")} ${nameStr}`);
+          const nameStr = names.map((n2) => import_picocolors19.default.bold(n2)).join(import_picocolors19.default.dim(" · "));
+          console.log(`     ${import_picocolors19.default.yellow(short)} ${import_picocolors19.default.dim("──")} ${nameStr}`);
           const subject = await getCommitSubject(hash);
           if (subject) {
-            console.log(`                ${import_picocolors18.default.dim(subject)}`);
+            console.log(`                ${import_picocolors19.default.dim(subject)}`);
           }
         }
         if (groups.size === 1) {
-          console.log(`     ${import_picocolors18.default.green("✓")} ${import_picocolors18.default.green("All branches aligned")} ${import_picocolors18.default.dim("— ready to start")}`);
+          console.log(`     ${import_picocolors19.default.green("✓")} ${import_picocolors19.default.green("All branches aligned")} ${import_picocolors19.default.dim("— ready to start")}`);
         } else {
-          console.log(`     ${import_picocolors18.default.yellow("⚠")} ${import_picocolors18.default.yellow("Branches are not fully aligned")}`);
+          console.log(`     ${import_picocolors19.default.yellow("⚠")} ${import_picocolors19.default.yellow("Branches are not fully aligned")}`);
         }
       }
     }
@@ -13768,7 +13906,7 @@ var sync_default = defineCommand({
 
 // src/commands/update.ts
 import { readFileSync as readFileSync4 } from "node:fs";
-var import_picocolors19 = __toESM(require_picocolors(), 1);
+var import_picocolors20 = __toESM(require_picocolors(), 1);
 var update_default = defineCommand({
   meta: {
     name: "update",
@@ -13805,8 +13943,8 @@ var update_default = defineCommand({
       process.exit(1);
     }
     if (protectedBranches.includes(currentBranch)) {
-      heading("\uD83D\uDD03 contrib update");
-      warn(`You're on ${import_picocolors19.default.bold(currentBranch)}, which is a protected branch. Updates (rebase) apply to feature branches.`);
+      projectHeading("update", "\uD83D\uDD03");
+      warn(`You're on ${import_picocolors20.default.bold(currentBranch)}, which is a protected branch. Updates (rebase) apply to feature branches.`);
       await fetchAll();
       const { origin } = config;
       const remoteRef = `${origin}/${currentBranch}`;
@@ -13815,12 +13953,12 @@ var update_default = defineCommand({
       const hasCommits = localWork.unpushedCommits > 0;
       const hasAnything = hasCommits || dirty;
       if (!hasAnything) {
-        info(`No local changes found on ${import_picocolors19.default.bold(currentBranch)}.`);
-        info(`Use ${import_picocolors19.default.bold("contrib sync")} to sync protected branches, or ${import_picocolors19.default.bold("contrib start")} to create a feature branch.`);
+        info(`No local changes found on ${import_picocolors20.default.bold(currentBranch)}.`);
+        info(`Use ${import_picocolors20.default.bold("contrib sync")} to sync protected branches, or ${import_picocolors20.default.bold("contrib start")} to create a feature branch.`);
         process.exit(1);
       }
       if (hasCommits) {
-        info(`Found ${import_picocolors19.default.bold(String(localWork.unpushedCommits))} unpushed commit${localWork.unpushedCommits !== 1 ? "s" : ""} on ${import_picocolors19.default.bold(currentBranch)}.`);
+        info(`Found ${import_picocolors20.default.bold(String(localWork.unpushedCommits))} unpushed commit${localWork.unpushedCommits !== 1 ? "s" : ""} on ${import_picocolors20.default.bold(currentBranch)}.`);
       }
       if (dirty) {
         info("You also have uncommitted changes in the working tree.");
@@ -13836,56 +13974,37 @@ var update_default = defineCommand({
         info("No changes made. You are still on your current branch.");
         return;
       }
-      info(import_picocolors19.default.dim("Tip: Describe what you're going to work on in plain English and we'll generate a branch name."));
-      const description = await inputPrompt("What are you going to work on?");
-      let newBranchName = description;
-      if (!args["no-ai"] && looksLikeNaturalLanguage(description)) {
-        const copilotError = await checkCopilotAvailable();
-        if (!copilotError) {
-          const spinner = createSpinner("Generating branch name suggestion...");
-          const suggested = await suggestBranchName(description, args.model);
-          if (suggested) {
-            spinner.success("Branch name suggestion ready.");
-            console.log(`
-  ${import_picocolors19.default.dim("AI suggestion:")} ${import_picocolors19.default.bold(import_picocolors19.default.cyan(suggested))}`);
-            const accepted = await confirmPrompt(`Use ${import_picocolors19.default.bold(suggested)} as your branch name?`);
-            newBranchName = accepted ? suggested : await inputPrompt("Enter branch name", description);
-          } else {
-            spinner.fail("AI did not return a suggestion.");
-            newBranchName = await inputPrompt("Enter branch name", description);
-          }
-        }
-      }
-      if (!hasPrefix(newBranchName, config.branchPrefixes)) {
-        const prefix = await selectPrompt(`Choose a branch type for ${import_picocolors19.default.bold(newBranchName)}:`, config.branchPrefixes);
-        newBranchName = formatBranchName(prefix, newBranchName);
-      }
-      if (!isValidBranchName(newBranchName)) {
-        error("Invalid branch name. Use only alphanumeric characters, dots, hyphens, underscores, and slashes.");
-        process.exit(1);
+      const newBranchName = await promptForBranchName({
+        branchPrefixes: config.branchPrefixes,
+        useAI: isAIEnabled(config, args["no-ai"]),
+        model: args.model
+      });
+      if (!newBranchName) {
+        info("No changes made. You are still on your current branch.");
+        return;
       }
       const branchResult = await createBranch(newBranchName);
       if (branchResult.exitCode !== 0) {
         error(`Failed to create branch: ${branchResult.stderr}`);
         process.exit(1);
       }
-      success(`Created ${import_picocolors19.default.bold(newBranchName)} with your changes.`);
+      success(`Created ${import_picocolors20.default.bold(newBranchName)} with your changes.`);
       await updateLocalBranch(currentBranch, remoteRef);
-      info(`Reset ${import_picocolors19.default.bold(currentBranch)} back to ${import_picocolors19.default.bold(remoteRef)} — no damage done.`, "");
+      info(`Reset ${import_picocolors20.default.bold(currentBranch)} back to ${import_picocolors20.default.bold(remoteRef)} — no damage done.`, "");
       console.log();
-      success(`You're now on ${import_picocolors19.default.bold(newBranchName)} with all your work intact.`);
-      info(`Run ${import_picocolors19.default.bold("contrib update")} again to rebase onto latest ${import_picocolors19.default.bold(baseBranch)}.`, "");
+      success(`You're now on ${import_picocolors20.default.bold(newBranchName)} with all your work intact.`);
+      info(`Run ${import_picocolors20.default.bold("contrib update")} again to rebase onto latest ${import_picocolors20.default.bold(baseBranch)}.`, "");
       return;
     }
     if (await hasUncommittedChanges()) {
       error("You have uncommitted changes. Please commit or stash them first.");
       process.exit(1);
     }
-    heading("\uD83D\uDD03 contrib update");
+    projectHeading("update", "\uD83D\uDD03");
     const mergedPR = await getMergedPRForBranch(currentBranch);
     if (mergedPR) {
-      warn(`PR #${mergedPR.number} (${import_picocolors19.default.bold(mergedPR.title)}) has already been merged.`);
-      info(`Link: ${import_picocolors19.default.underline(mergedPR.url)}`, "");
+      warn(`PR #${mergedPR.number} (${import_picocolors20.default.bold(mergedPR.title)}) has already been merged.`);
+      info(`Link: ${import_picocolors20.default.underline(mergedPR.url)}`, "");
       const localWork = await hasLocalWork(syncSource.remote, currentBranch);
       const hasWork = localWork.uncommitted || localWork.unpushedCommits > 0;
       if (hasWork) {
@@ -13898,49 +14017,29 @@ var update_default = defineCommand({
         const SAVE_NEW_BRANCH = "Save changes to a new branch";
         const DISCARD = "Discard all changes and clean up";
         const CANCEL = "Cancel";
-        const action = await selectPrompt(`${import_picocolors19.default.bold(currentBranch)} is stale but has local work. What would you like to do?`, [SAVE_NEW_BRANCH, DISCARD, CANCEL]);
+        const action = await selectPrompt(`${import_picocolors20.default.bold(currentBranch)} is stale but has local work. What would you like to do?`, [SAVE_NEW_BRANCH, DISCARD, CANCEL]);
         if (action === CANCEL) {
           info("No changes made. You are still on your current branch.");
           return;
         }
         if (action === SAVE_NEW_BRANCH) {
-          info(import_picocolors19.default.dim("Tip: Describe what you're going to work on in plain English and we'll generate a branch name."));
-          const description = await inputPrompt("What are you going to work on?");
-          let newBranchName = description;
-          if (!args["no-ai"] && looksLikeNaturalLanguage(description)) {
-            const spinner = createSpinner("Generating branch name suggestion...");
-            const suggested = await suggestBranchName(description, args.model);
-            if (suggested) {
-              spinner.success("Branch name suggestion ready.");
-              console.log(`
-  ${import_picocolors19.default.dim("AI suggestion:")} ${import_picocolors19.default.bold(import_picocolors19.default.cyan(suggested))}`);
-              const accepted = await confirmPrompt(`Use ${import_picocolors19.default.bold(suggested)} as your branch name?`);
-              newBranchName = accepted ? suggested : await inputPrompt("Enter branch name", description);
-            } else {
-              spinner.fail("AI did not return a suggestion.");
-              newBranchName = await inputPrompt("Enter branch name", description);
-            }
-          }
-          if (!hasPrefix(newBranchName, config.branchPrefixes)) {
-            const prefix = await selectPrompt(`Choose a branch type for ${import_picocolors19.default.bold(newBranchName)}:`, config.branchPrefixes);
-            newBranchName = formatBranchName(prefix, newBranchName);
-          }
-          if (!isValidBranchName(newBranchName)) {
-            error("Invalid branch name. Use only alphanumeric characters, dots, hyphens, underscores, and slashes.");
-            process.exit(1);
+          const newBranchName = await promptForBranchName({
+            branchPrefixes: config.branchPrefixes,
+            useAI: isAIEnabled(config, args["no-ai"]),
+            model: args.model
+          });
+          if (!newBranchName) {
+            info("No changes made. You are still on your current branch.");
+            return;
           }
           const staleUpstream = await getUpstreamRef();
           const staleUpstreamHash = staleUpstream ? await getCommitHash(staleUpstream) : null;
-          if (await branchExists(newBranchName)) {
-            error(`Branch ${import_picocolors19.default.bold(newBranchName)} already exists. Choose a different name.`);
-            process.exit(1);
-          }
           const renameResult = await renameBranch(currentBranch, newBranchName);
           if (renameResult.exitCode !== 0) {
             error(`Failed to rename branch: ${renameResult.stderr}`);
             process.exit(1);
           }
-          success(`Renamed ${import_picocolors19.default.bold(currentBranch)} → ${import_picocolors19.default.bold(newBranchName)}`);
+          success(`Renamed ${import_picocolors20.default.bold(currentBranch)} → ${import_picocolors20.default.bold(newBranchName)}`);
           await unsetUpstream();
           await fetchRemote(syncSource.remote);
           let rebaseResult2;
@@ -13952,11 +14051,11 @@ var update_default = defineCommand({
           }
           if (rebaseResult2.exitCode !== 0) {
             warn("Rebase encountered conflicts. Resolve them manually, then run:");
-            info(`  ${import_picocolors19.default.bold("git rebase --continue")}`, "");
+            info(`  ${import_picocolors20.default.bold("git rebase --continue")}`, "");
           } else {
-            success(`Rebased ${import_picocolors19.default.bold(newBranchName)} onto ${import_picocolors19.default.bold(syncSource.ref)}.`);
+            success(`Rebased ${import_picocolors20.default.bold(newBranchName)} onto ${import_picocolors20.default.bold(syncSource.ref)}.`);
           }
-          info(`All your changes are preserved. Run ${import_picocolors19.default.bold("contrib submit")} when ready to create a new PR.`, "");
+          info(`All your changes are preserved. Run ${import_picocolors20.default.bold("contrib submit")} when ready to create a new PR.`, "");
           return;
         }
         warn("Discarding local changes...");
@@ -13969,30 +14068,30 @@ var update_default = defineCommand({
         process.exit(1);
       }
       await updateLocalBranch(baseBranch, syncSource.ref);
-      success(`Synced ${import_picocolors19.default.bold(baseBranch)} with ${import_picocolors19.default.bold(syncSource.ref)}.`);
-      info(`Deleting stale branch ${import_picocolors19.default.bold(currentBranch)}...`);
+      success(`Synced ${import_picocolors20.default.bold(baseBranch)} with ${import_picocolors20.default.bold(syncSource.ref)}.`);
+      info(`Deleting stale branch ${import_picocolors20.default.bold(currentBranch)}...`);
       await forceDeleteBranch(currentBranch);
-      success(`Deleted ${import_picocolors19.default.bold(currentBranch)}.`);
-      info(`Run ${import_picocolors19.default.bold("contrib start")} to begin a new feature branch.`, "");
+      success(`Deleted ${import_picocolors20.default.bold(currentBranch)}.`);
+      info(`Run ${import_picocolors20.default.bold("contrib start")} to begin a new feature branch.`, "");
       return;
     }
-    info(`Updating ${import_picocolors19.default.bold(currentBranch)} with latest ${import_picocolors19.default.bold(baseBranch)}...`);
+    info(`Updating ${import_picocolors20.default.bold(currentBranch)} with latest ${import_picocolors20.default.bold(baseBranch)}...`);
     await fetchRemote(syncSource.remote);
     if (!await refExists(syncSource.ref)) {
-      error(`Remote ref ${import_picocolors19.default.bold(syncSource.ref)} does not exist.`);
+      error(`Remote ref ${import_picocolors20.default.bold(syncSource.ref)} does not exist.`);
       error("Run `git fetch --all` and verify your remote configuration.");
       process.exit(1);
     }
     await updateLocalBranch(baseBranch, syncSource.ref);
     const rebaseStrategy = await determineRebaseStrategy(currentBranch, syncSource.ref);
     if (rebaseStrategy.strategy === "onto" && rebaseStrategy.ontoOldBase) {
-      info(import_picocolors19.default.dim(`Using --onto rebase (branch was based on a different ref)`));
+      info(import_picocolors20.default.dim(`Using --onto rebase (branch was based on a different ref)`));
     }
     const rebaseResult = rebaseStrategy.strategy === "onto" && rebaseStrategy.ontoOldBase ? await rebaseOnto(syncSource.ref, rebaseStrategy.ontoOldBase) : await rebase(syncSource.ref);
     if (rebaseResult.exitCode !== 0) {
       warn("Rebase hit conflicts. Resolve them manually.");
       console.log();
-      if (!args["no-ai"]) {
+      if (isAIEnabled(config, args["no-ai"])) {
         const copilotError = await checkCopilotAvailable();
         if (!copilotError) {
           info("Fetching AI conflict resolution suggestions...");
@@ -14015,10 +14114,10 @@ ${content.slice(0, 2000)}
             if (suggestion) {
               spinner.success("AI conflict guidance ready.");
               console.log(`
-${import_picocolors19.default.bold("\uD83D\uDCA1 AI Conflict Resolution Guidance:")}`);
-              console.log(import_picocolors19.default.dim("─".repeat(60)));
+${import_picocolors20.default.bold("\uD83D\uDCA1 AI Conflict Resolution Guidance:")}`);
+              console.log(import_picocolors20.default.dim("─".repeat(60)));
               console.log(suggestion);
-              console.log(import_picocolors19.default.dim("─".repeat(60)));
+              console.log(import_picocolors20.default.dim("─".repeat(60)));
               console.log();
             } else {
               spinner.fail("AI could not analyze the conflicts.");
@@ -14026,20 +14125,21 @@ ${import_picocolors19.default.bold("\uD83D\uDCA1 AI Conflict Resolution Guidance
           }
         }
       }
-      console.log(import_picocolors19.default.bold("To resolve:"));
+      console.log(import_picocolors20.default.bold("To resolve:"));
       console.log(`  1. Fix conflicts in the affected files`);
-      console.log(`  2. ${import_picocolors19.default.cyan("git add <resolved-files>")}`);
-      console.log(`  3. ${import_picocolors19.default.cyan("git rebase --continue")}`);
+      console.log(`  2. ${import_picocolors20.default.cyan("git add <resolved-files>")}`);
+      console.log(`  3. ${import_picocolors20.default.cyan("git rebase --continue")}`);
       console.log();
-      console.log(`  Or abort: ${import_picocolors19.default.cyan("git rebase --abort")}`);
+      console.log(`  Or abort: ${import_picocolors20.default.cyan("git rebase --abort")}`);
       process.exit(1);
     }
-    success(`${import_picocolors19.default.bold(currentBranch)} has been rebased onto latest ${import_picocolors19.default.bold(baseBranch)}`);
+    success(`${import_picocolors20.default.bold(currentBranch)} has been rebased onto latest ${import_picocolors20.default.bold(baseBranch)}`);
   }
 });
 
 // src/commands/validate.ts
-var import_picocolors20 = __toESM(require_picocolors(), 1);
+var import_picocolors21 = __toESM(require_picocolors(), 1);
+import { readFileSync as readFileSync5 } from "node:fs";
 var validate_default = defineCommand({
   meta: {
     name: "validate",
@@ -14049,7 +14149,11 @@ var validate_default = defineCommand({
     message: {
       type: "positional",
       description: "The commit message to validate",
-      required: true
+      required: false
+    },
+    file: {
+      type: "string",
+      description: "Path to a commit message file; only the first line is validated"
     }
   },
   async run({ args }) {
@@ -14063,14 +14167,18 @@ var validate_default = defineCommand({
       info('Commit convention is set to "none". All messages are accepted.');
       process.exit(0);
     }
-    const message = args.message;
+    const message = args.file ? readFileSync5(args.file, "utf-8").split(/\r?\n/, 1)[0] ?? "" : args.message;
+    if (!message) {
+      error("No commit message provided. Pass a message or use --file <path>.");
+      process.exit(1);
+    }
     if (validateCommitMessage(message, convention)) {
       success(`Valid ${CONVENTION_LABELS[convention]} message.`);
       process.exit(0);
     }
     const errors = getValidationError(convention);
     for (const line of errors) {
-      console.error(import_picocolors20.default.red(`  ✗ ${line}`));
+      console.error(import_picocolors21.default.red(`  ✗ ${line}`));
     }
     process.exit(1);
   }
@@ -15465,7 +15573,7 @@ nodeFiglet.fontsSync = function() {
 };
 
 // src/ui/banner.ts
-var import_picocolors21 = __toESM(require_picocolors(), 1);
+var import_picocolors22 = __toESM(require_picocolors(), 1);
 var LOGO_BIG;
 try {
   LOGO_BIG = nodeFiglet.textSync(`Contribute
@@ -15487,19 +15595,33 @@ function getAuthor() {
 }
 function showBanner(variant = "small") {
   const logo = variant === "big" ? LOGO_BIG : LOGO_SMALL;
-  console.log(import_picocolors21.default.cyan(`
+  console.log(import_picocolors22.default.cyan(`
 ${logo}`));
-  console.log(`  ${import_picocolors21.default.dim(`v${getVersion()}`)} ${import_picocolors21.default.dim("—")} ${import_picocolors21.default.dim(`Built by ${getAuthor()}`)}`);
+  console.log(`  ${import_picocolors22.default.dim(`v${getVersion()}`)} ${import_picocolors22.default.dim("—")} ${import_picocolors22.default.dim(`Built by ${getAuthor()}`)}`);
   if (variant === "big") {
     console.log();
-    console.log(`  ${import_picocolors21.default.yellow("Star")}        ${import_picocolors21.default.cyan("https://github.com/warengonzaga/contribute-now")}`);
-    console.log(`  ${import_picocolors21.default.green("Contribute")}  ${import_picocolors21.default.cyan("https://github.com/warengonzaga/contribute-now/blob/main/CONTRIBUTING.md")}`);
-    console.log(`  ${import_picocolors21.default.magenta("Sponsor")}     ${import_picocolors21.default.cyan("https://warengonzaga.com/sponsor")}`);
+    console.log(`  ${import_picocolors22.default.yellow("Star")}        ${import_picocolors22.default.cyan("https://github.com/warengonzaga/contribute-now")}`);
+    console.log(`  ${import_picocolors22.default.green("Contribute")}  ${import_picocolors22.default.cyan("https://github.com/warengonzaga/contribute-now/blob/main/CONTRIBUTING.md")}`);
+    console.log(`  ${import_picocolors22.default.magenta("Sponsor")}     ${import_picocolors22.default.cyan("https://warengonzaga.com/sponsor")}`);
   }
   console.log();
 }
 
 // src/index.ts
+function normalizeCliArgs(argv2) {
+  return argv2.map((arg, index) => {
+    const previous = argv2[index - 1];
+    const isSubmitCommand = previous === "submit" || argv2.includes("submit");
+    if (!isSubmitCommand) {
+      return arg;
+    }
+    if (arg === "-pr" || arg === "--pr") {
+      return "--pullrequest";
+    }
+    return arg;
+  });
+}
+process.argv = normalizeCliArgs(process.argv);
 var isVersion = process.argv.includes("--version") || process.argv.includes("-v");
 if (!isVersion) {
   const subCommands = [