@quikcommit/cli 9.0.0 → 10.0.0

package/dist/index.js

@@ -7879,6 +7879,26 @@ function getStagedFiles() {
     encoding: "utf-8"
   });
 }
+function getWorkingTreeDiff(excludes = []) {
+  const args = ["diff", "HEAD"];
+  if (excludes.length > 0) {
+    args.push("--");
+    args.push(".");
+    for (const pattern of excludes) {
+      args.push(`:(exclude)${pattern}`);
+    }
+  }
+  return (0, import_child_process2.execFileSync)("git", args, {
+    encoding: "utf-8",
+    maxBuffer: 10 * 1024 * 1024
+  });
+}
+function getAllChangedFiles() {
+  const output = (0, import_child_process2.execFileSync)("git", ["status", "--porcelain"], {
+    encoding: "utf-8"
+  });
+  return output.trim().split("\n").filter(Boolean).map((line) => line.slice(3)).join("\n");
+}
 function hasStagedChanges() {
   const output = (0, import_child_process2.execFileSync)("git", ["diff", "--cached", "--name-only"], {
     encoding: "utf-8"
@@ -7889,17 +7909,21 @@ function getUnstagedFiles() {
   const output = (0, import_child_process2.execFileSync)("git", ["status", "--porcelain"], {
     encoding: "utf-8"
   });
-  return output.trim().split("\n").filter(Boolean).filter((line) => !line.startsWith("??"));
+  return output.trim().split("\n").filter(Boolean);
 }
 function stageAll() {
-  (0, import_child_process2.execFileSync)("git", ["add", "-u"], { stdio: "pipe" });
+  (0, import_child_process2.execFileSync)("git", ["add", "-A"], { stdio: "pipe" });
 }
 function gitCommit(message) {
   const tmpDir = (0, import_fs2.mkdtempSync)((0, import_path2.join)((0, import_os3.tmpdir)(), "qc-"));
   const tmpFile = (0, import_path2.join)(tmpDir, "commit.txt");
   (0, import_fs2.writeFileSync)(tmpFile, message, { mode: 384 });
   try {
-    (0, import_child_process2.execFileSync)("git", ["commit", "-F", tmpFile], { stdio: "inherit" });
+    (0, import_child_process2.execFileSync)("git", ["commit", "-F", tmpFile], { stdio: "pipe" });
+  } catch (err) {
+    const stderr = err?.stderr?.toString() ?? "";
+    if (stderr) process.stderr.write(stderr);
+    throw err;
   } finally {
     try {
       (0, import_fs2.unlinkSync)(tmpFile);
@@ -7909,7 +7933,13 @@ function gitCommit(message) {
   }
 }
 function gitPush() {
-  (0, import_child_process2.execFileSync)("git", ["push"], { stdio: "inherit" });
+  try {
+    (0, import_child_process2.execFileSync)("git", ["push"], { stdio: "pipe" });
+  } catch (err) {
+    const stderr = err?.stderr?.toString() ?? "";
+    if (stderr) process.stderr.write(stderr);
+    throw err;
+  }
 }
 function getBranchCommits(base = "main") {
   validateRef(base, "base");
@@ -7979,6 +8009,12 @@ function getFullDiff(base = "main") {
     maxBuffer: 10 * 1024 * 1024
   });
 }
+function getStagedFileCount() {
+  const output = (0, import_child_process2.execFileSync)("git", ["diff", "--cached", "--name-only"], {
+    encoding: "utf-8"
+  });
+  return output.trim().split("\n").filter(Boolean).length;
+}
 function getStagedDiffShortstat() {
   try {
     const out = (0, import_child_process2.execFileSync)("git", ["diff", "--cached", "--shortstat"], {
@@ -7996,13 +8032,6 @@ function getStagedDiffShortstat() {
     return { additions: 0, deletions: 0 };
   }
 }
-function getShortStagedFiles(max = 3) {
-  const output = (0, import_child_process2.execFileSync)("git", ["diff", "--cached", "--name-only"], {
-    encoding: "utf-8"
-  });
-  const all = output.trim().split("\n").filter(Boolean);
-  return { files: all.slice(0, max), total: all.length };
-}
 function getCommitHash() {
   return (0, import_child_process2.execFileSync)("git", ["rev-parse", "--short", "HEAD"], {
     encoding: "utf-8"
@@ -8135,7 +8164,13 @@ function getHeadSha() {
 }
 function gitPushSetUpstream(branch) {
   validateRef(branch, "branch");
-  (0, import_child_process2.execFileSync)("git", ["push", "-u", "origin", branch], { stdio: "inherit" });
+  try {
+    (0, import_child_process2.execFileSync)("git", ["push", "-u", "origin", branch], { stdio: "pipe" });
+  } catch (err) {
+    const stderr = err?.stderr?.toString() ?? "";
+    if (stderr) process.stderr.write(stderr);
+    throw err;
+  }
 }
 function deleteBranch(name) {
   validateRef(name, "name");
@@ -9362,7 +9397,7 @@ function renderBoxedCommit(header, body, opts) {
     if (body) lines2.push("", body);
     return lines2.join("\n");
   }
-  const innerWidth = opts.width - 8;
+  const innerWidth = opts.width - 6;
   const horiz = opts.width - 2;
   const top = "  " + (opts.isColor ? import_picocolors2.default.dim("\u256D" + "\u2500".repeat(horiz) + "\u256E") : "\u256D" + "\u2500".repeat(horiz) + "\u256E");
   const bottom = "  " + (opts.isColor ? import_picocolors2.default.dim("\u2570" + "\u2500".repeat(horiz) + "\u256F") : "\u2570" + "\u2500".repeat(horiz) + "\u256F");
@@ -9380,7 +9415,7 @@ function renderBoxedCommit(header, body, opts) {
   const lines = [];
   const headerParts = wrapLine(firstLineStyled, innerWidth);
   for (let i = 0; i < headerParts.length; i++) {
-    const indent = i === 0 ? "" : "    ";
+    const indent = i === 0 ? "" : "  ";
     lines.push(boxedLine(indent + (headerParts[i] ?? ""), innerWidth, opts.isColor));
   }
   if (body) {
@@ -10112,8 +10147,17 @@ async function runLocalCommit(args) {
     }
   }
   gitCommit(message);
+  const branch = getCurrentBranch();
+  log.step(`[${branch} committed]`);
   if (args.push) {
+    const pushStats = getPushStats();
+    log.step(`pushing to origin/${branch}...`);
     gitPush();
+    if (pushStats) {
+      log.success(`pushed ${pushStats.commits} commit(s) \xB7 ${pushStats.stat}`);
+    } else {
+      log.success("pushed");
+    }
   }
 }
 async function generateLocalBranchName(opts) {
@@ -10896,8 +10940,16 @@ async function runBranchGuard(args, log) {
   if (action === "continue") {
     return { action: "continue" };
   }
-  const stagedDiff = state.mode === "uncommitted" ? getStagedDiff(args.excludes ?? []) : "";
-  const stagedChanges = state.mode === "uncommitted" ? getStagedFiles() : "";
+  let stagedDiff = "";
+  let stagedChanges = "";
+  if (state.mode === "uncommitted") {
+    stagedDiff = getStagedDiff(args.excludes ?? []);
+    stagedChanges = getStagedFiles();
+    if (!stagedDiff.trim()) {
+      stagedDiff = getWorkingTreeDiff(args.excludes ?? []);
+      stagedChanges = getAllChangedFiles();
+    }
+  }
   const recentCommits = state.mode === "rescue" ? getRecentBranchCommits(state.commitsAhead) : void 0;
   const branchRules = args.branchRules ?? (config2.branch?.generation?.types && config2.branch.generation.types.length > 0 ? { types: [...config2.branch.generation.types] } : void 0);
   const apiKey = args.apiKey;
@@ -10990,10 +11042,22 @@ async function runBranchGuard(args, log) {
 async function promptProtectedAction(mode) {
   const rl = import_promises2.default.createInterface({ input: process.stdin, output: process.stderr });
   try {
-    const question = mode === "rescue" ? "Move commits to a new branch? [B/c/a] " : "Create a new branch first? [B/c/a] ";
-    const answer = (await rl.question(question)).trim().toLowerCase();
-    if (answer === "" || answer === "b" || answer === "y") return "branch";
-    if (answer === "c") return "continue";
+    const continueLabel = mode === "rescue" ? "commit on this branch anyway (do not move existing commits)" : "commit on this branch anyway (not recommended)";
+    const branchLabel = mode === "rescue" ? "create a new branch and move your existing commits to it" : "create a new branch first, then commit your staged changes there";
+    process.stderr.write(
+      `
+What would you like to do?
+  (b)ranch  ${branchLabel}  \u2190 default
+  (c)ommit  ${continueLabel}
+  (a)bort   cancel without committing
+`
+    );
+    const answer = (await rl.question("> ")).trim().toLowerCase();
+    if (answer === "" || answer === "b" || answer === "branch" || answer === "y") return "branch";
+    if (answer === "c" || answer === "commit") return "continue";
+    if (answer === "a" || answer === "abort" || answer === "n") return "abort";
+    process.stderr.write(`(unrecognized response "${answer}" \u2014 aborting)
+`);
     return "abort";
   } finally {
     rl.close();
@@ -11051,15 +11115,13 @@ async function runCommit(args) {
   void _exhaustive;
   if (all || config2.autoStage) {
     stageAll();
-    const { files, total } = getShortStagedFiles();
-    const fileList = total > 3 ? `${files.join(", ")}, +${total - 3} more` : files.join(", ");
+    const total = getStagedFileCount();
     log.step(`staging working tree (${total} file(s))...`);
-    if (fileList) log.dim(`  ${fileList}`);
   }
   if (!hasStagedChanges()) {
     const unstaged = getUnstagedFiles();
     if (unstaged.length > 0) {
-      log.error("No staged changes. Use `qc -a` to stage tracked files, or `git add` manually.");
+      log.error("No staged changes. Use `qc -a` to stage all files (modified + untracked), or `git add` manually.");
     } else {
       log.error("No changes to commit.");
     }
@@ -11185,11 +11247,11 @@ async function runCommit(args) {
   const branch = getCurrentBranch();
   log.step(`[${branch} ${hash}] committed`);
   if (push) {
+    const pushStats = getPushStats();
     log.step(`pushing to origin/${branch}...`);
     gitPush();
-    const stats = getPushStats();
-    if (stats) {
-      log.success(`pushed ${stats.commits} commit(s) \xB7 ${stats.stat}`);
+    if (pushStats) {
+      log.success(`pushed ${pushStats.commits} commit(s) \xB7 ${pushStats.stat}`);
     } else {
       log.success("pushed");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quikcommit/cli",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "description": "AI-powered conventional commit messages",
   "bin": {
     "qc": "./dist/index.js"