contribute-now 0.4.1 → 0.5.0-dev.9ad3d01

package/README.md

@@ -204,17 +204,19 @@ Checks include:
 
 ### `contrib log`
 
-Show a colorized, workflow-aware commit log with graph visualization.
+Show a colorized, workflow-aware commit log. By default it shows only **local unpushed commits** — the changes you've made since the last push (or since branching off the base branch). Use flags to switch between different views.
 
 ```bash
-contrib log                # last 20 commits with graph
-contrib log -n 50          # last 50 commits
-contrib log --all          # all branches
-contrib log --no-graph     # flat view without graph lines
+contrib log                # local unpushed commits (default)
+contrib log --remote       # commits on remote not yet pulled
+contrib log --full         # full history for the current branch
+contrib log --all          # commits across all branches
+contrib log -n 50          # change the commit limit (default: 20)
 contrib log -b feature/x   # log for a specific branch
+contrib log --no-graph     # flat view without graph lines
 ```
 
-Protected branches (main, dev) are highlighted, and the current branch is color-coded for quick orientation.
+When no upstream tracking is set (branch hasn't been pushed yet), the command automatically compares against the base branch from your config (e.g., `origin/dev`). Protected branches are highlighted, and the current branch is color-coded for quick orientation.
 
 ---
 
@@ -352,15 +354,40 @@ bun test        # run tests
 bun run lint    # check code quality
 ```
 
-## Contributing
+## 🎯 Contributing
 
-Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) for the workflow, commit convention, and PR guidelines.
+Contributions are welcome, create a pull request to this repo and I will review your code. Please consider to submit your pull request to the `dev` branch. Thank you!
 
-## License
+Read the project's [contributing guide](./CONTRIBUTING.md) for more info.
 
-[GPL-3.0](LICENSE) © [Waren Gonzaga](https://warengonzaga.com)
+## 🐛 Issues
 
----
+Please report any issues and bugs by [creating a new issue here](https://github.com/warengonzaga/contribute-now/issues/new/choose), also make sure you're reporting an issue that doesn't exist. Any help to improve the project would be appreciated. Thanks! 🙏✨
+
+## 🙏 Sponsor
+
+Like this project? **Leave a star**! ⭐⭐⭐⭐⭐
+
+Want to support my work and get some perks? [Become a sponsor](https://github.com/sponsors/warengonzaga)! 💖
+
+Or, you just love what I do? [Buy me a coffee](https://buymeacoffee.com/warengonzaga)! ☕
+
+Recognized my open-source contributions? [Nominate me](https://stars.github.com/nominate) as GitHub Star! 💫
 
-💻💖☕ Made with ❤️ by [Waren Gonzaga](https://github.com/warengonzaga)
+## 📋 Code of Conduct
+
+Read the project's [code of conduct](./CODE_OF_CONDUCT.md).
+
+## 📃 License
+
+This project is licensed under [GNU General Public License v3.0](https://opensource.org/licenses/GPL-3.0).
+
+## 📝 Author
+
+This project is created by **[Waren Gonzaga](https://github.com/warengonzaga)**, with the help of awesome [contributors](https://github.com/warengonzaga/contribute-now/graphs/contributors).
+
+[![contributors](https://contrib.rocks/image?repo=warengonzaga/contribute-now)](https://github.com/warengonzaga/contribute-now/graphs/contributors)
+
+---
 
+💻💖☕ by [Waren Gonzaga](https://warengonzaga.com) & [YHWH](https://www.youtube.com/watch?v=VOZbswniA-g) 🙏 — Without *Him*, none of this exists, *even me*.

package/dist/index.js

@@ -547,6 +547,76 @@ async function getLogEntries(options) {
     return { hash: hash.trim(), subject: subject.trim(), refs: refs.trim() };
   });
 }
+async function getLocalCommitsGraph(options) {
+  const count = options?.count ?? 20;
+  const upstream = options?.upstream;
+  if (!upstream)
+    return [];
+  const args = [
+    "log",
+    "--oneline",
+    "--graph",
+    "--decorate",
+    `--max-count=${count}`,
+    "--color=never",
+    `${upstream}..HEAD`
+  ];
+  const { exitCode, stdout } = await run(args);
+  if (exitCode !== 0)
+    return [];
+  return stdout.trimEnd().split(`
+`).filter(Boolean);
+}
+async function getLocalCommitsEntries(options) {
+  const count = options?.count ?? 20;
+  const upstream = options?.upstream;
+  if (!upstream)
+    return [];
+  const args = ["log", `--format=%h||%s||%D`, `--max-count=${count}`, `${upstream}..HEAD`];
+  const { exitCode, stdout } = await run(args);
+  if (exitCode !== 0)
+    return [];
+  return stdout.trimEnd().split(`
+`).filter(Boolean).map((line) => {
+    const [hash = "", subject = "", refs = ""] = line.split("||");
+    return { hash: hash.trim(), subject: subject.trim(), refs: refs.trim() };
+  });
+}
+async function getRemoteOnlyCommitsGraph(options) {
+  const count = options?.count ?? 20;
+  const upstream = options?.upstream;
+  if (!upstream)
+    return [];
+  const args = [
+    "log",
+    "--oneline",
+    "--graph",
+    "--decorate",
+    `--max-count=${count}`,
+    "--color=never",
+    `HEAD..${upstream}`
+  ];
+  const { exitCode, stdout } = await run(args);
+  if (exitCode !== 0)
+    return [];
+  return stdout.trimEnd().split(`
+`).filter(Boolean);
+}
+async function getRemoteOnlyCommitsEntries(options) {
+  const count = options?.count ?? 20;
+  const upstream = options?.upstream;
+  if (!upstream)
+    return [];
+  const args = ["log", `--format=%h||%s||%D`, `--max-count=${count}`, `HEAD..${upstream}`];
+  const { exitCode, stdout } = await run(args);
+  if (exitCode !== 0)
+    return [];
+  return stdout.trimEnd().split(`
+`).filter(Boolean).map((line) => {
+    const [hash = "", subject = "", refs = ""] = line.split("||");
+    return { hash: hash.trim(), subject: subject.trim(), refs: refs.trim() };
+  });
+}
 async function getLocalBranches() {
   const { exitCode, stdout } = await run(["branch", "-vv", "--no-color"]);
   if (exitCode !== 0)
@@ -575,6 +645,17 @@ async function getRemoteBranches() {
   return stdout.trimEnd().split(`
 `).map((line) => line.trim()).filter((line) => line.length > 0 && !line.includes(" -> "));
 }
+async function isBranchMergedInto(branch, base) {
+  const { exitCode } = await run(["merge-base", "--is-ancestor", branch, base]);
+  return exitCode === 0;
+}
+async function getLastCommitDate(branch) {
+  const { exitCode, stdout } = await run(["log", "-1", "--format=%aI", branch]);
+  if (exitCode !== 0)
+    return null;
+  const date = stdout.trim();
+  return date || null;
+}
 
 // src/utils/logger.ts
 import { LogEngine, LogMode } from "@wgtechlabs/log-engine";
@@ -1141,19 +1222,22 @@ function extractJson(raw) {
   }
   return text2;
 }
-async function generateCommitMessage(diff, stagedFiles, model, convention = "clean-commit") {
+async function generateCommitMessage(diff, stagedFiles, model, convention = "clean-commit", context) {
   try {
     const isLarge = stagedFiles.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD;
     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 squashHint = context === "squash-merge" ? `
+
+CONTEXT: This is a squash merge of an entire feature branch into the base branch. All commits are being combined into ONE single commit. Generate a single high-level summary that describes the overall feature or change — NOT a list of individual commits. Think: what capability was added or what problem was solved? Be specific but concise.` : "";
     const diffContent = isLarge ? createCompactDiff(stagedFiles, diff) : diff.slice(0, 4000);
     const userMessage = `Generate a commit message for these staged changes:
 
 Files (${stagedFiles.length}): ${stagedFiles.join(", ")}
 
 Diff:
-${diffContent}${multiFileHint}`;
+${diffContent}${multiFileHint}${squashHint}`;
     const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model, isLarge ? COPILOT_LONG_TIMEOUT_MS : COPILOT_TIMEOUT_MS);
     return result?.trim() ?? null;
   } catch {
@@ -1885,6 +1969,27 @@ ${pc6.bold("Changed files:")}`);
       }
     }
     info(`Staged files: ${stagedFiles.join(", ")}`);
+    const LARGE_COMMIT_THRESHOLD = 10;
+    if (stagedFiles.length >= LARGE_COMMIT_THRESHOLD && !args.group) {
+      const dirs = new Set(stagedFiles.map((f) => f.split("/")[0]));
+      if (dirs.size > 1) {
+        console.log();
+        warn(`You're staging ${pc6.bold(String(stagedFiles.length))} files across ${pc6.bold(String(dirs.size))} directories in a single commit.`);
+        info(pc6.dim("Large commits mixing different topics make history harder to read and bisect. " + "For cleaner history, consider splitting into atomic commits."));
+        const choice = await selectPrompt("How would you like to proceed?", [
+          "Continue as single commit",
+          "Switch to group mode (AI splits into atomic commits)",
+          "Cancel"
+        ]);
+        if (choice === "Cancel") {
+          process.exit(0);
+        }
+        if (choice === "Switch to group mode (AI splits into atomic commits)") {
+          await runGroupCommit(args.model, config);
+          return;
+        }
+      }
+    }
     let commitMessage = null;
     const useAI = !args["no-ai"];
     if (useAI) {
@@ -2163,7 +2268,7 @@ import pc7 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.4.1",
+  version: "0.5.0-dev.9ad3d01",
   description: "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   type: "module",
   bin: {
@@ -2181,9 +2286,10 @@ var package_default = {
     lint: "biome check .",
     "lint:fix": "biome check --write .",
     format: "biome format --write .",
-    "www:dev": "bun run --cwd www dev",
-    "www:build": "bun run --cwd www build",
-    "www:preview": "bun run --cwd www preview"
+    "landing:install": "bun install --cwd landing",
+    "landing:dev": "bun run --cwd landing dev",
+    "landing:build": "bun run --cwd landing build",
+    "landing:preview": "bun run --cwd landing preview"
   },
   engines: {
     node: ">=18",
@@ -2681,7 +2787,19 @@ var log_default = defineCommand6({
     all: {
       type: "boolean",
       alias: "a",
-      description: "Show all branches, not just current",
+      description: "Show commits from all branches",
+      default: false
+    },
+    remote: {
+      type: "boolean",
+      alias: "r",
+      description: "Show only remote commits not yet pulled locally",
+      default: false
+    },
+    full: {
+      type: "boolean",
+      alias: "f",
+      description: "Show full commit history for the current branch",
       default: false
     },
     graph: {
@@ -2703,44 +2821,197 @@ var log_default = defineCommand6({
     }
     const config = readConfig();
     const count = args.count ? Number.parseInt(args.count, 10) : 20;
-    const showAll = args.all;
     const showGraph = args.graph;
     const targetBranch = args.branch;
+    let mode = "local";
+    if (args.all)
+      mode = "all";
+    else if (args.remote)
+      mode = "remote";
+    else if (args.full || targetBranch)
+      mode = "full";
     const protectedBranches = config ? getProtectedBranches(config) : ["main", "master"];
     const currentBranch = await getCurrentBranch();
+    const upstream = await getUpstreamRef();
+    let compareRef = upstream;
+    let usingFallback = false;
+    if (!compareRef) {
+      const fallback = await resolveBaseBranchRef(config);
+      if (fallback) {
+        compareRef = fallback;
+        usingFallback = true;
+      }
+    }
     heading("\uD83D\uDCDC commit log");
-    if (showGraph) {
-      const lines = await getLogGraph({ count, all: showAll, branch: targetBranch });
-      if (lines.length === 0) {
-        console.log(pc9.dim("  No commits found."));
+    printModeHeader(mode, currentBranch, compareRef, usingFallback);
+    if (mode === "local" || mode === "remote") {
+      if (!compareRef) {
         console.log();
+        console.log(pc9.yellow("  ⚠ Could not determine a comparison branch."));
+        console.log(pc9.dim("    No upstream tracking set and no remote base branch found."));
+        console.log(pc9.dim(`    Use ${pc9.bold("contrib log --full")} to see the full commit history instead.`));
+        console.log();
+        printGuidance();
         return;
       }
-      console.log();
-      for (const line of lines) {
-        console.log(`  ${colorizeGraphLine(line, protectedBranches, currentBranch)}`);
+      const hasCommits = await renderScopedLog({ mode, count, upstream: compareRef, showGraph, protectedBranches, currentBranch });
+      if (!hasCommits) {
+        printGuidance();
+        return;
       }
     } else {
-      const entries = await getLogEntries({ count, all: showAll, branch: targetBranch });
-      if (entries.length === 0) {
-        console.log(pc9.dim("  No commits found."));
-        console.log();
+      const hasCommits = await renderFullLog({ count, all: mode === "all", showGraph, targetBranch, protectedBranches, currentBranch });
+      if (!hasCommits) {
+        printGuidance();
         return;
       }
-      console.log();
-      for (const entry of entries) {
-        const hashStr = pc9.yellow(entry.hash);
-        const refsStr = entry.refs ? ` ${colorizeRefs(entry.refs, protectedBranches, currentBranch)}` : "";
-        const subjectStr = colorizeSubject(entry.subject);
-        console.log(`  ${hashStr}${refsStr} ${subjectStr}`);
+    }
+    printFooter(mode, count, targetBranch);
+    printGuidance();
+  }
+});
+async function resolveBaseBranchRef(config) {
+  if (!config) {
+    for (const candidate2 of ["origin/main", "origin/master"]) {
+      if (await branchExists(candidate2))
+        return candidate2;
+    }
+    return null;
+  }
+  const baseBranch = getBaseBranch(config);
+  const remote = config.origin ?? "origin";
+  const candidate = `${remote}/${baseBranch}`;
+  if (await branchExists(candidate))
+    return candidate;
+  for (const fallback of ["origin/main", "origin/master"]) {
+    if (fallback !== candidate && await branchExists(fallback))
+      return fallback;
+  }
+  return null;
+}
+function printModeHeader(mode, currentBranch, compareRef, usingFallback = false) {
+  const branch = currentBranch ?? "HEAD";
+  const fallbackNote = usingFallback ? pc9.yellow(" (no upstream — comparing against base branch)") : "";
+  console.log();
+  switch (mode) {
+    case "local":
+      console.log(pc9.dim(`  mode: ${pc9.bold("local")} — unpushed commits on ${pc9.bold(branch)}`) + fallbackNote);
+      if (compareRef) {
+        console.log(pc9.dim(`  comparing: ${pc9.bold(compareRef)} ➜ ${pc9.bold("HEAD")}`));
+      }
+      break;
+    case "remote":
+      console.log(pc9.dim(`  mode: ${pc9.bold("remote")} — commits on remote not yet pulled into ${pc9.bold(branch)}`) + fallbackNote);
+      if (compareRef) {
+        console.log(pc9.dim(`  comparing: ${pc9.bold("HEAD")} ➜ ${pc9.bold(compareRef)}`));
       }
+      break;
+    case "full":
+      console.log(pc9.dim(`  mode: ${pc9.bold("full")} — complete commit history for ${pc9.bold(branch)}`));
+      break;
+    case "all":
+      console.log(pc9.dim(`  mode: ${pc9.bold("all")} — commits across all branches`));
+      break;
+  }
+}
+async function renderScopedLog(options) {
+  const { mode, count, upstream, showGraph, protectedBranches, currentBranch } = options;
+  if (showGraph) {
+    const graphFn = mode === "local" ? getLocalCommitsGraph : getRemoteOnlyCommitsGraph;
+    const lines = await graphFn({ count, upstream });
+    if (lines.length === 0) {
+      printEmptyState(mode);
+      return false;
     }
     console.log();
-    console.log(pc9.dim(`  Showing ${count} most recent commits${showAll ? " (all branches)" : targetBranch ? ` (${targetBranch})` : ""}`));
-    console.log(pc9.dim(`  Use ${pc9.bold("contrib log -n 50")} for more, or ${pc9.bold("contrib log --all")} for all branches`));
+    for (const line of lines) {
+      console.log(`  ${colorizeGraphLine(line, protectedBranches, currentBranch)}`);
+    }
+  } else {
+    const entryFn = mode === "local" ? getLocalCommitsEntries : getRemoteOnlyCommitsEntries;
+    const entries = await entryFn({ count, upstream });
+    if (entries.length === 0) {
+      printEmptyState(mode);
+      return false;
+    }
     console.log();
+    for (const entry of entries) {
+      const hashStr = pc9.yellow(entry.hash);
+      const refsStr = entry.refs ? ` ${colorizeRefs(entry.refs, protectedBranches, currentBranch)}` : "";
+      const subjectStr = colorizeSubject(entry.subject);
+      console.log(`  ${hashStr}${refsStr} ${subjectStr}`);
+    }
   }
-});
+  return true;
+}
+function printEmptyState(mode) {
+  console.log();
+  if (mode === "local") {
+    console.log(pc9.dim("  No local unpushed commits — you're up to date with remote!"));
+  } else {
+    console.log(pc9.dim("  No remote-only commits — your local branch is up to date!"));
+  }
+  console.log();
+}
+async function renderFullLog(options) {
+  const { count, all, showGraph, targetBranch, protectedBranches, currentBranch } = options;
+  if (showGraph) {
+    const lines = await getLogGraph({ count, all, branch: targetBranch });
+    if (lines.length === 0) {
+      console.log(pc9.dim("  No commits found."));
+      console.log();
+      return false;
+    }
+    console.log();
+    for (const line of lines) {
+      console.log(`  ${colorizeGraphLine(line, protectedBranches, currentBranch)}`);
+    }
+  } else {
+    const entries = await getLogEntries({ count, all, branch: targetBranch });
+    if (entries.length === 0) {
+      console.log(pc9.dim("  No commits found."));
+      console.log();
+      return false;
+    }
+    console.log();
+    for (const entry of entries) {
+      const hashStr = pc9.yellow(entry.hash);
+      const refsStr = entry.refs ? ` ${colorizeRefs(entry.refs, protectedBranches, currentBranch)}` : "";
+      const subjectStr = colorizeSubject(entry.subject);
+      console.log(`  ${hashStr}${refsStr} ${subjectStr}`);
+    }
+  }
+  return true;
+}
+function printFooter(mode, count, targetBranch) {
+  console.log();
+  switch (mode) {
+    case "local":
+      console.log(pc9.dim(`  Showing up to ${count} unpushed commits`));
+      break;
+    case "remote":
+      console.log(pc9.dim(`  Showing up to ${count} remote-only commits`));
+      break;
+    case "full":
+      console.log(pc9.dim(`  Showing ${count} most recent commits${targetBranch ? ` (${targetBranch})` : ""}`));
+      break;
+    case "all":
+      console.log(pc9.dim(`  Showing ${count} most recent commits (all branches)`));
+      break;
+  }
+}
+function printGuidance() {
+  console.log();
+  console.log(pc9.dim("  ─── quick guide ───"));
+  console.log(pc9.dim(`  ${pc9.bold("contrib log")}            local unpushed commits (default)`));
+  console.log(pc9.dim(`  ${pc9.bold("contrib log --remote")}   commits on remote not yet pulled`));
+  console.log(pc9.dim(`  ${pc9.bold("contrib log --full")}     full history for the current branch`));
+  console.log(pc9.dim(`  ${pc9.bold("contrib log --all")}      commits across all branches`));
+  console.log(pc9.dim(`  ${pc9.bold("contrib log -n 50")}      change the commit limit (default: 20)`));
+  console.log(pc9.dim(`  ${pc9.bold("contrib log -b dev")}     view log for a specific branch`));
+  console.log(pc9.dim(`  ${pc9.bold("contrib log --no-graph")} flat list without graph lines`));
+  console.log();
+}
 function colorizeGraphLine(line, protectedBranches, currentBranch) {
   const match = line.match(/^([|/\\*\s_.-]*)([a-f0-9]{7,12})(\s+\(([^)]+)\))?\s*(.*)/);
   if (!match) {
@@ -3221,10 +3492,20 @@ var status_default = defineCommand9({
       const devLine = formatStatus(config.devBranch, devRemoteRef, devDiv.ahead, devDiv.behind);
       console.log(devLine);
     }
-    if (currentBranch && currentBranch !== mainBranch && currentBranch !== config.devBranch) {
+    const protectedBranches = getProtectedBranches(config);
+    const isFeatureBranch = currentBranch && !protectedBranches.includes(currentBranch);
+    let branchStatus = null;
+    if (isFeatureBranch) {
       const branchDiv = await getDivergence(currentBranch, baseBranch);
       const branchLine = formatStatus(currentBranch, baseBranch, branchDiv.ahead, branchDiv.behind);
       console.log(branchLine + pc12.dim(` (current ${pc12.green("*")})`));
+      branchStatus = await detectBranchStatus(currentBranch, baseBranch);
+      if (branchStatus.merged) {
+        console.log(`  ${pc12.green("✓")}  ${pc12.green("Branch merged")} — ${pc12.dim(branchStatus.mergedReason ?? "all commits reachable from base")}`);
+      }
+      if (branchStatus.stale) {
+        console.log(`  ${pc12.yellow("⏳")}  ${pc12.yellow("Branch is stale")} — ${pc12.dim(`last commit ${branchStatus.staleDaysAgo} days ago`)}`);
+      }
     } else if (currentBranch) {
       console.log(pc12.dim(`  (on ${pc12.bold(currentBranch)} branch)`));
     }
@@ -3259,10 +3540,16 @@ var status_default = defineCommand9({
     if (fileStatus.modified.length > 0 || fileStatus.untracked.length > 0) {
       tips.push(`Run ${pc12.bold("contrib commit")} to stage and commit changes`);
     }
-    if (fileStatus.staged.length === 0 && fileStatus.modified.length === 0 && fileStatus.untracked.length === 0 && currentBranch && currentBranch !== mainBranch && currentBranch !== config.devBranch) {
-      const branchDiv = await getDivergence(currentBranch, `${origin}/${currentBranch}`);
-      if (branchDiv.ahead > 0) {
-        tips.push(`Run ${pc12.bold("contrib submit")} to push and create/update your PR`);
+    if (isFeatureBranch && branchStatus) {
+      if (branchStatus.merged) {
+        tips.push(`Run ${pc12.bold("contrib clean")} to delete this merged branch`);
+      } else if (branchStatus.stale) {
+        tips.push(`Run ${pc12.bold("contrib sync")} to rebase on latest changes, or ${pc12.bold("contrib clean")} if no longer needed`);
+      } else if (fileStatus.staged.length === 0 && fileStatus.modified.length === 0 && fileStatus.untracked.length === 0) {
+        const branchDiv = await getDivergence(currentBranch, `${origin}/${currentBranch}`);
+        if (branchDiv.ahead > 0) {
+          tips.push(`Run ${pc12.bold("contrib submit")} to push and create/update your PR`);
+        }
       }
     }
     if (tips.length > 0) {
@@ -3288,6 +3575,48 @@ function formatStatus(branch, base, ahead, behind) {
   }
   return `  ${pc12.red("⚡")}  ${label} ${pc12.yellow(`${ahead} ahead`)}${pc12.dim(", ")}${pc12.red(`${behind} behind`)} ${pc12.dim(base)}`;
 }
+var STALE_THRESHOLD_DAYS = 14;
+async function detectBranchStatus(branch, baseBranch) {
+  const result = { merged: false, mergedReason: null, stale: false, staleDaysAgo: null };
+  const div = await getDivergence(branch, baseBranch);
+  const hasWork = div.ahead > 0;
+  if (hasWork) {
+    if (await isBranchMergedInto(branch, baseBranch)) {
+      result.merged = true;
+      result.mergedReason = `all commits reachable from ${baseBranch}`;
+      return result;
+    }
+    const mergedBranches = await getMergedBranches(baseBranch);
+    if (mergedBranches.includes(branch)) {
+      result.merged = true;
+      result.mergedReason = `listed in merged branches of ${baseBranch}`;
+      return result;
+    }
+  }
+  const goneBranches = await getGoneBranches();
+  if (goneBranches.includes(branch)) {
+    result.merged = true;
+    result.mergedReason = "remote branch deleted (likely squash-merged)";
+    return result;
+  }
+  if (await checkGhInstalled()) {
+    const mergedPR = await getMergedPRForBranch(branch);
+    if (mergedPR) {
+      result.merged = true;
+      result.mergedReason = `PR #${mergedPR.number} was merged`;
+      return result;
+    }
+  }
+  const lastDate = await getLastCommitDate(branch);
+  if (lastDate) {
+    const daysAgo = Math.floor((Date.now() - new Date(lastDate).getTime()) / (1000 * 60 * 60 * 24));
+    if (daysAgo >= STALE_THRESHOLD_DAYS) {
+      result.stale = true;
+      result.staleDaysAgo = daysAgo;
+    }
+  }
+  return result;
+}
 
 // src/commands/submit.ts
 import { defineCommand as defineCommand10 } from "citty";
@@ -3311,10 +3640,12 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
     if (!copilotError) {
       const spinner = createSpinner("Generating AI commit message for squash merge...");
       const [stagedDiff, stagedFiles] = await Promise.all([getStagedDiff(), getStagedFiles()]);
-      const aiMsg = await generateCommitMessage(stagedDiff, stagedFiles, options?.model, options?.convention ?? "clean-commit");
+      const aiMsg = await generateCommitMessage(stagedDiff, stagedFiles, options?.model, options?.convention ?? "clean-commit", "squash-merge");
       if (aiMsg) {
         message = aiMsg;
         spinner.success("AI commit message generated.");
+        console.log(`
+  ${pc13.dim("AI suggestion:")} ${pc13.bold(pc13.cyan(message))}`);
       } else {
         spinner.fail("AI did not return a commit message.");
       }
@@ -3322,13 +3653,38 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
       warn(`AI unavailable: ${copilotError}`);
     }
   }
-  const fallback = message || `squash merge ${featureBranch}`;
-  let finalMsg;
+  let finalMsg = null;
   if (message) {
-    console.log(`  ${pc13.dim("Commit message:")} ${pc13.bold(message)}`);
-    finalMsg = message;
+    while (!finalMsg) {
+      const action = await selectPrompt("What would you like to do?", [
+        "Accept this message",
+        "Edit this message",
+        "Regenerate",
+        "Write manually"
+      ]);
+      if (action === "Accept this message") {
+        finalMsg = message;
+      } else if (action === "Edit this message") {
+        finalMsg = await inputPrompt("Edit commit message", message);
+      } else if (action === "Regenerate") {
+        const spinner = createSpinner("Regenerating commit message...");
+        const [stagedDiff, stagedFiles] = await Promise.all([getStagedDiff(), getStagedFiles()]);
+        const regen = await generateCommitMessage(stagedDiff, stagedFiles, options?.model, options?.convention ?? "clean-commit", "squash-merge");
+        if (regen) {
+          message = regen;
+          spinner.success("Commit message regenerated.");
+          console.log(`
+  ${pc13.dim("AI suggestion:")} ${pc13.bold(pc13.cyan(regen))}`);
+        } else {
+          spinner.fail("Regeneration failed.");
+          finalMsg = await inputPrompt("Enter commit message");
+        }
+      } else {
+        finalMsg = await inputPrompt("Enter commit message");
+      }
+    }
   } else {
-    finalMsg = await inputPrompt("Commit message", fallback);
+    finalMsg = await inputPrompt("Commit message", `squash merge ${featureBranch}`);
   }
   const commitResult = await commitWithMessage(finalMsg);
   if (commitResult.exitCode !== 0) {
@@ -3581,6 +3937,25 @@ var submit_default = defineCommand10({
         return;
       }
     }
+    if (ghInstalled && ghAuthed) {
+      const existingPR = await getPRForBranch(currentBranch);
+      if (existingPR) {
+        info(`Pushing ${pc13.bold(currentBranch)} to ${origin}...`);
+        const pushResult2 = await pushSetUpstream(origin, currentBranch);
+        if (pushResult2.exitCode !== 0) {
+          error(`Failed to push: ${pushResult2.stderr}`);
+          if (pushResult2.stderr.includes("rejected") || pushResult2.stderr.includes("non-fast-forward")) {
+            warn("The remote branch has diverged. Try:");
+            info(`  git pull --rebase ${origin} ${currentBranch}`);
+            info("  Then run `contrib submit` again.");
+          }
+          process.exit(1);
+        }
+        success(`Pushed changes to existing PR #${existingPR.number}: ${pc13.bold(existingPR.title)}`);
+        console.log(`  ${pc13.cyan(existingPR.url)}`);
+        return;
+      }
+    }
     let prTitle = null;
     let prBody = null;
     async function tryGenerateAI() {
@@ -3683,7 +4058,6 @@ ${pc13.dim("AI body preview:")}`);
     }
     if (submitAction === "squash") {
       await performSquashMerge(origin, baseBranch, currentBranch, {
-        defaultMsg: prTitle ?? undefined,
         model: args.model,
         convention: config.commitConvention
       });
@@ -3714,12 +4088,6 @@ ${pc13.dim("AI body preview:")}`);
       }
       return;
     }
-    const existingPR = await getPRForBranch(currentBranch);
-    if (existingPR) {
-      success(`Pushed changes to existing PR #${existingPR.number}: ${pc13.bold(existingPR.title)}`);
-      console.log(`  ${pc13.cyan(existingPR.url)}`);
-      return;
-    }
     if (submitAction === "fill") {
       const fillResult = await createPRFill(baseBranch, args.draft);
       if (fillResult.exitCode !== 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contribute-now",
-  "version": "0.4.1",
+  "version": "0.5.0-dev.9ad3d01",
   "description": "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   "type": "module",
   "bin": {
@@ -18,9 +18,10 @@
     "lint": "biome check .",
     "lint:fix": "biome check --write .",
     "format": "biome format --write .",
-    "www:dev": "bun run --cwd www dev",
-    "www:build": "bun run --cwd www build",
-    "www:preview": "bun run --cwd www preview"
+    "landing:install": "bun install --cwd landing",
+    "landing:dev": "bun run --cwd landing dev",
+    "landing:build": "bun run --cwd landing build",
+    "landing:preview": "bun run --cwd landing preview"
   },
   "engines": {
     "node": ">=18",