repomind 0.7.0 → 0.8.0

package/dist/index.js

@@ -30993,14 +30993,102 @@ async function stageLines(fullPatch, lineSelections) {
 
 // ../../packages/git/src/worktree.ts
 import { join } from "node:path";
+
+// ../../packages/git/src/verify.ts
+function parseDiffStats(diff2) {
+  if (!diff2.trim()) {
+    return { files: [], totalAdditions: 0, totalDeletions: 0 };
+  }
+  const files = [];
+  let currentPath = null;
+  let additions = 0;
+  let deletions = 0;
+  const lines = diff2.split("\n");
+  for (const line of lines) {
+    const fileMatch = line.match(/^diff --git a\/.+ b\/(.+)$/);
+    if (fileMatch) {
+      if (currentPath !== null) {
+        files.push({ path: currentPath, additions, deletions });
+      }
+      currentPath = fileMatch[1];
+      additions = 0;
+      deletions = 0;
+      continue;
+    }
+    if (line.startsWith("index ") || line.startsWith("--- ") || line.startsWith("+++ ") || line.startsWith("@@ ") || line.startsWith("Binary ") || line.startsWith("new file") || line.startsWith("deleted file") || line.startsWith("old mode") || line.startsWith("new mode") || line.startsWith("similarity index") || line.startsWith("rename from") || line.startsWith("rename to")) {
+      continue;
+    }
+    if (line.startsWith("+")) {
+      additions++;
+    } else if (line.startsWith("-")) {
+      deletions++;
+    }
+  }
+  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 };
+}
+function verifyCommitIntegrity(originalDiff, committedDiff) {
+  const original = parseDiffStats(originalDiff);
+  const committed = parseDiffStats(committedDiff);
+  if (original.totalAdditions !== committed.totalAdditions || original.totalDeletions !== committed.totalDeletions) {
+    return {
+      match: false,
+      details: `Stats divergem: original +${original.totalAdditions}/-${original.totalDeletions}, committed +${committed.totalAdditions}/-${committed.totalDeletions}`
+    };
+  }
+  const originalPaths = original.files.map((f) => f.path).sort();
+  const committedPaths = committed.files.map((f) => f.path).sort();
+  if (originalPaths.length !== committedPaths.length) {
+    return {
+      match: false,
+      details: `Arquivos diferem: original ${originalPaths.length} files, committed ${committedPaths.length} files`
+    };
+  }
+  for (let i = 0; i < originalPaths.length; i++) {
+    if (originalPaths[i] !== committedPaths[i]) {
+      return {
+        match: false,
+        details: `Arquivo diferente: expected "${originalPaths[i]}", got "${committedPaths[i]}"`
+      };
+    }
+  }
+  const committedByPath = new Map(committed.files.map((f) => [f.path, f]));
+  for (const origFile of original.files) {
+    const commFile = committedByPath.get(origFile.path);
+    if (!commFile) {
+      return {
+        match: false,
+        details: `Arquivo "${origFile.path}" nao encontrado no diff committed`
+      };
+    }
+    if (origFile.additions !== commFile.additions || origFile.deletions !== commFile.deletions) {
+      return {
+        match: false,
+        details: `Stats de "${origFile.path}" divergem: original +${origFile.additions}/-${origFile.deletions}, committed +${commFile.additions}/-${commFile.deletions}`
+      };
+    }
+  }
+  return { match: true };
+}
+async function captureCommittedDiff(cwd2, commitCount) {
+  return runGitAt(cwd2, ["diff", `HEAD~${commitCount}..HEAD`]);
+}
+
+// ../../packages/git/src/worktree.ts
 async function applyPatchInWorktree(wtPath, patch) {
+  const normalizedPatch = patch.endsWith("\n") ? patch : `${patch}
+`;
   const proc = Bun.spawn(["git", "apply", "--index", "--3way"], {
     cwd: wtPath,
     stdin: "pipe",
     stdout: "pipe",
     stderr: "pipe"
   });
-  proc.stdin.write(patch);
+  proc.stdin.write(normalizedPatch);
   proc.stdin.end();
   const stderr = await new Response(proc.stderr).text();
   const code = await proc.exited;
@@ -31017,23 +31105,61 @@ async function getCurrentBranchRef(repoRoot) {
     );
   }
 }
-async function commitViaWorktree(repoRoot, groups) {
+async function commitViaWorktree(repoRoot, groups, options) {
+  const debug = process.argv.includes("--verbose") || !!process.env.REPOMIND_DEBUG;
+  const log = debug ? (msg) => console.error(`[worktree] ${msg}`) : () => {
+  };
   const branchRef = await getCurrentBranchRef(repoRoot);
+  log(`branch: ${branchRef}`);
+  const totalPatches = groups.reduce((s, g) => s + g.patches.length, 0);
+  log(`groups: ${groups.length}, total patches: ${totalPatches}`);
+  if (totalPatches === 0) {
+    throw new GitError(
+      "Nenhum patch para aplicar \u2014 verifique se os arquivos t\xEAm diff v\xE1lido."
+    );
+  }
   await runGitAt(repoRoot, ["worktree", "prune"]).catch(() => {
   });
   const wtPath = join(repoRoot, ".git", `split-wt-${Date.now()}`);
+  log(`creating worktree at: ${wtPath}`);
   await runGitAt(repoRoot, ["worktree", "add", "--detach", wtPath, "HEAD"]);
   try {
-    for (const group of groups) {
-      for (const patch of group.patches) {
-        await applyPatchInWorktree(wtPath, patch);
+    for (let i = 0; i < groups.length; i++) {
+      const group = groups[i];
+      log(
+        `group ${i + 1}/${groups.length}: ${group.patches.length} patches, msg="${group.message}"`
+      );
+      for (let j = 0; j < group.patches.length; j++) {
+        log(
+          `  applying patch ${j + 1}/${group.patches.length} (${group.patches[j].length} chars)`
+        );
+        await applyPatchInWorktree(wtPath, group.patches[j]);
       }
       await runGitAt(wtPath, ["commit", "-m", group.message]);
+      log("  committed");
+    }
+    if (options?.originalDiff && !options?.skipVerification) {
+      const committedDiff = await captureCommittedDiff(wtPath, groups.length);
+      const verification = verifyCommitIntegrity(
+        options.originalDiff,
+        committedDiff
+      );
+      log(
+        `verification: match=${verification.match}${verification.details ? ` (${verification.details})` : ""}`
+      );
+      if (!verification.match) {
+        throw new GitError(
+          `Verificacao de integridade falhou: ${verification.details ?? "diff mismatch"}. Nenhum commit foi aplicado.`
+        );
+      }
     }
     const wtHead = (await runGitAt(wtPath, ["rev-parse", "HEAD"])).trim();
+    log(`fast-forward: ${branchRef} -> ${wtHead}`);
     await runGitAt(repoRoot, ["update-ref", branchRef, wtHead]);
     await runGitAt(repoRoot, ["reset", "HEAD"]);
+    log("done \u2014 index reset");
   } catch (err) {
+    log(`ERROR: ${err instanceof Error ? err.message : String(err)}`);
     await runGitAt(repoRoot, ["worktree", "remove", "--force", wtPath]).catch(
       () => {
       }
@@ -42951,12 +43077,39 @@ ${issueRef.trim()}`);
         setPhase("committing");
         const code = await deps.runGitCommit(message);
         if (code !== 0) {
-          setErrorMsg("git commit falhou. Verifique os hooks do reposit\xF3rio.");
+          setErrorMsg("git commit falhou. Verifique os hooks do repositorio.");
           setPhase("error-commit");
-        } else {
-          committedMessageRef.current = message;
-          setPhase("done");
+          return;
         }
+        if (deps.captureCommittedDiff && deps.verifyCommitIntegrity && deps.getRepoRoot && deps.runGitReset) {
+          setPhase("verifying");
+          try {
+            const repoRoot = await deps.getRepoRoot();
+            const committedDiff = await deps.captureCommittedDiff(repoRoot, 1);
+            const verification = deps.verifyCommitIntegrity(
+              rawDiff,
+              committedDiff
+            );
+            if (!verification.match) {
+              await deps.runGitReset(["--soft", "HEAD~1"]);
+              setErrorMsg(
+                `Verificacao falhou: ${verification.details ?? "diff mismatch"}. Commit desfeito.`
+              );
+              setPhase("error-commit");
+              return;
+            }
+          } catch (verifyErr) {
+            const verbose2 = process.argv.includes("--verbose") || !!process.env.REPOMIND_DEBUG;
+            if (verbose2) {
+              console.error(
+                "[verify] Verificacao pos-commit falhou:",
+                verifyErr
+              );
+            }
+          }
+        }
+        committedMessageRef.current = message;
+        setPhase("done");
       } else if (denied) {
         setPhase("aborted");
       }
@@ -43115,6 +43268,10 @@ ${bodyParts.join("\n\n")}` : newMsg
         /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Spinner, {}),
         /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { color: C.dim, children: "Fazendo commit..." })
       ] }),
+      phase === "verifying" && /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(Box_default, { gap: 1, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Spinner, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { color: C.dim, children: "Verificando integridade do commit..." })
+      ] }),
       phase === "done" && /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(Box_default, { gap: 1, children: [
         /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { color: C.green, children: "\u2728" }),
         /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { bold: true, children: "Commit realizado com sucesso" })
@@ -43216,6 +43373,17 @@ async function runGitCommit(message) {
   });
   return proc.exited;
 }
+async function runGitReset(args2) {
+  const proc = Bun.spawn(["git", "reset", ...args2], {
+    stdout: "pipe",
+    stderr: "pipe"
+  });
+  const code = await proc.exited;
+  if (code !== 0) {
+    const stderr = await new Response(proc.stderr).text();
+    throw new Error(`git reset failed: ${stderr}`);
+  }
+}
 async function commitCommand() {
   const fileConfig = await readRepoConfig();
   let exitCode = 0;
@@ -43230,6 +43398,10 @@ async function commitCommand() {
         apiPost: (path, body, tkn) => apiClient.post(path, body, tkn),
         postStream: (path, body, tkn, timeoutMs) => apiClient.postStream(path, body, tkn, timeoutMs),
         runGitCommit,
+        captureCommittedDiff,
+        verifyCommitIntegrity,
+        getRepoRoot,
+        runGitReset,
         fileConfig
       },
       onExit: (code, message) => {
@@ -44057,6 +44229,7 @@ function SplitApp({
   const [hunksMap, setHunksMap] = (0, import_react72.useState)(/* @__PURE__ */ new Map());
   const [patchMap, setPatchMap] = (0, import_react72.useState)(/* @__PURE__ */ new Map());
   const [authToken, setAuthToken] = (0, import_react72.useState)("");
+  const [originalRawDiff, setOriginalRawDiff] = (0, import_react72.useState)("");
   const [streamPayload, setStreamPayload] = (0, import_react72.useState)(
     null
   );
@@ -44076,7 +44249,11 @@ function SplitApp({
     if (!TERMINAL_PHASES4.includes(phase)) return;
     const code = phase === "done" || phase === "aborted" ? 0 : 1;
     exit();
-    onExit(code, phase === "done" ? committedMessagesRef.current : void 0);
+    onExit(
+      code,
+      phase === "done" ? committedMessagesRef.current : void 0,
+      code !== 0 ? errorMsg : void 0
+    );
   }, [phase]);
   (0, import_react72.useEffect)(() => {
     if (phase !== "analyzing") return;
@@ -44120,6 +44297,7 @@ function SplitApp({
             return;
           }
           files = changes.files;
+          setOriginalRawDiff(changes.rawDiff);
         } else {
           const changes = await deps.getAllChanges();
           if (changes.isEmpty) {
@@ -44214,9 +44392,15 @@ function SplitApp({
     { isActive: phase === "review" }
   );
   async function startCommitting() {
+    const debug = process.argv.includes("--verbose") || process.argv.includes("-v") || !!process.env.REPOMIND_DEBUG;
+    const log = debug ? (msg) => console.error(`[split-commit] ${msg}`) : () => {
+    };
     setPhase("committing");
     setCommitProgress(0);
     const activeGroups2 = groups.filter((g) => !skippedGroups.has(g.groupId));
+    log(
+      `activeGroups: ${activeGroups2.length}, patchMap: ${patchMap.size}, hunksMap: ${hunksMap.size}`
+    );
     if (activeGroups2.length === 0) {
       setPhase("aborted");
       return;
@@ -44227,8 +44411,21 @@ function SplitApp({
         hunksMap,
         patchMap
       );
+      log(
+        `worktreeGroups: ${worktreeGroups.length}, patches: [${worktreeGroups.map((g) => g.patches.length).join(",")}]`
+      );
+      for (let gi = 0; gi < worktreeGroups.length; gi++) {
+        log(
+          `  group[${gi}]: ${worktreeGroups[gi].patches.length} patches, msg="${worktreeGroups[gi].message?.slice(0, 60)}"`
+        );
+      }
       const repoRoot = await deps.getRepoRoot();
-      await deps.commitViaWorktree(repoRoot, worktreeGroups);
+      log(`repoRoot: ${repoRoot}`);
+      setPhase("verifying");
+      await deps.commitViaWorktree(repoRoot, worktreeGroups, {
+        originalDiff: originalRawDiff
+      });
+      log("commitViaWorktree done (verified)");
       for (let i = 0; i < activeGroups2.length; i++) {
         setCommitProgress(i + 1);
         if (authToken) {
@@ -44241,6 +44438,8 @@ function SplitApp({
       setPhase("done");
     } catch (e) {
       const detail = e instanceof Error ? e.message : "Erro desconhecido";
+      log(`ERROR: ${detail}`);
+      if (e instanceof Error && e.stack) log(e.stack);
       setErrorMsg(`Erro atomico no split: ${detail}`);
       setPhase("error-commit");
     }
@@ -44387,6 +44586,20 @@ function SplitApp({
           activeGroupCount !== 1 ? "s" : ""
         ] }) })
       ] }),
+      phase === "verifying" && /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+        activeGroups.map((g, i) => /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(Box_default, { flexDirection: "column", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(Box_default, { gap: 1, alignItems: "center", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color: C.green, children: "\u2713" }),
+            /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(TypeBadge, { type: g.type }),
+            /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color: C.green, children: g.description })
+          ] }),
+          i < activeGroups.length - 1 && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color: C.dim, children: "\u2502" })
+        ] }, g.groupId)),
+        /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(Box_default, { marginTop: 1, gap: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Spinner, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color: C.dim, children: "Verificando integridade dos commits..." })
+        ] })
+      ] }),
       phase === "done" && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Box_default, { flexDirection: "column", marginTop: 1, children: activeGroups.map((g, i) => /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(Box_default, { flexDirection: "column", children: [
         /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(Box_default, { gap: 1, alignItems: "center", children: [
           /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Text, { color: C.green, children: "\u2713" }),
@@ -44458,6 +44671,7 @@ async function splitCommand() {
   const useStaged = !process.argv.includes("--all");
   let exitCode = 0;
   let completedCommits = [];
+  let errorMessage = "";
   enterImmersive();
   const { waitUntilExit } = render_default(
     import_react73.default.createElement(SplitApp, {
@@ -44484,9 +44698,10 @@ async function splitCommand() {
         fileConfig,
         useStaged
       },
-      onExit: (code, commits) => {
+      onExit: (code, commits, error) => {
         exitCode = code;
         completedCommits = commits ?? [];
+        errorMessage = error ?? "";
       }
     })
   );
@@ -44498,6 +44713,10 @@ async function splitCommand() {
     );
     await waitUntilExit2();
   }
+  if (exitCode !== 0 && errorMessage) {
+    console.error(`
+\u2717 ${errorMessage}`);
+  }
   process.exit(exitCode);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repomind",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "type": "module",
   "description": "AI-powered git commit messages and repository insights",
   "keywords": ["git", "ai", "commit", "cli"],
@@ -26,9 +26,9 @@
     "react": "^19.2.4"
   },
   "devDependencies": {
-    "@repomind/config": "0.0.1",
-    "@repomind/git": "0.0.1",
-    "@repomind/types": "0.0.1",
+    "@repomind/config": "workspace:*",
+    "@repomind/git": "workspace:*",
+    "@repomind/types": "workspace:*",
     "@types/react": "^19.2.14",
     "esbuild": "^0.25.0",
     "typescript": "^5.7.0"