@a9n-shoji/rvw 0.4.0 → 0.4.2

package/dist/cli.mjs

@@ -18947,6 +18947,13 @@ function secureNewPath(targetPath, expectedMode, label, chmod = chmodSync) {
   }
   assertSecureExistingPath(targetPath, expectedMode, label);
 }
+var domainRevisionMetaKeys = {
+  pullRequests: "revision_pull_requests",
+  pullRequestContent: "revision_pull_request_content",
+  comments: "revision_comments",
+  walkthroughs: "revision_walkthroughs",
+  structures: "revision_structures"
+};
 var RvwDatabase = class {
   filePath;
   configuredPath;
@@ -19090,10 +19097,69 @@ var RvwDatabase = class {
     ).run();
     return this.getChangeSequence();
   }
+  incrementDomainRevisions(domains) {
+    const uniqueDomains = [...new Set(domains)];
+    this.incrementChangeSequence();
+    const increment2 = this.database.prepare(
+      "UPDATE app_meta SET value = CAST(CAST(value AS INTEGER) + 1 AS TEXT) WHERE key = ?"
+    );
+    for (const domain2 of uniqueDomains) increment2.run(domainRevisionMetaKeys[domain2]);
+    return this.getChangeSequence();
+  }
   getChangeSequence() {
     const row = this.database.prepare("SELECT value FROM app_meta WHERE key = 'change_sequence'").get();
     return Number(stringValue(row, "value"));
   }
+  getRevisionSnapshot() {
+    const rows = this.database.prepare(
+      `SELECT key, value
+         FROM app_meta
+         WHERE key IN (
+           'change_sequence',
+           'revision_pull_requests',
+           'revision_pull_request_content',
+           'revision_comments',
+           'revision_walkthroughs',
+           'revision_structures'
+         )`
+    ).all();
+    const values = new Map(rows.map((row) => [stringValue(row, "key"), stringValue(row, "value")]));
+    const value = (key2) => {
+      const raw3 = values.get(key2);
+      if (raw3 === void 0) throw new RvwError("DATABASE_ERROR", `revision\u304C\u3042\u308A\u307E\u305B\u3093: ${key2}`);
+      return Number(raw3);
+    };
+    return {
+      changeSequence: value("change_sequence"),
+      revisions: {
+        pullRequests: value(domainRevisionMetaKeys.pullRequests),
+        pullRequestContent: value(domainRevisionMetaKeys.pullRequestContent),
+        comments: value(domainRevisionMetaKeys.comments),
+        walkthroughs: value(domainRevisionMetaKeys.walkthroughs),
+        structures: value(domainRevisionMetaKeys.structures)
+      }
+    };
+  }
+  getDomainRevisions() {
+    return this.getRevisionSnapshot().revisions;
+  }
+  getPullRequestRevisionSnapshot(id) {
+    this.database.exec("BEGIN");
+    try {
+      const result = {
+        pullRequest: this.getPullRequest(id),
+        revisionSnapshot: this.getRevisionSnapshot()
+      };
+      this.database.exec("COMMIT");
+      return result;
+    } catch (error51) {
+      try {
+        this.database.exec("ROLLBACK");
+      } catch {
+      }
+      throw error51;
+    }
+  }
   getCommentWatchDatabaseId() {
     const row = this.database.prepare("SELECT value FROM app_meta WHERE key = 'comment_watch_database_id'").get();
     if (!row) throw new RvwError("DATABASE_ERROR", "comment watch\u306Edatabase ID\u304C\u3042\u308A\u307E\u305B\u3093\u3002");
@@ -19246,7 +19312,19 @@ var RvwDatabase = class {
       const statement = this.database.prepare(
         "UPDATE pull_requests SET github_state = ?, github_is_draft = ? WHERE id = ?"
       );
+      let changed = false;
       for (const update of updates) {
+        const current = this.getPullRequest(update.pullRequestId);
+        if (!current) {
+          throw new RvwError(
+            "PR_NOT_FOUND",
+            `Pull Request\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${update.pullRequestId}`,
+            { status: 404 }
+          );
+        }
+        if (current.githubState === update.state && current.githubIsDraft === update.isDraft) {
+          continue;
+        }
         const result = statement.run(update.state, update.isDraft ? 1 : 0, update.pullRequestId);
         if (Number(result.changes) !== 1) {
           throw new RvwError(
@@ -19255,18 +19333,24 @@ var RvwDatabase = class {
             { status: 404 }
           );
         }
+        changed = true;
       }
-      this.incrementChangeSequence();
+      if (changed) this.incrementDomainRevisions(["pullRequests"]);
     });
   }
   updateRepositoryLocation(id, repository) {
+    const existing = this.getPullRequest(id);
+    if (!existing) throw new RvwError("PR_NOT_FOUND", "Pull Request\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
+    if (existing.localRepositoryPath === repository.localRepositoryPath && existing.gitCommonDir === repository.gitCommonDir) {
+      return existing;
+    }
     this.immediateTransaction(() => {
       const result = this.database.prepare(
         "UPDATE pull_requests SET local_repository_path = ?, git_common_dir = ?, updated_at = ? WHERE id = ?"
       ).run(repository.localRepositoryPath, repository.gitCommonDir, (/* @__PURE__ */ new Date()).toISOString(), id);
       if (Number(result.changes) === 0)
         throw new RvwError("PR_NOT_FOUND", "Pull Request\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(["pullRequests"]);
     });
     const pullRequest = this.getPullRequest(id);
     if (!pullRequest) throw new RvwError("PR_NOT_FOUND", "Pull Request\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
@@ -19276,6 +19360,8 @@ var RvwDatabase = class {
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const existing = this.findPullRequestByIdentity(github.owner, github.repository, github.number);
     const id = existing?.id ?? randomUUID();
+    const contentChanged = !existing || existing.latestTitle !== github.title || existing.latestBody !== github.body;
+    const semanticChanged = !existing || existing.url !== github.url || existing.latestAuthorLogin !== github.authorLogin || existing.latestHeadRepositoryOwner !== github.headRepositoryOwner || existing.latestHeadRepositoryName !== github.headRepositoryName || existing.localRepositoryPath !== repository.localRepositoryPath || existing.gitCommonDir !== repository.gitCommonDir || contentChanged || existing.latestBaseRefName !== github.baseRefName || existing.latestHeadRefName !== github.headRefName || existing.latestBaseOid !== github.baseOid || existing.latestComparisonBaseOid !== comparisonBaseOid || existing.latestHeadOid !== github.headOid || existing.githubCreatedAt !== github.createdAt || existing.githubUpdatedAt !== github.updatedAt || existing.githubState !== github.state || existing.githubIsDraft !== github.isDraft;
     this.database.prepare(
       `INSERT INTO pull_requests(
           id, host, owner, repository, number, github_url,
@@ -19329,16 +19415,19 @@ var RvwDatabase = class {
       github.isDraft ? 1 : 0,
       now,
       existing?.createdAt ?? now,
-      now,
+      semanticChanged ? now : existing.updatedAt,
       comparisonBaseOid
     );
-    return id;
+    return { id, semanticChanged, contentChanged };
   }
   upsertPullRequest(github, repository, comparisonBaseOid) {
     const id = this.immediateTransaction(() => {
-      const writtenId = this.writePullRequest(github, repository, comparisonBaseOid);
-      this.incrementChangeSequence();
-      return writtenId;
+      const write = this.writePullRequest(github, repository, comparisonBaseOid);
+      const domains = [];
+      if (write.semanticChanged) domains.push("pullRequests");
+      if (write.contentChanged) domains.push("pullRequestContent");
+      if (domains.length > 0) this.incrementDomainRevisions(domains);
+      return write.id;
     });
     const pullRequest = this.getPullRequest(id);
     if (!pullRequest)
@@ -19347,10 +19436,14 @@ var RvwDatabase = class {
   }
   syncPullRequestAndComments(github, repository, comparisonBaseOid, updates) {
     const id = this.immediateTransaction(() => {
-      const writtenId = this.writePullRequest(github, repository, comparisonBaseOid);
-      this.applyCommentUpdates(updates, github.headOid);
-      this.incrementChangeSequence();
-      return writtenId;
+      const write = this.writePullRequest(github, repository, comparisonBaseOid);
+      const commentsChanged = this.applyCommentUpdates(updates, github.headOid);
+      const domains = [];
+      if (write.semanticChanged) domains.push("pullRequests");
+      if (write.contentChanged) domains.push("pullRequestContent");
+      if (commentsChanged) domains.push("comments");
+      if (domains.length > 0) this.incrementDomainRevisions(domains);
+      return write.id;
     });
     const pullRequest = this.getPullRequest(id);
     if (!pullRequest)
@@ -19359,10 +19452,16 @@ var RvwDatabase = class {
   }
   resetPullRequest(github, repository, comparisonBaseOid) {
     const id = this.immediateTransaction(() => {
-      const writtenId = this.writePullRequest(github, repository, comparisonBaseOid);
-      this.deletePullRequestHistory(writtenId);
-      this.incrementChangeSequence();
-      return writtenId;
+      const write = this.writePullRequest(github, repository, comparisonBaseOid);
+      this.deletePullRequestHistory(write.id);
+      this.incrementDomainRevisions([
+        "pullRequests",
+        "pullRequestContent",
+        "comments",
+        "walkthroughs",
+        "structures"
+      ]);
+      return write.id;
     });
     const pullRequest = this.getPullRequest(id);
     if (!pullRequest)
@@ -19496,7 +19595,7 @@ var RvwDatabase = class {
              key_hash, request_hash, structure_id, created_at
            ) VALUES (?, ?, ?, ?)`
       ).run(keyHash, input.idempotencyRequestHash, id, now);
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(["structures"]);
       structureId = id;
     });
     if (!structureId) {
@@ -19579,7 +19678,7 @@ var RvwDatabase = class {
         "INSERT OR IGNORE INTO structure_retired_edge_ids(structure_id, edge_id, retired_at) VALUES (?, ?, ?)"
       );
       for (const edgeId of retiredEdgesAtThisUpdate) retireEdge.run(id, edgeId, now);
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(["structures"]);
     });
     const structure = this.getStructure(id);
     if (!structure) throw new RvwError("DATABASE_ERROR", "\u66F4\u65B0\u3057\u305FStructure\u3092\u8AAD\u307F\u51FA\u305B\u307E\u305B\u3093\u3002");
@@ -19619,7 +19718,7 @@ var RvwDatabase = class {
           { status: 409, details: { expectedUpdatedAt: expectedUpdatedAt2 } }
         );
       }
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(["structures"]);
       return {
         id: structure.id,
         ref: structure.ref,
@@ -19715,7 +19814,7 @@ var RvwDatabase = class {
         now
       );
       this.insertCodeReferences("walkthrough", id, input.references);
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(["walkthroughs"]);
     });
     const walkthrough = this.getWalkthrough(id);
     if (!walkthrough) {
@@ -19742,7 +19841,7 @@ var RvwDatabase = class {
       }
       this.database.prepare("DELETE FROM walkthrough_references WHERE walkthrough_id = ?").run(id);
       this.insertCodeReferences("walkthrough", id, input.references);
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(["walkthroughs"]);
     });
     const walkthrough = this.getWalkthrough(id);
     if (!walkthrough) {
@@ -19778,7 +19877,9 @@ var RvwDatabase = class {
            WHERE id IN (SELECT comment_id FROM comment_targets WHERE walkthrough_id = ?)`
       ).run(id);
       this.database.prepare("DELETE FROM walkthroughs WHERE id = ?").run(id);
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(
+        counts.comments === 0 ? ["walkthroughs"] : ["walkthroughs", "comments"]
+      );
       return {
         id: walkthrough.id,
         ref: walkthrough.ref,
@@ -19816,7 +19917,7 @@ var RvwDatabase = class {
             post_id, comment_ref, pull_request_url, created_at
           ) VALUES (?, ?, ?, ?)`
       ).run(postId, formatCommentUri(id), pullRequest.url, now);
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(["comments"]);
     });
     const comment3 = this.getComment(id);
     if (!comment3) throw new RvwError("DATABASE_ERROR", "\u4FDD\u5B58\u3057\u305F\u30B3\u30E1\u30F3\u30C8\u3092\u8AAD\u307F\u51FA\u305B\u307E\u305B\u3093\u3002");
@@ -19935,7 +20036,7 @@ var RvwDatabase = class {
           FROM comments c
           JOIN comment_targets t ON t.comment_id = c.id
           LEFT JOIN walkthroughs w ON w.id = t.walkthrough_id
-          WHERE c.pull_request_id = ?${where} ORDER BY c.updated_at DESC`
+          WHERE c.pull_request_id = ?${where} ORDER BY c.updated_at DESC, c.id DESC`
     ).all(pullRequestId).map((row) => this.mapComment(row));
   }
   listCommentPage(pullRequestId, resolved, limit, offset) {
@@ -20061,7 +20162,7 @@ var RvwDatabase = class {
         ).run(idempotencyKeyHash, idempotencyRequestHash2, id, now);
       }
       this.database.prepare("UPDATE comments SET updated_at = ? WHERE id = ?").run(now, commentId);
-      if (incrementSequence) this.incrementChangeSequence();
+      if (incrementSequence) this.incrementDomainRevisions(["comments"]);
       result = {
         id,
         commentId,
@@ -20096,7 +20197,7 @@ var RvwDatabase = class {
       this.database.prepare("DELETE FROM comment_post_references WHERE post_id = ?").run(postId);
       this.insertCodeReferences("comment-post", postId, references);
       this.database.prepare("UPDATE comments SET updated_at = ? WHERE id = ?").run(now, commentId);
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(["comments"]);
     });
     const post = this.getCommentPost(postId);
     if (!post) {
@@ -20128,7 +20229,7 @@ var RvwDatabase = class {
     this.immediateTransaction(() => {
       this.database.prepare("DELETE FROM comment_posts WHERE id = ? AND comment_id = ?").run(postId, commentId);
       this.database.prepare("UPDATE comments SET updated_at = ? WHERE id = ?").run(now, commentId);
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(["comments"]);
     });
     return { commentId, postId };
   }
@@ -20138,7 +20239,7 @@ var RvwDatabase = class {
       const result = this.database.prepare("UPDATE comments SET resolved_at = ?, updated_at = ? WHERE id = ?").run(resolved ? now : null, now, commentId);
       if (Number(result.changes) === 0)
         throw new RvwError("COMMENT_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
-      if (incrementSequence) this.incrementChangeSequence();
+      if (incrementSequence) this.incrementDomainRevisions(["comments"]);
     };
     if (incrementSequence) this.immediateTransaction(write);
     else write();
@@ -20153,14 +20254,18 @@ var RvwDatabase = class {
     }
     this.immediateTransaction(() => {
       this.database.prepare("DELETE FROM comments WHERE id = ?").run(commentId);
-      this.incrementChangeSequence();
+      this.incrementDomainRevisions(["comments"]);
     });
     return { id: comment3.id, ref: comment3.ref };
   }
   applyCommentUpdates(updates, relatedCommitOid) {
+    let changed = false;
     for (const update of updates) {
+      const current = this.getComment(update.commentId);
+      if (!current) throw new RvwError("COMMENT_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
       if (update.reply.trim().length > 0) {
-        this.insertReply(
+        const existingPostIds = new Set(current.posts.map(({ id }) => id));
+        const reply = this.insertReply(
           update.commentId,
           {
             body: update.reply,
@@ -20173,11 +20278,14 @@ var RvwDatabase = class {
           },
           false
         );
-      } else if (!this.getComment(update.commentId)) {
-        throw new RvwError("COMMENT_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
+        if (!existingPostIds.has(reply.id)) changed = true;
+      }
+      if (update.resolve && current.resolvedAt === null) {
+        this.setCommentResolved(update.commentId, true, false);
+        changed = true;
       }
-      if (update.resolve) this.setCommentResolved(update.commentId, true, false);
     }
+    return changed;
   }
 };
 
@@ -20187,12 +20295,13 @@ import path5 from "node:path";
 import { TextDecoder as TextDecoder2 } from "node:util";
 
 // src/shared/constants.ts
-var APP_VERSION = "0.4.0";
+var APP_VERSION = "0.4.2";
 var PROTOCOL_VERSION = 4;
 var VIEWER_ID_HEADER = "x-rvw-viewer-id";
 var VIEWER_OPEN_LEASE_HEADER = "x-rvw-viewer-open-lease";
 var VIEWER_OPEN_LEASE_QUERY = "viewerLease";
 var GIT_OBJECT_ID_PATTERN = /^[0-9a-f]{40,64}$/i;
+var CONTENT_FINGERPRINT_PATTERN = /^[0-9a-f]{64}$/;
 var MAX_TEXT_DOCUMENT_BYTES = 1024 * 1024;
 var MAX_MARKDOWN_ASSET_BYTES = 5 * 1024 * 1024;
 var MAX_GITHUB_ATTACHMENT_BYTES = 10 * 1024 * 1024;
@@ -28386,6 +28495,9 @@ ${normalizeLf(body3)}`;
 function hashDocument(value) {
   return createHash2("sha256").update(normalizeLf(value), "utf8").digest("hex");
 }
+function pullRequestContentFingerprint(title, body3) {
+  return hashDocument(buildPullRequestMarkdown(title, body3));
+}
 function selectedLineText(value, startLine, endLine) {
   const lines2 = normalizeLf(value).split("\n");
   if (startLine < 1 || endLine < startLine || endLine > lines2.length) return null;
@@ -28477,6 +28589,34 @@ function structureSourceAnchor(structure, locator) {
   const edge = structure.edges.find((candidate) => candidate.id === locator.edgeId);
   return edge?.anchors[locator.anchorIndex] ?? null;
 }
+function compareStableIds(left, right) {
+  if (left === right) return 0;
+  return left < right ? -1 : 1;
+}
+function closestMatchingStructureNode(structure, matchingNodeIds) {
+  if (matchingNodeIds.size === 0) return null;
+  const distances = /* @__PURE__ */ new Map([[structure.originNodeId, 0]]);
+  const neighbors = new Map(structure.nodes.map((node2) => [node2.id, /* @__PURE__ */ new Set()]));
+  for (const edge of structure.edges) {
+    neighbors.get(edge.from)?.add(edge.to);
+    neighbors.get(edge.to)?.add(edge.from);
+  }
+  const queue = [structure.originNodeId];
+  for (let index2 = 0; index2 < queue.length; index2 += 1) {
+    const nodeId = queue[index2];
+    const distance = distances.get(nodeId);
+    for (const neighbor of neighbors.get(nodeId) ?? []) {
+      if (distances.has(neighbor)) continue;
+      distances.set(neighbor, distance + 1);
+      queue.push(neighbor);
+    }
+  }
+  return structure.nodes.filter((node2) => matchingNodeIds.has(node2.id)).sort((left, right) => {
+    const leftDistance = distances.get(left.id) ?? Number.POSITIVE_INFINITY;
+    const rightDistance = distances.get(right.id) ?? Number.POSITIVE_INFINITY;
+    return leftDistance - rightDistance || compareStableIds(left.id, right.id);
+  })[0] ?? null;
+}
 
 // src/domain/source-excerpt.ts
 var SOURCE_EXCERPT_CONTEXT_LINES = 20;
@@ -41445,6 +41585,18 @@ function assertLinePair(startLine, endLine) {
 }
 var codeReferenceIdPattern = /^[A-Za-z][A-Za-z0-9_-]{0,63}$/;
 var walkthroughDiagramNodePattern = /^[A-Za-z][A-Za-z0-9_-]{0,63}$/;
+function structureSummary(structure) {
+  return {
+    id: structure.id,
+    ref: structure.ref,
+    pullRequestId: structure.pullRequestId,
+    sourceOid: structure.sourceOid,
+    title: structure.title,
+    scope: structure.scope,
+    createdAt: structure.createdAt,
+    updatedAt: structure.updatedAt
+  };
+}
 var mermaidIdentifierPattern = /[A-Za-z][A-Za-z0-9_-]{0,63}/g;
 var mermaidEdgePattern = /[<|o*x]*[-.=~]{2,}[|o*x>]*/g;
 var mermaidClassShorthandPattern = /:::[A-Za-z][A-Za-z0-9_-]*(?:,[A-Za-z][A-Za-z0-9_-]*)*/g;
@@ -41666,6 +41818,20 @@ function assertCodeReferencePath(filePath) {
     throw new RvwError("INVALID_INPUT", `code reference\u306Epath\u304C\u4E0D\u6B63\u3067\u3059: ${filePath}`);
   }
 }
+async function mapWithConcurrency(values, concurrency, mapper) {
+  const results = new Array(values.length);
+  let nextIndex = 0;
+  const worker = async () => {
+    while (nextIndex < values.length) {
+      const index2 = nextIndex++;
+      results[index2] = await mapper(values[index2], index2);
+    }
+  };
+  await Promise.all(
+    Array.from({ length: Math.min(concurrency, values.length) }, async () => await worker())
+  );
+  return results;
+}
 var RvwService = class {
   constructor(database, git, github) {
     this.database = database;
@@ -42053,7 +42219,10 @@ var RvwService = class {
     });
   }
   async getPullRequestView(id) {
-    const pullRequest = this.getPullRequest(id);
+    const { pullRequest, revisionSnapshot } = this.database.getPullRequestRevisionSnapshot(id);
+    if (!pullRequest) {
+      throw new RvwError("PR_NOT_FOUND", "Pull Request\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002", { status: 404 });
+    }
     const commits = await this.git.commits(
       pullRequest.localRepositoryPath,
       pullRequest.latestComparisonBaseOid,
@@ -42061,11 +42230,30 @@ var RvwService = class {
     );
     return {
       pullRequest,
+      pullRequestContentFingerprint: pullRequestContentFingerprint(
+        pullRequest.latestTitle,
+        pullRequest.latestBody
+      ),
       comparisonBaseOid: pullRequest.latestComparisonBaseOid,
       headOid: pullRequest.latestHeadOid,
-      commits
+      commits,
+      ...revisionSnapshot
     };
   }
+  assertPullRequestContentFingerprint(pullRequest, expectedFingerprint) {
+    const actualFingerprint = pullRequestContentFingerprint(
+      pullRequest.latestTitle,
+      pullRequest.latestBody
+    );
+    if (expectedFingerprint !== void 0 && expectedFingerprint !== actualFingerprint) {
+      throw new RvwError("STALE_CONTENT", "Pull Request\u672C\u6587\u304C\u66F4\u65B0\u3055\u308C\u3066\u3044\u307E\u3059\u3002", {
+        status: 409,
+        details: { expectedFingerprint, actualFingerprint },
+        suggestions: ["\u6700\u65B0\u306EPull Request\u672C\u6587\u3092\u518D\u53D6\u5F97\u3057\u3066\u304F\u3060\u3055\u3044\u3002"]
+      });
+    }
+    return actualFingerprint;
+  }
   async assertCommitAvailable(pullRequest, oid) {
     if (!GIT_OBJECT_ID_PATTERN.test(oid) || !await this.git.hasObject(pullRequest.localRepositoryPath, oid)) {
       throw new RvwError("COMMIT_NOT_FOUND", `Git commit\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${oid}`, { status: 404 });
@@ -42122,6 +42310,26 @@ var RvwService = class {
     );
     return { ref, ...content3 };
   }
+  async getDocumentWithContentFingerprint(ref, expectedFingerprint) {
+    if (ref.kind !== "pull-request-markdown") {
+      return { document: await this.getDocument(ref), pullRequestContentFingerprint: null };
+    }
+    const pullRequest = this.getPullRequest(ref.pullRequestId);
+    const fingerprint = this.assertPullRequestContentFingerprint(pullRequest, expectedFingerprint);
+    const text5 = buildPullRequestMarkdown(pullRequest.latestTitle, pullRequest.latestBody);
+    return {
+      document: {
+        ref,
+        availability: "available",
+        text: text5,
+        byteLength: Buffer.byteLength(text5, "utf8"),
+        entryKind: "virtual",
+        normalizedLineEndings: false,
+        oid: null
+      },
+      pullRequestContentFingerprint: fingerprint
+    };
+  }
   async getRepositoryAsset(pullRequestId, sourceOid, filePath) {
     const pullRequest = this.getPullRequest(pullRequestId);
     await this.assertCommitAvailable(pullRequest, sourceOid);
@@ -42149,7 +42357,7 @@ var RvwService = class {
     ]);
     return { ref, old, new: next2 };
   }
-  async search(pullRequestId, oid, query, options) {
+  async search(pullRequestId, oid, query, options, expectedPullRequestContentFingerprint) {
     const queryBytes = Buffer.byteLength(query, "utf8");
     if (queryBytes === 0 || queryBytes > MAX_SEARCH_QUERY_BYTES || query.includes("\n") || query.includes("\r")) {
       throw new RvwError(
@@ -42158,6 +42366,10 @@ var RvwService = class {
       );
     }
     const pullRequest = this.getPullRequest(pullRequestId);
+    const contentFingerprint = this.assertPullRequestContentFingerprint(
+      pullRequest,
+      expectedPullRequestContentFingerprint
+    );
     await this.assertCommitAvailable(pullRequest, oid);
     const prMarkdown = buildPullRequestMarkdown(pullRequest.latestTitle, pullRequest.latestBody);
     const results = [];
@@ -42183,6 +42395,7 @@ var RvwService = class {
       });
     }
     return {
+      pullRequestContentFingerprint: contentFingerprint,
       results,
       matchCount: results.reduce((count, result) => count + result.matches.length, 0),
       truncated: gitResult.truncated || results.length >= MAX_SEARCH_RESULTS && (gitResult.results.length > 0 || prMarkdown.split("\n").some((line) => findFixedStringMatches(line, query, options).length > 0)),
@@ -42509,6 +42722,85 @@ var RvwService = class {
     this.getPullRequest(pullRequestId);
     return this.database.listStructures(pullRequestId);
   }
+  async listFileStructureReferences(pullRequestId, targetSourceOid, targetPath) {
+    assertCodeReferencePath(targetPath);
+    const index2 = await this.listFileStructureReferenceIndex(pullRequestId, targetSourceOid);
+    return index2.entries.find(({ path: candidate }) => candidate === targetPath)?.references ?? [];
+  }
+  async listFileStructureReferenceIndex(pullRequestId, targetSourceOid) {
+    const pullRequest = this.getPullRequest(pullRequestId);
+    const structures = this.database.listStructures(pullRequestId).flatMap((summary) => {
+      const structure = this.database.getStructure(summary.id);
+      return structure?.pullRequestId === pullRequestId ? [structure] : [];
+    });
+    if (structures.length === 0) return { sourceOid: targetSourceOid, entries: [] };
+    await this.assertCommitAvailable(pullRequest, targetSourceOid);
+    const treePaths = (await this.git.tree(pullRequest.localRepositoryPath, targetSourceOid)).map(
+      (entry) => entry.path
+    );
+    const targetPaths = new Set(treePaths);
+    const successorIndexes = /* @__PURE__ */ new Map();
+    const successorIndex = (sourceOid) => {
+      const key2 = JSON.stringify([sourceOid, targetSourceOid]);
+      const cached2 = successorIndexes.get(key2);
+      if (cached2) return cached2;
+      const index2 = this.git.changedFilesWithCopies(pullRequest.localRepositoryPath, sourceOid, targetSourceOid).then((changes) => {
+        const successors = /* @__PURE__ */ new Map();
+        for (const candidate of changes) {
+          if (!candidate.status.startsWith("R") && !candidate.status.startsWith("C") || candidate.oldPath === null || candidate.newPath === null) {
+            continue;
+          }
+          const paths = successors.get(candidate.oldPath) ?? /* @__PURE__ */ new Set();
+          paths.add(candidate.newPath);
+          successors.set(candidate.oldPath, paths);
+        }
+        return successors;
+      });
+      successorIndexes.set(key2, index2);
+      return index2;
+    };
+    const resolvePath = (sourceOid, sourcePath) => {
+      if (targetPaths.has(sourcePath)) return Promise.resolve(sourcePath);
+      if (sourceOid === targetSourceOid) return Promise.resolve(null);
+      return successorIndex(sourceOid).then((index2) => {
+        const successors = index2.get(sourcePath);
+        if (successors?.size !== 1) return null;
+        const successor = [...successors][0];
+        return targetPaths.has(successor) ? successor : null;
+      });
+    };
+    const referencesByPath = /* @__PURE__ */ new Map();
+    for (const structure of structures) {
+      const matchingNodeIdsByPath = /* @__PURE__ */ new Map();
+      for (const node2 of structure.nodes) {
+        if (!node2.anchor) continue;
+        const resolvedPath = await resolvePath(structure.sourceOid, node2.anchor.path);
+        if (!resolvedPath) continue;
+        const nodeIds = matchingNodeIdsByPath.get(resolvedPath) ?? /* @__PURE__ */ new Set();
+        nodeIds.add(node2.id);
+        matchingNodeIdsByPath.set(resolvedPath, nodeIds);
+      }
+      for (const [resolvedPath, matchingNodeIds] of matchingNodeIdsByPath) {
+        const targetNode = closestMatchingStructureNode(structure, matchingNodeIds);
+        if (!targetNode) continue;
+        const references = referencesByPath.get(resolvedPath) ?? [];
+        references.push({
+          structure: structureSummary(structure),
+          targetNodeId: targetNode.id,
+          targetNodeLabel: targetNode.label,
+          matchingNodeCount: matchingNodeIds.size
+        });
+        referencesByPath.set(resolvedPath, references);
+      }
+    }
+    return {
+      sourceOid: targetSourceOid,
+      entries: treePaths.flatMap((path11) => {
+        const references = referencesByPath.get(path11);
+        return references ? [{ path: path11, references }] : [];
+      })
+    };
+  }
   listStructuresByReference(reference) {
     const pullRequest = this.resolveStoredPullRequest(reference);
     return { pullRequest, structures: this.database.listStructures(pullRequest.id) };
@@ -42867,38 +43159,15 @@ var RvwService = class {
       path: reference.path
     });
     const latestHeadOid = pullRequest.latestHeadOid;
-    let latestPath = reference.path;
-    let latestDocument;
-    if (sourceOid === latestHeadOid) {
-      latestDocument = sourceDocument;
-    } else {
-      latestDocument = await this.getDocument({
-        kind: "repository-file",
-        pullRequestId: pullRequest.id,
-        sourceOid: latestHeadOid,
-        path: reference.path
-      });
-      if (latestDocument.availability === "missing") {
-        const successorPaths = [
-          ...new Set(
-            (await this.git.changedFilesWithCopies(
-              pullRequest.localRepositoryPath,
-              sourceOid,
-              latestHeadOid
-            )).filter(
-              (candidate) => (candidate.status.startsWith("R") || candidate.status.startsWith("C")) && candidate.oldPath === reference.path && candidate.newPath !== null
-            ).map((candidate) => candidate.newPath)
-          )
-        ];
-        latestPath = successorPaths.length === 1 ? successorPaths[0] : null;
-        latestDocument = latestPath === null ? null : await this.getDocument({
-          kind: "repository-file",
-          pullRequestId: pullRequest.id,
-          sourceOid: latestHeadOid,
-          path: latestPath
-        });
-      }
-    }
+    const resolvedLatestFile = await this.resolveSourceFileAtCommit(
+      pullRequest,
+      sourceOid,
+      reference.path,
+      latestHeadOid,
+      sourceDocument
+    );
+    const latestPath = resolvedLatestFile?.path ?? null;
+    const latestDocument = resolvedLatestFile?.document ?? null;
     const latestFileExists = latestDocument !== null && latestDocument.availability !== "missing";
     const latestFileDisplayable = latestDocument?.availability === "available";
     const mappedRange = reference.startLine === null || reference.endLine === null ? latestFileDisplayable ? null : void 0 : sourceDocument.availability === "available" && latestDocument?.availability === "available" ? mapUnchangedLineRange(
@@ -42955,6 +43224,38 @@ var RvwService = class {
       document: sourceDocument
     };
   }
+  async resolveSourceFileAtCommit(pullRequest, sourceOid, sourcePath, targetSourceOid, sourceDocument) {
+    const directDocument = sourceOid === targetSourceOid ? sourceDocument : await this.getDocument({
+      kind: "repository-file",
+      pullRequestId: pullRequest.id,
+      sourceOid: targetSourceOid,
+      path: sourcePath
+    });
+    if (directDocument.availability !== "missing") {
+      return { path: sourcePath, document: directDocument };
+    }
+    if (sourceOid === targetSourceOid) return null;
+    const successorPaths = [
+      ...new Set(
+        (await this.git.changedFilesWithCopies(
+          pullRequest.localRepositoryPath,
+          sourceOid,
+          targetSourceOid
+        )).filter(
+          (candidate) => (candidate.status.startsWith("R") || candidate.status.startsWith("C")) && candidate.oldPath === sourcePath && candidate.newPath !== null
+        ).map((candidate) => candidate.newPath)
+      )
+    ];
+    if (successorPaths.length !== 1) return null;
+    const successorPath = successorPaths[0];
+    const successorDocument = await this.getDocument({
+      kind: "repository-file",
+      pullRequestId: pullRequest.id,
+      sourceOid: targetSourceOid,
+      path: successorPath
+    });
+    return successorDocument.availability === "missing" ? null : { path: successorPath, document: successorDocument };
+  }
   getWalkthroughByUri(uri) {
     const walkthrough = this.database.getWalkthrough(parseWalkthroughUri(uri));
     if (!walkthrough) {
@@ -43204,40 +43505,54 @@ var RvwService = class {
     }
     return { ...placeMutableDocumentComment(comment3.target, walkthrough.body), path: null };
   }
-  async resolveRepositoryCommentPath(pullRequest, source, destinationOid) {
+  async resolveRepositoryCommentPath(pullRequest, source, destinationOid, context) {
     if (source.sourceOid === destinationOid) {
       return { path: source.path, deleted: false };
     }
-    const changes = await this.git.changedFiles(
-      pullRequest.localRepositoryPath,
-      source.sourceOid,
-      destinationOid
-    );
+    const key2 = JSON.stringify([source.sourceOid, destinationOid]);
+    let changesPromise = context.changedFiles.get(key2);
+    if (!changesPromise) {
+      changesPromise = this.git.changedFiles(
+        pullRequest.localRepositoryPath,
+        source.sourceOid,
+        destinationOid
+      );
+      context.changedFiles.set(key2, changesPromise);
+    }
+    const changes = await changesPromise;
     const change = changes.find((candidate) => candidate.oldPath === source.path);
     if (change?.kind === "deleted" || change && change.newPath === null) {
       return { path: source.path, deleted: true };
     }
     return { path: change?.newPath ?? source.path, deleted: false };
   }
-  async placeRepositoryCommentAtPath(pullRequest, source, destinationOid, destinationPath) {
-    const destinationContent = await this.getDocument({
-      kind: "repository-file",
-      pullRequestId: pullRequest.id,
-      sourceOid: destinationOid,
-      path: destinationPath
-    });
+  async placeRepositoryCommentAtPath(pullRequest, source, destinationOid, destinationPath, context) {
+    const destinationContent = await this.getPlacementDocument(
+      pullRequest,
+      {
+        kind: "repository-file",
+        pullRequestId: pullRequest.id,
+        sourceOid: destinationOid,
+        path: destinationPath
+      },
+      context
+    );
     if (source.startLine === null || source.endLine === null) {
       return destinationContent.availability === "missing" ? { outdated: true, range: null, path: destinationPath } : { outdated: false, range: null, path: destinationPath };
     }
     if (destinationContent.availability !== "available") {
       return { outdated: true, range: null, path: destinationPath };
     }
-    const sourceContent = await this.getDocument({
-      kind: "repository-file",
-      pullRequestId: pullRequest.id,
-      sourceOid: source.sourceOid,
-      path: source.path
-    });
+    const sourceContent = await this.getPlacementDocument(
+      pullRequest,
+      {
+        kind: "repository-file",
+        pullRequestId: pullRequest.id,
+        sourceOid: source.sourceOid,
+        path: source.path
+      },
+      context
+    );
     if (sourceContent.availability !== "available") {
       return { outdated: true, range: null, path: destinationPath };
     }
@@ -43250,55 +43565,171 @@ var RvwService = class {
     return range ? { outdated: false, range, path: destinationPath } : { outdated: true, range: null, path: destinationPath };
   }
   async placeComment(comment3, destination) {
-    if (comment3.pullRequestId !== destination.pullRequestId) {
+    const pullRequest = this.getPullRequest(comment3.pullRequestId);
+    return await this.placeCommentForDestination(
+      comment3,
+      pullRequest,
+      { kind: "document", ref: destination },
+      this.createCommentPlacementRequestContext()
+    );
+  }
+  createCommentPlacementRequestContext() {
+    return {
+      commitAvailability: /* @__PURE__ */ new Map(),
+      changedFiles: /* @__PURE__ */ new Map(),
+      documents: /* @__PURE__ */ new Map()
+    };
+  }
+  async assertPlacementCommitAvailable(pullRequest, oid, context) {
+    let available = context.commitAvailability.get(oid);
+    if (!available) {
+      available = this.assertCommitAvailable(pullRequest, oid);
+      context.commitAvailability.set(oid, available);
+    }
+    await available;
+  }
+  async getPlacementDocument(pullRequest, ref, context) {
+    const key2 = JSON.stringify(ref);
+    let document3 = context.documents.get(key2);
+    if (!document3) {
+      document3 = (async () => {
+        if (ref.kind === "pull-request-markdown") {
+          const text5 = buildPullRequestMarkdown(pullRequest.latestTitle, pullRequest.latestBody);
+          return {
+            ref,
+            availability: "available",
+            text: text5,
+            byteLength: Buffer.byteLength(text5, "utf8"),
+            entryKind: "virtual",
+            normalizedLineEndings: false,
+            oid: null
+          };
+        }
+        await this.assertPlacementCommitAvailable(pullRequest, ref.sourceOid, context);
+        const content3 = await this.git.readDocument(
+          pullRequest.localRepositoryPath,
+          ref.sourceOid,
+          ref.path
+        );
+        return { ref, ...content3 };
+      })();
+      context.documents.set(key2, document3);
+    }
+    return await document3;
+  }
+  async placeCommentForDestination(comment3, pullRequest, destination, context) {
+    if (destination.kind === "walkthrough") {
+      return this.placeWalkthroughComment(comment3, destination.walkthroughId);
+    }
+    if (destination.kind === "commit") {
+      await this.assertPlacementCommitAvailable(pullRequest, destination.oid, context);
+    }
+    const documentDestination = destination.kind === "document" ? destination.ref : null;
+    const destinationOid = destination.kind === "commit" ? destination.oid : documentDestination?.kind === "repository-file" ? documentDestination.sourceOid : null;
+    if (documentDestination !== null && comment3.pullRequestId !== documentDestination.pullRequestId) {
       return { outdated: true, range: null, path: null };
     }
     if (comment3.target.kind === "pull-request") return { outdated: false, range: null, path: null };
     if (comment3.target.kind === "walkthrough") {
       return this.placeWalkthroughComment(comment3);
     }
-    const pullRequest = this.getPullRequest(comment3.pullRequestId);
     if (comment3.target.documentKind === "pull-request-markdown") {
-      return destination.kind === "pull-request-markdown" ? this.placePullRequestMarkdownComment(comment3, pullRequest) : { outdated: true, range: null, path: null };
+      return destination.kind === "commit" || documentDestination?.kind === "pull-request-markdown" ? this.placePullRequestMarkdownComment(comment3, pullRequest) : { outdated: true, range: null, path: null };
     }
-    if (destination.kind !== "repository-file") return { outdated: true, range: null, path: null };
+    if (destinationOid === null) return { outdated: true, range: null, path: null };
     const source = comment3.target;
+    await this.assertPlacementCommitAvailable(pullRequest, source.sourceOid, context);
     const resolved = await this.resolveRepositoryCommentPath(
       pullRequest,
       source,
-      destination.sourceOid
+      destinationOid,
+      context
     );
     if (resolved.deleted) return { outdated: true, range: null, path: source.path };
-    if (resolved.path !== destination.path) {
+    if (documentDestination?.kind === "repository-file" && resolved.path !== documentDestination.path) {
       return { outdated: true, range: null, path: resolved.path };
     }
     return await this.placeRepositoryCommentAtPath(
       pullRequest,
       source,
-      destination.sourceOid,
-      resolved.path
+      destinationOid,
+      resolved.path,
+      context
     );
   }
   async placeCommentAtCommit(comment3, destinationOid) {
     const pullRequest = this.getPullRequest(comment3.pullRequestId);
-    await this.assertCommitAvailable(pullRequest, destinationOid);
-    if (comment3.target.kind === "pull-request") return { outdated: false, range: null, path: null };
-    if (comment3.target.kind === "walkthrough") {
-      return this.placeWalkthroughComment(comment3);
-    }
-    if (comment3.target.documentKind === "pull-request-markdown") {
-      return this.placePullRequestMarkdownComment(comment3, pullRequest);
-    }
-    const source = comment3.target;
-    const resolved = await this.resolveRepositoryCommentPath(pullRequest, source, destinationOid);
-    if (resolved.deleted) return { outdated: true, range: null, path: source.path };
-    return await this.placeRepositoryCommentAtPath(
+    return await this.placeCommentForDestination(
+      comment3,
       pullRequest,
-      source,
-      destinationOid,
-      resolved.path
+      { kind: "commit", oid: destinationOid },
+      this.createCommentPlacementRequestContext()
     );
   }
+  async resolveCommentPlacements(pullRequestId, commentIds, destinations, expectedPullRequestContentFingerprint) {
+    const pullRequest = this.getPullRequest(pullRequestId);
+    const contentFingerprint = this.assertPullRequestContentFingerprint(
+      pullRequest,
+      expectedPullRequestContentFingerprint
+    );
+    const uniqueCommentIds = [...new Set(commentIds)];
+    const comments = [];
+    const missingCommentIds = [];
+    for (const commentId of uniqueCommentIds) {
+      const comment3 = this.database.getComment(commentId);
+      if (!comment3) {
+        missingCommentIds.push(commentId);
+        continue;
+      }
+      if (comment3.pullRequestId !== pullRequestId) {
+        throw new RvwError(
+          "INVALID_INPUT",
+          `\u5225\u306EPull Request\u306E\u30B3\u30E1\u30F3\u30C8\u306F\u4E00\u62EC\u89E3\u6C7A\u3067\u304D\u307E\u305B\u3093: ${commentId}`
+        );
+      }
+      comments.push(comment3);
+    }
+    const context = this.createCommentPlacementRequestContext();
+    if (comments.length > 0) {
+      for (const destination of destinations) {
+        if (destination.kind === "commit") {
+          await this.assertPlacementCommitAvailable(pullRequest, destination.oid, context);
+        } else if (destination.kind === "document" && destination.ref.kind === "repository-file") {
+          await this.assertPlacementCommitAvailable(
+            pullRequest,
+            destination.ref.sourceOid,
+            context
+          );
+        }
+      }
+    }
+    return {
+      pullRequestContentFingerprint: contentFingerprint,
+      comments: await mapWithConcurrency(comments, 4, async (comment3) => {
+        const placements = [];
+        const failures = [];
+        for (const destination of destinations) {
+          try {
+            placements.push({
+              destination,
+              placement: await this.placeCommentForDestination(
+                comment3,
+                pullRequest,
+                destination,
+                context
+              )
+            });
+          } catch (error51) {
+            const placementError = asRvwError(error51);
+            if (placementError.code !== "COMMIT_NOT_FOUND") throw error51;
+            failures.push({ destination, error: placementError.toJSON() });
+          }
+        }
+        return { commentId: comment3.id, placements, failures };
+      }),
+      missingCommentIds
+    };
+  }
   async getResetPreview(pullRequestId) {
     const pullRequest = this.getPullRequest(pullRequestId);
     const refs = await this.git.listRefsByPrefix(
@@ -47596,9 +48027,30 @@ var editCommentPostSchema = external_exports.object({
   body: external_exports.string().min(1).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES),
   references: external_exports.array(codeReferenceInputSchema).optional()
 });
+var placementDocumentRefSchema = external_exports.discriminatedUnion("kind", [
+  external_exports.object({ kind: external_exports.literal("pull-request-markdown"), pullRequestId: external_exports.uuid() }),
+  external_exports.object({
+    kind: external_exports.literal("repository-file"),
+    pullRequestId: external_exports.uuid(),
+    sourceOid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN),
+    path: external_exports.string().min(1)
+  })
+]);
+var resolveCommentPlacementsSchema = external_exports.object({
+  commentIds: external_exports.array(external_exports.uuid()),
+  expectedPullRequestContentFingerprint: external_exports.string().regex(CONTENT_FINGERPRINT_PATTERN).optional(),
+  destinations: external_exports.array(
+    external_exports.union([
+      external_exports.object({ kind: external_exports.literal("document"), ref: placementDocumentRefSchema }),
+      external_exports.object({ kind: external_exports.literal("commit"), oid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN) }),
+      external_exports.object({ kind: external_exports.literal("walkthrough"), walkthroughId: external_exports.uuid() })
+    ])
+  ).min(1).max(4)
+});
 
 // src/server/app.ts
 var oidSchema = external_exports.string().regex(GIT_OBJECT_ID_PATTERN);
+var contentFingerprintSchema = external_exports.string().regex(CONTENT_FINGERPRINT_PATTERN);
 var nonnegativeIndexSchema = external_exports.coerce.number().int().nonnegative();
 var svgAssetContentSecurityPolicy = "default-src 'none'; style-src 'unsafe-inline'; base-uri 'none'; form-action 'none'; sandbox";
 function requiredQuery(value, name) {
@@ -47608,6 +48060,9 @@ function requiredQuery(value, name) {
 function oidQuery(value, name) {
   return oidSchema.parse(requiredQuery(value, name));
 }
+function optionalContentFingerprint(value) {
+  return value === void 0 ? void 0 : contentFingerprintSchema.parse(value);
+}
 function structureSourceLocator(query) {
   if (query.locatorKind === "node") {
     return { kind: "node", nodeId: requiredQuery(query.nodeId, "nodeId") };
@@ -47717,7 +48172,7 @@ function createApp(service, options) {
         rawViewerLease === void 0 ? void 0 : viewerIdSchema.parse(rawViewerLease)
       );
     }
-    return context.json({ ok: true, changeSequence: service.database.getChangeSequence() });
+    return context.json({ ok: true, ...service.database.getRevisionSnapshot() });
   });
   app.post("/api/meta/viewers/release", async (context) => {
     const input = viewerReleaseSchema.parse(await context.req.json());
@@ -47758,10 +48213,10 @@ function createApp(service, options) {
       ...await service.openPullRequest(input.reference, input.cwd)
     });
   });
-  app.post(
-    "/api/pull-requests/:id/refresh",
-    async (context) => context.json({ ok: true, ...await service.refreshPullRequest(context.req.param("id")) })
-  );
+  app.post("/api/pull-requests/:id/refresh", async (context) => {
+    const result = await service.refreshPullRequest(context.req.param("id"));
+    return context.json({ ok: true, ...result });
+  });
   app.post("/api/pull-requests/:id/reset", async (context) => {
     const input = resetSchema.parse(await context.req.json());
     if (!input.yes) {
@@ -47799,7 +48254,13 @@ function createApp(service, options) {
   });
   app.get("/api/pull-requests/:id/document", async (context) => {
     const ref = documentRefFromQuery(context.req.param("id"), context.req.query());
-    return context.json({ ok: true, document: await service.getDocument(ref) });
+    return context.json({
+      ok: true,
+      ...await service.getDocumentWithContentFingerprint(
+        ref,
+        optionalContentFingerprint(context.req.query("expectedPullRequestContentFingerprint"))
+      )
+    });
   });
   app.on(["GET", "HEAD"], "/api/pull-requests/:id/markdown-asset", async (context) => {
     const sourceOid = oidQuery(context.req.query("sourceOid"), "sourceOid");
@@ -47858,10 +48319,16 @@ function createApp(service, options) {
     const wholeWord = parseBooleanQuery(context.req.query("wholeWord"), "wholeWord");
     return context.json({
       ok: true,
-      ...await service.search(context.req.param("id"), oid, query, {
-        matchCase,
-        wholeWord
-      })
+      ...await service.search(
+        context.req.param("id"),
+        oid,
+        query,
+        {
+          matchCase,
+          wholeWord
+        },
+        optionalContentFingerprint(context.req.query("expectedPullRequestContentFingerprint"))
+      )
     });
   });
   app.get("/api/pull-requests/:id/comments", (context) => {
@@ -47916,6 +48383,25 @@ function createApp(service, options) {
       structures: service.listStructures(context.req.param("id"))
     })
   );
+  app.get("/api/pull-requests/:id/structure-references", async (context) => {
+    const sourceOid = oidQuery(context.req.query("sourceOid"), "sourceOid");
+    const filePath = requiredQuery(context.req.query("path"), "path");
+    return context.json({
+      ok: true,
+      references: await service.listFileStructureReferences(
+        context.req.param("id"),
+        sourceOid,
+        filePath
+      )
+    });
+  });
+  app.get("/api/pull-requests/:id/structure-reference-index", async (context) => {
+    const sourceOid = oidQuery(context.req.query("sourceOid"), "sourceOid");
+    return context.json({
+      ok: true,
+      index: await service.listFileStructureReferenceIndex(context.req.param("id"), sourceOid)
+    });
+  });
   app.get(
     "/api/pull-requests/:id/structures/:structureId",
     (context) => context.json({
@@ -47969,43 +48455,51 @@ function createApp(service, options) {
   });
   app.post("/api/comments/:id/posts", async (context) => {
     const input = replySchema.parse(await context.req.json());
+    const commentId = context.req.param("id");
+    const post = await service.replyToComment(commentId, {
+      body: input.body,
+      ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid },
+      ...input.authorLabel === void 0 ? {} : { authorLabel: input.authorLabel },
+      lastModifiedBy: "human",
+      ...input.references === void 0 ? {} : { references: input.references }
+    });
     return context.json(
       {
         ok: true,
-        post: await service.replyToComment(context.req.param("id"), {
-          body: input.body,
-          ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid },
-          ...input.authorLabel === void 0 ? {} : { authorLabel: input.authorLabel },
-          lastModifiedBy: "human",
-          ...input.references === void 0 ? {} : { references: input.references }
-        })
+        post,
+        comment: service.database.getComment(commentId)
       },
       201
     );
   });
   app.patch("/api/comments/:id/posts/:postId", async (context) => {
     const input = editCommentPostSchema.parse(await context.req.json());
+    const commentId = context.req.param("id");
+    const post = input.references === void 0 ? await service.updateCommentPost(
+      commentId,
+      context.req.param("postId"),
+      input.body,
+      "human"
+    ) : await service.editCommentPost(commentId, context.req.param("postId"), {
+      body: input.body,
+      references: input.references,
+      lastModifiedBy: "human"
+    });
     return context.json({
       ok: true,
-      post: input.references === void 0 ? await service.updateCommentPost(
-        context.req.param("id"),
-        context.req.param("postId"),
-        input.body,
-        "human"
-      ) : await service.editCommentPost(context.req.param("id"), context.req.param("postId"), {
-        body: input.body,
-        references: input.references,
-        lastModifiedBy: "human"
-      })
+      post,
+      comment: service.database.getComment(commentId)
     });
   });
-  app.delete(
-    "/api/comments/:id/posts/:postId",
-    (context) => context.json({
+  app.delete("/api/comments/:id/posts/:postId", (context) => {
+    const commentId = context.req.param("id");
+    const deleted = service.deleteReply(commentId, context.req.param("postId"));
+    return context.json({
       ok: true,
-      deleted: service.deleteReply(context.req.param("id"), context.req.param("postId"))
-    })
-  );
+      deleted,
+      comment: service.database.getComment(commentId)
+    });
+  });
   app.post(
     "/api/comments/:id/resolve",
     (context) => context.json({ ok: true, comment: service.setCommentResolved(context.req.param("id"), true) })
@@ -48018,6 +48512,18 @@ function createApp(service, options) {
     "/api/comments/:id",
     (context) => context.json({ ok: true, deleted: service.deleteComment(context.req.param("id")) })
   );
+  app.post("/api/pull-requests/:pullRequestId/comment-placements/resolve", async (context) => {
+    const input = resolveCommentPlacementsSchema.parse(await context.req.json());
+    return context.json({
+      ok: true,
+      ...await service.resolveCommentPlacements(
+        context.req.param("pullRequestId"),
+        input.commentIds,
+        input.destinations,
+        input.expectedPullRequestContentFingerprint
+      )
+    });
+  });
   app.get("/api/comments/:id/placement", async (context) => {
     const comment3 = service.database.getComment(context.req.param("id"));
     if (!comment3)
@@ -48029,22 +48535,21 @@ function createApp(service, options) {
         placement: { outdated: true, range: null, path: null }
       });
     }
+    let destination;
     if (context.req.query("kind") === "commit") {
       const oid = oidQuery(context.req.query("oid"), "oid");
-      return context.json({
-        ok: true,
-        placement: await service.placeCommentAtCommit(comment3, oid)
-      });
-    }
-    if (context.req.query("kind") === "walkthrough") {
+      destination = { kind: "commit", oid };
+    } else if (context.req.query("kind") === "walkthrough") {
       const walkthroughId = requiredQuery(context.req.query("walkthroughId"), "walkthroughId");
-      return context.json({
-        ok: true,
-        placement: service.placeWalkthroughComment(comment3, walkthroughId)
-      });
+      destination = { kind: "walkthrough", walkthroughId };
+    } else {
+      destination = {
+        kind: "document",
+        ref: documentRefFromQuery(pullRequestId, context.req.query())
+      };
     }
-    const destination = documentRefFromQuery(pullRequestId, context.req.query());
-    return context.json({ ok: true, placement: await service.placeComment(comment3, destination) });
+    const placement = destination.kind === "commit" ? await service.placeCommentAtCommit(comment3, destination.oid) : destination.kind === "walkthrough" ? service.placeWalkthroughComment(comment3, destination.walkthroughId) : await service.placeComment(comment3, destination.ref);
+    return context.json({ ok: true, placement });
   });
   if (options.staticDirectory && existsSync4(options.staticDirectory)) {
     app.use("*", serveStatic({ root: options.staticDirectory }));