@quikcommit/cli 12.0.0 → 13.0.0

package/dist/index.js

@@ -89,20 +89,59 @@ function slugifyFilename(path) {
   const noExt = basename.replace(/\.[^.]+$/, "");
   return noExt.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40);
 }
+function isTestPath(f) {
+  return /\.(test|spec)\.[^.]+$/i.test(f) || /^tests?\//i.test(f);
+}
 function pickBestFile(files) {
   const codeFiles = files.filter((f) => !NON_CODE_PATTERNS.some((rx) => rx.test(f)));
-  return codeFiles[0] ?? files[0] ?? "";
+  const srcDirs = codeFiles.filter((f) => /^(src|lib|app|packages)\//.test(f));
+  const nonTestSrc = srcDirs.filter((f) => !isTestPath(f));
+  return nonTestSrc[0] ?? srcDirs[0] ?? codeFiles[0] ?? files[0] ?? "";
+}
+function inferTypeFromFiles(files) {
+  const isNonCode = (f) => NON_CODE_PATTERNS.some((rx) => rx.test(f));
+  let srcCount = 0, testCount = 0, docCount = 0, ciCount = 0;
+  for (const f of files) {
+    if (/^\.github\//i.test(f)) {
+      ciCount++;
+    } else if (isTestPath(f)) {
+      testCount++;
+    } else if (/^docs?\//i.test(f) || /\.md$/i.test(f) || /^readme/i.test(f)) {
+      docCount++;
+    } else if (!isNonCode(f)) {
+      srcCount++;
+    }
+  }
+  if (srcCount === 0 && testCount > 0 && docCount === 0 && ciCount === 0)
+    return "test";
+  if (srcCount === 0 && docCount > 0 && testCount === 0 && ciCount === 0)
+    return "docs";
+  if (srcCount === 0 && ciCount > 0 && testCount === 0 && docCount === 0)
+    return "ci";
+  if (srcCount > 10)
+    return "refactor";
+  if (srcCount > 0)
+    return "feat";
+  if (testCount >= docCount && testCount >= ciCount)
+    return "test";
+  if (docCount >= ciCount)
+    return "docs";
+  if (ciCount > 0)
+    return "ci";
+  return "chore";
 }
 function deterministicBranchName(opts) {
   const files = opts.files ?? [];
-  const codeFiles = files.filter((f) => !NON_CODE_PATTERNS.some((rx) => rx.test(f)));
-  const haystack = `${opts.description ?? ""} ${(codeFiles.length > 0 ? codeFiles : files).join(" ")}`;
   let type = "chore";
-  for (const [rx, t] of TYPE_HINTS) {
-    if (rx.test(haystack)) {
-      type = t;
-      break;
+  if (opts.description) {
+    for (const [rx, t] of TYPE_HINTS) {
+      if (rx.test(opts.description)) {
+        type = t;
+        break;
+      }
     }
+  } else if (files.length > 0) {
+    type = inferTypeFromFiles(files);
   }
   let slug;
   if (opts.description) {
@@ -127,16 +166,16 @@ var init_branch = __esm({
   "../shared/dist/branch.js"() {
     "use strict";
     BRANCH_NAME_RX = /^(feat|fix|refactor|perf|docs|test|chore|ci)\/[a-z0-9][a-z0-9-]{0,51}$/;
-    PROTECTED_BRANCH_RX = /(^|[/-])(main|master|develop|trunk|release)([/-]|$)/i;
+    PROTECTED_BRANCH_RX = /(^|\/)(main|master|develop|trunk|release)(\/|$)/i;
     MAX_BRANCH_NAME_LENGTH = 60;
     TYPE_HINTS = [
-      [/\btest|spec\b/i, "test"],
-      [/\bdocs?\b|readme|\.md$/i, "docs"],
-      [/\bperf|benchmark/i, "perf"],
+      [/\b(ci|workflow)\b|github\/actions/i, "ci"],
+      [/\b(perf|benchmark)\b/i, "perf"],
       [/\brefactor\b/i, "refactor"],
-      [/\bci|workflow|github\/actions/i, "ci"],
-      [/\bfix|bug|issue/i, "fix"],
-      [/\bfeat|add|new\b/i, "feat"]
+      [/\b(fix|bug|issue|patch)\b/i, "fix"],
+      [/\b(feat|add|new)\b/i, "feat"],
+      [/\b(docs?)\b|\breadme\b/i, "docs"],
+      [/\b(test|spec)\b/i, "test"]
     ];
     NON_CODE_PATTERNS = [
       /^docs?\//i,
@@ -150,6 +189,8 @@ var init_branch = __esm({
       /\.json$/,
       /\.toml$/,
       /\/\.?config\b/i,
+      /\.config\.[a-z]+$/i,
+      // root-level config: eslint.config.mjs, vitest.config.ts
       /^\.github\//,
       /^\.vscode\//
     ];
@@ -400,7 +441,8 @@ var init_api = __esm({
             "Content-Type": "application/json",
             Authorization: `Bearer ${this.apiKey}`
           },
-          body: JSON.stringify(body)
+          body: JSON.stringify(body),
+          signal: AbortSignal.timeout(3e4)
         });
         if (!res.ok) {
           if (res.status === 413) {
@@ -476,7 +518,8 @@ var init_api = __esm({
             "Content-Type": "application/json",
             Authorization: `Bearer ${this.apiKey}`
           },
-          body: options?.body
+          body: options?.body,
+          signal: AbortSignal.timeout(3e4)
         });
         if (!res.ok) {
           const err = await res.json().catch(() => ({ error: res.statusText }));
@@ -7868,6 +7911,7 @@ __export(git_exports, {
   createBranch: () => createBranch,
   deleteBranch: () => deleteBranch,
   getAllChangedFiles: () => getAllChangedFiles,
+  getAllChangedFilesWithStatus: () => getAllChangedFilesWithStatus,
   getBranchCommits: () => getBranchCommits,
   getChangedFilesSince: () => getChangedFilesSince,
   getCommitHash: () => getCommitHash,
@@ -7890,6 +7934,7 @@ __export(git_exports, {
   getStagedFiles: () => getStagedFiles,
   getUnstagedFiles: () => getUnstagedFiles,
   getUpstreamRef: () => getUpstreamRef,
+  getWorkingDiffStat: () => getWorkingDiffStat,
   getWorkingTreeDiff: () => getWorkingTreeDiff,
   gitCommit: () => gitCommit,
   gitPush: () => gitPush,
@@ -7945,7 +7990,8 @@ function getStagedDiff(excludes = []) {
 }
 function getStagedFiles() {
   return (0, import_child_process2.execFileSync)("git", ["diff", "--cached", "--name-only"], {
-    encoding: "utf-8"
+    encoding: "utf-8",
+    maxBuffer: 10 * 1024 * 1024
   });
 }
 function getWorkingTreeDiff(excludes = []) {
@@ -7968,9 +8014,36 @@ function getAllChangedFiles() {
   });
   return output.trim().split("\n").filter(Boolean).map((line) => line.slice(3)).join("\n");
 }
+function getAllChangedFilesWithStatus() {
+  const output = (0, import_child_process2.execFileSync)("git", ["status", "--porcelain"], {
+    encoding: "utf-8"
+  });
+  return output.trim().split("\n").filter(Boolean).map((line) => {
+    const xy = line.slice(0, 2).trim();
+    const filepath = line.slice(3);
+    let status = "M";
+    if (xy === "??") status = "A";
+    else if (xy.includes("D")) status = "D";
+    else if (xy.includes("A")) status = "A";
+    else if (xy.includes("R")) status = "R";
+    return `${status}  ${filepath}`;
+  }).join("\n");
+}
+function getWorkingDiffStat(staged) {
+  const args = staged ? ["diff", "--cached", "--stat=120"] : ["diff", "HEAD", "--stat=120"];
+  try {
+    return (0, import_child_process2.execFileSync)("git", args, {
+      encoding: "utf-8",
+      maxBuffer: 1024 * 1024
+    }).trim();
+  } catch {
+    return "";
+  }
+}
 function hasStagedChanges() {
   const output = (0, import_child_process2.execFileSync)("git", ["diff", "--cached", "--name-only"], {
-    encoding: "utf-8"
+    encoding: "utf-8",
+    maxBuffer: 10 * 1024 * 1024
   });
   return output.trim().length > 0;
 }
@@ -8839,7 +8912,8 @@ function isMinified(content) {
     (l) => (l.startsWith("+") || l.startsWith("-")) && !l.startsWith("+++") && !l.startsWith("---")
   );
   if (lines.length === 0) return false;
-  return lines.some((l) => l.length > 500);
+  const longLines = lines.filter((l) => l.length > 500).length;
+  return longLines > lines.length / 2;
 }
 function preprocessDiff(diff) {
   const files = parseDiffIntoFiles(diff);
@@ -9564,7 +9638,9 @@ function sanitizeBranchName(input) {
 function ensureUniqueName(name, exists) {
   if (!exists(name)) return name;
   for (let i = 2; i <= 100; i++) {
-    const candidate = `${name}-${i}`;
+    const suffix = `-${i}`;
+    const base = name.length + suffix.length > MAX_BRANCH_NAME_LENGTH ? name.slice(0, MAX_BRANCH_NAME_LENGTH - suffix.length) : name;
+    const candidate = `${base}${suffix}`;
     if (!exists(candidate)) return candidate;
   }
   throw new Error(`Could not find a unique name for ${name} after 100 attempts`);
@@ -10835,6 +10911,8 @@ async function generateLocalBranchName(opts) {
   sections.push("Generate a git branch name in the format <type>/<kebab-case-slug>.");
   sections.push("Type must be one of: feat, fix, refactor, perf, docs, test, chore, ci.");
   sections.push("Slug: 2-5 words, lowercase, hyphen-separated, max 55 chars.");
+  sections.push("For LARGE changesets: identify the dominant THEME (migration, refactor, feature). Name for the theme, not a single file.");
+  sections.push("Look for DELETED + ADDED files as signals of migration.");
   sections.push("Output ONLY the branch name on a single line. No explanation.");
   sections.push("");
   if (opts.description) {
@@ -10843,9 +10921,22 @@ async function generateLocalBranchName(opts) {
   } else if (opts.recentCommits && opts.recentCommits.length > 0) {
     sections.push("RECENT COMMITS:");
     for (const c of opts.recentCommits) sections.push(`- ${c}`);
-  } else if (opts.diff) {
-    sections.push("DIFF:");
-    sections.push(opts.diff.slice(0, 3e4));
+  } else {
+    if (opts.changes) {
+      sections.push("FILES CHANGED (PRIMARY signal \u2014 complete list):");
+      sections.push(opts.changes.slice(0, 8e3));
+      sections.push("");
+    }
+    if (opts.diffStat) {
+      sections.push("CHANGE MAGNITUDE:");
+      sections.push(opts.diffStat.slice(0, 6e3));
+      sections.push("");
+    }
+    if (opts.diff) {
+      const budget = opts.diffStat ? 8e3 : 3e4;
+      sections.push("DIFF (supplementary, may be truncated):");
+      sections.push(opts.diff.slice(0, budget));
+    }
   }
   const userContent = sections.join("\n");
   const model = opts.model ?? local.model;
@@ -10883,6 +10974,7 @@ async function generateLocalBranchName(opts) {
       body = {
         diff: opts.diff,
         changes: opts.changes,
+        diff_stat: opts.diffStat,
         recent_commits: opts.recentCommits,
         description: opts.description,
         model,
@@ -10952,6 +11044,7 @@ async function runLocalBranch(opts) {
       description: opts.description,
       diff: opts.diff,
       changes: opts.changes,
+      diffStat: opts.diffStat,
       recentCommits: opts.recentCommits,
       model: opts.model,
       rules: opts.rules
@@ -11193,8 +11286,11 @@ async function runBranch(opts) {
         "No staged changes detected. Stage with `git add`, or provide -m '<description>'."
       );
     }
-    payload.diff = getStagedDiff(config2.excludes ?? []);
+    const rawDiff = getStagedDiff(config2.excludes ?? []);
+    const processed = preprocessDiff(rawDiff).processedDiff;
+    payload.diff = processed.slice(0, 6e4) || void 0;
     payload.changes = getStagedFiles();
+    payload.diff_stat = getWorkingDiffStat(true) || void 0;
   }
   const apiKey = opts.apiKey ?? getApiKey();
   if (!apiKey) {
@@ -11204,6 +11300,7 @@ async function runBranch(opts) {
         description: opts.message,
         diff: opts.message ? void 0 : payload.diff,
         changes: opts.message ? void 0 : payload.changes,
+        diffStat: opts.message ? void 0 : payload.diff_stat,
         recentCommits: payload.recent_commits,
         model: opts.model,
         noSwitch: opts.noSwitch,
@@ -11231,6 +11328,10 @@ async function runBranch(opts) {
   try {
     const client = new ApiClient({ apiKey });
     result = await client.generateBranchName(payload);
+  } catch {
+    const filesArr = payload.changes?.split("\n").filter(Boolean) ?? [];
+    result = deterministicBranchName({ files: filesArr, description: payload.description });
+    log.dim("(used deterministic fallback; API generation failed)");
   } finally {
     spinner.stop();
   }
@@ -11260,6 +11361,7 @@ var init_branch2 = __esm({
     init_branch_rescue();
     init_protected_branch_guard();
     init_git();
+    init_smart_diff();
     init_branch_name();
     init_commit_helpers();
     init_ui();
@@ -11645,14 +11747,21 @@ async function runBranchGuard(args, log) {
     return { action: "continue" };
   }
   let stagedDiff = "";
-  let stagedChanges = "";
+  let plainFiles = "";
+  let changesForAI = "";
+  let diffStat = "";
   if (state.mode === "uncommitted") {
-    stagedDiff = getStagedDiff(args.excludes ?? []);
-    stagedChanges = getStagedFiles();
-    if (!stagedDiff.trim()) {
-      stagedDiff = getWorkingTreeDiff(args.excludes ?? []);
-      stagedChanges = getAllChangedFiles();
-    }
+    let rawDiff = getStagedDiff(args.excludes ?? []);
+    plainFiles = getStagedFiles();
+    changesForAI = plainFiles;
+    const isStaged = !!rawDiff.trim();
+    if (!isStaged) {
+      rawDiff = getWorkingTreeDiff(args.excludes ?? []);
+      plainFiles = getAllChangedFiles();
+      changesForAI = getAllChangedFilesWithStatus();
+    }
+    stagedDiff = preprocessDiff(rawDiff).processedDiff;
+    diffStat = getWorkingDiffStat(isStaged);
   }
   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);
@@ -11682,30 +11791,33 @@ async function runBranchGuard(args, log) {
     if (apiKey) {
       const client = new ApiClient({ apiKey });
       try {
+        const cappedDiff = stagedDiff ? stagedDiff.slice(0, 6e4) : void 0;
         const branchResult = await client.generateBranchName({
-          diff: stagedDiff || void 0,
-          changes: stagedChanges || void 0,
+          diff: cappedDiff || void 0,
+          changes: changesForAI || void 0,
+          diff_stat: diffStat || void 0,
           recent_commits: recentCommits,
           model: args.model,
           rules: branchRules
         });
         rawName = branchResult.name;
       } catch {
-        const fallbackInput = state.mode === "rescue" ? { files: [], description: recentCommits?.join(" ") ?? "" } : { files: stagedChanges ? stagedChanges.split("\n").filter(Boolean) : [] };
+        const fallbackInput = state.mode === "rescue" ? { files: [], description: recentCommits?.join(" ") ?? "" } : { files: plainFiles ? plainFiles.split("\n").filter(Boolean) : [] };
         rawName = deterministicBranchName(fallbackInput).name;
         usedFallback = true;
       }
     } else {
       try {
         rawName = await generateLocalBranchNameFn({
-          diff: stagedDiff || void 0,
-          changes: stagedChanges || void 0,
+          diff: stagedDiff ? stagedDiff.slice(0, 6e4) : void 0,
+          changes: changesForAI || void 0,
+          diffStat: diffStat || void 0,
           recentCommits,
           model: args.model,
           rules: branchRules
         });
       } catch {
-        const fallbackInput = state.mode === "rescue" ? { files: [], description: recentCommits?.join(" ") ?? "" } : { files: stagedChanges ? stagedChanges.split("\n").filter(Boolean) : [] };
+        const fallbackInput = state.mode === "rescue" ? { files: [], description: recentCommits?.join(" ") ?? "" } : { files: plainFiles ? plainFiles.split("\n").filter(Boolean) : [] };
         rawName = deterministicBranchName(fallbackInput).name;
         usedFallback = true;
       }
@@ -11779,6 +11891,7 @@ var init_branch_guard = __esm({
     import_promises2 = __toESM(require("node:readline/promises"));
     init_api();
     init_git();
+    init_smart_diff();
     init_protected_branch_guard();
     init_branch_rescue();
     init_branch_name();
@@ -11882,7 +11995,11 @@ async function runCommit(args) {
         if (intersected.length > 0) rules = { ...rules, scopes: intersected };
       }
     }
-  } catch {
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (msg && !/not found|404|403/i.test(msg)) {
+      log.dim("\u26A0 could not fetch team rules: " + msg.slice(0, 80));
+    }
   }
   rules = applyCliTypeScopeToRules(rules, args.type, args.scope);
   const recentCommits = args.noContext ? void 0 : getRecentBranchCommits(5);
@@ -12308,6 +12425,8 @@ function parseArgs(args) {
       result.messageOnly = true;
     } else if (arg === "--message" && i + 1 < args.length) {
       result.message = args[++i];
+    } else if (arg === "--message") {
+      throw new Error("Flag --message requires a value");
     } else if (arg === "--push") {
       result.push = true;
     } else if (arg === "--rescue") {
@@ -12347,33 +12466,51 @@ function parseArgs(args) {
       }
     } else if (arg === "--api-key" && i + 1 < args.length) {
       result.apiKey = args[++i];
+    } else if (arg === "--api-key") {
+      throw new Error("Flag --api-key requires a value");
     } else if (arg === "--base" && i + 1 < args.length) {
       result.base = args[++i];
+    } else if (arg === "--base") {
+      throw new Error("Flag --base requires a value");
     } else if (arg === "--create") {
       result.create = true;
     } else if (arg === "--from" && i + 1 < args.length) {
       result.from = args[++i];
+    } else if (arg === "--from") {
+      throw new Error("Flag --from requires a value");
     } else if (arg === "--from-commits") {
       result.fromCommits = true;
     } else if (arg === "--to" && i + 1 < args.length) {
       result.to = args[++i];
+    } else if (arg === "--to") {
+      throw new Error("Flag --to requires a value");
     } else if (arg === "--write") {
       result.write = true;
     } else if (arg === "--version" && i + 1 < args.length) {
       result.version = args[++i];
+    } else if (arg === "--version") {
+      throw new Error("Flag --version requires a value");
     } else if (arg === "--uninstall") {
       result.uninstall = true;
     } else if (arg === "--hook-mode") {
       result.hookMode = true;
     } else if (arg === "--model" && i + 1 < args.length) {
       result.model = args[++i];
+    } else if (arg === "--model") {
+      throw new Error("Flag --model requires a value");
     } else if (arg === "--type" && i + 1 < args.length) {
       result.type = args[++i];
+    } else if (arg === "--type") {
+      throw new Error("Flag --type requires a value");
     } else if (arg === "--scope" && i + 1 < args.length) {
       result.scope = args[++i];
+    } else if (arg === "--scope") {
+      throw new Error("Flag --scope requires a value");
     } else if (arg === "--exclude" && i + 1 < args.length) {
       const ex = args[++i];
       if (ex) result.exclude.push(ex);
+    } else if (arg === "--exclude") {
+      throw new Error("Flag --exclude requires a value");
     } else if (arg === "--no-color") {
     } else if (arg === "--no-animate") {
       result.noAnimate = true;
@@ -12385,6 +12522,8 @@ function parseArgs(args) {
         );
       }
       result.boxStyleOverride = v;
+    } else if (arg === "--style") {
+      throw new Error("Flag --style requires a value");
     } else if (arg === "login") {
       result.command = "login";
       subcommandSeen = true;
@@ -12420,6 +12559,10 @@ function parseArgs(args) {
       subcommandSeen = true;
     } else if (subcommandSeen && !arg.startsWith("-")) {
       result.positionals.push(arg);
+    } else if (arg.startsWith("--")) {
+      throw new Error(`Unknown flag: ${arg}`);
+    } else if (!subcommandSeen) {
+      throw new Error(`Unknown command: ${arg}. Run 'qc --help' for usage.`);
     }
   }
   if (result.messageOnly && result.push) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quikcommit/cli",
-  "version": "12.0.0",
+  "version": "13.0.0",
   "description": "AI-powered conventional commit messages",
   "bin": {
     "qc": "./dist/index.js"
@@ -34,14 +34,14 @@
     "esbuild": "^0.28.0",
     "typescript": "^5.9.3",
     "vitest": "^4.1.5",
-    "@quikcommit/shared": "9.0.0"
+    "@quikcommit/shared": "10.0.0"
   },
   "scripts": {
     "build": "node build.mjs",
     "typecheck": "tsc --noEmit",
     "start": "node dist/index.js",
     "test": "vitest run",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix"
+    "lint": "oxlint .",
+    "lint:fix": "oxlint --fix"
   }
 }