contribute-now 0.1.2 → 0.2.0-dev.70284d0

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { defineCommand as defineCommand9, runMain } from "citty";
+import { defineCommand as defineCommand11, runMain } from "citty";
 
 // src/commands/clean.ts
 import { defineCommand } from "citty";
@@ -44,12 +44,14 @@ function isGitignored(cwd = process.cwd()) {
 }
 function getDefaultConfig() {
   return {
+    workflow: "clean-flow",
     role: "contributor",
     mainBranch: "main",
     devBranch: "dev",
     upstream: "upstream",
     origin: "origin",
-    branchPrefixes: ["feature", "fix", "docs", "chore", "test", "refactor"]
+    branchPrefixes: ["feature", "fix", "docs", "chore", "test", "refactor"],
+    commitConvention: "clean-commit"
   };
 }
 
@@ -167,8 +169,12 @@ async function createBranch(branch, from) {
 async function resetHard(ref) {
   return run(["reset", "--hard", ref]);
 }
-async function pushForceWithLease(remote, branch) {
-  return run(["push", "--force-with-lease", remote, branch]);
+async function updateLocalBranch(branch, target) {
+  const current = await getCurrentBranch();
+  if (current === branch) {
+    return resetHard(target);
+  }
+  return run(["branch", "-f", branch, target]);
 }
 async function pushSetUpstream(remote, branch) {
   return run(["push", "-u", remote, branch]);
@@ -236,6 +242,9 @@ async function getLog(base, head) {
   return stdout.trim().split(`
 `).filter(Boolean);
 }
+async function pullBranch(remote, branch) {
+  return run(["pull", remote, branch]);
+}
 
 // src/utils/logger.ts
 import { LogEngine, LogMode } from "@wgtechlabs/log-engine";
@@ -265,6 +274,53 @@ function heading(msg) {
 ${pc2.bold(msg)}`);
 }
 
+// src/utils/workflow.ts
+var WORKFLOW_DESCRIPTIONS = {
+  "clean-flow": "Clean Flow — main + dev, squash features into dev, merge dev into main",
+  "github-flow": "GitHub Flow — main + feature branches, squash/merge into main",
+  "git-flow": "Git Flow — main + develop + release + hotfix branches"
+};
+function getBaseBranch(config) {
+  switch (config.workflow) {
+    case "clean-flow":
+    case "git-flow":
+      return config.devBranch ?? "dev";
+    case "github-flow":
+      return config.mainBranch;
+  }
+}
+function hasDevBranch(workflow) {
+  return workflow === "clean-flow" || workflow === "git-flow";
+}
+function getSyncSource(config) {
+  const { workflow, role, mainBranch, origin, upstream } = config;
+  const devBranch = config.devBranch ?? "dev";
+  switch (workflow) {
+    case "clean-flow":
+      if (role === "contributor") {
+        return { remote: upstream, ref: `${upstream}/${devBranch}`, strategy: "pull" };
+      }
+      return { remote: origin, ref: `${origin}/${devBranch}`, strategy: "pull" };
+    case "github-flow":
+      if (role === "contributor") {
+        return { remote: upstream, ref: `${upstream}/${mainBranch}`, strategy: "pull" };
+      }
+      return { remote: origin, ref: `${origin}/${mainBranch}`, strategy: "pull" };
+    case "git-flow":
+      if (role === "contributor") {
+        return { remote: upstream, ref: `${upstream}/${devBranch}`, strategy: "pull" };
+      }
+      return { remote: origin, ref: `${origin}/${devBranch}`, strategy: "pull" };
+  }
+}
+function getProtectedBranches(config) {
+  const branches = [config.mainBranch];
+  if (hasDevBranch(config.workflow) && config.devBranch) {
+    branches.push(config.devBranch);
+  }
+  return branches;
+}
+
 // src/commands/clean.ts
 var clean_default = defineCommand({
   meta: {
@@ -289,12 +345,13 @@ var clean_default = defineCommand({
       error("No .contributerc.json found. Run `contrib setup` first.");
       process.exit(1);
     }
-    const { mainBranch, devBranch, origin } = config;
+    const { origin } = config;
+    const baseBranch = getBaseBranch(config);
     const currentBranch = await getCurrentBranch();
     heading("\uD83E\uDDF9 contrib clean");
-    const mergedBranches = await getMergedBranches(devBranch);
-    const protected_ = new Set([mainBranch, devBranch, currentBranch ?? ""]);
-    const candidates = mergedBranches.filter((b) => !protected_.has(b));
+    const mergedBranches = await getMergedBranches(baseBranch);
+    const protectedBranches = new Set([...getProtectedBranches(config), currentBranch ?? ""]);
+    const candidates = mergedBranches.filter((b) => !protectedBranches.has(b));
     if (candidates.length === 0) {
       info("No merged branches to clean up.");
     } else {
@@ -332,10 +389,86 @@ ${pc3.bold("Branches to delete:")}`);
 import { defineCommand as defineCommand2 } from "citty";
 import pc4 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 CLEAN_COMMIT_SYSTEM_PROMPT = `You are a git commit message generator. Generate a Clean Commit message following this exact format:
-<emoji> <type>[!][(<scope>)]: <description>
+var CONVENTIONAL_COMMIT_SYSTEM_PROMPT = `You are a git commit message generator. Generate a Conventional Commit message following this exact format:
+<type>[!][(<scope>)]: <description>
+
+Types:
+feat     – a new feature
+fix      – a bug fix
+docs     – documentation only changes
+style    – changes that do not affect code meaning (whitespace, formatting)
+refactor – code change that neither fixes a bug nor adds a feature
+perf     – performance improvement
+test     – adding or correcting tests
+build    – changes to the build system or external dependencies
+ci       – changes to CI configuration files and scripts
+chore    – other changes that don't modify src or test files
+revert   – reverts a previous commit
+
+Rules:
+- Breaking change (!) only for: feat, fix, refactor, perf
+- Description: concise, imperative mood, max 72 chars, lowercase start
+- Scope: optional, camelCase or kebab-case component name
+- Return ONLY the commit message line, nothing else
+
+Examples:
+feat: add user authentication system
+fix(auth): resolve token expiry issue
+docs: update contributing guidelines
+feat!: redesign authentication API`;
+var CLEAN_COMMIT_SYSTEM_PROMPT = `You are a git commit message generator. Generate a Clean Commit message following this EXACT format:
+<emoji> <type>[!][ (<scope>)]: <description>
+
+CRITICAL spacing rules (must follow exactly):
+- There MUST be a space between the emoji and the type
+- If a scope is used, there MUST be a space before the opening parenthesis
+- There MUST be a colon and a space after the type or scope before the description
+- Pattern: EMOJI SPACE TYPE SPACE OPENPAREN SCOPE CLOSEPAREN COLON SPACE DESCRIPTION
 
 Emoji and type table:
 \uD83D\uDCE6 new      – new features, files, or capabilities
@@ -350,15 +483,21 @@ Emoji and type table:
 
 Rules:
 - Breaking change (!) only for: new, update, remove, security
-- Description: concise, imperative mood, max 72 chars
+- Description: concise, imperative mood, max 72 chars, lowercase start
 - Scope: optional, camelCase or kebab-case component name
 - Return ONLY the commit message line, nothing else
 
-Examples:
-\uD83D\uDCE6 new: user authentication system
+Correct examples:
+\uD83D\uDCE6 new: add user authentication system
 \uD83D\uDD27 update (api): improve error handling
 ⚙️ setup (ci): configure github actions workflow
-\uD83D\uDCE6 new!: completely redesign authentication system`;
+\uD83D\uDCE6 new!: redesign authentication system
+\uD83D\uDDD1️ remove (deps): drop unused lodash dependency
+
+WRONG (never do this):
+⚙️setup(ci): ... ← missing spaces
+\uD83D\uDCE6new: ... ← missing space after emoji
+\uD83D\uDD27 update(api): ... ← missing space before scope`;
 var BRANCH_NAME_SYSTEM_PROMPT = `You are a git branch name generator. Convert natural language descriptions into proper git branch names.
 
 Format: <prefix>/<kebab-case-name>
@@ -392,8 +531,21 @@ Rules:
 - Suggest the most likely correct resolution strategy
 - Never auto-resolve — provide guidance only
 - Be concise and actionable`;
+function suppressSubprocessWarnings() {
+  const prev = process.env.NODE_NO_WARNINGS;
+  process.env.NODE_NO_WARNINGS = "1";
+  return prev;
+}
+function restoreWarnings(prev) {
+  if (prev === undefined) {
+    delete process.env.NODE_NO_WARNINGS;
+  } else {
+    process.env.NODE_NO_WARNINGS = prev;
+  }
+}
 async function checkCopilotAvailable() {
   let client = null;
+  const prev = suppressSubprocessWarnings();
   try {
     client = new CopilotClient;
     await client.start();
@@ -416,6 +568,7 @@ async function checkCopilotAvailable() {
     }
     return `Copilot health check failed: ${msg}`;
   } finally {
+    restoreWarnings(prev);
     try {
       await client.stop();
     } catch {}
@@ -423,17 +576,18 @@ async function checkCopilotAvailable() {
   return null;
 }
 async function callCopilot(systemMessage, userMessage, model) {
+  const prev = suppressSubprocessWarnings();
   const client = new CopilotClient;
   await client.start();
   try {
     const sessionConfig = {
-      systemMessage: { content: systemMessage }
+      systemMessage: { mode: "replace", content: systemMessage }
     };
     if (model)
       sessionConfig.model = model;
     const session = await client.createSession(sessionConfig);
     try {
-      const response = await session.sendAndWait({ content: userMessage });
+      const response = await session.sendAndWait({ prompt: userMessage });
       if (!response?.data?.content)
         return null;
       return response.data.content;
@@ -441,10 +595,16 @@ async function callCopilot(systemMessage, userMessage, model) {
       await session.destroy();
     }
   } finally {
+    restoreWarnings(prev);
     await client.stop();
   }
 }
-async function generateCommitMessage(diff, stagedFiles, model) {
+function getCommitSystemPrompt(convention) {
+  if (convention === "conventional")
+    return CONVENTIONAL_COMMIT_SYSTEM_PROMPT;
+  return CLEAN_COMMIT_SYSTEM_PROMPT;
+}
+async function generateCommitMessage(diff, stagedFiles, model, convention = "clean-commit") {
   try {
     const userMessage = `Generate a commit message for these staged changes:
 
@@ -452,7 +612,7 @@ Files: ${stagedFiles.join(", ")}
 
 Diff:
 ${diff.slice(0, 4000)}`;
-    const result = await callCopilot(CLEAN_COMMIT_SYSTEM_PROMPT, userMessage, model);
+    const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model);
     return result?.trim() ?? null;
   } catch {
     return null;
@@ -498,14 +658,10 @@ ${conflictDiff.slice(0, 4000)}`;
 }
 
 // src/commands/commit.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;
-function validateCleanCommit(msg) {
-  return CLEAN_COMMIT_PATTERN.test(msg);
-}
 var commit_default = defineCommand2({
   meta: {
     name: "commit",
-    description: "Stage changes and create a Clean Commit message (AI-powered)"
+    description: "Stage changes and create a commit message (AI-powered)"
   },
   args: {
     model: {
@@ -556,7 +712,7 @@ ${pc4.bold("Changed files:")}`);
       } else {
         info("Generating commit message with AI...");
         const diff = await getStagedDiff();
-        commitMessage = await generateCommitMessage(diff, stagedFiles, args.model);
+        commitMessage = await generateCommitMessage(diff, stagedFiles, args.model, config.commitConvention);
         if (commitMessage) {
           console.log(`
   ${pc4.dim("AI suggestion:")} ${pc4.bold(pc4.cyan(commitMessage))}`);
@@ -580,7 +736,7 @@ ${pc4.bold("Changed files:")}`);
       } else if (action === "Regenerate") {
         info("Regenerating...");
         const diff = await getStagedDiff();
-        const regen = await generateCommitMessage(diff, stagedFiles, args.model);
+        const regen = await generateCommitMessage(diff, stagedFiles, args.model, config.commitConvention);
         if (regen) {
           console.log(`
   ${pc4.dim("AI suggestion:")} ${pc4.bold(pc4.cyan(regen))}`);
@@ -594,19 +750,25 @@ ${pc4.bold("Changed files:")}`);
         finalMessage = await inputPrompt("Enter commit message");
       }
     } else {
-      console.log();
-      console.log(pc4.dim("Clean Commit format: <emoji> <type>[!][(<scope>)]: <description>"));
-      console.log(pc4.dim("Examples: \uD83D\uDCE6 new: user auth | \uD83D\uDD27 update (api): improve errors"));
-      console.log();
+      const convention2 = config.commitConvention;
+      if (convention2 !== "none") {
+        console.log();
+        for (const hint of CONVENTION_FORMAT_HINTS[convention2]) {
+          console.log(pc4.dim(hint));
+        }
+        console.log();
+      }
       finalMessage = await inputPrompt("Enter commit message");
     }
     if (!finalMessage) {
       error("No commit message provided.");
       process.exit(1);
     }
-    if (!validateCleanCommit(finalMessage)) {
-      warn("Commit message does not follow Clean Commit format.");
-      warn("Format: <emoji> <type>[!][(<scope>)]: <description>");
+    const convention = config.commitConvention;
+    if (!validateCommitMessage(finalMessage, convention)) {
+      for (const line of getValidationError(convention)) {
+        warn(line);
+      }
       const proceed = await confirmPrompt("Commit anyway?");
       if (!proceed)
         process.exit(1);
@@ -620,9 +782,117 @@ ${pc4.bold("Changed files:")}`);
   }
 });
 
-// src/commands/setup.ts
+// src/commands/hook.ts
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, rmSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { join as join2 } from "node:path";
 import { defineCommand as defineCommand3 } from "citty";
 import pc5 from "picocolors";
+var HOOK_MARKER = "# managed by contribute-now";
+function getHooksDir(cwd = process.cwd()) {
+  return join2(cwd, ".git", "hooks");
+}
+function getHookPath(cwd = process.cwd()) {
+  return join2(getHooksDir(cwd), "commit-msg");
+}
+function generateHookScript() {
+  return `#!/bin/sh
+${HOOK_MARKER}
+# Validates commit messages against your configured convention.
+# Install:   contrib hook install
+# Uninstall: contrib hook uninstall
+
+commit_msg_file="$1"
+commit_msg=$(head -1 "$commit_msg_file")
+
+# Skip merge commits and fixup/squash commits
+case "$commit_msg" in
+  Merge\\ *|fixup!*|squash!*|amend!*) exit 0 ;;
+esac
+
+# Validate using contrib CLI
+npx contrib validate "$commit_msg"
+`;
+}
+var hook_default = defineCommand3({
+  meta: {
+    name: "hook",
+    description: "Install or uninstall the commit-msg git hook"
+  },
+  args: {
+    action: {
+      type: "positional",
+      description: "Action to perform: install or uninstall",
+      required: true
+    }
+  },
+  async run({ args }) {
+    if (!await isGitRepo()) {
+      error("Not inside a git repository.");
+      process.exit(1);
+    }
+    const action = args.action;
+    if (action !== "install" && action !== "uninstall") {
+      error(`Unknown action "${action}". Use "install" or "uninstall".`);
+      process.exit(1);
+    }
+    if (action === "install") {
+      await installHook();
+    } else {
+      await uninstallHook();
+    }
+  }
+});
+async function installHook() {
+  heading("\uD83E\uDE9D hook install");
+  const config = readConfig();
+  if (!config) {
+    error("No .contributerc.json found. Run `contrib setup` first.");
+    process.exit(1);
+  }
+  if (config.commitConvention === "none") {
+    warn('Commit convention is set to "none". No hook to install.');
+    info("Change your convention with `contrib setup` first.");
+    process.exit(0);
+  }
+  const hookPath = getHookPath();
+  const hooksDir = getHooksDir();
+  if (existsSync2(hookPath)) {
+    const existing = readFileSync2(hookPath, "utf-8");
+    if (!existing.includes(HOOK_MARKER)) {
+      error("A commit-msg hook already exists and was not installed by contribute-now.");
+      warn(`Path: ${hookPath}`);
+      warn("Remove it manually or back it up before installing.");
+      process.exit(1);
+    }
+    info("Updating existing contribute-now hook...");
+  }
+  if (!existsSync2(hooksDir)) {
+    mkdirSync(hooksDir, { recursive: true });
+  }
+  writeFileSync2(hookPath, generateHookScript(), { mode: 493 });
+  success(`commit-msg hook installed.`);
+  info(`Convention: ${pc5.bold(CONVENTION_LABELS[config.commitConvention])}`);
+  info(`Path: ${pc5.dim(hookPath)}`);
+}
+async function uninstallHook() {
+  heading("\uD83E\uDE9D hook uninstall");
+  const hookPath = getHookPath();
+  if (!existsSync2(hookPath)) {
+    info("No commit-msg hook found. Nothing to uninstall.");
+    return;
+  }
+  const content = readFileSync2(hookPath, "utf-8");
+  if (!content.includes(HOOK_MARKER)) {
+    error("The commit-msg hook was not installed by contribute-now. Leaving it untouched.");
+    process.exit(1);
+  }
+  rmSync(hookPath);
+  success("commit-msg hook removed.");
+}
+
+// src/commands/setup.ts
+import { defineCommand as defineCommand4 } from "citty";
+import pc6 from "picocolors";
 
 // src/utils/gh.ts
 import { execFile as execFileCb2 } from "node:child_process";
@@ -735,7 +1005,7 @@ async function getRepoInfoFromRemote(remote = "origin") {
 }
 
 // src/commands/setup.ts
-var setup_default = defineCommand3({
+var setup_default = defineCommand4({
   meta: {
     name: "setup",
     description: "Initialize contribute-now config for this repo (.contributerc.json)"
@@ -746,6 +1016,27 @@ var setup_default = defineCommand3({
       process.exit(1);
     }
     heading("\uD83D\uDD27 contribute-now setup");
+    const workflowChoice = await selectPrompt("Which git workflow does this project use?", [
+      "Clean Flow — main + dev, squash features into dev, merge dev into main (recommended)",
+      "GitHub Flow — main + feature branches, squash/merge into main",
+      "Git Flow — main + develop + release + hotfix branches"
+    ]);
+    let workflow = "clean-flow";
+    if (workflowChoice.startsWith("GitHub"))
+      workflow = "github-flow";
+    else if (workflowChoice.startsWith("Git Flow"))
+      workflow = "git-flow";
+    info(`Workflow: ${pc6.bold(WORKFLOW_DESCRIPTIONS[workflow])}`);
+    const conventionChoice = await selectPrompt("Which commit convention should this project use?", [
+      `${CONVENTION_DESCRIPTIONS["clean-commit"]} (recommended)`,
+      CONVENTION_DESCRIPTIONS.conventional,
+      CONVENTION_DESCRIPTIONS.none
+    ]);
+    let commitConvention = "clean-commit";
+    if (conventionChoice.includes("Conventional Commits"))
+      commitConvention = "conventional";
+    else if (conventionChoice.includes("No commit"))
+      commitConvention = "none";
     const remotes = await getRemotes();
     if (remotes.length === 0) {
       error("No git remotes found. Add a remote first (e.g., git remote add origin <url>).");
@@ -788,8 +1079,8 @@ var setup_default = defineCommand3({
       detectedRole = roleChoice;
       detectionSource = "user selection";
     } else {
-      info(`Detected role: ${pc5.bold(detectedRole)} (via ${detectionSource})`);
-      const confirmed = await confirmPrompt(`Role detected as ${pc5.bold(detectedRole)}. Is this correct?`);
+      info(`Detected role: ${pc6.bold(detectedRole)} (via ${detectionSource})`);
+      const confirmed = await confirmPrompt(`Role detected as ${pc6.bold(detectedRole)}. Is this correct?`);
       if (!confirmed) {
         const roleChoice = await selectPrompt("Select your role:", ["maintainer", "contributor"]);
         detectedRole = roleChoice;
@@ -797,7 +1088,11 @@ var setup_default = defineCommand3({
     }
     const defaultConfig = getDefaultConfig();
     const mainBranch = await inputPrompt("Main branch name", defaultConfig.mainBranch);
-    const devBranch = await inputPrompt("Dev branch name", defaultConfig.devBranch);
+    let devBranch;
+    if (hasDevBranch(workflow)) {
+      const defaultDev = workflow === "git-flow" ? "develop" : "dev";
+      devBranch = await inputPrompt("Dev/develop branch name", defaultDev);
+    }
     const originRemote = await inputPrompt("Origin remote name", defaultConfig.origin);
     let upstreamRemote = defaultConfig.upstream;
     if (detectedRole === "contributor") {
@@ -814,12 +1109,14 @@ var setup_default = defineCommand3({
       }
     }
     const config = {
+      workflow,
       role: detectedRole,
       mainBranch,
-      devBranch,
+      ...devBranch ? { devBranch } : {},
       upstream: upstreamRemote,
       origin: originRemote,
-      branchPrefixes: defaultConfig.branchPrefixes
+      branchPrefixes: defaultConfig.branchPrefixes,
+      commitConvention
     };
     writeConfig(config);
     success(`✅ Config written to .contributerc.json`);
@@ -828,15 +1125,21 @@ var setup_default = defineCommand3({
       warn('  echo ".contributerc.json" >> .gitignore');
     }
     console.log();
-    info(`Role: ${pc5.bold(config.role)}`);
-    info(`Main: ${pc5.bold(config.mainBranch)} | Dev: ${pc5.bold(config.devBranch)}`);
-    info(`Origin: ${pc5.bold(config.origin)}${config.role === "contributor" ? ` | Upstream: ${pc5.bold(config.upstream)}` : ""}`);
+    info(`Workflow: ${pc6.bold(WORKFLOW_DESCRIPTIONS[config.workflow])}`);
+    info(`Convention: ${pc6.bold(CONVENTION_DESCRIPTIONS[config.commitConvention])}`);
+    info(`Role: ${pc6.bold(config.role)}`);
+    if (config.devBranch) {
+      info(`Main: ${pc6.bold(config.mainBranch)} | Dev: ${pc6.bold(config.devBranch)}`);
+    } else {
+      info(`Main: ${pc6.bold(config.mainBranch)}`);
+    }
+    info(`Origin: ${pc6.bold(config.origin)}${config.role === "contributor" ? ` | Upstream: ${pc6.bold(config.upstream)}` : ""}`);
   }
 });
 
 // src/commands/start.ts
-import { defineCommand as defineCommand4 } from "citty";
-import pc6 from "picocolors";
+import { defineCommand as defineCommand5 } from "citty";
+import pc7 from "picocolors";
 
 // src/utils/branch.ts
 var DEFAULT_PREFIXES = ["feature", "fix", "docs", "chore", "test", "refactor"];
@@ -852,10 +1155,10 @@ function looksLikeNaturalLanguage(input) {
 }
 
 // src/commands/start.ts
-var start_default = defineCommand4({
+var start_default = defineCommand5({
   meta: {
     name: "start",
-    description: "Create a new feature branch from the latest dev"
+    description: "Create a new feature branch from the latest base branch"
   },
   args: {
     name: {
@@ -887,7 +1190,9 @@ var start_default = defineCommand4({
       error("You have uncommitted changes. Please commit or stash them before creating a branch.");
       process.exit(1);
     }
-    const { devBranch, origin, upstream, branchPrefixes, role } = config;
+    const { branchPrefixes } = config;
+    const baseBranch = getBaseBranch(config);
+    const syncSource = getSyncSource(config);
     let branchName = args.name;
     heading("\uD83C\uDF3F contrib start");
     const useAI = !args["no-ai"] && looksLikeNaturalLanguage(branchName);
@@ -896,8 +1201,8 @@ var start_default = defineCommand4({
       const suggested = await suggestBranchName(branchName, args.model);
       if (suggested) {
         console.log(`
-  ${pc6.dim("AI suggestion:")} ${pc6.bold(pc6.cyan(suggested))}`);
-        const accepted = await confirmPrompt(`Use ${pc6.bold(suggested)} as your branch name?`);
+  ${pc7.dim("AI suggestion:")} ${pc7.bold(pc7.cyan(suggested))}`);
+        const accepted = await confirmPrompt(`Use ${pc7.bold(suggested)} as your branch name?`);
         if (accepted) {
           branchName = suggested;
         } else {
@@ -906,31 +1211,29 @@ var start_default = defineCommand4({
       }
     }
     if (!hasPrefix(branchName, branchPrefixes)) {
-      const prefix = await selectPrompt(`Choose a branch type for ${pc6.bold(branchName)}:`, branchPrefixes);
+      const prefix = await selectPrompt(`Choose a branch type for ${pc7.bold(branchName)}:`, branchPrefixes);
       branchName = formatBranchName(prefix, branchName);
     }
-    info(`Creating branch: ${pc6.bold(branchName)}`);
-    const remote = role === "contributor" ? upstream : origin;
-    const remoteDevRef = role === "contributor" ? `${upstream}/${devBranch}` : `${origin}/${devBranch}`;
-    await fetchRemote(remote);
-    const resetResult = await resetHard(remoteDevRef);
-    if (resetResult.exitCode !== 0) {}
-    const result = await createBranch(branchName, devBranch);
+    info(`Creating branch: ${pc7.bold(branchName)}`);
+    await fetchRemote(syncSource.remote);
+    const updateResult = await updateLocalBranch(baseBranch, syncSource.ref);
+    if (updateResult.exitCode !== 0) {}
+    const result = await createBranch(branchName, baseBranch);
     if (result.exitCode !== 0) {
       error(`Failed to create branch: ${result.stderr}`);
       process.exit(1);
     }
-    success(`✅ Created ${pc6.bold(branchName)} from latest ${pc6.bold(devBranch)}`);
+    success(`✅ Created ${pc7.bold(branchName)} from latest ${pc7.bold(baseBranch)}`);
   }
 });
 
 // src/commands/status.ts
-import { defineCommand as defineCommand5 } from "citty";
-import pc7 from "picocolors";
-var status_default = defineCommand5({
+import { defineCommand as defineCommand6 } from "citty";
+import pc8 from "picocolors";
+var status_default = defineCommand6({
   meta: {
     name: "status",
-    description: "Show sync status of main, dev, and current branch"
+    description: "Show sync status of branches"
   },
   async run() {
     if (!await isGitRepo()) {
@@ -943,60 +1246,57 @@ var status_default = defineCommand5({
       process.exit(1);
     }
     heading("\uD83D\uDCCA contribute-now status");
+    console.log(`  ${pc8.dim("Workflow:")} ${pc8.bold(WORKFLOW_DESCRIPTIONS[config.workflow])}`);
+    console.log(`  ${pc8.dim("Role:")} ${pc8.bold(config.role)}`);
+    console.log();
     await fetchAll();
     const currentBranch = await getCurrentBranch();
-    const { mainBranch, devBranch, origin, upstream } = config;
+    const { mainBranch, origin, upstream, workflow } = config;
+    const baseBranch = getBaseBranch(config);
     const isContributor = config.role === "contributor";
     const dirty = await hasUncommittedChanges();
     if (dirty) {
-      console.log(`  ${pc7.yellow("⚠")}  ${pc7.yellow("Uncommitted changes in working tree")}`);
+      console.log(`  ${pc8.yellow("⚠")}  ${pc8.yellow("Uncommitted changes in working tree")}`);
       console.log();
     }
     const mainRemote = `${origin}/${mainBranch}`;
     const mainDiv = await getDivergence(mainBranch, mainRemote);
     const mainStatus = formatStatus(mainBranch, mainRemote, mainDiv.ahead, mainDiv.behind);
     console.log(mainStatus);
-    const devRemoteRef = isContributor ? `${upstream}/${devBranch}` : `${origin}/${mainBranch}`;
-    const devDiv = await getDivergence(devBranch, devRemoteRef);
-    let devLine = formatStatus(devBranch, devRemoteRef, devDiv.ahead, devDiv.behind);
-    if (!isContributor && devDiv.ahead > 0 && devDiv.behind > 0) {
-      devLine += pc7.red(" (needs sync! squash-merge divergence detected)");
-    } else if (devDiv.ahead > 0 && devDiv.behind === 0) {
-      devLine += pc7.yellow(" (needs sync!)");
-    }
-    console.log(devLine);
-    if (currentBranch && currentBranch !== mainBranch && currentBranch !== devBranch) {
-      const branchDiv = await getDivergence(currentBranch, devBranch);
-      const branchLine = formatStatus(currentBranch, devBranch, branchDiv.ahead, branchDiv.behind);
-      console.log(branchLine + pc7.dim(` (current ${pc7.green("*")})`));
+    if (hasDevBranch(workflow) && config.devBranch) {
+      const devRemoteRef = isContributor ? `${upstream}/${config.devBranch}` : `${origin}/${config.devBranch}`;
+      const devDiv = await getDivergence(config.devBranch, devRemoteRef);
+      const devLine = formatStatus(config.devBranch, devRemoteRef, devDiv.ahead, devDiv.behind);
+      console.log(devLine);
+    }
+    if (currentBranch && currentBranch !== mainBranch && currentBranch !== config.devBranch) {
+      const branchDiv = await getDivergence(currentBranch, baseBranch);
+      const branchLine = formatStatus(currentBranch, baseBranch, branchDiv.ahead, branchDiv.behind);
+      console.log(branchLine + pc8.dim(` (current ${pc8.green("*")})`));
     } else if (currentBranch) {
-      if (currentBranch === mainBranch) {
-        console.log(pc7.dim(`  (on ${pc7.bold(mainBranch)} branch)`));
-      } else if (currentBranch === devBranch) {
-        console.log(pc7.dim(`  (on ${pc7.bold(devBranch)} branch)`));
-      }
+      console.log(pc8.dim(`  (on ${pc8.bold(currentBranch)} branch)`));
     }
     console.log();
   }
 });
 function formatStatus(branch, base, ahead, behind) {
-  const label = pc7.bold(branch.padEnd(20));
+  const label = pc8.bold(branch.padEnd(20));
   if (ahead === 0 && behind === 0) {
-    return `  ${pc7.green("✓")}  ${label} ${pc7.dim(`in sync with ${base}`)}`;
+    return `  ${pc8.green("✓")}  ${label} ${pc8.dim(`in sync with ${base}`)}`;
   }
   if (ahead > 0 && behind === 0) {
-    return `  ${pc7.yellow("↑")}  ${label} ${pc7.yellow(`${ahead} commit${ahead !== 1 ? "s" : ""} ahead of ${base}`)}`;
+    return `  ${pc8.yellow("↑")}  ${label} ${pc8.yellow(`${ahead} commit${ahead !== 1 ? "s" : ""} ahead of ${base}`)}`;
   }
   if (behind > 0 && ahead === 0) {
-    return `  ${pc7.red("↓")}  ${label} ${pc7.red(`${behind} commit${behind !== 1 ? "s" : ""} behind ${base}`)}`;
+    return `  ${pc8.red("↓")}  ${label} ${pc8.red(`${behind} commit${behind !== 1 ? "s" : ""} behind ${base}`)}`;
   }
-  return `  ${pc7.red("⚡")}  ${label} ${pc7.yellow(`${ahead} ahead`)}${pc7.dim(", ")}${pc7.red(`${behind} behind`)} ${pc7.dim(base)}`;
+  return `  ${pc8.red("⚡")}  ${label} ${pc8.yellow(`${ahead} ahead`)}${pc8.dim(", ")}${pc8.red(`${behind} behind`)} ${pc8.dim(base)}`;
 }
 
 // src/commands/submit.ts
-import { defineCommand as defineCommand6 } from "citty";
-import pc8 from "picocolors";
-var submit_default = defineCommand6({
+import { defineCommand as defineCommand7 } from "citty";
+import pc9 from "picocolors";
+var submit_default = defineCommand7({
   meta: {
     name: "submit",
     description: "Push current branch and create a pull request"
@@ -1027,18 +1327,20 @@ var submit_default = defineCommand6({
       error("No .contributerc.json found. Run `contrib setup` first.");
       process.exit(1);
     }
-    const { mainBranch, devBranch, origin } = config;
+    const { origin } = config;
+    const baseBranch = getBaseBranch(config);
+    const protectedBranches = getProtectedBranches(config);
     const currentBranch = await getCurrentBranch();
     if (!currentBranch) {
       error("Could not determine current branch.");
       process.exit(1);
     }
-    if (currentBranch === mainBranch || currentBranch === devBranch) {
-      error(`Cannot submit ${pc8.bold(mainBranch)} or ${pc8.bold(devBranch)} as a PR. Switch to your feature branch.`);
+    if (protectedBranches.includes(currentBranch)) {
+      error(`Cannot submit ${protectedBranches.map((b) => pc9.bold(b)).join(" or ")} as a PR. Switch to your feature branch.`);
       process.exit(1);
     }
     heading("\uD83D\uDE80 contrib submit");
-    info(`Pushing ${pc8.bold(currentBranch)} to ${origin}...`);
+    info(`Pushing ${pc9.bold(currentBranch)} to ${origin}...`);
     const pushResult = await pushSetUpstream(origin, currentBranch);
     if (pushResult.exitCode !== 0) {
       error(`Failed to push: ${pushResult.stderr}`);
@@ -1049,10 +1351,10 @@ var submit_default = defineCommand6({
     if (!ghInstalled || !ghAuthed) {
       const repoInfo = await getRepoInfoFromRemote(origin);
       if (repoInfo) {
-        const prUrl = `https://github.com/${repoInfo.owner}/${repoInfo.repo}/compare/${devBranch}...${currentBranch}?expand=1`;
+        const prUrl = `https://github.com/${repoInfo.owner}/${repoInfo.repo}/compare/${baseBranch}...${currentBranch}?expand=1`;
         console.log();
         info("Create your PR manually:");
-        console.log(`  ${pc8.cyan(prUrl)}`);
+        console.log(`  ${pc9.cyan(prUrl)}`);
       } else {
         info("gh CLI not available. Create your PR manually on GitHub.");
       }
@@ -1064,17 +1366,17 @@ var submit_default = defineCommand6({
       const copilotError = await checkCopilotAvailable();
       if (!copilotError) {
         info("Generating AI PR description...");
-        const commits = await getLog(devBranch, "HEAD");
-        const diff = await getLogDiff(devBranch, "HEAD");
+        const commits = await getLog(baseBranch, "HEAD");
+        const diff = await getLogDiff(baseBranch, "HEAD");
         const result = await generatePRDescription(commits, diff, args.model);
         if (result) {
           prTitle = result.title;
           prBody = result.body;
           console.log(`
-  ${pc8.dim("AI title:")} ${pc8.bold(pc8.cyan(prTitle))}`);
+  ${pc9.dim("AI title:")} ${pc9.bold(pc9.cyan(prTitle))}`);
           console.log(`
-${pc8.dim("AI body preview:")}`);
-          console.log(pc8.dim(prBody.slice(0, 300) + (prBody.length > 300 ? "..." : "")));
+${pc9.dim("AI body preview:")}`);
+          console.log(pc9.dim(prBody.slice(0, 300) + (prBody.length > 300 ? "..." : "")));
         } else {
           warn("AI did not return a PR description.");
         }
@@ -1095,7 +1397,7 @@ ${pc8.dim("AI body preview:")}`);
         prTitle = await inputPrompt("PR title");
         prBody = await inputPrompt("PR body (markdown)");
       } else {
-        const fillResult = await createPRFill(devBranch, args.draft);
+        const fillResult = await createPRFill(baseBranch, args.draft);
         if (fillResult.exitCode !== 0) {
           error(`Failed to create PR: ${fillResult.stderr}`);
           process.exit(1);
@@ -1109,7 +1411,7 @@ ${pc8.dim("AI body preview:")}`);
         prTitle = await inputPrompt("PR title");
         prBody = await inputPrompt("PR body (markdown)");
       } else {
-        const fillResult = await createPRFill(devBranch, args.draft);
+        const fillResult = await createPRFill(baseBranch, args.draft);
         if (fillResult.exitCode !== 0) {
           error(`Failed to create PR: ${fillResult.stderr}`);
           process.exit(1);
@@ -1123,7 +1425,7 @@ ${pc8.dim("AI body preview:")}`);
       process.exit(1);
     }
     const prResult = await createPR({
-      base: devBranch,
+      base: baseBranch,
       title: prTitle,
       body: prBody ?? "",
       draft: args.draft
@@ -1137,12 +1439,12 @@ ${pc8.dim("AI body preview:")}`);
 });
 
 // src/commands/sync.ts
-import { defineCommand as defineCommand7 } from "citty";
-import pc9 from "picocolors";
-var sync_default = defineCommand7({
+import { defineCommand as defineCommand8 } from "citty";
+import pc10 from "picocolors";
+var sync_default = defineCommand8({
   meta: {
     name: "sync",
-    description: "Reset dev branch to match origin/main (maintainer) or upstream/dev (contributor)"
+    description: "Sync your local branches with the remote"
   },
   args: {
     yes: {
@@ -1162,86 +1464,70 @@ var sync_default = defineCommand7({
       error("No .contributerc.json found. Run `contrib setup` first.");
       process.exit(1);
     }
-    const { role, mainBranch, devBranch, origin, upstream } = config;
+    const { workflow, role, origin } = config;
     if (await hasUncommittedChanges()) {
       error("You have uncommitted changes. Please commit or stash them before syncing.");
       process.exit(1);
     }
-    heading(`\uD83D\uDD04 contrib sync (${role})`);
-    if (role === "maintainer") {
-      info(`Fetching ${origin}...`);
-      const fetchResult = await fetchRemote(origin);
-      if (fetchResult.exitCode !== 0) {
-        error(`Failed to fetch ${origin}: ${fetchResult.stderr}`);
-        process.exit(1);
-      }
-      const div = await getDivergence(devBranch, `${origin}/${mainBranch}`);
-      if (div.ahead > 0 || div.behind > 0) {
-        info(`${pc9.bold(devBranch)} is ${pc9.yellow(`${div.ahead} ahead`)} and ${pc9.red(`${div.behind} behind`)} ${origin}/${mainBranch}`);
-      } else {
-        info(`${pc9.bold(devBranch)} is already in sync with ${origin}/${mainBranch}`);
-      }
-      if (!args.yes) {
-        const ok = await confirmPrompt(`This will reset ${pc9.bold(devBranch)} to match ${pc9.bold(`${origin}/${mainBranch}`)}.`);
-        if (!ok)
-          process.exit(0);
-      }
-      const coResult = await checkoutBranch(devBranch);
-      if (coResult.exitCode !== 0) {
-        error(`Failed to checkout ${devBranch}: ${coResult.stderr}`);
-        process.exit(1);
-      }
-      const resetResult = await resetHard(`${origin}/${mainBranch}`);
-      if (resetResult.exitCode !== 0) {
-        error(`Failed to reset: ${resetResult.stderr}`);
-        process.exit(1);
-      }
-      const pushResult = await pushForceWithLease(origin, devBranch);
-      if (pushResult.exitCode !== 0) {
-        error(`Failed to push: ${pushResult.stderr}`);
-        process.exit(1);
-      }
-      success(`✅ ${devBranch} has been reset to match ${origin}/${mainBranch} and pushed.`);
+    heading(`\uD83D\uDD04 contrib sync (${workflow}, ${role})`);
+    const baseBranch = getBaseBranch(config);
+    const syncSource = getSyncSource(config);
+    info(`Fetching ${syncSource.remote}...`);
+    const fetchResult = await fetchRemote(syncSource.remote);
+    if (fetchResult.exitCode !== 0) {
+      error(`Failed to fetch ${syncSource.remote}: ${fetchResult.stderr}`);
+      process.exit(1);
+    }
+    if (role === "contributor" && syncSource.remote !== origin) {
+      await fetchRemote(origin);
+    }
+    const div = await getDivergence(baseBranch, syncSource.ref);
+    if (div.ahead > 0 || div.behind > 0) {
+      info(`${pc10.bold(baseBranch)} is ${pc10.yellow(`${div.ahead} ahead`)} and ${pc10.red(`${div.behind} behind`)} ${syncSource.ref}`);
     } else {
-      info(`Fetching ${upstream}...`);
-      const fetchResult = await fetchRemote(upstream);
-      if (fetchResult.exitCode !== 0) {
-        error(`Failed to fetch ${upstream}: ${fetchResult.stderr}`);
-        process.exit(1);
-      }
-      if (!args.yes) {
-        const ok = await confirmPrompt(`This will reset local ${pc9.bold(devBranch)} to match ${pc9.bold(`${upstream}/${devBranch}`)}.`);
-        if (!ok)
-          process.exit(0);
-      }
-      const coResult = await checkoutBranch(devBranch);
-      if (coResult.exitCode !== 0) {
-        error(`Failed to checkout ${devBranch}: ${coResult.stderr}`);
-        process.exit(1);
-      }
-      const resetResult = await resetHard(`${upstream}/${devBranch}`);
-      if (resetResult.exitCode !== 0) {
-        error(`Failed to reset: ${resetResult.stderr}`);
-        process.exit(1);
-      }
-      const pushResult = await pushForceWithLease(origin, devBranch);
-      if (pushResult.exitCode !== 0) {
-        error(`Failed to push: ${pushResult.stderr}`);
-        process.exit(1);
+      info(`${pc10.bold(baseBranch)} is already in sync with ${syncSource.ref}`);
+    }
+    if (!args.yes) {
+      const ok = await confirmPrompt(`This will pull ${pc10.bold(syncSource.ref)} into local ${pc10.bold(baseBranch)}.`);
+      if (!ok)
+        process.exit(0);
+    }
+    const coResult = await checkoutBranch(baseBranch);
+    if (coResult.exitCode !== 0) {
+      error(`Failed to checkout ${baseBranch}: ${coResult.stderr}`);
+      process.exit(1);
+    }
+    const pullResult = await pullBranch(syncSource.remote, baseBranch);
+    if (pullResult.exitCode !== 0) {
+      error(`Failed to pull: ${pullResult.stderr}`);
+      process.exit(1);
+    }
+    success(`✅ ${baseBranch} is now in sync with ${syncSource.ref}`);
+    if (hasDevBranch(workflow) && role === "maintainer") {
+      const mainDiv = await getDivergence(config.mainBranch, `${origin}/${config.mainBranch}`);
+      if (mainDiv.behind > 0) {
+        info(`Also syncing ${pc10.bold(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 checkoutBranch(baseBranch);
       }
-      success(`✅ ${devBranch} has been reset to match ${upstream}/${devBranch} and pushed.`);
     }
   }
 });
 
 // src/commands/update.ts
-import { readFileSync as readFileSync2 } from "node:fs";
-import { defineCommand as defineCommand8 } from "citty";
-import pc10 from "picocolors";
-var update_default = defineCommand8({
+import { readFileSync as readFileSync3 } from "node:fs";
+import { defineCommand as defineCommand9 } from "citty";
+import pc11 from "picocolors";
+var update_default = defineCommand9({
   meta: {
     name: "update",
-    description: "Rebase current branch onto latest dev"
+    description: "Rebase current branch onto the latest base branch"
   },
   args: {
     model: {
@@ -1264,14 +1550,16 @@ var update_default = defineCommand8({
       error("No .contributerc.json found. Run `contrib setup` first.");
       process.exit(1);
     }
-    const { mainBranch, devBranch, origin, upstream, role } = config;
+    const baseBranch = getBaseBranch(config);
+    const protectedBranches = getProtectedBranches(config);
+    const syncSource = getSyncSource(config);
     const currentBranch = await getCurrentBranch();
     if (!currentBranch) {
       error("Could not determine current branch.");
       process.exit(1);
     }
-    if (currentBranch === mainBranch || currentBranch === devBranch) {
-      error(`Use \`contrib sync\` to update ${pc10.bold(mainBranch)} or ${pc10.bold(devBranch)} branches.`);
+    if (protectedBranches.includes(currentBranch)) {
+      error(`Use \`contrib sync\` to update ${protectedBranches.map((b) => pc11.bold(b)).join(" or ")} branches.`);
       process.exit(1);
     }
     if (await hasUncommittedChanges()) {
@@ -1279,12 +1567,10 @@ var update_default = defineCommand8({
       process.exit(1);
     }
     heading("\uD83D\uDD03 contrib update");
-    info(`Updating ${pc10.bold(currentBranch)} with latest ${pc10.bold(devBranch)}...`);
-    const remote = role === "contributor" ? upstream : origin;
-    const remoteDevRef = role === "contributor" ? `${upstream}/${devBranch}` : `${origin}/${devBranch}`;
-    await fetchRemote(remote);
-    await resetHard(remoteDevRef);
-    const rebaseResult = await rebase(devBranch);
+    info(`Updating ${pc11.bold(currentBranch)} with latest ${pc11.bold(baseBranch)}...`);
+    await fetchRemote(syncSource.remote);
+    await updateLocalBranch(baseBranch, syncSource.ref);
+    const rebaseResult = await rebase(baseBranch);
     if (rebaseResult.exitCode !== 0) {
       warn("Rebase hit conflicts. Resolve them manually.");
       console.log();
@@ -1296,7 +1582,7 @@ var update_default = defineCommand8({
           let conflictDiff = "";
           for (const file of conflictFiles.slice(0, 3)) {
             try {
-              const content = readFileSync2(file, "utf-8");
+              const content = readFileSync3(file, "utf-8");
               if (content.includes("<<<<<<<")) {
                 conflictDiff += `
 --- ${file} ---
@@ -1309,34 +1595,73 @@ ${content.slice(0, 2000)}
             const suggestion = await suggestConflictResolution(conflictDiff, args.model);
             if (suggestion) {
               console.log(`
-${pc10.bold("\uD83D\uDCA1 AI Conflict Resolution Guidance:")}`);
-              console.log(pc10.dim("─".repeat(60)));
+${pc11.bold("\uD83D\uDCA1 AI Conflict Resolution Guidance:")}`);
+              console.log(pc11.dim("─".repeat(60)));
               console.log(suggestion);
-              console.log(pc10.dim("─".repeat(60)));
+              console.log(pc11.dim("─".repeat(60)));
               console.log();
             }
           }
         }
       }
-      console.log(pc10.bold("To resolve:"));
+      console.log(pc11.bold("To resolve:"));
       console.log(`  1. Fix conflicts in the affected files`);
-      console.log(`  2. ${pc10.cyan("git add <resolved-files>")}`);
-      console.log(`  3. ${pc10.cyan("git rebase --continue")}`);
+      console.log(`  2. ${pc11.cyan("git add <resolved-files>")}`);
+      console.log(`  3. ${pc11.cyan("git rebase --continue")}`);
       console.log();
-      console.log(`  Or abort: ${pc10.cyan("git rebase --abort")}`);
+      console.log(`  Or abort: ${pc11.cyan("git rebase --abort")}`);
       process.exit(1);
     }
-    success(`✅ ${pc10.bold(currentBranch)} has been rebased onto latest ${pc10.bold(devBranch)}`);
+    success(`✅ ${pc11.bold(currentBranch)} has been rebased onto latest ${pc11.bold(baseBranch)}`);
+  }
+});
+
+// src/commands/validate.ts
+import { defineCommand as defineCommand10 } from "citty";
+import pc12 from "picocolors";
+var validate_default = defineCommand10({
+  meta: {
+    name: "validate",
+    description: "Validate a commit message against the configured convention"
+  },
+  args: {
+    message: {
+      type: "positional",
+      description: "The commit message to validate",
+      required: true
+    }
+  },
+  async run({ args }) {
+    const config = readConfig();
+    if (!config) {
+      error("No .contributerc.json found. Run `contrib setup` first.");
+      process.exit(1);
+    }
+    const convention = config.commitConvention;
+    if (convention === "none") {
+      info('Commit convention is set to "none". All messages are accepted.');
+      process.exit(0);
+    }
+    const message = args.message;
+    if (validateCommitMessage(message, convention)) {
+      success(`Valid ${CONVENTION_LABELS[convention]} message.`);
+      process.exit(0);
+    }
+    const errors = getValidationError(convention);
+    for (const line of errors) {
+      console.error(pc12.red(`  ✗ ${line}`));
+    }
+    process.exit(1);
   }
 });
 
 // src/ui/banner.ts
 import figlet from "figlet";
-import pc11 from "picocolors";
+import pc13 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.1.2",
+  version: "0.2.0-dev.70284d0",
   description: "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   type: "module",
   bin: {
@@ -1348,12 +1673,12 @@ var package_default = {
   ],
   scripts: {
     build: "bun build src/index.ts --outfile dist/index.js --target node --packages external",
+    cli: "bun run src/index.ts --",
     dev: "bun src/index.ts",
     test: "bun test",
     lint: "biome check .",
     "lint:fix": "biome check --write .",
     format: "biome format --write .",
-    prepare: "husky || true",
     "www:dev": "bun run --cwd www dev",
     "www:build": "bun run --cwd www build",
     "www:preview": "bun run --cwd www preview"
@@ -1390,7 +1715,6 @@ var package_default = {
     "@biomejs/biome": "^2.4.4",
     "@types/bun": "latest",
     "@types/figlet": "^1.7.0",
-    husky: "^9.1.7",
     typescript: "^5.7.0"
   }
 };
@@ -1398,9 +1722,10 @@ var package_default = {
 // src/ui/banner.ts
 var LOGO;
 try {
-  LOGO = figlet.textSync("contrib", { font: "ANSI Shadow" });
+  LOGO = figlet.textSync(`Contribute
+Now`, { font: "ANSI Shadow" });
 } catch {
-  LOGO = "contribute-now";
+  LOGO = "Contribute Now";
 }
 function getVersion() {
   return package_default.version ?? "unknown";
@@ -1408,16 +1733,15 @@ function getVersion() {
 function getAuthor() {
   return typeof package_default.author === "string" ? package_default.author : "unknown";
 }
-function showBanner(minimal = false) {
-  console.log(pc11.cyan(`
+function showBanner(showLinks = false) {
+  console.log(pc13.cyan(`
 ${LOGO}`));
-  console.log(`  ${pc11.dim(`v${getVersion()}`)} ${pc11.dim("—")} ${pc11.dim(`Built by ${getAuthor()}`)}`);
-  if (!minimal) {
-    console.log(`  ${pc11.dim(package_default.description)}`);
+  console.log(`  ${pc13.dim(`v${getVersion()}`)} ${pc13.dim("—")} ${pc13.dim(`Built by ${getAuthor()}`)}`);
+  if (showLinks) {
     console.log();
-    console.log(`  ${pc11.yellow("Star")}        ${pc11.cyan("https://github.com/warengonzaga/contribute-now")}`);
-    console.log(`  ${pc11.green("Contribute")}  ${pc11.cyan("https://github.com/warengonzaga/contribute-now/blob/main/CONTRIBUTING.md")}`);
-    console.log(`  ${pc11.magenta("Sponsor")}     ${pc11.cyan("https://warengonzaga.com/sponsor")}`);
+    console.log(`  ${pc13.yellow("Star")}        ${pc13.cyan("https://github.com/warengonzaga/contribute-now")}`);
+    console.log(`  ${pc13.green("Contribute")}  ${pc13.cyan("https://github.com/warengonzaga/contribute-now/blob/main/CONTRIBUTING.md")}`);
+    console.log(`  ${pc13.magenta("Sponsor")}     ${pc13.cyan("https://warengonzaga.com/sponsor")}`);
   }
   console.log();
 }
@@ -1425,11 +1749,11 @@ ${LOGO}`));
 // src/index.ts
 var isHelp = process.argv.includes("--help") || process.argv.includes("-h");
 showBanner(isHelp);
-var main = defineCommand9({
+var main = defineCommand11({
   meta: {
     name: "contrib",
     version: getVersion(),
-    description: "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges."
+    description: "Git workflow CLI that guides contributors through clean branching, commits, and PRs."
   },
   args: {
     version: {
@@ -1446,7 +1770,9 @@ var main = defineCommand9({
     update: update_default,
     submit: submit_default,
     clean: clean_default,
-    status: status_default
+    status: status_default,
+    hook: hook_default,
+    validate: validate_default
   },
   run({ args }) {
     if (args.version) {