fix: a new finding on a line that already carries a comment is no longer dropped as a resend

README.md

@@ -236,7 +236,7 @@ The forge dialog is a composer, not a push button:
 - **Comment**, **Approve** or **Request changes** — and an approval needs nothing attached, since a verdict stands on its own. Approve and Request changes are disabled on your own pull request, which the forge refuses anyway
 - everything goes as **one review**: one notification for the author, a summary that has somewhere to live, and no half-posted review if something fails
 
-A comment on a line the pull request does not touch is caught before anything is sent, because the whole review is a single request and one unpostable line would reject all of it. Findings already sent are marked *already on the pull request* and left unselected.
+A comment on a line the pull request does not touch is caught before anything is sent, because the whole review is a single request and one unpostable line would reject all of it. Findings already sent are marked *already on the pull request* and left unselected. A finding that has been sent once is not sent again, however it has been reworded since, because the forge cannot update the comment already there — but a new finding on a line that already carries someone's comment does go out, since the line says nothing about which finding is on it.
 
 Existing inline comments can be pulled into the viewer from the same dialog.
 

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diffity/api",
-  "version": "0.10.35",
+  "version": "0.10.36",
   "private": true,
   "type": "module",
   "main": "./dist/index.js",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/diffity",
-  "version": "0.10.35",
+  "version": "0.10.36",
   "description": "Agent-agnostic, GitHub-style diff viewer and code review tool with a live agent loop",
   "type": "module",
   "bin": {

packages/cli/src/inbox/runtime.ts

@@ -1,7 +1,7 @@
 import { spawn, execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import type { LiveRequest } from '@diffity/api';
-import { createReview, fetchPrContext, type PrContext, type PrSnapshot } from '@diffity/github';
+import { createReview, fetchPrContext, getViewerLogin, type PrContext, type PrSnapshot } from '@diffity/github';
 import { createWriteStream, mkdirSync, readFileSync, rmSync, writeFileSync, type WriteStream } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { logsDir, type ExportOpts, type MarkPostedOpts, type PrepareDeps, type RunAgentOpts, type ServerHandle } from './prepare.js';
@@ -59,7 +59,9 @@ export function realPrepareDeps(nodePath: string, entry: string, dataDirFor: (wo
     prContext: (snapshot, worktree) => writePrContext(snapshot, dataDirFor(worktree), log),
     // In this process, with the reviewer's own credentials: posting the alert findings is the
     // daemon's own act, after the agent has finished, and never something the agent can reach.
-    postReview: opts => createReview(opts.owner, opts.repo, opts.prNumber, opts.headSha, opts.submission),
+    postReview: async opts => createReview(opts.owner, opts.repo, opts.prNumber, opts.headSha, opts.submission, {
+      viewerLogin: await getViewerLogin(),
+    }),
     markPosted: opts => markPosted(nodePath, entry, opts, dataDirFor(opts.worktree)),
     exportBundle: opts => exportBundle(nodePath, entry, opts, dataDirFor(opts.worktree)),
     log,

packages/cli/src/server.ts

@@ -67,6 +67,7 @@ import {
   prCommits as githubPrCommits,
   prBaseRef as githubPrBaseRef,
   getCompareDiff as githubCompareDiff,
+  getViewerLogin,
   type CreateReviewOptions,
   type GitHubRemote,
 } from '@diffity/github';
@@ -83,7 +84,7 @@ import { computeDiffFingerprint } from './fingerprint.js';
 import { parseDiffStatFiles } from './diff-stat.js';
 import { parseDiffStatSummary } from './diff-stat.js';
 import { anyReviewInProgress, getReviewRun } from './review-run.js';
-import { createThread, addReply, getThreadsForSession, markThreadsSubmitted, setThreadForgeComment, updateThreadStatus } from './threads.js';
+import { createThread, addReply, getThreadsForSession, markThreadsSubmitted, setThreadForgeComment, threadsOnTheForge, updateThreadStatus } from './threads.js';
 import { existingThreadFor } from './github-pull.js';
 import { threadsResolvedRemotely } from './github-resolution.js';
 import { noteViewerSeen, markViewerGone, viewerSnapshot, viewerIsPresent, viewerHasGone, awakeMs, VIEWER_POLL_MS } from './viewers.js';
@@ -831,7 +832,16 @@ export function startServer(options: ServerOptions): Promise<ServerResult> {
               details.prNumber,
               details.headSha,
               submission,
-              target,
+              {
+                ...target,
+                // Which findings are already on the pull request is a question about these
+                // findings, not about the lines they sit on — a line collects comments over
+                // rounds, and the ones on it may be nothing to do with what is being sent now.
+                postedThreadIds: threadsOnTheForge(
+                  submission.comments.map(comment => comment.threadId).filter((id): id is string => !!id),
+                ),
+                viewerLogin: await getViewerLogin(),
+              },
             );
             // Only the reader's own submit counts as the pull request being handled; an agent
             // posting through this route is not the reviewer having reviewed it. The mark is

packages/cli/src/threads.ts

@@ -173,6 +173,26 @@ export function markThreadsSubmitted(
   }
 }
 
+/**
+ * Of these findings, the ones that are on the forge already — sent from here, or pulled from
+ * there and so known by the comment they exist as. What sits on a line cannot say which finding
+ * put it there, so this record is what tells a resend from a new remark in the same place.
+ */
+export function threadsOnTheForge(ids: string[]): Set<string> {
+  if (ids.length === 0) {
+    return new Set();
+  }
+
+  const rows = queryAll<{ id: string }>(
+    `SELECT id FROM comment_threads
+      WHERE (submitted_at IS NOT NULL OR github_comment_id IS NOT NULL)
+        AND id IN (${ids.map(() => '?').join(', ')})`,
+    ...ids,
+  );
+
+  return new Set(rows.map(row => row.id));
+}
+
 /** Records which forge comment a thread exists as, once that is learned. */
 export function setThreadForgeComment(threadId: string, githubCommentId: number): void {
   getDb()