@hifullmoon/aicommit 2.6.3 → 2.6.5

package/CHANGELOG.md

@@ -4,6 +4,18 @@ This file lists notable user-facing changes. Internal refactors, test-only chang
 
 ## [Unreleased]
 
+## [2.6.5] - 2026-09-21
+
+### Fixed
+
+- Large split plans now validate commit messages during planning and automatically retry with specific policy errors, including missing or empty subjects. Planning failures are labeled accurately instead of being reported as API failures.
+
+## [2.6.4] - 2026-09-19
+
+### Fixed
+
+- Large split planning now sizes batches for the model response limit and preserves valid file groupings when the provider omits a group summary.
+
 ## [2.6.3] - 2026-09-15
 
 ### Changed
@@ -255,7 +267,9 @@ This file lists notable user-facing changes. Internal refactors, test-only chang
 - Added file-level split planning and execution with Git-state concurrency checks.
 - Added provider presets and user/project configuration boundaries.
 
-[Unreleased]: https://github.com/hi-fullmoon/AICommit/compare/v2.6.3...HEAD
+[Unreleased]: https://github.com/hi-fullmoon/AICommit/compare/v2.6.5...HEAD
+[2.6.5]: https://github.com/hi-fullmoon/AICommit/releases/tag/v2.6.5
+[2.6.4]: https://github.com/hi-fullmoon/AICommit/releases/tag/v2.6.4
 [2.6.3]: https://github.com/hi-fullmoon/AICommit/releases/tag/v2.6.3
 [2.6.2]: https://github.com/hi-fullmoon/AICommit/releases/tag/v2.6.2
 [2.6.1]: https://github.com/hi-fullmoon/AICommit/releases/tag/v2.6.1

package/docs/distribution.md

@@ -33,7 +33,7 @@ The release workflow uses npm Trusted Publishing without a long-lived `NPM_TOKEN
 ```bash
 workdir=$(mktemp -d)
 cd "$workdir"
-npm install --package-lock-only @hifullmoon/aicommit@2.6.3
+npm install --package-lock-only @hifullmoon/aicommit@2.6.5
 npm audit signatures
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hifullmoon/aicommit",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "description": "Safe, local-first AI commit message generator for Git workflows",
   "type": "module",
   "bin": {

package/src/api.js

@@ -207,6 +207,7 @@ export async function getResponseText(
         : reasoning || '';
 
     const partial = text.trim();
+    const followUp = typeof followUpPrompt === 'function' ? followUpPrompt() : followUpPrompt;
     const recoveryPrompt =
       truncatedByLimit || invalidResponse
         ? `The previous response was ${
@@ -214,8 +215,8 @@ export async function getResponseText(
           }. ` +
           'Reproduce the COMPLETE answer from the beginning; do not continue from the cut-off point. ' +
           'Keep the answer concise.\n\n' +
-          followUpPrompt
-        : followUpPrompt;
+          followUp
+        : followUp;
 
     // With reasoning, its conclusion plus the partial answer is enough to
     // reconstruct the output without paying to send the original diff again.

package/src/change-analysis.js

@@ -4,7 +4,7 @@ import { createAnalysisBudget, DEFAULT_LARGE_CHANGE, estimateTokens } from './an
 import { getResponseText } from './api.js';
 import { encodeUntrustedData } from './trust.js';
 import { ERROR_CATEGORIES, fail } from './errors.js';
-import { normalizeCommitPolicy } from './policy.js';
+import { normalizeCommitPolicy, validateCommitCandidate } from './policy.js';
 import { getProviderAdapter } from './providers.js';
 import { createHash } from 'node:crypto';
 import {
@@ -315,6 +315,7 @@ function parseAnalysisJson(raw) {
 }
 
 async function jsonCall(config, instruction, items, validate = null, stream = null) {
+  let validationError = '';
   const parseAndValidate = (raw) => {
     const parsed = parseAnalysisJson(raw);
     validate?.(parsed);
@@ -328,14 +329,17 @@ async function jsonCall(config, instruction, items, validate = null, stream = nu
     ],
     0,
     Math.min(2048, config.maxTokens || 1024),
-    'Return the complete requested JSON array, preserving every required input ID exactly once. ' +
-      `Required IDs: ${JSON.stringify(items.map((item) => item.id))}`,
+    () =>
+      'Return the complete requested JSON array, preserving every required input ID exactly once. ' +
+      `Required IDs: ${JSON.stringify(items.map((item) => item.id))}. ` +
+      (validationError ? `Correct these validation errors: ${validationError}` : ''),
     stream,
     (response) => {
       try {
         parseAndValidate(response);
         return true;
-      } catch {
+      } catch (error) {
+        validationError = error.message;
         return false;
       }
     },
@@ -351,17 +355,39 @@ async function jsonCall(config, instruction, items, validate = null, stream = nu
   }
 }
 
-export function validatePartition(groups, ids) {
+export function validatePlanMessages(groups, policy) {
+  const errors = [];
+  for (const [index, group] of groups.entries()) {
+    const subject = typeof group.subject === 'string' ? group.subject.trim() : '';
+    if (!subject) {
+      errors.push(`Group ${index + 1}: The subject field must be a non-empty commit header.`);
+      continue;
+    }
+    const body = typeof group.body === 'string' ? group.body.trim() : '';
+    const validation = validateCommitCandidate(body ? `${subject}\n\n${body}` : subject, {
+      policy,
+    });
+    if (!validation.valid)
+      errors.push(`Group ${index + 1}: ${validation.errors.map((item) => item.message).join(' ')}`);
+  }
+  if (errors.length)
+    throw fail(
+      ERROR_CATEGORIES.RESPONSE_FORMAT,
+      `Split commit messages violate commitPolicy: ${errors.join(' ')}`,
+    );
+}
+
+export function validatePartition(groups, ids, requireSummary = true) {
   const remaining = new Set(ids);
   if (!Array.isArray(groups) || !groups.length)
     throw fail(ERROR_CATEGORIES.RESPONSE_FORMAT, 'Analysis returned an empty partition.');
   for (const group of groups) {
     if (
+      !group ||
       !Array.isArray(group.ids) ||
       !group.ids.length ||
-      typeof group.summary !== 'string' ||
-      !group.summary.trim() ||
-      group.summary.length > 2000
+      (requireSummary &&
+        (typeof group.summary !== 'string' || !group.summary.trim() || group.summary.length > 2000))
     )
       throw fail(ERROR_CATEGORIES.RESPONSE_FORMAT, 'Analysis returned an invalid group.');
     for (const id of group.ids)
@@ -729,15 +755,23 @@ export async function planAnalyzedChanges(config, facts, coverage = null, stream
     config.splitMaxDiffChars || 16000,
     Math.floor(config.analysisBudget.limits.chunkInputTokens * 0.6),
   );
+  // A model may keep every input as a separate commit. Limit candidate count
+  // by the response budget too, leaving room for a complete JSON plan.
+  const outputTokens = Math.min(2048, config.maxTokens || 1024);
+  const maxPlanItems = Math.max(
+    1,
+    Math.min(config.splitMaxPlanFiles || 100, Math.floor((outputTokens - 224) / 80)),
+  );
+  const batchConfig = { ...config, splitMaxPlanFiles: maxPlanItems };
   for (let level = 0; level < 8; level++) {
     const byId = new Map(candidates.map((x) => [x.id, x]));
     const batches =
       !deep && level === 0
-        ? localPlanBatches(config, candidates, cap)
+        ? localPlanBatches(batchConfig, candidates, cap)
         : packItems(
             candidates.map(({ id, path, summary }) => ({ id, path, summary })),
             cap,
-            config.splitMaxPlanFiles || 100,
+            maxPlanItems,
           );
     if (!deep && level === 0 && coverage) {
       coverage.sampledFiles = batches.flat().filter((item) => item.representativeExcerpt).length;
@@ -769,21 +803,32 @@ export async function planAnalyzedChanges(config, facts, coverage = null, stream
       };
       const groups = await jsonCall(
         config,
-        `Each commit message must follow this policy: ${JSON.stringify(policy)}.\nGroup related changes into logical commits, including related implementation and tests across directories. Return [{"ids":[input IDs],"summary":"factual combined change summary","subject":"commit subject","body":"optional commit body"}]. Assign every input ID exactly once. Do not merge unrelated changes just to reduce group count.${!deep && level === 0 ? ' Inputs are a compact local inventory, not full semantic summaries. One ID may represent multiple files and must remain atomic; use kind, module, status, fileCount, examples, and any representativeExcerpt conservatively.' : ''}`,
+        `Each commit message must follow this policy: ${JSON.stringify(policy)}.\nThe subject field must contain the complete Conventional Commit header: <type>[optional scope][optional !]: <description>. Respect the policy's language, scope, length, body, and breaking-change rules; include a body when required and omit it when forbidden.\nGroup related changes into logical commits, including related implementation and tests across directories. Return [{"ids":[input IDs],"summary":"factual combined change summary","subject":"complete commit header","body":"commit body if permitted or required"}]. Assign every input ID exactly once. Do not merge unrelated changes just to reduce group count.${finalPlan ? ' The summary field is optional in this final plan.' : ''}${!deep && level === 0 ? ' Inputs are a compact local inventory, not full semantic summaries. One ID may represent multiple files and must remain atomic; use kind, module, status, fileCount, examples, and any representativeExcerpt conservatively.' : ''}`,
         batch,
         (candidate) => {
-          validatePartition(candidate, ids);
-          if (candidate.some((group) => typeof group.subject !== 'string' || !group.subject.trim()))
-            throw fail(
-              ERROR_CATEGORIES.RESPONSE_FORMAT,
-              'Analysis plan is missing a commit subject.',
-            );
+          validatePartition(candidate, ids, false);
+          validatePlanMessages(candidate, policy);
         },
         batchStream,
       );
       for (const group of groups) {
+        const sourceSummary = group.ids
+          .map((id) => {
+            const fact = byId.get(id);
+            return (
+              fact.summary ||
+              `${fact.status || 'Changed'} ${fact.kind || 'files'} in ${fact.module || fact.path || 'repository'} (${fact.files.length} files)`
+            ).slice(0, 160);
+          })
+          .join('; ');
         next.push({
           ...group,
+          summary:
+            typeof group.summary === 'string' &&
+            group.summary.trim() &&
+            group.summary.length <= 2000
+              ? group.summary
+              : sourceSummary.slice(0, 2000),
           id: `L${level}G${next.length}`,
           files: group.ids.flatMap((id) => byId.get(id).files),
         });

package/src/split.js

@@ -1836,7 +1836,7 @@ export async function splitFlow(
       reasoning: config.reasoning,
       machineOutput,
       cancelMessage: 'Split cancelled.',
-      failureMessage: 'API call failed',
+      failureMessage: 'Split planning failed',
       task: async (stream) => {
         if (large) {
           let plan;