local-diff-reviewer 2.0.1 → 2.0.2

package/dist/cli/start.js

@@ -29,6 +29,9 @@ function anchorKey(anchor) {
   if (anchor.type === "diff-line") return `diff:${anchor.filePath}:${anchor.side}:${anchor.lineNumber}`;
   return `markdown:${anchor.filePath}:${anchor.lineNumber}`;
 }
+function isThreadOnFileSnapshot(thread, file) {
+  return thread.filePath === file.path && thread.fileSnapshotHash === file.snapshotHash;
+}
 function getThreadStatus(thread) {
   if (thread.status === "resolved") return "resolved";
   return getOpenThreadStatus(thread);
@@ -42,12 +45,10 @@ function getMergedThreadStatus(threads) {
 }
 
 // src/server/storage.ts
-async function readComments(repoRoot, diffHash2) {
-  const store = await readCommentStore(repoRoot);
-  if (!diffHash2) return store;
-  return { threads: store.threads.filter((thread) => thread.diffHash === diffHash2) };
+async function readComments(repoRoot) {
+  return readCommentStore(repoRoot);
 }
-async function attachLegacyComments(repoRoot, diffHash2) {
+async function attachLegacyComments(repoRoot, diffHash2, diffFiles) {
   const store = await readCommentStore(repoRoot);
   let changed = false;
   for (const thread of store.threads) {
@@ -55,6 +56,11 @@ async function attachLegacyComments(repoRoot, diffHash2) {
       thread.diffHash = diffHash2;
       changed = true;
     }
+    const file = diffFiles.find((item) => item.path === thread.filePath);
+    if (!thread.fileSnapshotHash && file && (thread.diffHash === diffHash2 || getThreadStatus(thread) === "submit")) {
+      thread.fileSnapshotHash = file.snapshotHash;
+      changed = true;
+    }
   }
   if (changed) await writeComments(repoRoot, store);
 }
@@ -93,7 +99,8 @@ async function readLegacyComments(repoRoot) {
 function normalizeStore(store) {
   const groups = /* @__PURE__ */ new Map();
   for (const thread of store.threads) {
-    const key = `${thread.diffHash ?? "legacy"}:${anchorKey(thread.anchor)}`;
+    const snapshotKey = thread.fileSnapshotHash ?? (thread.diffHash ? `diff:${thread.diffHash}` : "legacy");
+    const key = `${snapshotKey}:${anchorKey(thread.anchor)}`;
     groups.set(key, [...groups.get(key) ?? [], thread]);
   }
   return {
@@ -137,7 +144,7 @@ async function importAgentComments(repoRoot, diffHash2, diffFiles, rawComments)
     }
     const thread = buildAgentThread(parsed, diffHash2, diffFiles, result, label);
     if (!thread) continue;
-    const existingThread = store.threads.find((item) => item.diffHash === diffHash2 && sameAnchor(item.anchor, thread.anchor));
+    const existingThread = store.threads.find((item) => item.fileSnapshotHash === thread.fileSnapshotHash && sameAnchor(item.anchor, thread.anchor));
     if (hasDuplicateAgentComment(store.threads, thread)) {
       result.skipped.push(`${label}: duplicate agent comment skipped`);
       continue;
@@ -227,6 +234,7 @@ function buildAgentThread(comment, diffHash2, diffFiles, result, label) {
     filePath: anchor.filePath,
     anchor,
     diffHash: diffHash2,
+    fileSnapshotHash: file.snapshotHash,
     status: "replied",
     comments: [
       {
@@ -273,7 +281,7 @@ function buildAnchor(file, comment, result, label) {
 function hasDuplicateAgentComment(threads, nextThread) {
   const nextComment = nextThread.comments[0]?.body.trim();
   return threads.some((thread) => {
-    return thread.comments.some((comment) => comment.author === "agent" && comment.body.trim() === nextComment) && thread.diffHash === nextThread.diffHash && thread.filePath === nextThread.filePath && sameAnchor(thread.anchor, nextThread.anchor);
+    return thread.comments.some((comment) => comment.author === "agent" && comment.body.trim() === nextComment) && thread.fileSnapshotHash === nextThread.fileSnapshotHash && thread.filePath === nextThread.filePath && sameAnchor(thread.anchor, nextThread.anchor);
   });
 }
 function diffLineExists(file, side, lineNumber) {
@@ -312,6 +320,7 @@ function isRecord(value) {
 }
 
 // src/core/diff-parser.ts
+import { createHash as createHash2 } from "node:crypto";
 var hunkHeaderPattern = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
 function parseUnifiedDiff(input) {
   const lines = input.replace(/\r\n/g, "\n").split("\n");
@@ -328,6 +337,7 @@ function parseUnifiedDiff(input) {
         oldPath: paths?.[1] ?? "",
         newPath: paths?.[2] ?? "",
         path: paths?.[2] ?? "",
+        snapshotHash: "",
         status: "modified",
         additions: 0,
         deletions: 0,
@@ -413,7 +423,11 @@ function parseUnifiedDiff(input) {
     const synthetic = { type: "context", content: line, oldLineNumber: oldLine, newLineNumber: newLine };
     currentHunk.lines.push(synthetic);
   }
-  return files.filter((file) => file.path);
+  return files.filter((file) => file.path).map((file) => ({ ...file, snapshotHash: fileSnapshotHash(file) }));
+}
+function fileSnapshotHash(file) {
+  const snapshot = { ...file, snapshotHash: void 0 };
+  return createHash2("sha256").update(JSON.stringify(snapshot)).digest("hex").slice(0, 16);
 }
 function normalizeDiffPath(path) {
   if (path === "/dev/null") return path;
@@ -424,7 +438,7 @@ function isMarkdownPath(path) {
 }
 
 // src/core/git.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { readFile as readFile2 } from "node:fs/promises";
@@ -473,7 +487,7 @@ function parseReviewMode(args) {
   throw new Error("Usage: local-diff-reviewer [working|staged|<base> <target>]");
 }
 function diffHash(diff) {
-  return createHash2("sha256").update(diff).digest("hex").slice(0, 16);
+  return createHash3("sha256").update(diff).digest("hex").slice(0, 16);
 }
 function isSafeRepoPath(repoRoot, path) {
   const normalized = normalize(join2(repoRoot, path));
@@ -528,7 +542,7 @@ function binaryAddedDiff(path) {
 }
 
 // src/cli/runtime-registry.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 import { access, mkdir as mkdir2, readFile as readFile3, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir as homedir2, platform as platform2 } from "node:os";
 import { basename as basename2, dirname as dirname2, join as join3 } from "node:path";
@@ -569,7 +583,7 @@ async function stopRecordedRuntimes(repoRoot) {
 }
 function runtimePath(repoRoot) {
   const repoName = basename2(repoRoot) || "repo";
-  const repoHash = createHash3("sha256").update(repoRoot).digest("hex").slice(0, 12);
+  const repoHash = createHash4("sha256").update(repoRoot).digest("hex").slice(0, 12);
   return join3(runtimeDir(), `${repoName}-${repoHash}.runtime.json`);
 }
 function runtimeDir() {
@@ -623,7 +637,7 @@ import { createServer } from "node:http";
 import { join as join4, normalize as normalize2, resolve, sep } from "node:path";
 
 // src/shared/types.ts
-var REVIEW_REFRESH_PROTOCOL = 1;
+var REVIEW_REFRESH_PROTOCOL = 3;
 
 // src/core/markdown-source-map.ts
 import GithubSlugger from "github-slugger";
@@ -816,8 +830,13 @@ async function startServer(state, port = 4966) {
         res.status(400).json({ error: "Comment body is required" });
         return;
       }
+      const file = state.diffFiles.find((item) => item.path === body.filePath);
+      if (!file) {
+        res.status(400).json({ error: "Comment file is not present in the current diff" });
+        return;
+      }
       const store = await readComments(state.session.repoRoot);
-      const existingThread = store.threads.find((thread2) => thread2.diffHash === state.session.diffHash && sameAnchor(thread2.anchor, body.anchor));
+      const existingThread = store.threads.find((thread2) => thread2.fileSnapshotHash === file.snapshotHash && sameAnchor(thread2.anchor, body.anchor));
       const comment = {
         id: crypto.randomUUID(),
         body: commentBody,
@@ -838,6 +857,7 @@ async function startServer(state, port = 4966) {
         filePath: body.filePath,
         anchor: body.anchor,
         diffHash: state.session.diffHash,
+        fileSnapshotHash: file.snapshotHash,
         status: "submit",
         comments: [comment],
         createdAt: now,
@@ -982,7 +1002,7 @@ async function startServer(state, port = 4966) {
     try {
       const scope = req.body;
       const store = await readComments(state.session.repoRoot);
-      const threads = selectPromptThreads(store.threads, scope);
+      const threads = selectPromptThreads(store.threads, scope, state.diffFiles);
       res.json({ prompt: formatPrompt(threads) });
     } catch (error) {
       next(error);
@@ -1032,12 +1052,15 @@ function listen(app, port) {
     });
   });
 }
-function selectPromptThreads(threads, scope) {
+function selectPromptThreads(threads, scope, currentFiles) {
+  const isCurrentSnapshotThread = (thread) => currentFiles.some((file) => isThreadOnFileSnapshot(thread, file));
   if (scope.type === "thread") return threads.filter((thread) => thread.id === scope.threadId);
   if (scope.type === "file-unresolved") {
-    return threads.filter((thread) => thread.filePath === scope.filePath && thread.status !== "resolved");
+    return threads.filter(
+      (thread) => thread.filePath === scope.filePath && thread.status !== "resolved" && isCurrentSnapshotThread(thread)
+    );
   }
-  return threads.filter((thread) => thread.status !== "resolved");
+  return threads.filter((thread) => thread.status !== "resolved" && isCurrentSnapshotThread(thread));
 }
 
 // src/cli/start.ts
@@ -1061,7 +1084,7 @@ async function main() {
     diffHash: diffHash(diff),
     createdAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  await attachLegacyComments(repoRoot, session.diffHash);
+  await attachLegacyComments(repoRoot, session.diffHash, diffFiles);
   const importResult = await importAgentComments(repoRoot, session.diffHash, diffFiles, comments);
   if (!newSession && !dev) {
     const reusedUrl = await refreshRunningReview(session, diffFiles);

package/dist/web/assets/{arc-BTM4ghNf.js → arc-B7-mERto.js}

@@ -1 +1 @@
-import{n as e,t}from"./path-BJQEcSo7.js";import{a as n,c as r,d as i,f as a,i as o,l as s,m as c,n as l,o as u,p as d,r as f,u as p}from"./dist-DP09l7dv.js";function m(e){return e.innerRadius}function h(e){return e.outerRadius}function g(e){return e.startAngle}function _(e){return e.endAngle}function v(e){return e&&e.padAngle}function y(e,t,n,r,i,a,o,s){var c=n-e,l=r-t,u=o-i,d=s-a,f=d*c-u*l;if(!(f*f<1e-12))return f=(u*(t-a)-d*(e-i))/f,[e+f*c,t+f*l]}function b(e,t,n,r,i,a,o){var c=e-n,l=t-r,u=(o?a:-a)/d(c*c+l*l),f=u*l,p=-u*c,m=e+f,h=t+p,g=n+f,_=r+p,v=(m+g)/2,y=(h+_)/2,b=g-m,x=_-h,S=b*b+x*x,C=i-a,w=m*_-g*h,T=(x<0?-1:1)*d(s(0,C*C*S-w*w)),E=(w*x-b*T)/S,D=(-w*b-x*T)/S,O=(w*x+b*T)/S,k=(-w*b+x*T)/S,A=E-v,j=D-y,M=O-v,N=k-y;return A*A+j*j>M*M+N*N&&(E=O,D=k),{cx:E,cy:D,x01:-f,y01:-p,x11:E*(i/C-1),y11:D*(i/C-1)}}function x(){var s=m,x=h,S=e(0),C=null,w=g,T=_,E=v,D=null,O=t(k);function k(){var e,t,m=+s.apply(this,arguments),h=+x.apply(this,arguments),g=w.apply(this,arguments)-r,_=T.apply(this,arguments)-r,v=l(_-g),k=_>g;if(D||=e=O(),h<m&&(t=h,h=m,m=t),!(h>1e-12))D.moveTo(0,0);else if(v>c-1e-12)D.moveTo(h*u(g),h*a(g)),D.arc(0,0,h,g,_,!k),m>1e-12&&(D.moveTo(m*u(_),m*a(_)),D.arc(0,0,m,_,g,k));else{var A=g,j=_,M=g,N=_,P=v,F=v,I=E.apply(this,arguments)/2,L=I>1e-12&&(C?+C.apply(this,arguments):d(m*m+h*h)),R=p(l(h-m)/2,+S.apply(this,arguments)),z=R,B=R,V,H;if(L>1e-12){var U=o(L/m*a(I)),W=o(L/h*a(I));(P-=U*2)>1e-12?(U*=k?1:-1,M+=U,N-=U):(P=0,M=N=(g+_)/2),(F-=W*2)>1e-12?(W*=k?1:-1,A+=W,j-=W):(F=0,A=j=(g+_)/2)}var G=h*u(A),K=h*a(A),q=m*u(N),J=m*a(N);if(R>1e-12){var Y=h*u(j),X=h*a(j),Z=m*u(M),Q=m*a(M),$;if(v<i)if($=y(G,K,Z,Q,Y,X,q,J)){var ee=G-$[0],te=K-$[1],ne=Y-$[0],re=X-$[1],ie=1/a(f((ee*ne+te*re)/(d(ee*ee+te*te)*d(ne*ne+re*re)))/2),ae=d($[0]*$[0]+$[1]*$[1]);z=p(R,(m-ae)/(ie-1)),B=p(R,(h-ae)/(ie+1))}else z=B=0}F>1e-12?B>1e-12?(V=b(Z,Q,G,K,h,B,k),H=b(Y,X,q,J,h,B,k),D.moveTo(V.cx+V.x01,V.cy+V.y01),B<R?D.arc(V.cx,V.cy,B,n(V.y01,V.x01),n(H.y01,H.x01),!k):(D.arc(V.cx,V.cy,B,n(V.y01,V.x01),n(V.y11,V.x11),!k),D.arc(0,0,h,n(V.cy+V.y11,V.cx+V.x11),n(H.cy+H.y11,H.cx+H.x11),!k),D.arc(H.cx,H.cy,B,n(H.y11,H.x11),n(H.y01,H.x01),!k))):(D.moveTo(G,K),D.arc(0,0,h,A,j,!k)):D.moveTo(G,K),!(m>1e-12)||!(P>1e-12)?D.lineTo(q,J):z>1e-12?(V=b(q,J,Y,X,m,-z,k),H=b(G,K,Z,Q,m,-z,k),D.lineTo(V.cx+V.x01,V.cy+V.y01),z<R?D.arc(V.cx,V.cy,z,n(V.y01,V.x01),n(H.y01,H.x01),!k):(D.arc(V.cx,V.cy,z,n(V.y01,V.x01),n(V.y11,V.x11),!k),D.arc(0,0,m,n(V.cy+V.y11,V.cx+V.x11),n(H.cy+H.y11,H.cx+H.x11),k),D.arc(H.cx,H.cy,z,n(H.y11,H.x11),n(H.y01,H.x01),!k))):D.arc(0,0,m,N,M,k)}if(D.closePath(),e)return D=null,e+``||null}return k.centroid=function(){var e=(+s.apply(this,arguments)+ +x.apply(this,arguments))/2,t=(+w.apply(this,arguments)+ +T.apply(this,arguments))/2-i/2;return[u(t)*e,a(t)*e]},k.innerRadius=function(t){return arguments.length?(s=typeof t==`function`?t:e(+t),k):s},k.outerRadius=function(t){return arguments.length?(x=typeof t==`function`?t:e(+t),k):x},k.cornerRadius=function(t){return arguments.length?(S=typeof t==`function`?t:e(+t),k):S},k.padRadius=function(t){return arguments.length?(C=t==null?null:typeof t==`function`?t:e(+t),k):C},k.startAngle=function(t){return arguments.length?(w=typeof t==`function`?t:e(+t),k):w},k.endAngle=function(t){return arguments.length?(T=typeof t==`function`?t:e(+t),k):T},k.padAngle=function(t){return arguments.length?(E=typeof t==`function`?t:e(+t),k):E},k.context=function(e){return arguments.length?(D=e??null,k):D},k}export{x as t};
+import{n as e,t}from"./path-BJQEcSo7.js";import{a as n,c as r,d as i,f as a,i as o,l as s,m as c,n as l,o as u,p as d,r as f,u as p}from"./dist-DvROHOnO.js";function m(e){return e.innerRadius}function h(e){return e.outerRadius}function g(e){return e.startAngle}function _(e){return e.endAngle}function v(e){return e&&e.padAngle}function y(e,t,n,r,i,a,o,s){var c=n-e,l=r-t,u=o-i,d=s-a,f=d*c-u*l;if(!(f*f<1e-12))return f=(u*(t-a)-d*(e-i))/f,[e+f*c,t+f*l]}function b(e,t,n,r,i,a,o){var c=e-n,l=t-r,u=(o?a:-a)/d(c*c+l*l),f=u*l,p=-u*c,m=e+f,h=t+p,g=n+f,_=r+p,v=(m+g)/2,y=(h+_)/2,b=g-m,x=_-h,S=b*b+x*x,C=i-a,w=m*_-g*h,T=(x<0?-1:1)*d(s(0,C*C*S-w*w)),E=(w*x-b*T)/S,D=(-w*b-x*T)/S,O=(w*x+b*T)/S,k=(-w*b+x*T)/S,A=E-v,j=D-y,M=O-v,N=k-y;return A*A+j*j>M*M+N*N&&(E=O,D=k),{cx:E,cy:D,x01:-f,y01:-p,x11:E*(i/C-1),y11:D*(i/C-1)}}function x(){var s=m,x=h,S=e(0),C=null,w=g,T=_,E=v,D=null,O=t(k);function k(){var e,t,m=+s.apply(this,arguments),h=+x.apply(this,arguments),g=w.apply(this,arguments)-r,_=T.apply(this,arguments)-r,v=l(_-g),k=_>g;if(D||=e=O(),h<m&&(t=h,h=m,m=t),!(h>1e-12))D.moveTo(0,0);else if(v>c-1e-12)D.moveTo(h*u(g),h*a(g)),D.arc(0,0,h,g,_,!k),m>1e-12&&(D.moveTo(m*u(_),m*a(_)),D.arc(0,0,m,_,g,k));else{var A=g,j=_,M=g,N=_,P=v,F=v,I=E.apply(this,arguments)/2,L=I>1e-12&&(C?+C.apply(this,arguments):d(m*m+h*h)),R=p(l(h-m)/2,+S.apply(this,arguments)),z=R,B=R,V,H;if(L>1e-12){var U=o(L/m*a(I)),W=o(L/h*a(I));(P-=U*2)>1e-12?(U*=k?1:-1,M+=U,N-=U):(P=0,M=N=(g+_)/2),(F-=W*2)>1e-12?(W*=k?1:-1,A+=W,j-=W):(F=0,A=j=(g+_)/2)}var G=h*u(A),K=h*a(A),q=m*u(N),J=m*a(N);if(R>1e-12){var Y=h*u(j),X=h*a(j),Z=m*u(M),Q=m*a(M),$;if(v<i)if($=y(G,K,Z,Q,Y,X,q,J)){var ee=G-$[0],te=K-$[1],ne=Y-$[0],re=X-$[1],ie=1/a(f((ee*ne+te*re)/(d(ee*ee+te*te)*d(ne*ne+re*re)))/2),ae=d($[0]*$[0]+$[1]*$[1]);z=p(R,(m-ae)/(ie-1)),B=p(R,(h-ae)/(ie+1))}else z=B=0}F>1e-12?B>1e-12?(V=b(Z,Q,G,K,h,B,k),H=b(Y,X,q,J,h,B,k),D.moveTo(V.cx+V.x01,V.cy+V.y01),B<R?D.arc(V.cx,V.cy,B,n(V.y01,V.x01),n(H.y01,H.x01),!k):(D.arc(V.cx,V.cy,B,n(V.y01,V.x01),n(V.y11,V.x11),!k),D.arc(0,0,h,n(V.cy+V.y11,V.cx+V.x11),n(H.cy+H.y11,H.cx+H.x11),!k),D.arc(H.cx,H.cy,B,n(H.y11,H.x11),n(H.y01,H.x01),!k))):(D.moveTo(G,K),D.arc(0,0,h,A,j,!k)):D.moveTo(G,K),!(m>1e-12)||!(P>1e-12)?D.lineTo(q,J):z>1e-12?(V=b(q,J,Y,X,m,-z,k),H=b(G,K,Z,Q,m,-z,k),D.lineTo(V.cx+V.x01,V.cy+V.y01),z<R?D.arc(V.cx,V.cy,z,n(V.y01,V.x01),n(H.y01,H.x01),!k):(D.arc(V.cx,V.cy,z,n(V.y01,V.x01),n(V.y11,V.x11),!k),D.arc(0,0,m,n(V.cy+V.y11,V.cx+V.x11),n(H.cy+H.y11,H.cx+H.x11),k),D.arc(H.cx,H.cy,z,n(H.y11,H.x11),n(H.y01,H.x01),!k))):D.arc(0,0,m,N,M,k)}if(D.closePath(),e)return D=null,e+``||null}return k.centroid=function(){var e=(+s.apply(this,arguments)+ +x.apply(this,arguments))/2,t=(+w.apply(this,arguments)+ +T.apply(this,arguments))/2-i/2;return[u(t)*e,a(t)*e]},k.innerRadius=function(t){return arguments.length?(s=typeof t==`function`?t:e(+t),k):s},k.outerRadius=function(t){return arguments.length?(x=typeof t==`function`?t:e(+t),k):x},k.cornerRadius=function(t){return arguments.length?(S=typeof t==`function`?t:e(+t),k):S},k.padRadius=function(t){return arguments.length?(C=t==null?null:typeof t==`function`?t:e(+t),k):C},k.startAngle=function(t){return arguments.length?(w=typeof t==`function`?t:e(+t),k):w},k.endAngle=function(t){return arguments.length?(T=typeof t==`function`?t:e(+t),k):T},k.padAngle=function(t){return arguments.length?(E=typeof t==`function`?t:e(+t),k):E},k.context=function(e){return arguments.length?(D=e??null,k):D},k}export{x as t};