@quikcommit/cli 11.0.0 → 12.0.0

package/dist/index.js

@@ -89,9 +89,14 @@ function slugifyFilename(path) {
   const noExt = basename.replace(/\.[^.]+$/, "");
   return noExt.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40);
 }
+function pickBestFile(files) {
+  const codeFiles = files.filter((f) => !NON_CODE_PATTERNS.some((rx) => rx.test(f)));
+  return codeFiles[0] ?? files[0] ?? "";
+}
 function deterministicBranchName(opts) {
   const files = opts.files ?? [];
-  const haystack = `${opts.description ?? ""} ${files.join(" ")}`;
+  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)) {
@@ -103,7 +108,7 @@ function deterministicBranchName(opts) {
   if (opts.description) {
     slug = opts.description.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").split("-").slice(0, 5).join("-").slice(0, 40);
   } else if (files.length > 0) {
-    slug = slugifyFilename(files[0] ?? "");
+    slug = slugifyFilename(pickBestFile(files));
   } else {
     slug = "changes";
   }
@@ -117,7 +122,7 @@ function deterministicBranchName(opts) {
   }
   return { name, type, slug };
 }
-var BRANCH_NAME_RX, PROTECTED_BRANCH_RX, MAX_BRANCH_NAME_LENGTH, TYPE_HINTS;
+var BRANCH_NAME_RX, PROTECTED_BRANCH_RX, MAX_BRANCH_NAME_LENGTH, TYPE_HINTS, NON_CODE_PATTERNS;
 var init_branch = __esm({
   "../shared/dist/branch.js"() {
     "use strict";
@@ -133,6 +138,21 @@ var init_branch = __esm({
       [/\bfix|bug|issue/i, "fix"],
       [/\bfeat|add|new\b/i, "feat"]
     ];
+    NON_CODE_PATTERNS = [
+      /^docs?\//i,
+      /^\.env/,
+      /\.md$/i,
+      /^readme/i,
+      /^changelog/i,
+      /^license/i,
+      /\.lock$/,
+      /\.ya?ml$/,
+      /\.json$/,
+      /\.toml$/,
+      /\/\.?config\b/i,
+      /^\.github\//,
+      /^\.vscode\//
+    ];
   }
 });
 
@@ -439,6 +459,13 @@ var init_api = __esm({
       async generateBranchName(req) {
         return this.request("/v1/branch", req);
       }
+      async summarizeChunk(diff, changes, model) {
+        const data = await this.request(
+          "/v1/summarize",
+          { diff, changes, ...model ? { model } : {} }
+        );
+        return data.summary ?? "";
+      }
       async fetchJson(endpoint, options) {
         if (!this.apiKey) {
           throw new Error("Not authenticated. Run `qc login` first.");
@@ -7913,7 +7940,7 @@ function getStagedDiff(excludes = []) {
   }
   return (0, import_child_process2.execFileSync)("git", args, {
     encoding: "utf-8",
-    maxBuffer: 10 * 1024 * 1024
+    maxBuffer: 50 * 1024 * 1024
   });
 }
 function getStagedFiles() {
@@ -7975,8 +8002,18 @@ function gitCommit(message) {
   }
 }
 function gitPush() {
+  const branch = (0, import_child_process2.execFileSync)("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+    encoding: "utf-8"
+  }).trim();
+  let hasUpstream = false;
+  try {
+    (0, import_child_process2.execFileSync)("git", ["rev-parse", "--abbrev-ref", `${branch}@{upstream}`], { stdio: "pipe" });
+    hasUpstream = true;
+  } catch {
+  }
+  const args = hasUpstream ? ["push"] : ["push", "--set-upstream", "origin", branch];
   try {
-    (0, import_child_process2.execFileSync)("git", ["push"], { stdio: "pipe" });
+    (0, import_child_process2.execFileSync)("git", args, { stdio: "pipe" });
   } catch (err) {
     const stderr = err?.stderr?.toString() ?? "";
     if (stderr) process.stderr.write(stderr);
@@ -8091,19 +8128,36 @@ function getPushStats() {
     const branch = (0, import_child_process2.execFileSync)("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
       encoding: "utf-8"
     }).trim();
-    const countOutput = (0, import_child_process2.execFileSync)(
-      "git",
-      ["rev-list", "--count", `origin/${branch}..HEAD`],
-      { encoding: "utf-8" }
-    ).trim();
-    const parsedCount = parseInt(countOutput, 10);
-    const commits = Number.isFinite(parsedCount) ? parsedCount : 0;
+    let upstream = null;
+    try {
+      upstream = (0, import_child_process2.execFileSync)(
+        "git",
+        ["rev-parse", "--abbrev-ref", `${branch}@{upstream}`],
+        { encoding: "utf-8", stdio: "pipe" }
+      ).trim();
+    } catch {
+    }
+    if (upstream) {
+      const countOutput = (0, import_child_process2.execFileSync)(
+        "git",
+        ["rev-list", "--count", `${upstream}..HEAD`],
+        { encoding: "utf-8" }
+      ).trim();
+      const parsedCount = parseInt(countOutput, 10);
+      const commits = Number.isFinite(parsedCount) ? parsedCount : 0;
+      const stat2 = (0, import_child_process2.execFileSync)(
+        "git",
+        ["diff", "--shortstat", `${upstream}..HEAD`],
+        { encoding: "utf-8" }
+      ).trim();
+      return { commits, stat: stat2 };
+    }
     const stat = (0, import_child_process2.execFileSync)(
       "git",
-      ["diff", "--shortstat", `origin/${branch}..HEAD`],
+      ["diff", "--shortstat", "HEAD~1..HEAD"],
       { encoding: "utf-8" }
     ).trim();
-    return { commits, stat };
+    return { commits: 1, stat };
   } catch {
     return null;
   }
@@ -8747,7 +8801,8 @@ var smart_diff_exports = {};
 __export(smart_diff_exports, {
   classifyFile: () => classifyFile,
   preprocessDiff: () => preprocessDiff,
-  preprocessDiffWithSizeBudget: () => preprocessDiffWithSizeBudget
+  preprocessDiffWithSizeBudget: () => preprocessDiffWithSizeBudget,
+  splitDiffIntoChunks: () => splitDiffIntoChunks
 });
 function sanitizeFilepath(path) {
   return path.replace(/[\x00-\x1F\x7F[\]`]/g, "_").slice(0, 200);
@@ -8788,7 +8843,7 @@ function isMinified(content) {
 }
 function preprocessDiff(diff) {
   const files = parseDiffIntoFiles(diff);
-  if (files.length === 0) return { processedDiff: diff, summarized: [], aggressivelySummarized: [], tokensSaved: 0 };
+  if (files.length === 0) return { processedDiff: diff, summarized: [], tokensSaved: 0, needsChunking: false };
   const kept = [];
   const summarized = [];
   let tokensSaved = 0;
@@ -8833,19 +8888,50 @@ function preprocessDiff(diff) {
   return {
     processedDiff: kept.join(""),
     summarized,
-    aggressivelySummarized: [],
-    tokensSaved
+    tokensSaved,
+    needsChunking: false
   };
 }
-function buildFileSummary(file) {
-  const sizeKB = Math.round(file.content.length / 1024);
-  return `[modified: ${sanitizeFilepath(file.filepath)} \u2014 +${file.additions} \u2212${file.deletions} lines, ~${sizeKB}KB]
-`;
+function stripContext(fileContent, contextLines) {
+  const lines = fileContent.split("\n");
+  const result = [];
+  let inHeader = true;
+  const pendingContext = [];
+  let afterChange = 0;
+  for (const line of lines) {
+    if (inHeader) {
+      result.push(line);
+      if (line.startsWith("@@")) inHeader = false;
+      continue;
+    }
+    if (line.startsWith("@@")) {
+      pendingContext.length = 0;
+      afterChange = 0;
+      result.push(line);
+      continue;
+    }
+    if (line.startsWith("+") || line.startsWith("-")) {
+      if (contextLines > 0) {
+        result.push(...pendingContext.slice(-contextLines));
+      }
+      pendingContext.length = 0;
+      result.push(line);
+      afterChange = contextLines;
+      continue;
+    }
+    if (afterChange > 0) {
+      result.push(line);
+      afterChange--;
+    } else {
+      pendingContext.push(line);
+    }
+  }
+  return result.join("\n");
 }
-function preprocessDiffWithSizeBudget(diff, maxBytes = 5 * 1024 * 1024) {
+function preprocessDiffWithSizeBudget(diff, maxBytes = 750 * 1024) {
   const files = parseDiffIntoFiles(diff);
   if (files.length === 0) {
-    return { processedDiff: diff, summarized: [], aggressivelySummarized: [], tokensSaved: 0 };
+    return { processedDiff: diff, summarized: [], tokensSaved: 0, needsChunking: false };
   }
   const entries = [];
   const summarized = [];
@@ -8856,7 +8942,7 @@ function preprocessDiffWithSizeBudget(diff, maxBytes = 5 * 1024 * 1024) {
       case "sourcemap":
         tokensSaved += estimateTokens(file.content);
         summarized.push(file.filepath);
-        entries.push({ file, isNoise: true, summaryLine: null });
+        entries.push({ file, isNoise: true, summaryLine: null, strippedContent: null });
         break;
       case "lock":
         tokensSaved += estimateTokens(file.content);
@@ -8864,6 +8950,7 @@ function preprocessDiffWithSizeBudget(diff, maxBytes = 5 * 1024 * 1024) {
         entries.push({
           file,
           isNoise: true,
+          strippedContent: null,
           summaryLine: `[lock file updated: ${sanitizeFilepath(file.filepath)} (+${file.additions} \u2212${file.deletions} lines)]
 `
         });
@@ -8874,6 +8961,7 @@ function preprocessDiffWithSizeBudget(diff, maxBytes = 5 * 1024 * 1024) {
         entries.push({
           file,
           isNoise: true,
+          strippedContent: null,
           summaryLine: `[generated: ${sanitizeFilepath(file.filepath)} (+${file.additions} \u2212${file.deletions})]
 `
         });
@@ -8884,6 +8972,7 @@ function preprocessDiffWithSizeBudget(diff, maxBytes = 5 * 1024 * 1024) {
         entries.push({
           file,
           isNoise: true,
+          strippedContent: null,
           summaryLine: `[vendored: ${sanitizeFilepath(file.filepath)} updated]
 `
         });
@@ -8896,83 +8985,75 @@ function preprocessDiffWithSizeBudget(diff, maxBytes = 5 * 1024 * 1024) {
           entries.push({
             file,
             isNoise: true,
+            strippedContent: null,
             summaryLine: `[minified asset: ${sanitizeFilepath(file.filepath)} (${sizeKB} KB)]
 `
           });
         } else {
-          entries.push({ file, isNoise: false, summaryLine: null });
+          entries.push({ file, isNoise: false, summaryLine: null, strippedContent: null });
         }
         break;
     }
   }
-  const aggressiveMap = /* @__PURE__ */ new Map();
+  const codeEntries = entries.filter((e) => !e.isNoise);
   function buildOutput() {
     const parts = [];
     for (const entry of entries) {
       if (entry.isNoise) {
         if (entry.summaryLine !== null) parts.push(entry.summaryLine);
-      } else if (aggressiveMap.has(entry.file.filepath)) {
-        parts.push(aggressiveMap.get(entry.file.filepath));
       } else {
-        parts.push(entry.file.content);
+        parts.push(entry.strippedContent ?? entry.file.content);
       }
     }
     return parts.join("");
   }
-  const codeEntries = entries.filter((e) => !e.isNoise);
   let output = buildOutput();
   if (output.length <= maxBytes) {
-    return {
-      processedDiff: output,
-      summarized,
-      aggressivelySummarized: [],
-      tokensSaved
-    };
+    return { processedDiff: output, summarized, tokensSaved, needsChunking: false };
   }
-  const TIER1_THRESHOLD = 5 * 1024;
   for (const entry of codeEntries) {
-    if (entry.file.content.length > TIER1_THRESHOLD && !aggressiveMap.has(entry.file.filepath)) {
-      tokensSaved += estimateTokens(entry.file.content);
-      aggressiveMap.set(entry.file.filepath, buildFileSummary(entry.file));
-    }
+    const stripped = stripContext(entry.file.content, 1);
+    tokensSaved += estimateTokens(entry.file.content) - estimateTokens(stripped);
+    entry.strippedContent = stripped;
   }
   output = buildOutput();
   if (output.length <= maxBytes) {
-    return {
-      processedDiff: output,
-      summarized,
-      aggressivelySummarized: [...aggressiveMap.keys()],
-      tokensSaved
-    };
+    return { processedDiff: output, summarized, tokensSaved, needsChunking: false };
   }
-  const TIER2_THRESHOLD = 2 * 1024;
   for (const entry of codeEntries) {
-    if (entry.file.content.length > TIER2_THRESHOLD && !aggressiveMap.has(entry.file.filepath)) {
-      tokensSaved += estimateTokens(entry.file.content);
-      aggressiveMap.set(entry.file.filepath, buildFileSummary(entry.file));
-    }
+    const stripped = stripContext(entry.file.content, 0);
+    tokensSaved += estimateTokens(entry.strippedContent ?? entry.file.content) - estimateTokens(stripped);
+    entry.strippedContent = stripped;
   }
   output = buildOutput();
   if (output.length <= maxBytes) {
-    return {
-      processedDiff: output,
-      summarized,
-      aggressivelySummarized: [...aggressiveMap.keys()],
-      tokensSaved
-    };
+    return { processedDiff: output, summarized, tokensSaved, needsChunking: false };
   }
-  for (const entry of codeEntries) {
-    if (!aggressiveMap.has(entry.file.filepath)) {
-      tokensSaved += estimateTokens(entry.file.content);
-      aggressiveMap.set(entry.file.filepath, buildFileSummary(entry.file));
+  return { processedDiff: output, summarized, tokensSaved, needsChunking: true };
+}
+function splitDiffIntoChunks(diff, maxChunkBytes = 600 * 1024) {
+  const files = parseDiffIntoFiles(diff);
+  if (files.length === 0) return [];
+  const chunks = [];
+  let currentDiff = "";
+  let currentFiles = [];
+  for (const file of files) {
+    let content = file.content;
+    if (content.length > maxChunkBytes) {
+      content = stripContext(content, 0);
+    }
+    if (currentDiff.length > 0 && currentDiff.length + content.length > maxChunkBytes) {
+      chunks.push({ diff: currentDiff, files: currentFiles });
+      currentDiff = "";
+      currentFiles = [];
     }
+    currentDiff += content;
+    currentFiles.push(file.filepath);
   }
-  return {
-    processedDiff: buildOutput(),
-    summarized,
-    aggressivelySummarized: [...aggressiveMap.keys()],
-    tokensSaved
-  };
+  if (currentDiff.length > 0) {
+    chunks.push({ diff: currentDiff, files: currentFiles });
+  }
+  return chunks;
 }
 var LOCK_FILES, GENERATED_PATTERNS, VENDORED_PREFIXES;
 var init_smart_diff = __esm({
@@ -10579,17 +10660,15 @@ async function runLocalCommit(args) {
   let diff = getStagedDiff(excludes);
   const changes = getStagedFiles();
   if (!args.noSmartDiff) {
-    const smartResult = preprocessDiffWithSizeBudget(diff, 5 * 1024 * 1024);
+    const smartResult = preprocessDiffWithSizeBudget(diff);
     diff = smartResult.processedDiff;
     if (smartResult.summarized.length > 0 && !silent) {
       log.step(
         `smart-diff: ${smartResult.summarized.length} file(s) summarized (saved ~${Math.round(smartResult.tokensSaved / 1e3)}K tokens)`
       );
     }
-    if (smartResult.aggressivelySummarized.length > 0 && !silent) {
-      log.step(
-        `large-diff: ${smartResult.aggressivelySummarized.length} additional file(s) summarized to fit (commit message may be less specific)`
-      );
+    if (smartResult.needsChunking && !silent) {
+      log.step("large diff detected \u2014 local providers receive context-stripped diff");
     }
   }
   let rules = { ...await detectCommitlintRules(), ...config2.rules ?? {} };
@@ -11768,19 +11847,16 @@ async function runCommit(args) {
   const diff = getStagedDiff(excludes);
   const changes = getStagedFiles();
   let processedDiff = diff;
+  let needsChunking = false;
   if (!args.noSmartDiff) {
-    const smartResult = preprocessDiffWithSizeBudget(diff, 5 * 1024 * 1024);
+    const smartResult = preprocessDiffWithSizeBudget(diff);
     processedDiff = smartResult.processedDiff;
+    needsChunking = smartResult.needsChunking;
     if (smartResult.summarized.length > 0) {
       log.step(
         `smart-diff: ${smartResult.summarized.length} file(s) summarized (saved ~${Math.round(smartResult.tokensSaved / 1e3)}K tokens)`
       );
     }
-    if (smartResult.aggressivelySummarized.length > 0) {
-      log.step(
-        `large-diff: ${smartResult.aggressivelySummarized.length} additional file(s) summarized to fit (commit message may be less specific \u2014 consider committing fewer files at a time)`
-      );
-    }
   }
   const commitlintRules = await detectCommitlintRules();
   let rules = { ...commitlintRules, ...config2.rules ?? {} };
@@ -11818,7 +11894,7 @@ async function runCommit(args) {
   const boxStyle = args.boxStyleOverride ?? config2.ui?.box?.style ?? "gradient";
   const spinner = createStageSpinner({
     stage: "aiGenerate",
-    message: `generating commit (${modelDisplay})...`,
+    message: needsChunking ? `analyzing ${changes.trim().split("\n").length} files in chunks (${modelDisplay})...` : `generating commit (${modelDisplay})...`,
     ...uiCtx
   });
   if (!silent) spinner.start();
@@ -11826,14 +11902,63 @@ async function runCommit(args) {
   let generatedMessage;
   let diagnostics;
   try {
-    ({ message: generatedMessage, diagnostics } = await client.generateCommit(
-      processedDiff,
-      changes,
-      rules,
-      model,
-      recentCommits,
-      generationHints
-    ));
+    if (needsChunking) {
+      const chunks = splitDiffIntoChunks(processedDiff);
+      if (chunks.length === 0) {
+        spinner.stop();
+        log.error("No parseable diff content to analyze.");
+        process.exit(1);
+      }
+      spinner.stop();
+      if (!silent) log.step(`large diff \u2014 analyzing ${chunks.length} chunk(s) in parallel...`);
+      const results = await Promise.allSettled(
+        chunks.map(
+          (chunk) => client.summarizeChunk(chunk.diff, chunk.files.filter(Boolean).join("\n") || "unknown", model)
+        )
+      );
+      const summaries = [];
+      for (const r of results) {
+        if (r.status === "fulfilled" && r.value) {
+          summaries.push(r.value);
+        }
+      }
+      if (summaries.length === 0) {
+        log.error("All chunk summaries failed. Check your connection and try again.");
+        process.exit(1);
+      }
+      if (results.some((r) => r.status === "rejected") && !silent) {
+        const failed = results.filter((r) => r.status === "rejected").length;
+        log.step(`${failed}/${results.length} chunk(s) failed \u2014 continuing with partial summaries`);
+      }
+      const combinedSummary = summaries.join("\n\n");
+      const finalSpinner = createStageSpinner({
+        stage: "aiGenerate",
+        message: `generating commit from ${chunks.length} summaries (${modelDisplay})...`,
+        ...uiCtx
+      });
+      if (!silent) finalSpinner.start();
+      try {
+        ({ message: generatedMessage, diagnostics } = await client.generateCommit(
+          combinedSummary,
+          changes,
+          rules,
+          model,
+          recentCommits,
+          generationHints
+        ));
+      } finally {
+        finalSpinner.stop();
+      }
+    } else {
+      ({ message: generatedMessage, diagnostics } = await client.generateCommit(
+        processedDiff,
+        changes,
+        rules,
+        model,
+        recentCommits,
+        generationHints
+      ));
+    }
   } finally {
     spinner.stop();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quikcommit/cli",
-  "version": "11.0.0",
+  "version": "12.0.0",
   "description": "AI-powered conventional commit messages",
   "bin": {
     "qc": "./dist/index.js"
@@ -34,7 +34,7 @@
     "esbuild": "^0.28.0",
     "typescript": "^5.9.3",
     "vitest": "^4.1.5",
-    "@quikcommit/shared": "8.0.0"
+    "@quikcommit/shared": "9.0.0"
   },
   "scripts": {
     "build": "node build.mjs",