repomind 0.9.1 → 0.10.0

package/dist/index.js

@@ -77070,9 +77070,20 @@ function parseDiffStats(diff2) {
   if (currentPath !== null) {
     files.push({ path: currentPath, additions, deletions });
   }
-  const totalAdditions = files.reduce((s, f) => s + f.additions, 0);
-  const totalDeletions = files.reduce((s, f) => s + f.deletions, 0);
-  return { files, totalAdditions, totalDeletions };
+  const byPath = /* @__PURE__ */ new Map();
+  for (const f of files) {
+    const existing = byPath.get(f.path);
+    if (existing) {
+      existing.additions += f.additions;
+      existing.deletions += f.deletions;
+    } else {
+      byPath.set(f.path, { ...f });
+    }
+  }
+  const merged = [...byPath.values()];
+  const totalAdditions = merged.reduce((s, f) => s + f.additions, 0);
+  const totalDeletions = merged.reduce((s, f) => s + f.deletions, 0);
+  return { files: merged, totalAdditions, totalDeletions };
 }
 function verifyCommitIntegrity(originalDiff, committedDiff) {
   const original = parseDiffStats(originalDiff);
@@ -77117,16 +77128,21 @@ function verifyCommitIntegrity(originalDiff, committedDiff) {
   }
   return { match: true };
 }
-async function captureCommittedDiff(cwd2, commitCount) {
-  return runGitAt(cwd2, ["diff", `HEAD~${commitCount}..HEAD`]);
+async function captureCommittedDiff(wtPath, commitCount, repoRoot) {
+  return runGitAt(repoRoot, [
+    "-C",
+    wtPath,
+    "diff",
+    `HEAD~${commitCount}..HEAD`
+  ]);
 }
 
 // ../../packages/git/src/worktree.ts
-async function applyPatchInWorktree(wtPath, patch) {
+async function applyPatchInWorktree(wtPath, patch, repoRoot) {
   const normalizedPatch = patch.endsWith("\n") ? patch : `${patch}
 `;
-  const proc = Bun.spawn(["git", "apply", "--index", "--3way"], {
-    cwd: wtPath,
+  const proc = Bun.spawn(["git", "-C", wtPath, "apply", "--index", "--3way"], {
+    cwd: repoRoot,
     stdin: "pipe",
     stdout: "pipe",
     stderr: "pipe"
@@ -77167,6 +77183,8 @@ async function commitViaWorktree(repoRoot, groups, options) {
   log4(`creating worktree at: ${wtPath}`);
   await runGitAt(repoRoot, ["worktree", "add", "--detach", wtPath, "HEAD"]);
   try {
+    let actualCommitCount = 0;
+    const appliedPatches = [];
     for (let i = 0; i < groups.length; i++) {
       const group = groups[i];
       log4(
@@ -77180,17 +77198,21 @@ async function commitViaWorktree(repoRoot, groups, options) {
         log4(
           `  applying patch ${j + 1}/${group.patches.length} (${group.patches[j].length} chars)`
         );
-        await applyPatchInWorktree(wtPath, group.patches[j]);
+        await applyPatchInWorktree(wtPath, group.patches[j], repoRoot);
+        appliedPatches.push(group.patches[j]);
       }
-      await runGitAt(wtPath, ["commit", "-m", group.message]);
+      await runGitAt(repoRoot, ["-C", wtPath, "commit", "-m", group.message]);
+      actualCommitCount++;
       log4("  committed");
     }
-    if (options?.originalDiff && !options?.skipVerification) {
-      const committedDiff = await captureCommittedDiff(wtPath, groups.length);
-      const verification = verifyCommitIntegrity(
-        options.originalDiff,
-        committedDiff
+    if (actualCommitCount > 0 && !options?.skipVerification) {
+      const expectedDiff = appliedPatches.join("\n");
+      const committedDiff = await captureCommittedDiff(
+        wtPath,
+        actualCommitCount,
+        repoRoot
       );
+      const verification = verifyCommitIntegrity(expectedDiff, committedDiff);
       log4(
         `verification: match=${verification.match}${verification.details ? ` (${verification.details})` : ""}`
       );
@@ -77200,7 +77222,7 @@ async function commitViaWorktree(repoRoot, groups, options) {
         );
       }
     }
-    const wtHead = (await runGitAt(wtPath, ["rev-parse", "HEAD"])).trim();
+    const wtHead = (await runGitAt(repoRoot, ["-C", wtPath, "rev-parse", "HEAD"])).trim();
     log4(`fast-forward: ${branchRef} -> ${wtHead}`);
     await runGitAt(repoRoot, ["update-ref", branchRef, wtHead]);
     await runGitAt(repoRoot, ["reset", "HEAD"]);
@@ -89506,11 +89528,15 @@ ${prefixed}`);
           setPhase("error-commit");
           return;
         }
-        if (deps.captureCommittedDiff && deps.verifyCommitIntegrity && deps.getRepoRoot && deps.runGitReset) {
+        if (!deps.skipVerification && deps.captureCommittedDiff && deps.verifyCommitIntegrity && deps.getRepoRoot && deps.runGitReset) {
           setPhase("verifying");
           try {
             const repoRoot = await deps.getRepoRoot();
-            const committedDiff = await deps.captureCommittedDiff(repoRoot, 1);
+            const committedDiff = await deps.captureCommittedDiff(
+              repoRoot,
+              1,
+              repoRoot
+            );
             const verification = deps.verifyCommitIntegrity(
               rawDiff,
               committedDiff
@@ -89830,6 +89856,7 @@ async function commitCommand() {
   }
   const fileConfig = await readRepoConfig();
   const instructions = await resolveInstructions("commit");
+  const skipVerification = process.argv.includes("--no-verify");
   let exitCode = 0;
   let completedMessage = "";
   let errorMessage = "";
@@ -89848,7 +89875,8 @@ async function commitCommand() {
         getRepoRoot,
         runGitReset,
         fileConfig,
-        instructionsOverride: instructions
+        instructionsOverride: instructions,
+        skipVerification
       },
       onExit: (code, message, error4) => {
         exitCode = code;
@@ -91440,12 +91468,9 @@ ${body}`;
       const repoRoot = await deps.getRepoRoot();
       log4(`repoRoot: ${repoRoot}`);
       setPhase("verifying");
-      const hasSkippedGroups = worktreeGroups.some(
-        (g) => g.patches.length === 0
-      );
       await deps.commitViaWorktree(repoRoot, worktreeGroups, {
         originalDiff: originalRawDiff,
-        skipVerification: hasSkippedGroups
+        skipVerification: deps.skipVerification
       });
       log4("commitViaWorktree done (verified)");
       let hashes = [];
@@ -91776,6 +91801,7 @@ async function runGitCommit2(message) {
 async function splitCommand() {
   const fileConfig = await readRepoConfig();
   const useStaged = !process.argv.includes("--all");
+  const skipVerification = process.argv.includes("--no-verify");
   const instructions = await resolveInstructions("split");
   let exitCode = 0;
   let completedCommits = [];
@@ -91805,7 +91831,8 @@ async function splitCommand() {
         getRepoRoot,
         fileConfig,
         instructionsOverride: instructions,
-        useStaged
+        useStaged,
+        skipVerification
       },
       onExit: (code, commits, error4) => {
         exitCode = code;
@@ -92002,6 +92029,10 @@ var COMMAND_HELP = {
         name: "--instructions [texto]",
         description: 'Instru\xE7\xF5es pontuais para esta gera\xE7\xE3o (ex: "foca na parte de auth"). Sem texto abre um editor interativo.'
       },
+      {
+        name: "--no-verify",
+        description: "Pular verifica\xE7\xE3o de integridade do diff p\xF3s-commit"
+      },
       {
         name: "--verbose",
         alias: "-v",
@@ -92020,6 +92051,10 @@ var COMMAND_HELP = {
         name: "--instructions [texto]",
         description: 'Instru\xE7\xF5es pontuais para esta gera\xE7\xE3o (ex: "separa migration do model"). Sem texto abre um editor interativo.'
       },
+      {
+        name: "--no-verify",
+        description: "Pular verifica\xE7\xE3o de integridade do diff p\xF3s-commit"
+      },
       {
         name: "--verbose",
         alias: "-v",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repomind",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "type": "module",
   "description": "AI-powered git commit messages and repository insights",
   "keywords": [