contribute-now 0.2.0-dev.33be40f → 0.2.0-dev.7c81c96

package/dist/index.js

@@ -5,23 +5,7 @@ import { defineCommand as defineCommand11, runMain } from "citty";
 
 // src/commands/clean.ts
 import { defineCommand } from "citty";
-import pc4 from "picocolors";
-
-// src/utils/branch.ts
-var DEFAULT_PREFIXES = ["feature", "fix", "docs", "chore", "test", "refactor"];
-function hasPrefix(branchName, prefixes = DEFAULT_PREFIXES) {
-  return prefixes.some((p) => branchName.startsWith(`${p}/`));
-}
-function formatBranchName(prefix, name) {
-  const sanitized = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-  return `${prefix}/${sanitized}`;
-}
-function isValidBranchName(name) {
-  return /^[a-zA-Z0-9._/-]+$/.test(name) && !name.startsWith("/") && !name.endsWith("/");
-}
-function looksLikeNaturalLanguage(input) {
-  return input.includes(" ") && !input.includes("/");
-}
+import pc3 from "picocolors";
 
 // src/utils/config.ts
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
@@ -116,649 +100,201 @@ async function multiSelectPrompt(message, choices) {
   return result;
 }
 
-// src/utils/copilot.ts
-import { CopilotClient } from "@github/copilot-sdk";
-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.
-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.
-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) {
-  const conventionBlock = convention === "conventional" ? `Use Conventional Commit format: <type>[(<scope>)]: <description>
-Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert` : `Use Clean Commit format: <emoji> <type>[!][ (<scope>)]: <description>
-Emoji/type table:
-\uD83D\uDCE6 new, \uD83D\uDD27 update, \uD83D\uDDD1️ remove, \uD83D\uDD12 security, ⚙️ setup, ☕ chore, \uD83E\uDDEA test, \uD83D\uDCD6 docs, \uD83D\uDE80 release`;
-  return `You are a smart commit grouping assistant. Given a list of changed files and their diffs, group related changes into logical atomic commits.
-
-${conventionBlock}
-
-Return a JSON array of commit groups with this EXACT structure (no markdown fences, no explanation):
-[
-  {
-    "files": ["path/to/file1.ts", "path/to/file2.ts"],
-    "message": "<commit message following the convention above>"
-  }
-]
-
-Rules:
-- Group files that are logically related (e.g. a utility and its tests, a feature and its types)
-- 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
-- Order groups so foundational changes come first (types, utils) and consumers come after
-- Return ONLY the JSON array, nothing else`;
+// src/utils/git.ts
+import { execFile as execFileCb } from "node:child_process";
+import { readFileSync as readFileSync2 } from "node:fs";
+import { join as join2 } from "node:path";
+function run(args) {
+  return new Promise((resolve) => {
+    execFileCb("git", args, (error, stdout, stderr) => {
+      resolve({
+        exitCode: error ? error.code === "ENOENT" ? 127 : error.status ?? 1 : 0,
+        stdout: stdout ?? "",
+        stderr: stderr ?? ""
+      });
+    });
+  });
 }
-var BRANCH_NAME_SYSTEM_PROMPT = `You are a git branch name generator. Your ONLY job is to output a single git branch name. NOTHING ELSE.
-Output format: <prefix>/<kebab-case-name>
-Valid prefixes: feature, fix, docs, chore, test, refactor
-Rules: lowercase, kebab-case, 2-5 words after the prefix, no punctuation.
-CRITICAL: Output ONLY the branch name on a single line. No explanation. No markdown. No questions. No other text.
-Examples: fix/login-timeout | feature/user-profile-page | docs/update-readme | chore/update-pr-title`;
-var PR_DESCRIPTION_SYSTEM_PROMPT_BASE = `GitHub PR description generator. Return JSON: {"title":"<72 chars>","body":"## Summary\\n...\\n\\n## Changes\\n- ...\\n\\n## Test Plan\\n..."}
-IMPORTANT: The title must capture the overall theme or goal of the PR — NOT enumerate individual changes. Think: what problem does this PR solve or what capability does it add? Keep it focused and specific but high-level.`;
-function getPRDescriptionSystemPrompt(convention) {
-  if (convention === "clean-commit") {
-    return `${PR_DESCRIPTION_SYSTEM_PROMPT_BASE}
-CRITICAL: The PR title MUST follow the Clean Commit format exactly: <emoji> <type>: <description>
-Emoji/type table: \uD83D\uDCE6 new, \uD83D\uDD27 update, \uD83D\uDDD1️ remove, \uD83D\uDD12 security, ⚙️ setup, ☕ chore, \uD83E\uDDEA test, \uD83D\uDCD6 docs, \uD83D\uDE80 release
-Title examples: \uD83D\uDCE6 new: add user authentication | \uD83D\uDD27 update: improve error handling | \uD83D\uDDD1️ remove: drop legacy API
-Rules: title follows convention, present tense, max 72 chars, describes the PR theme not individual commits; body has Summary, Changes (bullets), Test Plan sections. Return ONLY the JSON object, no fences.`;
-  }
-  if (convention === "conventional") {
-    return `${PR_DESCRIPTION_SYSTEM_PROMPT_BASE}
-CRITICAL: The PR title MUST follow Conventional Commits format: <type>[(<scope>)]: <description>
-Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
-Title examples: feat: add user authentication | fix(auth): resolve token expiry | docs: update contributing guide
-Rules: title follows convention, present tense, max 72 chars, describes the PR theme not individual commits; body has Summary, Changes (bullets), Test Plan sections. Return ONLY the JSON object, no fences.`;
-  }
-  return `${PR_DESCRIPTION_SYSTEM_PROMPT_BASE}
-Rules: title concise present tense, describes the PR theme not individual commits; body has Summary, Changes (bullets), Test Plan sections. Return ONLY the JSON object, no fences.`;
+async function isGitRepo() {
+  const { exitCode } = await run(["rev-parse", "--is-inside-work-tree"]);
+  return exitCode === 0;
 }
-var CONFLICT_RESOLUTION_SYSTEM_PROMPT = `Git merge conflict advisor. Explain each side, suggest resolution strategy. Never auto-resolve — guidance only. Be concise and actionable.`;
-function suppressSubprocessWarnings() {
-  process.env.NODE_NO_WARNINGS = "1";
+async function getCurrentBranch() {
+  const { exitCode, stdout } = await run(["rev-parse", "--abbrev-ref", "HEAD"]);
+  if (exitCode !== 0)
+    return null;
+  return stdout.trim() || null;
 }
-function withTimeout(promise, ms) {
-  return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => reject(new Error(`Copilot request timed out after ${ms / 1000}s`)), ms);
-    promise.then((val) => {
-      clearTimeout(timer);
-      resolve(val);
-    }, (err) => {
-      clearTimeout(timer);
-      reject(err);
-    });
-  });
+async function getRemotes() {
+  const { exitCode, stdout } = await run(["remote"]);
+  if (exitCode !== 0)
+    return [];
+  return stdout.trim().split(`
+`).map((r) => r.trim()).filter(Boolean);
 }
-var COPILOT_TIMEOUT_MS = 30000;
-var COPILOT_LONG_TIMEOUT_MS = 90000;
-async function checkCopilotAvailable() {
-  try {
-    const client = await getManagedClient();
-    try {
-      await client.ping();
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      if (msg.includes("auth") || msg.includes("token") || msg.includes("401") || msg.includes("403")) {
-        return "Copilot authentication failed. Run `gh auth login` to refresh your token.";
-      }
-      if (msg.includes("ECONNREFUSED") || msg.includes("timeout") || msg.includes("network")) {
-        return "Could not reach GitHub Copilot service. Check your internet connection.";
-      }
-      return `Copilot health check failed: ${msg}`;
-    }
+async function getRemoteUrl(remote) {
+  const { exitCode, stdout } = await run(["remote", "get-url", remote]);
+  if (exitCode !== 0)
     return null;
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    if (msg.includes("ENOENT") || msg.includes("not found")) {
-      return "Copilot CLI binary not found. Ensure GitHub Copilot is installed and your gh CLI is up to date.";
-    }
-    return `Failed to start Copilot service: ${msg}`;
-  }
+  return stdout.trim() || null;
 }
-var _managedClient = null;
-var _clientStarted = false;
-async function getManagedClient() {
-  if (!_managedClient || !_clientStarted) {
-    suppressSubprocessWarnings();
-    _managedClient = new CopilotClient;
-    await _managedClient.start();
-    _clientStarted = true;
-    const cleanup = () => {
-      if (_managedClient && _clientStarted) {
-        try {
-          _managedClient.stop();
-        } catch {}
-        _clientStarted = false;
-        _managedClient = null;
-      }
-    };
-    process.once("exit", cleanup);
-    process.once("SIGINT", cleanup);
-    process.once("SIGTERM", cleanup);
-  }
-  return _managedClient;
+async function hasUncommittedChanges() {
+  const { exitCode, stdout } = await run(["status", "--porcelain"]);
+  if (exitCode !== 0)
+    return false;
+  return stdout.trim().length > 0;
 }
-async function callCopilot(systemMessage, userMessage, model, timeoutMs = COPILOT_TIMEOUT_MS) {
-  const client = await getManagedClient();
-  const sessionConfig = {
-    systemMessage: { mode: "replace", content: systemMessage }
-  };
-  if (model)
-    sessionConfig.model = model;
-  const session = await client.createSession(sessionConfig);
-  try {
-    const response = await withTimeout(session.sendAndWait({ prompt: userMessage }), timeoutMs);
-    if (!response?.data?.content)
-      return null;
-    return response.data.content;
-  } finally {
-    await session.destroy();
-  }
+async function fetchRemote(remote) {
+  return run(["fetch", remote]);
 }
-function getCommitSystemPrompt(convention) {
-  if (convention === "conventional")
-    return CONVENTIONAL_COMMIT_SYSTEM_PROMPT;
-  return CLEAN_COMMIT_SYSTEM_PROMPT;
+async function fetchAll() {
+  return run(["fetch", "--all", "--quiet"]);
 }
-function extractJson(raw) {
-  let text2 = raw.trim().replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
-  if (text2.startsWith("[") || text2.startsWith("{"))
-    return text2;
-  const arrayStart = text2.indexOf("[");
-  const objStart = text2.indexOf("{");
-  let start;
-  let closeChar;
-  if (arrayStart === -1 && objStart === -1)
-    return text2;
-  if (arrayStart === -1) {
-    start = objStart;
-    closeChar = "}";
-  } else if (objStart === -1) {
-    start = arrayStart;
-    closeChar = "]";
-  } else if (arrayStart < objStart) {
-    start = arrayStart;
-    closeChar = "]";
-  } else {
-    start = objStart;
-    closeChar = "}";
-  }
-  const end = text2.lastIndexOf(closeChar);
-  if (end > start) {
-    text2 = text2.slice(start, end + 1);
-  }
-  return text2;
+async function checkoutBranch(branch) {
+  return run(["checkout", branch]);
 }
-async function generateCommitMessage(diff, stagedFiles, model, convention = "clean-commit") {
-  try {
-    const multiFileHint = stagedFiles.length > 1 ? `
-
-IMPORTANT: Multiple files are staged. Generate ONE commit message that captures the high-level purpose of ALL changes together. Focus on the overall intent, not individual file changes. Be specific but concise — do not list every file.` : "";
-    const userMessage = `Generate a commit message for these staged changes:
-
-Files: ${stagedFiles.join(", ")}
-
-Diff:
-${diff.slice(0, 4000)}${multiFileHint}`;
-    const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model);
-    return result?.trim() ?? null;
-  } catch {
-    return null;
-  }
+async function createBranch(branch, from) {
+  const args = from ? ["checkout", "-b", branch, from] : ["checkout", "-b", branch];
+  return run(args);
 }
-async function generatePRDescription(commits, diff, model, convention = "clean-commit") {
-  try {
-    const userMessage = `Generate a PR description for these changes:
-
-Commits:
-${commits.join(`
-`)}
-
-Diff (truncated):
-${diff.slice(0, 4000)}`;
-    const result = await callCopilot(getPRDescriptionSystemPrompt(convention), userMessage, model);
-    if (!result)
-      return null;
-    const cleaned = extractJson(result);
-    return JSON.parse(cleaned);
-  } catch {
-    return null;
+async function resetHard(ref) {
+  return run(["reset", "--hard", ref]);
+}
+async function updateLocalBranch(branch, target) {
+  const current = await getCurrentBranch();
+  if (current === branch) {
+    return resetHard(target);
   }
+  return run(["branch", "-f", branch, target]);
 }
-async function suggestBranchName(description, model) {
-  try {
-    const result = await callCopilot(BRANCH_NAME_SYSTEM_PROMPT, description, model);
-    const trimmed = result?.trim() ?? null;
-    if (trimmed && /^[a-z]+\/[a-z0-9-]+$/.test(trimmed)) {
-      return trimmed;
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-async function suggestConflictResolution(conflictDiff, model) {
-  try {
-    const userMessage = `Help me resolve this merge conflict:
-
-${conflictDiff.slice(0, 4000)}`;
-    const result = await callCopilot(CONFLICT_RESOLUTION_SYSTEM_PROMPT, userMessage, model);
-    return result?.trim() ?? null;
-  } catch {
-    return null;
-  }
-}
-async function generateCommitGroups(files, diffs, model, convention = "clean-commit") {
-  const userMessage = `Group these changed files into logical atomic commits:
-
-Files:
-${files.join(`
-`)}
-
-Diffs (truncated):
-${diffs.slice(0, 6000)}`;
-  const result = await callCopilot(getGroupingSystemPrompt(convention), userMessage, model, COPILOT_LONG_TIMEOUT_MS);
-  if (!result) {
-    throw new Error("AI returned an empty response");
-  }
-  const cleaned = extractJson(result);
-  let parsed;
-  try {
-    parsed = JSON.parse(cleaned);
-  } catch {
-    throw new Error(`AI response is not valid JSON. Raw start: "${result.slice(0, 120)}..."`);
-  }
-  const groups = parsed;
-  if (!Array.isArray(groups) || groups.length === 0) {
-    throw new Error("AI response was not a valid JSON array of commit groups");
-  }
-  for (const group of groups) {
-    if (!Array.isArray(group.files) || typeof group.message !== "string") {
-      throw new Error("AI returned groups with invalid structure (missing files or message)");
-    }
-  }
-  return groups;
+async function pushSetUpstream(remote, branch) {
+  return run(["push", "-u", remote, branch]);
 }
-async function regenerateAllGroupMessages(groups, diffs, model, convention = "clean-commit") {
-  const groupSummary = groups.map((g, i) => `Group ${i + 1}: [${g.files.join(", ")}]`).join(`
-`);
-  const userMessage = `Regenerate ONLY the commit messages for these pre-defined file groups. Do NOT change the file groupings.
-
-Groups:
-${groupSummary}
-
-Diffs (truncated):
-${diffs.slice(0, 6000)}`;
-  const result = await callCopilot(getGroupingSystemPrompt(convention), userMessage, model, COPILOT_LONG_TIMEOUT_MS);
-  if (!result)
-    return groups;
-  try {
-    const cleaned = extractJson(result);
-    const parsed = JSON.parse(cleaned);
-    if (!Array.isArray(parsed) || parsed.length !== groups.length)
-      return groups;
-    return groups.map((g, i) => ({
-      files: g.files,
-      message: typeof parsed[i]?.message === "string" ? parsed[i].message : g.message
-    }));
-  } catch {
-    return groups;
-  }
+async function rebase(branch) {
+  return run(["rebase", branch]);
 }
-async function regenerateGroupMessage(files, diffs, model, convention = "clean-commit") {
-  try {
-    const userMessage = `Generate a single commit message for these files:
-
-Files: ${files.join(", ")}
-
-Diff:
-${diffs.slice(0, 4000)}`;
-    const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model);
-    return result?.trim() ?? null;
-  } catch {
+async function getUpstreamRef() {
+  const { exitCode, stdout } = await run(["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"]);
+  if (exitCode !== 0)
     return null;
-  }
-}
-
-// src/utils/gh.ts
-import { execFile as execFileCb } from "node:child_process";
-function run(args) {
-  return new Promise((resolve) => {
-    execFileCb("gh", args, (error, stdout, stderr) => {
-      resolve({
-        exitCode: error ? error.code === "ENOENT" ? 127 : error.status ?? 1 : 0,
-        stdout: stdout ?? "",
-        stderr: stderr ?? ""
-      });
-    });
-  });
+  return stdout.trim() || null;
 }
-async function checkGhInstalled() {
-  try {
-    const { exitCode } = await run(["--version"]);
-    return exitCode === 0;
-  } catch {
-    return false;
-  }
+async function rebaseOnto(newBase, oldBase) {
+  return run(["rebase", "--onto", newBase, oldBase]);
 }
-async function checkGhAuth() {
-  try {
-    const { exitCode } = await run(["auth", "status"]);
-    return exitCode === 0;
-  } catch {
-    return false;
-  }
+async function getStagedDiff() {
+  const { stdout } = await run(["diff", "--cached"]);
+  return stdout;
 }
-var SAFE_SLUG = /^[\w.-]+$/;
-async function checkRepoPermissions(owner, repo) {
-  if (!SAFE_SLUG.test(owner) || !SAFE_SLUG.test(repo))
-    return null;
-  const { exitCode, stdout } = await run(["api", `repos/${owner}/${repo}`, "--jq", ".permissions"]);
+async function getStagedFiles() {
+  const { exitCode, stdout } = await run(["diff", "--cached", "--name-only"]);
   if (exitCode !== 0)
-    return null;
-  try {
-    return JSON.parse(stdout.trim());
-  } catch {
-    return null;
-  }
+    return [];
+  return stdout.trim().split(`
+`).filter(Boolean);
 }
-async function isRepoFork() {
-  const { exitCode, stdout } = await run(["repo", "view", "--json", "isFork", "-q", ".isFork"]);
+async function getChangedFiles() {
+  const { exitCode, stdout } = await run(["status", "--porcelain"]);
   if (exitCode !== 0)
-    return null;
-  const val = stdout.trim();
-  if (val === "true")
-    return true;
-  if (val === "false")
-    return false;
-  return null;
+    return [];
+  return stdout.trimEnd().split(`
+`).filter(Boolean).map((l) => {
+    const line = l.replace(/\r$/, "");
+    const match = line.match(/^..\s+(.*)/);
+    if (!match)
+      return "";
+    const file = match[1];
+    const renameIdx = file.indexOf(" -> ");
+    return renameIdx !== -1 ? file.slice(renameIdx + 4) : file;
+  }).filter(Boolean);
 }
-async function getCurrentRepoInfo() {
+async function getDivergence(branch, base) {
   const { exitCode, stdout } = await run([
-    "repo",
-    "view",
-    "--json",
-    "nameWithOwner",
-    "-q",
-    ".nameWithOwner"
+    "rev-list",
+    "--left-right",
+    "--count",
+    `${base}...${branch}`
   ]);
   if (exitCode !== 0)
-    return null;
-  const nameWithOwner = stdout.trim();
-  if (!nameWithOwner)
-    return null;
-  const [owner, repo] = nameWithOwner.split("/");
-  if (!owner || !repo)
-    return null;
-  return { owner, repo };
-}
-async function createPR(options) {
-  const args = [
-    "pr",
-    "create",
-    "--base",
-    options.base,
-    "--title",
-    options.title,
-    "--body",
-    options.body
-  ];
-  if (options.draft)
-    args.push("--draft");
-  return run(args);
-}
-async function createPRFill(base, draft) {
-  const args = ["pr", "create", "--base", base, "--fill"];
-  if (draft)
-    args.push("--draft");
-  return run(args);
+    return { ahead: 0, behind: 0 };
+  const parts = stdout.trim().split(/\s+/);
+  return {
+    behind: Number.parseInt(parts[0] ?? "0", 10),
+    ahead: Number.parseInt(parts[1] ?? "0", 10)
+  };
 }
-async function getPRForBranch(headBranch) {
-  const { exitCode, stdout } = await run([
-    "pr",
-    "list",
-    "--head",
-    headBranch,
-    "--state",
-    "open",
-    "--json",
-    "number,url,title,state",
-    "--limit",
-    "1"
-  ]);
+async function getMergedBranches(base) {
+  const { exitCode, stdout } = await run(["branch", "--merged", base]);
   if (exitCode !== 0)
-    return null;
-  try {
-    const prs = JSON.parse(stdout.trim());
-    return prs.length > 0 ? prs[0] : null;
-  } catch {
-    return null;
-  }
+    return [];
+  return stdout.trim().split(`
+`).map((b) => b.replace(/^\*?\s+/, "").trim()).filter(Boolean);
 }
-async function getMergedPRForBranch(headBranch) {
-  const { exitCode, stdout } = await run([
-    "pr",
-    "list",
-    "--head",
-    headBranch,
-    "--state",
-    "merged",
-    "--json",
-    "number,url,title,state",
-    "--limit",
-    "1"
-  ]);
+async function getGoneBranches() {
+  const { exitCode, stdout } = await run(["branch", "-vv"]);
   if (exitCode !== 0)
-    return null;
-  try {
-    const prs = JSON.parse(stdout.trim());
-    return prs.length > 0 ? prs[0] : null;
-  } catch {
-    return null;
-  }
-}
-
-// src/utils/git.ts
-import { execFile as execFileCb2 } from "node:child_process";
-import { readFileSync as readFileSync2 } from "node:fs";
-import { join as join2 } from "node:path";
-function run2(args) {
-  return new Promise((resolve) => {
-    execFileCb2("git", args, (error, stdout, stderr) => {
-      resolve({
-        exitCode: error ? error.code === "ENOENT" ? 127 : error.status ?? 1 : 0,
-        stdout: stdout ?? "",
-        stderr: stderr ?? ""
-      });
-    });
-  });
-}
-async function isGitRepo() {
-  const { exitCode } = await run2(["rev-parse", "--is-inside-work-tree"]);
-  return exitCode === 0;
-}
-async function getCurrentBranch() {
-  const { exitCode, stdout } = await run2(["rev-parse", "--abbrev-ref", "HEAD"]);
-  if (exitCode !== 0)
-    return null;
-  return stdout.trim() || null;
-}
-async function getRemotes() {
-  const { exitCode, stdout } = await run2(["remote"]);
-  if (exitCode !== 0)
-    return [];
-  return stdout.trim().split(`
-`).map((r) => r.trim()).filter(Boolean);
-}
-async function getRemoteUrl(remote) {
-  const { exitCode, stdout } = await run2(["remote", "get-url", remote]);
-  if (exitCode !== 0)
-    return null;
-  return stdout.trim() || null;
-}
-async function hasUncommittedChanges() {
-  const { exitCode, stdout } = await run2(["status", "--porcelain"]);
-  if (exitCode !== 0)
-    return false;
-  return stdout.trim().length > 0;
-}
-async function fetchRemote(remote) {
-  return run2(["fetch", remote]);
-}
-async function fetchAll() {
-  return run2(["fetch", "--all", "--quiet"]);
-}
-async function checkoutBranch2(branch) {
-  return run2(["checkout", branch]);
-}
-async function createBranch(branch, from) {
-  const args = from ? ["checkout", "-b", branch, from] : ["checkout", "-b", branch];
-  return run2(args);
-}
-async function resetHard(ref) {
-  return run2(["reset", "--hard", ref]);
-}
-async function updateLocalBranch(branch, target) {
-  const current = await getCurrentBranch();
-  if (current === branch) {
-    return resetHard(target);
-  }
-  return run2(["branch", "-f", branch, target]);
-}
-async function pushSetUpstream(remote, branch) {
-  return run2(["push", "-u", remote, branch]);
-}
-async function rebase(branch) {
-  return run2(["rebase", branch]);
-}
-async function getUpstreamRef() {
-  const { exitCode, stdout } = await run2(["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"]);
-  if (exitCode !== 0)
-    return null;
-  return stdout.trim() || null;
-}
-async function rebaseOnto(newBase, oldBase) {
-  return run2(["rebase", "--onto", newBase, oldBase]);
-}
-async function getStagedDiff() {
-  const { stdout } = await run2(["diff", "--cached"]);
-  return stdout;
-}
-async function getStagedFiles() {
-  const { exitCode, stdout } = await run2(["diff", "--cached", "--name-only"]);
-  if (exitCode !== 0)
-    return [];
-  return stdout.trim().split(`
-`).filter(Boolean);
-}
-async function getChangedFiles() {
-  const { exitCode, stdout } = await run2(["status", "--porcelain"]);
-  if (exitCode !== 0)
-    return [];
-  return stdout.trimEnd().split(`
-`).filter(Boolean).map((l) => {
-    const line = l.replace(/\r$/, "");
-    const match = line.match(/^..\s+(.*)/);
-    if (!match)
-      return "";
-    const file = match[1];
-    const renameIdx = file.indexOf(" -> ");
-    return renameIdx !== -1 ? file.slice(renameIdx + 4) : file;
-  }).filter(Boolean);
-}
-async function getDivergence(branch, base) {
-  const { exitCode, stdout } = await run2([
-    "rev-list",
-    "--left-right",
-    "--count",
-    `${base}...${branch}`
-  ]);
-  if (exitCode !== 0)
-    return { ahead: 0, behind: 0 };
-  const parts = stdout.trim().split(/\s+/);
-  return {
-    behind: Number.parseInt(parts[0] ?? "0", 10),
-    ahead: Number.parseInt(parts[1] ?? "0", 10)
-  };
-}
-async function getMergedBranches(base) {
-  const { exitCode, stdout } = await run2(["branch", "--merged", base]);
-  if (exitCode !== 0)
-    return [];
-  return stdout.trim().split(`
-`).map((b) => b.replace(/^\*?\s+/, "").trim()).filter(Boolean);
-}
-async function getGoneBranches() {
-  const { exitCode, stdout } = await run2(["branch", "-vv"]);
-  if (exitCode !== 0)
-    return [];
-  return stdout.trimEnd().split(`
-`).filter((line) => line.includes(": gone]")).map((line) => line.replace(/^\*?\s+/, "").split(/\s+/)[0]).filter(Boolean);
+    return [];
+  return stdout.trimEnd().split(`
+`).filter((line) => line.includes(": gone]")).map((line) => line.replace(/^\*?\s+/, "").split(/\s+/)[0]).filter(Boolean);
 }
 async function deleteBranch(branch) {
-  return run2(["branch", "-d", branch]);
+  return run(["branch", "-d", branch]);
 }
 async function forceDeleteBranch(branch) {
-  return run2(["branch", "-D", branch]);
+  return run(["branch", "-D", branch]);
 }
 async function renameBranch(oldName, newName) {
-  return run2(["branch", "-m", oldName, newName]);
+  return run(["branch", "-m", oldName, newName]);
 }
 async function hasLocalWork(remote, branch) {
   const uncommitted = await hasUncommittedChanges();
   const trackingRef = `${remote}/${branch}`;
-  const { exitCode, stdout } = await run2(["rev-list", "--count", `${trackingRef}..${branch}`]);
+  const { exitCode, stdout } = await run(["rev-list", "--count", `${trackingRef}..${branch}`]);
   const unpushedCommits = exitCode === 0 ? Number.parseInt(stdout.trim(), 10) || 0 : 0;
   return { uncommitted, unpushedCommits };
 }
 async function deleteRemoteBranch(remote, branch) {
-  return run2(["push", remote, "--delete", branch]);
+  return run(["push", remote, "--delete", branch]);
 }
 async function mergeSquash(branch) {
-  return run2(["merge", "--squash", branch]);
+  return run(["merge", "--squash", branch]);
 }
 async function pushBranch(remote, branch) {
-  return run2(["push", remote, branch]);
+  return run(["push", remote, branch]);
 }
 async function pruneRemote(remote) {
-  return run2(["remote", "prune", remote]);
+  return run(["remote", "prune", remote]);
 }
 async function commitWithMessage(message) {
-  return run2(["commit", "-m", message]);
+  return run(["commit", "-m", message]);
 }
 async function getLogDiff(base, head) {
-  const { stdout } = await run2(["diff", `${base}...${head}`]);
+  const { stdout } = await run(["diff", `${base}...${head}`]);
   return stdout;
 }
 async function getLog(base, head) {
-  const { exitCode, stdout } = await run2(["log", `${base}..${head}`, "--oneline"]);
+  const { exitCode, stdout } = await run(["log", `${base}..${head}`, "--oneline"]);
   if (exitCode !== 0)
     return [];
   return stdout.trim().split(`
 `).filter(Boolean);
 }
 async function pullBranch(remote, branch) {
-  return run2(["pull", remote, branch]);
+  return run(["pull", remote, branch]);
 }
 async function stageFiles(files) {
-  return run2(["add", "--", ...files]);
+  return run(["add", "--", ...files]);
 }
 async function unstageFiles(files) {
-  return run2(["reset", "HEAD", "--", ...files]);
+  return run(["reset", "HEAD", "--", ...files]);
 }
 async function stageAll() {
-  return run2(["add", "-A"]);
+  return run(["add", "-A"]);
 }
 async function getFullDiffForFiles(files) {
   const [unstaged, staged, untracked] = await Promise.all([
-    run2(["diff", "--", ...files]),
-    run2(["diff", "--cached", "--", ...files]),
+    run(["diff", "--", ...files]),
+    run(["diff", "--cached", "--", ...files]),
     getUntrackedFiles()
   ]);
   const parts = [staged.stdout, unstaged.stdout].filter(Boolean);
@@ -785,14 +321,14 @@ ${lines.join(`
 `);
 }
 async function getUntrackedFiles() {
-  const { exitCode, stdout } = await run2(["ls-files", "--others", "--exclude-standard"]);
+  const { exitCode, stdout } = await run(["ls-files", "--others", "--exclude-standard"]);
   if (exitCode !== 0)
     return [];
   return stdout.trim().split(`
 `).filter(Boolean);
 }
 async function getFileStatus() {
-  const { exitCode, stdout } = await run2(["status", "--porcelain"]);
+  const { exitCode, stdout } = await run(["status", "--porcelain"]);
   if (exitCode !== 0)
     return { staged: [], modified: [], untracked: [] };
   const result = { staged: [], modified: [], untracked: [] };
@@ -854,53 +390,6 @@ function heading(msg) {
 ${pc2.bold(msg)}`);
 }
 
-// src/utils/spinner.ts
-import pc3 from "picocolors";
-var FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-function createSpinner(text2) {
-  let frameIdx = 0;
-  let currentText = text2;
-  let stopped = false;
-  const clearLine = () => {
-    process.stderr.write("\r\x1B[K");
-  };
-  const render = () => {
-    if (stopped)
-      return;
-    const frame = pc3.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(`${pc3.green("✔")} ${msg}
-`);
-    },
-    fail(msg) {
-      stop();
-      process.stderr.write(`${pc3.red("✖")} ${msg}
-`);
-    },
-    stop() {
-      stop();
-    }
-  };
-}
-
 // src/utils/workflow.ts
 var WORKFLOW_DESCRIPTIONS = {
   "clean-flow": "Clean Flow — main + dev, squash features into dev, merge dev into main",
@@ -960,57 +449,32 @@ async function handleCurrentBranchDeletion(currentBranch, baseBranch, config) {
       warn("You have uncommitted changes in your working tree.");
     }
     if (localWork.unpushedCommits > 0) {
-      warn(`You have ${pc4.bold(String(localWork.unpushedCommits))} local commit${localWork.unpushedCommits !== 1 ? "s" : ""} not pushed.`);
+      warn(`You have ${pc3.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(`${pc4.bold(currentBranch)} has local changes. What would you like to do?`, [SAVE_NEW_BRANCH, DISCARD, CANCEL]);
+    const action = await selectPrompt(`${pc3.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(pc4.dim("Tip: Describe what you're working on in plain English and we'll generate a branch name."));
-      const description = await inputPrompt("What are you working 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(`
-  ${pc4.dim("AI suggestion:")} ${pc4.bold(pc4.cyan(suggested))}`);
-          const accepted = await confirmPrompt(`Use ${pc4.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 ${pc4.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";
-      }
+      const suggestedName = currentBranch.replace(/^(feature|fix|docs|chore|test|refactor)\//, "$1/new-");
+      const newBranchName = await inputPrompt("New branch name", suggestedName !== currentBranch ? suggestedName : `${currentBranch}-v2`);
       const renameResult = await renameBranch(currentBranch, newBranchName);
       if (renameResult.exitCode !== 0) {
         error(`Failed to rename branch: ${renameResult.stderr}`);
         return "skipped";
       }
-      success(`Renamed ${pc4.bold(currentBranch)} → ${pc4.bold(newBranchName)}`);
+      success(`Renamed ${pc3.bold(currentBranch)} → ${pc3.bold(newBranchName)}`);
       const syncSource2 = getSyncSource(config);
       await fetchRemote(syncSource2.remote);
       const savedUpstreamRef = await getUpstreamRef();
       const rebaseResult = savedUpstreamRef && savedUpstreamRef !== syncSource2.ref ? await rebaseOnto(syncSource2.ref, savedUpstreamRef) : await rebase(syncSource2.ref);
       if (rebaseResult.exitCode !== 0) {
         warn("Rebase encountered conflicts. Resolve them after cleanup:");
-        info(`  ${pc4.bold(`git checkout ${newBranchName} && git rebase --continue`)}`);
+        info(`  ${pc3.bold(`git checkout ${newBranchName} && git rebase --continue`)}`);
       } else {
-        success(`Rebased ${pc4.bold(newBranchName)} onto ${pc4.bold(syncSource2.ref)}.`);
+        success(`Rebased ${pc3.bold(newBranchName)} onto ${pc3.bold(syncSource2.ref)}.`);
       }
       const coResult2 = await checkoutBranch(baseBranch);
       if (coResult2.exitCode !== 0) {
@@ -1018,12 +482,12 @@ async function handleCurrentBranchDeletion(currentBranch, baseBranch, config) {
         return "saved";
       }
       await updateLocalBranch(baseBranch, syncSource2.ref);
-      success(`Synced ${pc4.bold(baseBranch)} with ${pc4.bold(syncSource2.ref)}.`);
+      success(`Synced ${pc3.bold(baseBranch)} with ${pc3.bold(syncSource2.ref)}.`);
       return "saved";
     }
   }
   const syncSource = getSyncSource(config);
-  info(`Switching to ${pc4.bold(baseBranch)} and syncing...`);
+  info(`Switching to ${pc3.bold(baseBranch)} and syncing...`);
   await fetchRemote(syncSource.remote);
   const coResult = await checkoutBranch(baseBranch);
   if (coResult.exitCode !== 0) {
@@ -1031,7 +495,7 @@ async function handleCurrentBranchDeletion(currentBranch, baseBranch, config) {
     return "skipped";
   }
   await updateLocalBranch(baseBranch, syncSource.ref);
-  success(`Synced ${pc4.bold(baseBranch)} with ${pc4.bold(syncSource.ref)}.`);
+  success(`Synced ${pc3.bold(baseBranch)} with ${pc3.bold(syncSource.ref)}.`);
   return "switched";
 }
 var clean_default = defineCommand({
@@ -1073,27 +537,15 @@ var clean_default = defineCommand({
     const mergedCandidates = mergedBranches.filter((b) => !protectedBranches.has(b));
     const goneBranches = await getGoneBranches();
     const goneCandidates = goneBranches.filter((b) => !protectedBranches.has(b) && !mergedCandidates.includes(b));
-    if (currentBranch && !protectedBranches.has(currentBranch) && !mergedCandidates.includes(currentBranch) && !goneCandidates.includes(currentBranch)) {
-      const ghInstalled = await checkGhInstalled();
-      const ghAuthed = ghInstalled && await checkGhAuth();
-      if (ghInstalled && ghAuthed) {
-        const mergedPR = await getMergedPRForBranch(currentBranch);
-        if (mergedPR) {
-          warn(`PR #${mergedPR.number} (${pc4.bold(mergedPR.title)}) has already been merged.`);
-          info(`Link: ${pc4.underline(mergedPR.url)}`);
-          goneCandidates.push(currentBranch);
-        }
-      }
-    }
     if (mergedCandidates.length > 0) {
       console.log(`
-${pc4.bold("Merged branches to delete:")}`);
+${pc3.bold("Merged branches to delete:")}`);
       for (const b of mergedCandidates) {
-        const marker = b === currentBranch ? pc4.yellow(" (current)") : "";
-        console.log(`  ${pc4.dim("•")} ${b}${marker}`);
+        const marker = b === currentBranch ? pc3.yellow(" (current)") : "";
+        console.log(`  ${pc3.dim("•")} ${b}${marker}`);
       }
       console.log();
-      const ok = args.yes || await confirmPrompt(`Delete ${pc4.bold(String(mergedCandidates.length))} merged branch${mergedCandidates.length !== 1 ? "es" : ""}?`);
+      const ok = args.yes || await confirmPrompt(`Delete ${pc3.bold(String(mergedCandidates.length))} merged branch${mergedCandidates.length !== 1 ? "es" : ""}?`);
       if (ok) {
         for (const branch of mergedCandidates) {
           if (branch === currentBranch) {
@@ -1110,7 +562,7 @@ ${pc4.bold("Merged branches to delete:")}`);
           }
           const result = await deleteBranch(branch);
           if (result.exitCode === 0) {
-            success(`  Deleted ${pc4.bold(branch)}`);
+            success(`  Deleted ${pc3.bold(branch)}`);
           } else {
             warn(`  Failed to delete ${branch}: ${result.stderr.trim()}`);
           }
@@ -1121,13 +573,13 @@ ${pc4.bold("Merged branches to delete:")}`);
     }
     if (goneCandidates.length > 0) {
       console.log(`
-${pc4.bold("Stale branches (remote deleted, likely squash-merged):")}`);
+${pc3.bold("Stale branches (remote deleted, likely squash-merged):")}`);
       for (const b of goneCandidates) {
-        const marker = b === currentBranch ? pc4.yellow(" (current)") : "";
-        console.log(`  ${pc4.dim("•")} ${b}${marker}`);
+        const marker = b === currentBranch ? pc3.yellow(" (current)") : "";
+        console.log(`  ${pc3.dim("•")} ${b}${marker}`);
       }
       console.log();
-      const ok = args.yes || await confirmPrompt(`Delete ${pc4.bold(String(goneCandidates.length))} stale branch${goneCandidates.length !== 1 ? "es" : ""}?`);
+      const ok = args.yes || await confirmPrompt(`Delete ${pc3.bold(String(goneCandidates.length))} stale branch${goneCandidates.length !== 1 ? "es" : ""}?`);
       if (ok) {
         for (const branch of goneCandidates) {
           if (branch === currentBranch) {
@@ -1144,7 +596,7 @@ ${pc4.bold("Stale branches (remote deleted, likely squash-merged):")}`);
           }
           const result = await forceDeleteBranch(branch);
           if (result.exitCode === 0) {
-            success(`  Deleted ${pc4.bold(branch)}`);
+            success(`  Deleted ${pc3.bold(branch)}`);
           } else {
             warn(`  Failed to delete ${branch}: ${result.stderr.trim()}`);
           }
@@ -1159,56 +611,406 @@ ${pc4.bold("Stale branches (remote deleted, likely squash-merged):")}`);
     const finalBranch = await getCurrentBranch();
     if (finalBranch && protectedBranches.has(finalBranch)) {
       console.log();
-      info(`You're on ${pc4.bold(finalBranch)}. Run ${pc4.bold("contrib start")} to begin a new feature.`);
+      info(`You're on ${pc3.bold(finalBranch)}. Run ${pc3.bold("contrib start")} to begin a new feature.`);
     }
   }
-});
+});
+
+// src/commands/commit.ts
+import { defineCommand as defineCommand2 } from "citty";
+import pc5 from "picocolors";
+
+// 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;
+var CONVENTIONAL_COMMIT_PATTERN = /^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(!?)(\([a-zA-Z0-9][a-zA-Z0-9._-]*\))?: .{1,72}$/;
+var CONVENTION_LABELS = {
+  conventional: "Conventional Commits",
+  "clean-commit": "Clean Commit (by WGTech Labs)",
+  none: "No convention"
+};
+var CONVENTION_DESCRIPTIONS = {
+  conventional: "Conventional Commits — feat: | fix: | docs: | chore: etc. (conventionalcommits.org)",
+  "clean-commit": "Clean Commit — \uD83D\uDCE6 new: | \uD83D\uDD27 update: | \uD83D\uDDD1️ remove: etc. (by WGTech Labs)",
+  none: "No commit convention enforcement"
+};
+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"
+  ],
+  "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"
+  ]
+};
+function validateCommitMessage(message, convention) {
+  if (convention === "none")
+    return true;
+  if (convention === "clean-commit")
+    return CLEAN_COMMIT_PATTERN.test(message);
+  if (convention === "conventional")
+    return CONVENTIONAL_COMMIT_PATTERN.test(message);
+  return true;
+}
+function getValidationError(convention) {
+  if (convention === "none")
+    return [];
+  return [
+    `Commit message does not follow ${CONVENTION_LABELS[convention]} format.`,
+    ...CONVENTION_FORMAT_HINTS[convention]
+  ];
+}
+
+// src/utils/copilot.ts
+import { CopilotClient } from "@github/copilot-sdk";
+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.
+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.
+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) {
+  const conventionBlock = convention === "conventional" ? `Use Conventional Commit format: <type>[(<scope>)]: <description>
+Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert` : `Use Clean Commit format: <emoji> <type>[!][ (<scope>)]: <description>
+Emoji/type table:
+\uD83D\uDCE6 new, \uD83D\uDD27 update, \uD83D\uDDD1️ remove, \uD83D\uDD12 security, ⚙️ setup, ☕ chore, \uD83E\uDDEA test, \uD83D\uDCD6 docs, \uD83D\uDE80 release`;
+  return `You are a smart commit grouping assistant. Given a list of changed files and their diffs, group related changes into logical atomic commits.
+
+${conventionBlock}
+
+Return a JSON array of commit groups with this EXACT structure (no markdown fences, no explanation):
+[
+  {
+    "files": ["path/to/file1.ts", "path/to/file2.ts"],
+    "message": "<commit message following the convention above>"
+  }
+]
+
+Rules:
+- Group files that are logically related (e.g. a utility and its tests, a feature and its types)
+- 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
+- Order groups so foundational changes come first (types, utils) and consumers come after
+- Return ONLY the JSON array, nothing else`;
+}
+var BRANCH_NAME_SYSTEM_PROMPT = `Git branch name generator. Format: <prefix>/<kebab-case-name>
+Prefixes: feature, fix, docs, chore, test, refactor
+Rules: lowercase kebab-case, 2-5 words max. Return ONLY the branch name.
+Examples: fix/login-timeout | feature/user-profile-page | docs/update-readme`;
+var PR_DESCRIPTION_SYSTEM_PROMPT_BASE = `GitHub PR description generator. Return JSON: {"title":"<72 chars>","body":"## Summary\\n...\\n\\n## Changes\\n- ...\\n\\n## Test Plan\\n..."}`;
+function getPRDescriptionSystemPrompt(convention) {
+  if (convention === "clean-commit") {
+    return `${PR_DESCRIPTION_SYSTEM_PROMPT_BASE}
+CRITICAL: The PR title MUST follow the Clean Commit format exactly: <emoji> <type>: <description>
+Emoji/type table: \uD83D\uDCE6 new, \uD83D\uDD27 update, \uD83D\uDDD1️ remove, \uD83D\uDD12 security, ⚙️ setup, ☕ chore, \uD83E\uDDEA test, \uD83D\uDCD6 docs, \uD83D\uDE80 release
+Title examples: \uD83D\uDCE6 new: add user authentication | \uD83D\uDD27 update: improve error handling | \uD83D\uDDD1️ remove: drop legacy API
+Rules: title follows convention, present tense, max 72 chars; body has Summary, Changes (bullets), Test Plan sections. Return ONLY the JSON object, no fences.`;
+  }
+  if (convention === "conventional") {
+    return `${PR_DESCRIPTION_SYSTEM_PROMPT_BASE}
+CRITICAL: The PR title MUST follow Conventional Commits format: <type>[(<scope>)]: <description>
+Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
+Title examples: feat: add user authentication | fix(auth): resolve token expiry | docs: update contributing guide
+Rules: title follows convention, present tense, max 72 chars; body has Summary, Changes (bullets), Test Plan sections. Return ONLY the JSON object, no fences.`;
+  }
+  return `${PR_DESCRIPTION_SYSTEM_PROMPT_BASE}
+Rules: title concise present tense; body has Summary, Changes (bullets), Test Plan sections. Return ONLY the JSON object, no fences.`;
+}
+var CONFLICT_RESOLUTION_SYSTEM_PROMPT = `Git merge conflict advisor. Explain each side, suggest resolution strategy. Never auto-resolve — guidance only. Be concise and actionable.`;
+function suppressSubprocessWarnings() {
+  process.env.NODE_NO_WARNINGS = "1";
+}
+function withTimeout(promise, ms) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error(`Copilot request timed out after ${ms / 1000}s`)), ms);
+    promise.then((val) => {
+      clearTimeout(timer);
+      resolve(val);
+    }, (err) => {
+      clearTimeout(timer);
+      reject(err);
+    });
+  });
+}
+var COPILOT_TIMEOUT_MS = 30000;
+var COPILOT_LONG_TIMEOUT_MS = 90000;
+async function checkCopilotAvailable() {
+  try {
+    const client = await getManagedClient();
+    try {
+      await client.ping();
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      if (msg.includes("auth") || msg.includes("token") || msg.includes("401") || msg.includes("403")) {
+        return "Copilot authentication failed. Run `gh auth login` to refresh your token.";
+      }
+      if (msg.includes("ECONNREFUSED") || msg.includes("timeout") || msg.includes("network")) {
+        return "Could not reach GitHub Copilot service. Check your internet connection.";
+      }
+      return `Copilot health check failed: ${msg}`;
+    }
+    return null;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (msg.includes("ENOENT") || msg.includes("not found")) {
+      return "Copilot CLI binary not found. Ensure GitHub Copilot is installed and your gh CLI is up to date.";
+    }
+    return `Failed to start Copilot service: ${msg}`;
+  }
+}
+var _managedClient = null;
+var _clientStarted = false;
+async function getManagedClient() {
+  if (!_managedClient || !_clientStarted) {
+    suppressSubprocessWarnings();
+    _managedClient = new CopilotClient;
+    await _managedClient.start();
+    _clientStarted = true;
+    const cleanup = () => {
+      if (_managedClient && _clientStarted) {
+        try {
+          _managedClient.stop();
+        } catch {}
+        _clientStarted = false;
+        _managedClient = null;
+      }
+    };
+    process.once("exit", cleanup);
+    process.once("SIGINT", cleanup);
+    process.once("SIGTERM", cleanup);
+  }
+  return _managedClient;
+}
+async function callCopilot(systemMessage, userMessage, model, timeoutMs = COPILOT_TIMEOUT_MS) {
+  const client = await getManagedClient();
+  const sessionConfig = {
+    systemMessage: { mode: "replace", content: systemMessage }
+  };
+  if (model)
+    sessionConfig.model = model;
+  const session = await client.createSession(sessionConfig);
+  try {
+    const response = await withTimeout(session.sendAndWait({ prompt: userMessage }), timeoutMs);
+    if (!response?.data?.content)
+      return null;
+    return response.data.content;
+  } finally {
+    await session.destroy();
+  }
+}
+function getCommitSystemPrompt(convention) {
+  if (convention === "conventional")
+    return CONVENTIONAL_COMMIT_SYSTEM_PROMPT;
+  return CLEAN_COMMIT_SYSTEM_PROMPT;
+}
+function extractJson(raw) {
+  let text2 = raw.trim().replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
+  if (text2.startsWith("[") || text2.startsWith("{"))
+    return text2;
+  const arrayStart = text2.indexOf("[");
+  const objStart = text2.indexOf("{");
+  let start;
+  let closeChar;
+  if (arrayStart === -1 && objStart === -1)
+    return text2;
+  if (arrayStart === -1) {
+    start = objStart;
+    closeChar = "}";
+  } else if (objStart === -1) {
+    start = arrayStart;
+    closeChar = "]";
+  } else if (arrayStart < objStart) {
+    start = arrayStart;
+    closeChar = "]";
+  } else {
+    start = objStart;
+    closeChar = "}";
+  }
+  const end = text2.lastIndexOf(closeChar);
+  if (end > start) {
+    text2 = text2.slice(start, end + 1);
+  }
+  return text2;
+}
+async function generateCommitMessage(diff, stagedFiles, model, convention = "clean-commit") {
+  try {
+    const multiFileHint = stagedFiles.length > 1 ? `
+
+IMPORTANT: Multiple files are staged. Generate ONE commit message that captures the high-level purpose of ALL changes together. Focus on the overall intent, not individual file changes. Be specific but concise — do not list every file.` : "";
+    const userMessage = `Generate a commit message for these staged changes:
+
+Files: ${stagedFiles.join(", ")}
+
+Diff:
+${diff.slice(0, 4000)}${multiFileHint}`;
+    const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model);
+    return result?.trim() ?? null;
+  } catch {
+    return null;
+  }
+}
+async function generatePRDescription(commits, diff, model, convention = "clean-commit") {
+  try {
+    const userMessage = `Generate a PR description for these changes:
+
+Commits:
+${commits.join(`
+`)}
+
+Diff (truncated):
+${diff.slice(0, 4000)}`;
+    const result = await callCopilot(getPRDescriptionSystemPrompt(convention), userMessage, model);
+    if (!result)
+      return null;
+    const cleaned = extractJson(result);
+    return JSON.parse(cleaned);
+  } catch {
+    return null;
+  }
+}
+async function suggestBranchName(description, model) {
+  try {
+    const result = await callCopilot(BRANCH_NAME_SYSTEM_PROMPT, description, model);
+    return result?.trim() ?? null;
+  } catch {
+    return null;
+  }
+}
+async function suggestConflictResolution(conflictDiff, model) {
+  try {
+    const userMessage = `Help me resolve this merge conflict:
+
+${conflictDiff.slice(0, 4000)}`;
+    const result = await callCopilot(CONFLICT_RESOLUTION_SYSTEM_PROMPT, userMessage, model);
+    return result?.trim() ?? null;
+  } catch {
+    return null;
+  }
+}
+async function generateCommitGroups(files, diffs, model, convention = "clean-commit") {
+  const userMessage = `Group these changed files into logical atomic commits:
+
+Files:
+${files.join(`
+`)}
+
+Diffs (truncated):
+${diffs.slice(0, 6000)}`;
+  const result = await callCopilot(getGroupingSystemPrompt(convention), userMessage, model, COPILOT_LONG_TIMEOUT_MS);
+  if (!result) {
+    throw new Error("AI returned an empty response");
+  }
+  const cleaned = extractJson(result);
+  let parsed;
+  try {
+    parsed = JSON.parse(cleaned);
+  } catch {
+    throw new Error(`AI response is not valid JSON. Raw start: "${result.slice(0, 120)}..."`);
+  }
+  const groups = parsed;
+  if (!Array.isArray(groups) || groups.length === 0) {
+    throw new Error("AI response was not a valid JSON array of commit groups");
+  }
+  for (const group of groups) {
+    if (!Array.isArray(group.files) || typeof group.message !== "string") {
+      throw new Error("AI returned groups with invalid structure (missing files or message)");
+    }
+  }
+  return groups;
+}
+async function regenerateAllGroupMessages(groups, diffs, model, convention = "clean-commit") {
+  const groupSummary = groups.map((g, i) => `Group ${i + 1}: [${g.files.join(", ")}]`).join(`
+`);
+  const userMessage = `Regenerate ONLY the commit messages for these pre-defined file groups. Do NOT change the file groupings.
+
+Groups:
+${groupSummary}
+
+Diffs (truncated):
+${diffs.slice(0, 6000)}`;
+  const result = await callCopilot(getGroupingSystemPrompt(convention), userMessage, model, COPILOT_LONG_TIMEOUT_MS);
+  if (!result)
+    return groups;
+  try {
+    const cleaned = extractJson(result);
+    const parsed = JSON.parse(cleaned);
+    if (!Array.isArray(parsed) || parsed.length !== groups.length)
+      return groups;
+    return groups.map((g, i) => ({
+      files: g.files,
+      message: typeof parsed[i]?.message === "string" ? parsed[i].message : g.message
+    }));
+  } catch {
+    return groups;
+  }
+}
+async function regenerateGroupMessage(files, diffs, model, convention = "clean-commit") {
+  try {
+    const userMessage = `Generate a single commit message for these files:
 
-// src/commands/commit.ts
-import { defineCommand as defineCommand2 } from "citty";
-import pc5 from "picocolors";
+Files: ${files.join(", ")}
 
-// 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;
-var CONVENTIONAL_COMMIT_PATTERN = /^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(!?)(\([a-zA-Z0-9][a-zA-Z0-9._-]*\))?: .{1,72}$/;
-var CONVENTION_LABELS = {
-  conventional: "Conventional Commits",
-  "clean-commit": "Clean Commit (by WGTech Labs)",
-  none: "No convention"
-};
-var CONVENTION_DESCRIPTIONS = {
-  conventional: "Conventional Commits — feat: | fix: | docs: | chore: etc. (conventionalcommits.org)",
-  "clean-commit": "Clean Commit — \uD83D\uDCE6 new: | \uD83D\uDD27 update: | \uD83D\uDDD1️ remove: etc. (by WGTech Labs)",
-  none: "No commit convention enforcement"
-};
-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"
-  ],
-  "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"
-  ]
-};
-function validateCommitMessage(message, convention) {
-  if (convention === "none")
-    return true;
-  if (convention === "clean-commit")
-    return CLEAN_COMMIT_PATTERN.test(message);
-  if (convention === "conventional")
-    return CONVENTIONAL_COMMIT_PATTERN.test(message);
-  return true;
+Diff:
+${diffs.slice(0, 4000)}`;
+    const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model);
+    return result?.trim() ?? null;
+  } catch {
+    return null;
+  }
 }
-function getValidationError(convention) {
-  if (convention === "none")
-    return [];
-  return [
-    `Commit message does not follow ${CONVENTION_LABELS[convention]} format.`,
-    ...CONVENTION_FORMAT_HINTS[convention]
-  ];
+
+// src/utils/spinner.ts
+import pc4 from "picocolors";
+var FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+function createSpinner(text2) {
+  let frameIdx = 0;
+  let currentText = text2;
+  let stopped = false;
+  const clearLine = () => {
+    process.stderr.write("\r\x1B[K");
+  };
+  const render = () => {
+    if (stopped)
+      return;
+    const frame = pc4.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(`${pc4.green("✔")} ${msg}
+`);
+    },
+    fail(msg) {
+      stop();
+      process.stderr.write(`${pc4.red("✖")} ${msg}
+`);
+    },
+    stop() {
+      stop();
+    }
+  };
 }
 
 // src/commands/commit.ts
@@ -1688,6 +1490,144 @@ async function uninstallHook() {
 import { defineCommand as defineCommand4 } from "citty";
 import pc7 from "picocolors";
 
+// src/utils/gh.ts
+import { execFile as execFileCb2 } from "node:child_process";
+function run2(args) {
+  return new Promise((resolve) => {
+    execFileCb2("gh", args, (error2, stdout, stderr) => {
+      resolve({
+        exitCode: error2 ? error2.code === "ENOENT" ? 127 : error2.status ?? 1 : 0,
+        stdout: stdout ?? "",
+        stderr: stderr ?? ""
+      });
+    });
+  });
+}
+async function checkGhInstalled() {
+  try {
+    const { exitCode } = await run2(["--version"]);
+    return exitCode === 0;
+  } catch {
+    return false;
+  }
+}
+async function checkGhAuth() {
+  try {
+    const { exitCode } = await run2(["auth", "status"]);
+    return exitCode === 0;
+  } catch {
+    return false;
+  }
+}
+var SAFE_SLUG = /^[\w.-]+$/;
+async function checkRepoPermissions(owner, repo) {
+  if (!SAFE_SLUG.test(owner) || !SAFE_SLUG.test(repo))
+    return null;
+  const { exitCode, stdout } = await run2(["api", `repos/${owner}/${repo}`, "--jq", ".permissions"]);
+  if (exitCode !== 0)
+    return null;
+  try {
+    return JSON.parse(stdout.trim());
+  } catch {
+    return null;
+  }
+}
+async function isRepoFork() {
+  const { exitCode, stdout } = await run2(["repo", "view", "--json", "isFork", "-q", ".isFork"]);
+  if (exitCode !== 0)
+    return null;
+  const val = stdout.trim();
+  if (val === "true")
+    return true;
+  if (val === "false")
+    return false;
+  return null;
+}
+async function getCurrentRepoInfo() {
+  const { exitCode, stdout } = await run2([
+    "repo",
+    "view",
+    "--json",
+    "nameWithOwner",
+    "-q",
+    ".nameWithOwner"
+  ]);
+  if (exitCode !== 0)
+    return null;
+  const nameWithOwner = stdout.trim();
+  if (!nameWithOwner)
+    return null;
+  const [owner, repo] = nameWithOwner.split("/");
+  if (!owner || !repo)
+    return null;
+  return { owner, repo };
+}
+async function createPR(options) {
+  const args = [
+    "pr",
+    "create",
+    "--base",
+    options.base,
+    "--title",
+    options.title,
+    "--body",
+    options.body
+  ];
+  if (options.draft)
+    args.push("--draft");
+  return run2(args);
+}
+async function createPRFill(base, draft) {
+  const args = ["pr", "create", "--base", base, "--fill"];
+  if (draft)
+    args.push("--draft");
+  return run2(args);
+}
+async function getPRForBranch(headBranch) {
+  const { exitCode, stdout } = await run2([
+    "pr",
+    "list",
+    "--head",
+    headBranch,
+    "--state",
+    "open",
+    "--json",
+    "number,url,title,state",
+    "--limit",
+    "1"
+  ]);
+  if (exitCode !== 0)
+    return null;
+  try {
+    const prs = JSON.parse(stdout.trim());
+    return prs.length > 0 ? prs[0] : null;
+  } catch {
+    return null;
+  }
+}
+async function getMergedPRForBranch(headBranch) {
+  const { exitCode, stdout } = await run2([
+    "pr",
+    "list",
+    "--head",
+    headBranch,
+    "--state",
+    "merged",
+    "--json",
+    "number,url,title,state",
+    "--limit",
+    "1"
+  ]);
+  if (exitCode !== 0)
+    return null;
+  try {
+    const prs = JSON.parse(stdout.trim());
+    return prs.length > 0 ? prs[0] : null;
+  } catch {
+    return null;
+  }
+}
+
 // src/utils/remote.ts
 function parseRepoFromUrl(url) {
   const httpsMatch = url.match(/https?:\/\/github\.com\/([^/]+)\/([^/.]+?)(?:\.git)?$/);
@@ -1843,6 +1783,24 @@ var setup_default = defineCommand4({
 // src/commands/start.ts
 import { defineCommand as defineCommand5 } from "citty";
 import pc8 from "picocolors";
+
+// src/utils/branch.ts
+var DEFAULT_PREFIXES = ["feature", "fix", "docs", "chore", "test", "refactor"];
+function hasPrefix(branchName, prefixes = DEFAULT_PREFIXES) {
+  return prefixes.some((p) => branchName.startsWith(`${p}/`));
+}
+function formatBranchName(prefix, name) {
+  const sanitized = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+  return `${prefix}/${sanitized}`;
+}
+function isValidBranchName(name) {
+  return /^[a-zA-Z0-9._/-]+$/.test(name) && !name.startsWith("/") && !name.endsWith("/");
+}
+function looksLikeNaturalLanguage(input) {
+  return input.includes(" ") && !input.includes("/");
+}
+
+// src/commands/start.ts
 var start_default = defineCommand5({
   meta: {
     name: "start",
@@ -2040,7 +1998,7 @@ import { defineCommand as defineCommand7 } from "citty";
 import pc10 from "picocolors";
 async function performSquashMerge(origin, baseBranch, featureBranch, options) {
   info(`Checking out ${pc10.bold(baseBranch)}...`);
-  const coResult = await checkoutBranch2(baseBranch);
+  const coResult = await checkoutBranch(baseBranch);
   if (coResult.exitCode !== 0) {
     error(`Failed to checkout ${baseBranch}: ${coResult.stderr}`);
     process.exit(1);
@@ -2162,31 +2120,8 @@ var submit_default = defineCommand7({
             return;
           }
           if (action === SAVE_NEW_BRANCH) {
-            info(pc10.dim("Tip: Describe what you're working on in plain English and we'll generate a branch name."));
-            const description = await inputPrompt("What are you working 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(`
-  ${pc10.dim("AI suggestion:")} ${pc10.bold(pc10.cyan(suggested))}`);
-                const accepted = await confirmPrompt(`Use ${pc10.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 ${pc10.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 suggestedName = currentBranch.replace(/^(feature|fix|docs|chore|test|refactor)\//, "$1/new-");
+            const newBranchName = await inputPrompt("New branch name", suggestedName !== currentBranch ? suggestedName : `${currentBranch}-v2`);
             const renameResult = await renameBranch(currentBranch, newBranchName);
             if (renameResult.exitCode !== 0) {
               error(`Failed to rename branch: ${renameResult.stderr}`);
@@ -2212,7 +2147,7 @@ var submit_default = defineCommand7({
         const syncSource = getSyncSource(config);
         info(`Switching to ${pc10.bold(baseBranch)} and syncing...`);
         await fetchRemote(syncSource.remote);
-        const coResult = await checkoutBranch2(baseBranch);
+        const coResult = await checkoutBranch(baseBranch);
         if (coResult.exitCode !== 0) {
           error(`Failed to checkout ${baseBranch}: ${coResult.stderr}`);
           process.exit(1);
@@ -2426,7 +2361,7 @@ var sync_default = defineCommand8({
       if (!ok)
         process.exit(0);
     }
-    const coResult = await checkoutBranch2(baseBranch);
+    const coResult = await checkoutBranch(baseBranch);
     if (coResult.exitCode !== 0) {
       error(`Failed to checkout ${baseBranch}: ${coResult.stderr}`);
       process.exit(1);
@@ -2441,14 +2376,14 @@ var sync_default = defineCommand8({
       const mainDiv = await getDivergence(config.mainBranch, `${origin}/${config.mainBranch}`);
       if (mainDiv.behind > 0) {
         info(`Also syncing ${pc11.bold(config.mainBranch)}...`);
-        const mainCoResult = await checkoutBranch2(config.mainBranch);
+        const mainCoResult = await checkoutBranch(config.mainBranch);
         if (mainCoResult.exitCode === 0) {
           const mainPullResult = await pullBranch(origin, config.mainBranch);
           if (mainPullResult.exitCode === 0) {
             success(`✅ ${config.mainBranch} is now in sync with ${origin}/${config.mainBranch}`);
           }
         }
-        await checkoutBranch2(baseBranch);
+        await checkoutBranch(baseBranch);
       }
     }
   }
@@ -2569,7 +2504,7 @@ var update_default = defineCommand9({
         warn("Discarding local changes...");
       }
       await fetchRemote(syncSource.remote);
-      const coResult = await checkoutBranch2(baseBranch);
+      const coResult = await checkoutBranch(baseBranch);
       if (coResult.exitCode !== 0) {
         error(`Failed to checkout ${baseBranch}: ${coResult.stderr}`);
         process.exit(1);
@@ -2681,7 +2616,7 @@ import pc14 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.2.0-dev.33be40f",
+  version: "0.2.0-dev.7c81c96",
   description: "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   type: "module",
   bin: {