contribute-now 0.4.1-dev.f9d0aaa → 0.4.1-pr.f338a8f

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.
 
 ---
 

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)
@@ -2163,7 +2233,7 @@ import pc7 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.4.1-dev.f9d0aaa",
+  version: "0.4.1-pr.f338a8f",
   description: "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   type: "module",
   bin: {
@@ -2181,9 +2251,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 +2752,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 +2786,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) {
@@ -3581,6 +3817,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() {
@@ -3714,12 +3969,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-dev.f9d0aaa",
+  "version": "0.4.1-pr.f338a8f",
   "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",