@a9n-shoji/rvw 0.1.1 → 0.2.1

package/dist/cli.mjs

@@ -18512,7 +18512,7 @@ function date4(params) {
 config(en_default());
 
 // src/infrastructure/db/database.ts
-import { randomUUID } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import {
   chmodSync,
   closeSync,
@@ -18736,6 +18736,9 @@ function mapPullRequest(row) {
     repository: stringValue(row, "repository"),
     number: numberValue(row, "number"),
     url: stringValue(row, "github_url"),
+    latestAuthorLogin: nullableString(row, "latest_author_login"),
+    latestHeadRepositoryOwner: nullableString(row, "latest_head_repository_owner"),
+    latestHeadRepositoryName: nullableString(row, "latest_head_repository_name"),
     localRepositoryPath: stringValue(row, "local_repository_path"),
     gitCommonDir: stringValue(row, "git_common_dir"),
     latestTitle: stringValue(row, "latest_title"),
@@ -18751,6 +18754,32 @@ function mapPullRequest(row) {
     updatedAt: stringValue(row, "updated_at")
   };
 }
+function mapCodeReference(row) {
+  return {
+    id: stringValue(row, "reference_id"),
+    label: stringValue(row, "label"),
+    path: stringValue(row, "file_path"),
+    startLine: nullableNumber(row, "start_line"),
+    endLine: nullableNumber(row, "end_line"),
+    description: nullableString(row, "description")
+  };
+}
+function mapCommentPost(row, references = []) {
+  return {
+    id: stringValue(row, "id"),
+    commentId: stringValue(row, "comment_id"),
+    body: stringValue(row, "body"),
+    relatedCommitOid: nullableString(row, "related_commit_oid"),
+    references,
+    authorLabel: nullableString(row, "author_label"),
+    isRoot: numberValue(row, "is_root") === 1,
+    createdAt: stringValue(row, "created_at"),
+    updatedAt: stringValue(row, "updated_at")
+  };
+}
+function hashIdempotencyKey(value) {
+  return createHash("sha256").update(value, "utf8").digest("hex");
+}
 function findMigrationsDirectory(explicit) {
   if (explicit) return explicit;
   const moduleDirectory = path4.dirname(fileURLToPath2(import.meta.url));
@@ -18982,6 +19011,33 @@ var RvwDatabase = class {
     const row = this.database.prepare("SELECT value FROM app_meta WHERE key = 'change_sequence'").get();
     return Number(stringValue(row, "value"));
   }
+  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");
+    return stringValue(row, "value");
+  }
+  getLatestCommentPostEventSequence() {
+    const row = this.database.prepare("SELECT COALESCE(MAX(sequence), 0) AS sequence FROM comment_post_events").get();
+    return numberValue(row, "sequence");
+  }
+  listCommentPostEvents(afterSequence, limit) {
+    const rows = this.database.prepare(
+      `SELECT e.*, CASE WHEN p.id IS NULL THEN 1 ELSE 0 END AS deleted
+        FROM comment_post_events e
+        LEFT JOIN comment_posts p ON p.id = e.post_id
+        WHERE e.sequence > ?
+        ORDER BY e.sequence ASC
+        LIMIT ?`
+    ).all(afterSequence, limit);
+    return rows.map((row) => ({
+      sequence: numberValue(row, "sequence"),
+      createdAt: stringValue(row, "created_at"),
+      postId: stringValue(row, "post_id"),
+      commentRef: stringValue(row, "comment_ref"),
+      pullRequestUrl: stringValue(row, "pull_request_url"),
+      deleted: numberValue(row, "deleted") === 1
+    }));
+  }
   getThemePreference() {
     const row = this.database.prepare("SELECT value FROM app_meta WHERE key = 'theme_preference'").get();
     if (!row) {
@@ -19037,14 +19093,18 @@ var RvwDatabase = class {
       `INSERT INTO pull_requests(
           id, host, owner, repository, number, github_url,
           local_repository_path, git_common_dir,
+          latest_author_login, latest_head_repository_owner, latest_head_repository_name,
           latest_title, latest_body, latest_base_ref_name, latest_head_ref_name,
           latest_base_oid, latest_head_oid, github_updated_at, fetched_at,
           created_at, updated_at, latest_comparison_base_oid
-        ) VALUES (?, 'github.com', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        ) VALUES (?, 'github.com', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         ON CONFLICT(host, owner, repository, number) DO UPDATE SET
           github_url = excluded.github_url,
           local_repository_path = excluded.local_repository_path,
           git_common_dir = excluded.git_common_dir,
+          latest_author_login = excluded.latest_author_login,
+          latest_head_repository_owner = excluded.latest_head_repository_owner,
+          latest_head_repository_name = excluded.latest_head_repository_name,
           latest_title = excluded.latest_title,
           latest_body = excluded.latest_body,
           latest_base_ref_name = excluded.latest_base_ref_name,
@@ -19063,6 +19123,9 @@ var RvwDatabase = class {
       github.url,
       repository.localRepositoryPath,
       repository.gitCommonDir,
+      github.authorLogin,
+      github.headRepositoryOwner,
+      github.headRepositoryName,
       github.title,
       github.body,
       github.baseRefName,
@@ -19117,6 +19180,16 @@ var RvwDatabase = class {
     const posts = this.database.prepare(
       "SELECT count(*) AS count FROM comment_posts WHERE comment_id IN (SELECT id FROM comments WHERE pull_request_id = ?)"
     ).get(pullRequestId);
+    const commentReferences = this.database.prepare(
+      `SELECT count(*) AS count
+         FROM comment_post_references
+         WHERE post_id IN (
+           SELECT posts.id
+           FROM comment_posts AS posts
+           JOIN comments ON comments.id = posts.comment_id
+           WHERE comments.pull_request_id = ?
+         )`
+    ).get(pullRequestId);
     const targets = this.database.prepare(
       "SELECT count(*) AS count FROM comment_targets WHERE comment_id IN (SELECT id FROM comments WHERE pull_request_id = ?)"
     ).get(pullRequestId);
@@ -19127,6 +19200,7 @@ var RvwDatabase = class {
     return {
       comments: numberValue(comments, "count"),
       posts: numberValue(posts, "count"),
+      commentReferences: numberValue(commentReferences, "count"),
       targets: numberValue(targets, "count"),
       walkthroughs: numberValue(walkthroughs, "count"),
       walkthroughReferences: numberValue(walkthroughReferences, "count"),
@@ -19137,17 +19211,34 @@ var RvwDatabase = class {
     this.database.prepare("DELETE FROM comments WHERE pull_request_id = ?").run(pullRequestId);
     this.database.prepare("DELETE FROM walkthroughs WHERE pull_request_id = ?").run(pullRequestId);
   }
-  listWalkthroughReferences(walkthroughId) {
-    return this.database.prepare(
-      "SELECT * FROM walkthrough_references WHERE walkthrough_id = ? ORDER BY sort_order ASC"
-    ).all(walkthroughId).map((row) => ({
-      id: stringValue(row, "reference_id"),
-      label: stringValue(row, "label"),
-      path: stringValue(row, "file_path"),
-      startLine: nullableNumber(row, "start_line"),
-      endLine: nullableNumber(row, "end_line"),
-      description: nullableString(row, "description")
-    }));
+  codeReferenceStorage(kind) {
+    return kind === "comment-post" ? { table: "comment_post_references", ownerColumn: "post_id" } : { table: "walkthrough_references", ownerColumn: "walkthrough_id" };
+  }
+  listCodeReferences(kind, ownerId) {
+    const { table, ownerColumn } = this.codeReferenceStorage(kind);
+    return this.database.prepare(`SELECT * FROM ${table} WHERE ${ownerColumn} = ? ORDER BY sort_order ASC`).all(ownerId).map(mapCodeReference);
+  }
+  insertCodeReferences(kind, ownerId, references) {
+    if (references.length === 0) return;
+    const { table, ownerColumn } = this.codeReferenceStorage(kind);
+    const insertReference = this.database.prepare(
+      `INSERT INTO ${table}(
+        ${ownerColumn}, reference_id, label, file_path, start_line, end_line,
+        description, sort_order
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
+    );
+    references.forEach((reference, index2) => {
+      insertReference.run(
+        ownerId,
+        reference.id,
+        reference.label,
+        reference.path,
+        reference.startLine,
+        reference.endLine,
+        reference.description,
+        index2
+      );
+    });
   }
   mapWalkthrough(row) {
     const id = stringValue(row, "id");
@@ -19160,7 +19251,7 @@ var RvwDatabase = class {
       body: stringValue(row, "body"),
       authorLabel: nullableString(row, "author_label"),
       diagramBindings: stringRecordValue(row, "diagram_bindings_json"),
-      references: this.listWalkthroughReferences(id),
+      references: this.listCodeReferences("walkthrough", id),
       createdAt: stringValue(row, "created_at")
     };
   }
@@ -19206,7 +19297,7 @@ var RvwDatabase = class {
         JSON.stringify(input.diagramBindings),
         now
       );
-      this.insertWalkthroughReferences(id, input.references);
+      this.insertCodeReferences("walkthrough", id, input.references);
       this.incrementChangeSequence();
     });
     const walkthrough = this.getWalkthrough(id);
@@ -19215,26 +19306,6 @@ var RvwDatabase = class {
     }
     return walkthrough;
   }
-  insertWalkthroughReferences(walkthroughId, references) {
-    const insertReference = this.database.prepare(
-      `INSERT INTO walkthrough_references(
-        walkthrough_id, reference_id, label, file_path, start_line, end_line,
-        description, sort_order
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
-    );
-    references.forEach((reference, index2) => {
-      insertReference.run(
-        walkthroughId,
-        reference.id,
-        reference.label,
-        reference.path,
-        reference.startLine,
-        reference.endLine,
-        reference.description,
-        index2
-      );
-    });
-  }
   updateWalkthrough(id, input) {
     this.immediateTransaction(() => {
       const result = this.database.prepare(
@@ -19253,7 +19324,7 @@ var RvwDatabase = class {
         throw new RvwError("NOT_FOUND", "Walkthrough\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002", { status: 404 });
       }
       this.database.prepare("DELETE FROM walkthrough_references WHERE walkthrough_id = ?").run(id);
-      this.insertWalkthroughReferences(id, input.references);
+      this.insertCodeReferences("walkthrough", id, input.references);
       this.incrementChangeSequence();
     });
     const walkthrough = this.getWalkthrough(id);
@@ -19303,14 +19374,30 @@ var RvwDatabase = class {
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const id = randomUUID();
     const postId = randomUUID();
+    const pullRequest = this.getPullRequest(input.pullRequestId);
+    if (!pullRequest) throw new RvwError("PR_NOT_FOUND", "Pull Request\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
     this.immediateTransaction(() => {
       this.database.prepare(
         "INSERT INTO comments(id, pull_request_id, created_head_oid, resolved_at, created_at, updated_at) VALUES (?, ?, ?, NULL, ?, ?)"
       ).run(id, input.pullRequestId, input.createdHeadOid, now, now);
       this.insertCommentTarget(id, input.target);
       this.database.prepare(
-        "INSERT INTO comment_posts(id, comment_id, body, related_commit_oid, author_label, is_root, created_at, updated_at) VALUES (?, ?, ?, NULL, ?, 1, ?, ?)"
-      ).run(postId, id, input.body, input.authorLabel ?? null, now, now);
+        "INSERT INTO comment_posts(id, comment_id, body, related_commit_oid, author_label, is_root, created_at, updated_at) VALUES (?, ?, ?, ?, ?, 1, ?, ?)"
+      ).run(
+        postId,
+        id,
+        input.body,
+        input.relatedCommitOid ?? null,
+        input.authorLabel ?? null,
+        now,
+        now
+      );
+      this.insertCodeReferences("comment-post", postId, input.references ?? []);
+      this.database.prepare(
+        `INSERT INTO comment_post_events(
+            post_id, comment_ref, pull_request_url, created_at
+          ) VALUES (?, ?, ?, ?)`
+      ).run(postId, formatCommentUri(id), pullRequest.url, now);
       this.incrementChangeSequence();
     });
     const comment = this.getComment(id);
@@ -19461,6 +19548,7 @@ var RvwDatabase = class {
           commentId: comment.id,
           body: stringValue(row, "root_body"),
           relatedCommitOid: nullableString(row, "root_related_commit_oid"),
+          references: [],
           authorLabel: nullableString(row, "root_author_label"),
           isRoot: true,
           createdAt: stringValue(row, "root_created_at"),
@@ -19474,65 +19562,116 @@ var RvwDatabase = class {
   listCommentPosts(commentId) {
     return this.database.prepare(
       "SELECT * FROM comment_posts WHERE comment_id = ? ORDER BY is_root DESC, created_at ASC, id ASC"
-    ).all(commentId).map((row) => ({
-      id: stringValue(row, "id"),
-      commentId: stringValue(row, "comment_id"),
-      body: stringValue(row, "body"),
-      relatedCommitOid: nullableString(row, "related_commit_oid"),
-      authorLabel: nullableString(row, "author_label"),
-      isRoot: numberValue(row, "is_root") === 1,
-      createdAt: stringValue(row, "created_at"),
-      updatedAt: stringValue(row, "updated_at")
-    }));
+    ).all(commentId).map((row) => {
+      const postId = stringValue(row, "id");
+      return mapCommentPost(row, this.listCodeReferences("comment-post", postId));
+    });
+  }
+  getCommentPost(postId) {
+    const row = this.database.prepare("SELECT * FROM comment_posts WHERE id = ?").get(postId);
+    return row ? mapCommentPost(row, this.listCodeReferences("comment-post", postId)) : null;
   }
   insertReply(commentId, input, incrementSequence = true) {
-    if (!this.getComment(commentId))
-      throw new RvwError("COMMENT_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
-    const id = randomUUID();
-    const now = (/* @__PURE__ */ new Date()).toISOString();
+    let result;
     const write = () => {
+      const comment = this.getComment(commentId);
+      if (!comment) {
+        throw new RvwError("COMMENT_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
+      }
+      const pullRequest = this.getPullRequest(comment.pullRequestId);
+      if (!pullRequest) throw new RvwError("PR_NOT_FOUND", "Pull Request\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
+      const relatedCommitOid = input.relatedCommitOid ?? null;
+      const authorLabel = input.authorLabel ?? null;
+      const idempotencyKeyHash = input.idempotencyKey === void 0 ? null : hashIdempotencyKey(input.idempotencyKey);
+      const idempotencyRequestHash2 = idempotencyKeyHash === null ? null : input.idempotencyRequestHash ?? hashIdempotencyKey(
+        JSON.stringify({
+          operation: "comment.reply",
+          commentId,
+          body: input.body,
+          relatedCommitOid,
+          authorLabel,
+          references: input.references ?? []
+        })
+      );
+      if (idempotencyKeyHash !== null) {
+        const existingRow = this.database.prepare("SELECT * FROM comment_reply_idempotency WHERE key_hash = ?").get(idempotencyKeyHash);
+        if (existingRow) {
+          if (stringValue(existingRow, "request_hash") !== idempotencyRequestHash2) {
+            throw new RvwError(
+              "IDEMPOTENCY_CONFLICT",
+              "\u540C\u3058idempotencyKey\u304C\u5225\u306Ecomment reply\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002"
+            );
+          }
+          const postId = stringValue(existingRow, "post_id");
+          const existing = this.getCommentPost(postId);
+          if (!existing) {
+            throw new RvwError(
+              "IDEMPOTENCY_RESULT_DELETED",
+              "\u3053\u306EidempotencyKey\u3067\u4F5C\u6210\u3057\u305Fcomment reply\u306F\u65E2\u306B\u524A\u9664\u3055\u308C\u3066\u3044\u307E\u3059\u3002",
+              { details: { postId } }
+            );
+          }
+          result = existing;
+          return;
+        }
+      }
+      const id = randomUUID();
+      const now = (/* @__PURE__ */ new Date()).toISOString();
       this.database.prepare(
         "INSERT INTO comment_posts(id, comment_id, body, related_commit_oid, author_label, is_root, created_at, updated_at) VALUES (?, ?, ?, ?, ?, 0, ?, ?)"
-      ).run(
-        id,
-        commentId,
-        input.body,
-        input.relatedCommitOid ?? null,
-        input.authorLabel ?? null,
-        now,
-        now
-      );
+      ).run(id, commentId, input.body, relatedCommitOid, authorLabel, now, now);
+      this.insertCodeReferences("comment-post", id, input.references ?? []);
+      this.database.prepare(
+        `INSERT INTO comment_post_events(
+            post_id, comment_ref, pull_request_url, created_at
+          ) VALUES (?, ?, ?, ?)`
+      ).run(id, comment.ref, pullRequest.url, now);
+      if (idempotencyKeyHash !== null && idempotencyRequestHash2 !== null) {
+        this.database.prepare(
+          "INSERT INTO comment_reply_idempotency(key_hash, request_hash, post_id, created_at) VALUES (?, ?, ?, ?)"
+        ).run(idempotencyKeyHash, idempotencyRequestHash2, id, now);
+      }
       this.database.prepare("UPDATE comments SET updated_at = ? WHERE id = ?").run(now, commentId);
       if (incrementSequence) this.incrementChangeSequence();
+      result = {
+        id,
+        commentId,
+        body: input.body,
+        relatedCommitOid,
+        references: input.references ?? [],
+        authorLabel,
+        isRoot: false,
+        createdAt: now,
+        updatedAt: now
+      };
     };
     if (incrementSequence) this.immediateTransaction(write);
     else write();
-    return {
-      id,
-      commentId,
-      body: input.body,
-      relatedCommitOid: input.relatedCommitOid ?? null,
-      authorLabel: input.authorLabel ?? null,
-      isRoot: false,
-      createdAt: now,
-      updatedAt: now
-    };
+    if (!result) throw new RvwError("DATABASE_ERROR", "\u8FD4\u4FE1\u7D50\u679C\u3092\u8AAD\u307F\u51FA\u305B\u307E\u305B\u3093\u3002");
+    return result;
   }
-  updateCommentPost(commentId, postId, body) {
+  updateCommentPost(commentId, postId, body, relatedCommitOid, references) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
     this.immediateTransaction(() => {
-      const result = this.database.prepare(
+      const result = relatedCommitOid === void 0 ? this.database.prepare(
         "UPDATE comment_posts SET body = ?, updated_at = ? WHERE id = ? AND comment_id = ?"
-      ).run(body, now, postId, commentId);
+      ).run(body, now, postId, commentId) : this.database.prepare(
+        `UPDATE comment_posts SET body = ?, related_commit_oid = ?, updated_at = ?
+                WHERE id = ? AND comment_id = ?`
+      ).run(body, relatedCommitOid, now, postId, commentId);
       if (Number(result.changes) === 0) {
         throw new RvwError("COMMENT_POST_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u6295\u7A3F\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002", {
           status: 404
         });
       }
+      if (references !== void 0) {
+        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();
     });
-    const post = this.listCommentPosts(commentId).find((candidate) => candidate.id === postId);
+    const post = this.getCommentPost(postId);
     if (!post) {
       throw new RvwError("COMMENT_POST_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u6295\u7A3F\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002", {
         status: 404
@@ -19599,7 +19738,10 @@ var RvwDatabase = class {
           {
             body: update.reply,
             relatedCommitOid,
-            authorLabel: update.authorLabel ?? "Agent"
+            references: update.references ?? [],
+            authorLabel: update.authorLabel ?? "Agent",
+            ...update.idempotencyKey === void 0 ? {} : { idempotencyKey: update.idempotencyKey },
+            ...update.idempotencyRequestHash === void 0 ? {} : { idempotencyRequestHash: update.idempotencyRequestHash }
           },
           false
         );
@@ -19617,23 +19759,28 @@ import path5 from "node:path";
 import { TextDecoder as TextDecoder2 } from "node:util";
 
 // src/shared/constants.ts
-var APP_VERSION = "0.1.1";
-var PROTOCOL_VERSION = 2;
+var APP_VERSION = "0.2.1";
+var PROTOCOL_VERSION = 3;
 var VIEWER_ID_HEADER = "x-rvw-viewer-id";
 var GIT_OBJECT_ID_PATTERN = /^[0-9a-f]{40,64}$/i;
 var MAX_TEXT_DOCUMENT_BYTES = 1024 * 1024;
 var MAX_MARKDOWN_ASSET_BYTES = 5 * 1024 * 1024;
 var MAX_COMMENT_BODY_BYTES = 64 * 1024;
 var MAX_AUTHOR_LABEL_CHARACTERS = 100;
+var MAX_IDEMPOTENCY_KEY_CHARACTERS = 200;
 var DEFAULT_COMMENT_LIST_LIMIT = 50;
 var MAX_COMMENT_LIST_LIMIT = 100;
+var DEFAULT_COMMENT_WATCH_LIMIT = 100;
+var MAX_COMMENT_WATCH_LIMIT = 100;
+var DEFAULT_COMMENT_WATCH_INTERVAL_SECONDS = 10;
+var MAX_COMMENT_WATCH_INTERVAL_SECONDS = 300;
 var MAX_COMMENT_LIST_BODY_PREVIEW_BYTES = 512;
+var MAX_CODE_REFERENCES = 200;
+var MAX_CODE_REFERENCE_LABEL_CHARACTERS = 200;
+var MAX_CODE_REFERENCE_PATH_CHARACTERS = 4096;
+var MAX_CODE_REFERENCE_DESCRIPTION_CHARACTERS = 1e3;
 var MAX_WALKTHROUGH_BODY_BYTES = 256 * 1024;
-var MAX_WALKTHROUGH_REFERENCES = 200;
 var MAX_WALKTHROUGH_TITLE_CHARACTERS = 200;
-var MAX_WALKTHROUGH_REFERENCE_LABEL_CHARACTERS = 200;
-var MAX_WALKTHROUGH_REFERENCE_PATH_CHARACTERS = 4096;
-var MAX_WALKTHROUGH_REFERENCE_DESCRIPTION_CHARACTERS = 1e3;
 var MAX_SEARCH_QUERY_BYTES = 1024;
 var MAX_SEARCH_RESULTS = 500;
 var MAX_SEARCH_STDOUT_BYTES = 8 * 1024 * 1024;
@@ -20269,6 +20416,9 @@ var GitClient = class {
 
 // src/infrastructure/github/github-client.ts
 var ghPullRequestSchema = external_exports.object({
+  author: external_exports.object({ login: external_exports.string().min(1) }).nullable(),
+  headRepository: external_exports.object({ name: external_exports.string().min(1) }).nullable(),
+  headRepositoryOwner: external_exports.object({ login: external_exports.string().min(1) }).nullable(),
   number: external_exports.number().int().positive(),
   url: external_exports.url(),
   title: external_exports.string(),
@@ -20309,6 +20459,7 @@ var GitHubClient = class {
   async getPullRequest(reference, cwd) {
     await this.assertAuthenticated();
     const fields = [
+      "author",
       "number",
       "url",
       "title",
@@ -20358,6 +20509,9 @@ var GitHubClient = class {
       repository: identity.repository,
       number: parsed.data.number,
       url: parsed.data.url,
+      authorLogin: parsed.data.author?.login ?? null,
+      headRepositoryOwner: parsed.data.headRepositoryOwner?.login ?? null,
+      headRepositoryName: parsed.data.headRepository?.name ?? null,
       title: parsed.data.title,
       body: parsed.data.body ?? "",
       baseRefName: parsed.data.baseRefName,
@@ -20372,6 +20526,7 @@ var GitHubClient = class {
 };
 
 // src/application/rvw-service.ts
+import { createHash as createHash3 } from "node:crypto";
 import path6 from "node:path";
 
 // node_modules/.pnpm/mdast-util-to-string@4.0.0/node_modules/mdast-util-to-string/lib/index.js
@@ -27307,6 +27462,28 @@ function defaultOnError(left, right) {
   }
 }
 
+// src/domain/comment-watch-cursor.ts
+var CURSOR_VERSION = 1;
+var DATABASE_ID_PATTERN = /^[0-9a-f]{32}$/;
+function formatCommentWatchCursor(cursor) {
+  return Buffer.from(
+    JSON.stringify({ v: CURSOR_VERSION, d: cursor.databaseId, s: cursor.sequence }),
+    "utf8"
+  ).toString("base64url");
+}
+function parseCommentWatchCursor(value) {
+  try {
+    if (value.length === 0 || value.length > 512) throw new Error("cursor length");
+    const decoded = JSON.parse(Buffer.from(value, "base64url").toString("utf8"));
+    if (decoded.v !== CURSOR_VERSION || typeof decoded.d !== "string" || !DATABASE_ID_PATTERN.test(decoded.d) || typeof decoded.s !== "number" || !Number.isSafeInteger(decoded.s) || decoded.s < 0) {
+      throw new Error("cursor shape");
+    }
+    return { databaseId: decoded.d, sequence: decoded.s };
+  } catch (error51) {
+    throw new RvwError("INVALID_INPUT", "comment watch cursor\u304C\u4E0D\u6B63\u3067\u3059\u3002", { cause: error51 });
+  }
+}
+
 // node_modules/.pnpm/diff@9.0.0/node_modules/diff/libesm/diff/base.js
 var Diff = class {
   diff(oldStr, newStr, options = {}) {
@@ -27527,7 +27704,7 @@ function diffArrays(oldArr, newArr, options) {
 }
 
 // src/domain/pr-markdown.ts
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 function normalizeLf(value) {
   return value.replace(/\r\n?/g, "\n");
 }
@@ -27537,7 +27714,7 @@ function buildPullRequestMarkdown(title, body) {
 ${normalizeLf(body)}`;
 }
 function hashDocument(value) {
-  return createHash("sha256").update(normalizeLf(value), "utf8").digest("hex");
+  return createHash2("sha256").update(normalizeLf(value), "utf8").digest("hex");
 }
 function selectedLineText(value, startLine, endLine) {
   const lines2 = normalizeLf(value).split("\n");
@@ -27686,12 +27863,24 @@ function assertAuthorLabel(authorLabel) {
     );
   }
 }
+function assertIdempotencyKey(idempotencyKey2) {
+  if (idempotencyKey2 === void 0) return;
+  if (idempotencyKey2.length === 0 || idempotencyKey2.length > MAX_IDEMPOTENCY_KEY_CHARACTERS) {
+    throw new RvwError(
+      "INVALID_INPUT",
+      `idempotencyKey\u306F1\u301C${MAX_IDEMPOTENCY_KEY_CHARACTERS}\u6587\u5B57\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+    );
+  }
+}
+function idempotencyRequestHash(value) {
+  return createHash3("sha256").update(JSON.stringify(value), "utf8").digest("hex");
+}
 function assertLinePair(startLine, endLine) {
   if (startLine === null !== (endLine === null)) {
     throw new RvwError("INVALID_INPUT", "\u884C\u7BC4\u56F2\u306F\u958B\u59CB\u884C\u3068\u7D42\u4E86\u884C\u3092\u4E21\u65B9\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
   }
 }
-var walkthroughReferenceIdPattern = /^[A-Za-z][A-Za-z0-9_-]{0,63}$/;
+var codeReferenceIdPattern = /^[A-Za-z][A-Za-z0-9_-]{0,63}$/;
 var walkthroughDiagramNodePattern = /^[A-Za-z][A-Za-z0-9_-]{0,63}$/;
 var mermaidIdentifierPattern = /[A-Za-z][A-Za-z0-9_-]{0,63}/g;
 var mermaidEdgePattern = /[<|o*x]*[-.=~]{2,}[|o*x>]*/g;
@@ -27785,7 +27974,7 @@ function addMermaidDiagramNodes(source, nodeIds) {
     }
   }
 }
-function analyzeWalkthroughMarkdown(body) {
+function analyzeReferenceMarkdown(body) {
   const root = fromMarkdown(body);
   const definitions = /* @__PURE__ */ new Map();
   const visit = (node2, callback) => {
@@ -27814,9 +28003,9 @@ function analyzeWalkthroughMarkdown(body) {
     mermaidNodeIds
   };
 }
-function assertWalkthroughPath(filePath) {
-  if (filePath.length > MAX_WALKTHROUGH_REFERENCE_PATH_CHARACTERS || filePath.includes("\\") || path6.posix.isAbsolute(filePath) || path6.posix.normalize(filePath) !== filePath || filePath === "." || filePath.startsWith("../")) {
-    throw new RvwError("INVALID_INPUT", `walkthrough\u306Epath\u304C\u4E0D\u6B63\u3067\u3059: ${filePath}`);
+function assertCodeReferencePath(filePath) {
+  if (filePath.length > MAX_CODE_REFERENCE_PATH_CHARACTERS || filePath.includes("\\") || path6.posix.isAbsolute(filePath) || path6.posix.normalize(filePath) !== filePath || filePath === "." || filePath.startsWith("../")) {
+    throw new RvwError("INVALID_INPUT", `code reference\u306Epath\u304C\u4E0D\u6B63\u3067\u3059: ${filePath}`);
   }
 }
 var RvwService = class {
@@ -27969,13 +28158,33 @@ var RvwService = class {
           `commentUpdates\u306B\u306Freply\u307E\u305F\u306Fresolve\u304C\u5FC5\u8981\u3067\u3059: ${update.commentRef}`
         );
       }
+      if (!update.reply.trim() && (update.references?.length ?? 0) > 0) {
+        throw new RvwError(
+          "INVALID_INPUT",
+          `reply\u306E\u306A\u3044comment update\u3078code reference\u306F\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093: ${update.commentRef}`
+        );
+      }
       if (update.reply.trim()) assertTextBody(update.reply);
       assertAuthorLabel(update.authorLabel);
+      assertIdempotencyKey(update.idempotencyKey);
+      const authorLabel = update.authorLabel ?? "Agent";
       return {
         commentId,
         reply: update.reply,
         resolve: update.resolve,
-        ...update.authorLabel === void 0 ? {} : { authorLabel: update.authorLabel }
+        ...update.references === void 0 ? {} : { references: update.references },
+        ...update.authorLabel === void 0 ? {} : { authorLabel: update.authorLabel },
+        ...update.idempotencyKey === void 0 ? {} : { idempotencyKey: update.idempotencyKey },
+        ...update.idempotencyKey === void 0 ? {} : {
+          idempotencyRequestHash: idempotencyRequestHash({
+            operation: "pr.sync.comment-update",
+            commentId,
+            reply: update.reply,
+            resolve: update.resolve,
+            authorLabel,
+            references: update.references ?? []
+          })
+        }
       };
     });
   }
@@ -27999,6 +28208,19 @@ var RvwService = class {
       github.headOid
     );
     await this.git.ensureCommitRef(repository.worktreePath, github.number, github.headOid);
+    for (const update of updates) {
+      if (!update.reply.trim()) continue;
+      const comment = this.database.getComment(update.commentId);
+      if (!comment) {
+        throw new RvwError("COMMENT_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002");
+      }
+      await this.validateCodeReferences(this.getPullRequest(comment.pullRequestId), {
+        sourceOid: github.headOid,
+        body: update.reply,
+        references: update.references ?? [],
+        subject: "comment sync reply"
+      });
+    }
     const repositoryLocation = {
       localRepositoryPath: repository.worktreePath,
       gitCommonDir: repository.gitCommonDir
@@ -28235,6 +28457,90 @@ var RvwService = class {
       throw new RvwError("INVALID_INPUT", `${subject}\u306E\u884C\u7BC4\u56F2\u304C\u6587\u66F8\u5916\u3067\u3059\u3002`);
     }
   }
+  async validateCodeReferences(pullRequest, input) {
+    const markdown = analyzeReferenceMarkdown(input.body);
+    if (input.references.length > MAX_CODE_REFERENCES) {
+      throw new RvwError(
+        "INVALID_INPUT",
+        `${input.subject}\u306Ecode reference\u306F${MAX_CODE_REFERENCES}\u4EF6\u4EE5\u4E0B\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+      );
+    }
+    if ((input.references.length > 0 || markdown.referenceIds.length > 0) && !input.sourceOid) {
+      throw new RvwError(
+        "INVALID_INPUT",
+        `${input.subject}\u3067code reference\u3092\u4F7F\u3046\u5834\u5408\u306Frelated commit\u304C\u5FC5\u8981\u3067\u3059\u3002`
+      );
+    }
+    if (input.sourceOid) await this.assertCommitAvailable(pullRequest, input.sourceOid);
+    const referenceIds = /* @__PURE__ */ new Set();
+    for (const reference of input.references) {
+      if (!codeReferenceIdPattern.test(reference.id) || referenceIds.has(reference.id)) {
+        throw new RvwError(
+          "INVALID_INPUT",
+          `code reference ID\u304C\u4E0D\u6B63\u307E\u305F\u306F\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: ${reference.id}`
+        );
+      }
+      referenceIds.add(reference.id);
+      assertCodeReferencePath(reference.path);
+      if (reference.label.trim().length === 0 || reference.label.length > MAX_CODE_REFERENCE_LABEL_CHARACTERS) {
+        throw new RvwError("INVALID_INPUT", `code reference label\u304C\u4E0D\u6B63\u3067\u3059: ${reference.id}`);
+      }
+      if (reference.description !== null && reference.description.length > MAX_CODE_REFERENCE_DESCRIPTION_CHARACTERS) {
+        throw new RvwError(
+          "INVALID_INPUT",
+          `code reference description\u304C\u9577\u3059\u304E\u307E\u3059: ${reference.id}`
+        );
+      }
+      const content3 = await this.getDocument({
+        kind: "repository-file",
+        pullRequestId: pullRequest.id,
+        sourceOid: input.sourceOid,
+        path: reference.path
+      });
+      if (content3.availability !== "available") {
+        throw new RvwError("INVALID_INPUT", `code reference\u3092\u8868\u793A\u3067\u304D\u307E\u305B\u3093: ${reference.path}`);
+      }
+      this.validateLineRange(
+        content3.text ?? "",
+        reference.startLine,
+        reference.endLine,
+        `code reference ${reference.id}`
+      );
+    }
+    const malformedReference = markdown.referenceIds.find(
+      (referenceId) => !codeReferenceIdPattern.test(referenceId)
+    );
+    if (malformedReference !== void 0) {
+      throw new RvwError(
+        "INVALID_INPUT",
+        `Markdown reference ID\u304C\u4E0D\u6B63\u3067\u3059: ${malformedReference || "(empty)"}`
+      );
+    }
+    const missingReference = markdown.referenceIds.find(
+      (referenceId) => !referenceIds.has(referenceId)
+    );
+    if (missingReference) {
+      throw new RvwError(
+        "INVALID_INPUT",
+        `Markdown reference\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${missingReference}`
+      );
+    }
+    const usedReferenceIds = /* @__PURE__ */ new Set([
+      ...markdown.referenceIds,
+      ...input.additionalUsedReferenceIds ?? []
+    ]);
+    const unusedReference = input.references.find(
+      (reference) => !usedReferenceIds.has(reference.id)
+    );
+    if (unusedReference) {
+      const usageSurface = input.additionalUsedReferenceIds === void 0 ? "\u672C\u6587" : "\u672C\u6587\u307E\u305F\u306Fbinding";
+      throw new RvwError(
+        "INVALID_INPUT",
+        `code reference\u304C${usageSurface}\u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u305B\u3093: ${unusedReference.id}`
+      );
+    }
+    return markdown;
+  }
   async prepareCommentTarget(pullRequest, target) {
     if (target.kind === "pull-request") return target;
     if (target.kind === "walkthrough") {
@@ -28296,11 +28602,33 @@ var RvwService = class {
     const pullRequest = this.getPullRequest(input.pullRequestId);
     const target = await this.prepareCommentTarget(pullRequest, input.target);
     assertAuthorLabel(input.authorLabel);
-    return this.database.createComment({
+    const body = assertTextBody(input.body);
+    const references = input.references ?? [];
+    await this.validateCodeReferences(pullRequest, {
+      sourceOid: input.relatedCommitOid ?? null,
+      body,
+      references,
+      subject: "comment post"
+    });
+    const write = () => this.database.createComment({
       pullRequestId: pullRequest.id,
       createdHeadOid: pullRequest.latestHeadOid,
       target,
-      body: assertTextBody(input.body),
+      body,
+      ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid },
+      references,
+      ...input.authorLabel === void 0 ? {} : { authorLabel: input.authorLabel }
+    });
+    return input.relatedCommitOid ? await this.writeWithRetainedCommit(pullRequest, input.relatedCommitOid, "comment", write) : write();
+  }
+  async createCommentForReference(input) {
+    const pullRequest = this.resolveStoredPullRequest(input.pullRequest);
+    return await this.createComment({
+      pullRequestId: pullRequest.id,
+      target: input.target,
+      body: input.body,
+      ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid },
+      ...input.references === void 0 ? {} : { references: input.references },
       ...input.authorLabel === void 0 ? {} : { authorLabel: input.authorLabel }
     });
   }
@@ -28340,7 +28668,7 @@ var RvwService = class {
       result.pullRequest.url,
       result.pullRequest.localRepositoryPath
     ) : null;
-    const staleAgainstGitHub = live ? live.title !== result.pullRequest.latestTitle || live.body !== result.pullRequest.latestBody || live.baseOid !== result.pullRequest.latestBaseOid || live.headOid !== result.pullRequest.latestHeadOid || live.updatedAt !== result.pullRequest.githubUpdatedAt : null;
+    const staleAgainstGitHub = live ? live.title !== result.pullRequest.latestTitle || live.body !== result.pullRequest.latestBody || live.headRepositoryOwner !== result.pullRequest.latestHeadRepositoryOwner || live.headRepositoryName !== result.pullRequest.latestHeadRepositoryName || live.baseOid !== result.pullRequest.latestBaseOid || live.headOid !== result.pullRequest.latestHeadOid || live.updatedAt !== result.pullRequest.githubUpdatedAt : null;
     return {
       ...result,
       latestPlacement,
@@ -28389,6 +28717,39 @@ var RvwService = class {
       }
     };
   }
+  listCommentPostEvents(cursor, limit = DEFAULT_COMMENT_WATCH_LIMIT) {
+    if (!Number.isInteger(limit) || limit < 1 || limit > MAX_COMMENT_WATCH_LIMIT) {
+      throw new RvwError(
+        "INVALID_INPUT",
+        `comment watch\u306Elimit\u306F1\u301C${MAX_COMMENT_WATCH_LIMIT}\u306E\u6574\u6570\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+      );
+    }
+    const databaseId = this.database.getCommentWatchDatabaseId();
+    const parsed = cursor === void 0 ? null : parseCommentWatchCursor(cursor);
+    if (parsed !== null && parsed.databaseId !== databaseId) {
+      throw new RvwError("INVALID_INPUT", "comment watch cursor\u306F\u5225\u306Ervw database\u7528\u3067\u3059\u3002");
+    }
+    const latestAtStart = this.database.getLatestCommentPostEventSequence();
+    if (parsed !== null && parsed.sequence > latestAtStart) {
+      throw new RvwError("INVALID_INPUT", "comment watch cursor\u306Fdatabase\u306E\u6700\u65B0event\u3088\u308A\u5148\u3067\u3059\u3002");
+    }
+    const afterSequence = parsed?.sequence ?? latestAtStart;
+    const rawEvents = this.database.listCommentPostEvents(afterSequence, limit);
+    const events = rawEvents.map((event) => ({
+      cursor: formatCommentWatchCursor({ databaseId, sequence: event.sequence }),
+      event
+    }));
+    const lastSequence = rawEvents.at(-1)?.sequence ?? afterSequence;
+    const latestSequence = this.database.getLatestCommentPostEventSequence();
+    return {
+      databaseId,
+      startCursor: formatCommentWatchCursor({ databaseId, sequence: afterSequence }),
+      cursor: formatCommentWatchCursor({ databaseId, sequence: lastSequence }),
+      anchoredAtCurrent: parsed === null,
+      hasMore: lastSequence < latestSequence,
+      events
+    };
+  }
   listComments(pullRequestId, resolved) {
     this.getPullRequest(pullRequestId);
     return this.database.listComments(pullRequestId, resolved);
@@ -28430,50 +28791,16 @@ var RvwService = class {
         `walkthrough\u672C\u6587\u306F1\u301C${MAX_WALKTHROUGH_BODY_BYTES} UTF-8 bytes\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
       );
     }
-    if (input.references.length === 0 || input.references.length > MAX_WALKTHROUGH_REFERENCES) {
+    if (input.references.length === 0 || input.references.length > MAX_CODE_REFERENCES) {
       throw new RvwError(
         "INVALID_INPUT",
-        `walkthrough reference\u306F1\u301C${MAX_WALKTHROUGH_REFERENCES}\u4EF6\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+        `walkthrough reference\u306F1\u301C${MAX_CODE_REFERENCES}\u4EF6\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
       );
     }
     assertAuthorLabel(input.authorLabel);
-    const referenceIds = /* @__PURE__ */ new Set();
-    for (const reference of input.references) {
-      if (!walkthroughReferenceIdPattern.test(reference.id) || referenceIds.has(reference.id)) {
-        throw new RvwError(
-          "INVALID_INPUT",
-          `walkthrough reference ID\u304C\u4E0D\u6B63\u307E\u305F\u306F\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: ${reference.id}`
-        );
-      }
-      referenceIds.add(reference.id);
-      assertWalkthroughPath(reference.path);
-      if (reference.label.trim().length === 0 || reference.label.length > MAX_WALKTHROUGH_REFERENCE_LABEL_CHARACTERS) {
-        throw new RvwError("INVALID_INPUT", `reference label\u304C\u4E0D\u6B63\u3067\u3059: ${reference.id}`);
-      }
-      if (reference.description !== null && reference.description.length > MAX_WALKTHROUGH_REFERENCE_DESCRIPTION_CHARACTERS) {
-        throw new RvwError("INVALID_INPUT", `reference description\u304C\u9577\u3059\u304E\u307E\u3059: ${reference.id}`);
-      }
-      const content3 = await this.getDocument({
-        kind: "repository-file",
-        pullRequestId: pullRequest.id,
-        sourceOid: input.sourceOid,
-        path: reference.path
-      });
-      if (content3.availability !== "available") {
-        throw new RvwError(
-          "INVALID_INPUT",
-          `walkthrough reference\u3092\u8868\u793A\u3067\u304D\u307E\u305B\u3093: ${reference.path}`
-        );
-      }
-      this.validateLineRange(
-        content3.text ?? "",
-        reference.startLine,
-        reference.endLine,
-        `walkthrough reference ${reference.id}`
-      );
-    }
-    const markdown = analyzeWalkthroughMarkdown(input.body);
+    const markdown = analyzeReferenceMarkdown(input.body);
     const diagramBindings = input.diagramBindings ?? {};
+    const referenceIds = new Set(input.references.map((reference) => reference.id));
     for (const [nodeId, referenceId] of Object.entries(diagramBindings)) {
       if (!walkthroughDiagramNodePattern.test(nodeId)) {
         throw new RvwError("INVALID_INPUT", `Mermaid node ID\u304C\u4E0D\u6B63\u3067\u3059: ${nodeId}`);
@@ -28491,35 +28818,13 @@ var RvwService = class {
         );
       }
     }
-    const markdownReferenceIds = markdown.referenceIds;
-    const malformedReference = markdownReferenceIds.find(
-      (referenceId) => !walkthroughReferenceIdPattern.test(referenceId)
-    );
-    if (malformedReference !== void 0) {
-      throw new RvwError(
-        "INVALID_INPUT",
-        `Markdown reference ID\u304C\u4E0D\u6B63\u3067\u3059: ${malformedReference || "(empty)"}`
-      );
-    }
-    const missingReference = markdownReferenceIds.find(
-      (referenceId) => !referenceIds.has(referenceId)
-    );
-    if (missingReference) {
-      throw new RvwError(
-        "INVALID_INPUT",
-        `Markdown reference\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${missingReference}`
-      );
-    }
-    const usedReferenceIds = /* @__PURE__ */ new Set([...markdownReferenceIds, ...Object.values(diagramBindings)]);
-    const unusedReference = input.references.find(
-      (reference) => !usedReferenceIds.has(reference.id)
-    );
-    if (unusedReference) {
-      throw new RvwError(
-        "INVALID_INPUT",
-        `walkthrough reference\u304C\u672C\u6587\u307E\u305F\u306FMermaid binding\u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u305B\u3093: ${unusedReference.id}`
-      );
-    }
+    await this.validateCodeReferences(pullRequest, {
+      sourceOid: input.sourceOid,
+      body: input.body,
+      references: input.references,
+      additionalUsedReferenceIds: Object.values(diagramBindings),
+      subject: "Walkthrough"
+    });
     return {
       sourceOid: input.sourceOid,
       title,
@@ -28529,7 +28834,7 @@ var RvwService = class {
       references: input.references
     };
   }
-  async writeWalkthroughWithRetainedCommit(pullRequest, sourceOid, write) {
+  async writeWithRetainedCommit(pullRequest, sourceOid, subject, write) {
     const commitRef = await this.git.ensureCommitRef(
       pullRequest.localRepositoryPath,
       pullRequest.number,
@@ -28544,7 +28849,7 @@ var RvwService = class {
         } catch (cleanupError) {
           throw new RvwError(
             "LOCAL_STATE_INCONSISTENT",
-            "Walkthrough\u306E\u66F8\u304D\u8FBC\u307F\u5931\u6557\u5F8C\u306BGit ref\u3092\u5FA9\u5143\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002",
+            `${subject}\u306E\u66F8\u304D\u8FBC\u307F\u5931\u6557\u5F8C\u306BGit ref\u3092\u5FA9\u5143\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002`,
             { cause: cleanupError }
           );
         }
@@ -28555,9 +28860,10 @@ var RvwService = class {
   async publishWalkthrough(input) {
     const pullRequest = this.resolveStoredPullRequest(input.pullRequest);
     const content3 = await this.validateWalkthroughContent(pullRequest, input);
-    return await this.writeWalkthroughWithRetainedCommit(
+    return await this.writeWithRetainedCommit(
       pullRequest,
       content3.sourceOid,
+      "Walkthrough",
       () => this.database.createWalkthrough({
         pullRequestId: pullRequest.id,
         ...content3
@@ -28570,9 +28876,10 @@ var RvwService = class {
       ...input,
       authorLabel: input.authorLabel === void 0 ? walkthrough.authorLabel : input.authorLabel
     });
-    return await this.writeWalkthroughWithRetainedCommit(
+    return await this.writeWithRetainedCommit(
       pullRequest,
       content3.sourceOid,
+      "Walkthrough",
       () => this.database.updateWalkthrough(walkthrough.id, content3)
     );
   }
@@ -28598,13 +28905,32 @@ var RvwService = class {
     if (!comment)
       throw new RvwError("COMMENT_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002", { status: 404 });
     assertAuthorLabel(input.authorLabel);
-    if (input.relatedCommitOid) {
-      await this.assertCommitAvailable(
-        this.getPullRequest(comment.pullRequestId),
-        input.relatedCommitOid
-      );
-    }
-    return this.database.insertReply(id, { ...input, body: assertTextBody(input.body) });
+    assertIdempotencyKey(input.idempotencyKey);
+    const pullRequest = this.getPullRequest(comment.pullRequestId);
+    const body = assertTextBody(input.body);
+    const references = input.references ?? [];
+    await this.validateCodeReferences(pullRequest, {
+      sourceOid: input.relatedCommitOid ?? null,
+      body,
+      references,
+      subject: "comment reply"
+    });
+    const write = () => this.database.insertReply(id, {
+      ...input,
+      body,
+      references,
+      ...input.idempotencyKey === void 0 ? {} : {
+        idempotencyRequestHash: idempotencyRequestHash({
+          operation: "comment.reply",
+          commentId: id,
+          body,
+          relatedCommitOid: input.relatedCommitOid ?? null,
+          authorLabel: input.authorLabel ?? null,
+          references
+        })
+      }
+    });
+    return input.relatedCommitOid ? await this.writeWithRetainedCommit(pullRequest, input.relatedCommitOid, "comment", write) : write();
   }
   setCommentResolved(uriOrId, resolved) {
     const id = uriOrId.startsWith("rvw://") ? parseCommentUri(uriOrId) : uriOrId;
@@ -28614,8 +28940,44 @@ var RvwService = class {
     const id = uriOrId.startsWith("rvw://") ? parseCommentUri(uriOrId) : uriOrId;
     return this.database.deleteComment(id);
   }
-  updateCommentPost(commentId, postId, body) {
-    return this.database.updateCommentPost(commentId, postId, assertTextBody(body));
+  async updateCommentPost(commentId, postId, body) {
+    const comment = this.database.getComment(commentId);
+    const post = comment?.posts.find((candidate) => candidate.id === postId);
+    if (!comment || !post) {
+      throw new RvwError("COMMENT_POST_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u6295\u7A3F\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002", {
+        status: 404
+      });
+    }
+    const usedReferenceIds = new Set(analyzeReferenceMarkdown(body).referenceIds);
+    return await this.editCommentPost(commentId, postId, {
+      body,
+      references: post.references.filter((reference) => usedReferenceIds.has(reference.id))
+    });
+  }
+  async editCommentPost(uriOrId, postId, input) {
+    const commentId = uriOrId.startsWith("rvw://") ? parseCommentUri(uriOrId) : uriOrId;
+    const comment = this.database.getComment(commentId);
+    if (!comment) {
+      throw new RvwError("COMMENT_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002", { status: 404 });
+    }
+    const post = comment.posts.find((candidate) => candidate.id === postId);
+    if (!post) {
+      throw new RvwError("COMMENT_POST_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u6295\u7A3F\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002", {
+        status: 404
+      });
+    }
+    const body = assertTextBody(input.body);
+    const relatedCommitOid = input.relatedCommitOid === void 0 ? post.relatedCommitOid : input.relatedCommitOid;
+    const references = input.references ?? post.references;
+    const pullRequest = this.getPullRequest(comment.pullRequestId);
+    await this.validateCodeReferences(pullRequest, {
+      sourceOid: relatedCommitOid,
+      body,
+      references,
+      subject: "comment post"
+    });
+    const write = () => this.database.updateCommentPost(commentId, postId, body, input.relatedCommitOid, references);
+    return relatedCommitOid ? await this.writeWithRetainedCommit(pullRequest, relatedCommitOid, "comment", write) : write();
   }
   deleteReply(commentId, postId) {
     return this.database.deleteReply(commentId, postId);
@@ -28813,7 +29175,7 @@ function createRuntime(options = {}) {
 }
 
 // src/infrastructure/skills/skill-installer.ts
-import { createHash as createHash2, randomUUID as randomUUID3 } from "node:crypto";
+import { createHash as createHash4, randomUUID as randomUUID3 } from "node:crypto";
 import {
   cpSync,
   existsSync as existsSync2,
@@ -28829,7 +29191,11 @@ import {
 import os3 from "node:os";
 import path7 from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-var skillNames = ["rvw", "rvw-walkthrough"];
+var skillNames = [
+  "rvw",
+  "rvw-walkthrough",
+  "rvw-watch-comments"
+];
 var INSTALL_METADATA_FILE = ".rvw-install.json";
 var INSTALL_METADATA_SCHEMA_VERSION = 1;
 var MAX_DIGEST_ENTRIES = 1e4;
@@ -28843,7 +29209,7 @@ var adapters = {
   }
 };
 function directoryDigest(directory) {
-  const hash2 = createHash2("sha256");
+  const hash2 = createHash4("sha256");
   let entriesSeen = 0;
   let bytesSeen = 0;
   const walk = (current, relative) => {
@@ -32638,6 +33004,167 @@ var Hono2 = class extends Hono {
   }
 };
 
+// src/application/agent-command-schemas.ts
+var nonEmptyString = external_exports.string().min(1);
+var commentUri = external_exports.string().regex(/^rvw:\/\/comment\//);
+var walkthroughUri = external_exports.string().regex(/^rvw:\/\/walkthrough\//);
+var nullableCommentLine = external_exports.number().int().positive().nullable().optional().default(null);
+var idempotencyKey = external_exports.string().min(1).max(MAX_IDEMPOTENCY_KEY_CHARACTERS).optional();
+var commentTargetInputSchema = external_exports.union([
+  external_exports.object({ kind: external_exports.literal("pull-request") }).strict(),
+  external_exports.object({
+    kind: external_exports.literal("walkthrough"),
+    walkthroughId: external_exports.uuid(),
+    startLine: nullableCommentLine,
+    endLine: nullableCommentLine
+  }).strict(),
+  external_exports.object({
+    kind: external_exports.literal("document"),
+    documentKind: external_exports.literal("pull-request-markdown"),
+    startLine: nullableCommentLine,
+    endLine: nullableCommentLine
+  }).strict(),
+  external_exports.object({
+    kind: external_exports.literal("document"),
+    documentKind: external_exports.literal("repository-file"),
+    sourceOid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN),
+    path: nonEmptyString,
+    startLine: nullableCommentLine,
+    endLine: nullableCommentLine
+  }).strict()
+]).superRefine((target, context) => {
+  if (target.kind === "pull-request") return;
+  if (target.startLine === null !== (target.endLine === null)) {
+    context.addIssue({
+      code: "custom",
+      message: "startLine\u3068endLine\u306F\u4E21\u65B9\u6307\u5B9A\u3059\u308B\u304B\u3001\u4E21\u65B9\u7701\u7565\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+    });
+    return;
+  }
+  if (target.startLine !== null && target.endLine !== null && target.endLine < target.startLine) {
+    context.addIssue({
+      code: "custom",
+      message: "endLine\u306FstartLine\u4EE5\u4E0A\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+    });
+  }
+});
+var codeReferenceInputSchema = external_exports.object({
+  id: external_exports.string().regex(/^[A-Za-z][A-Za-z0-9_-]{0,63}$/),
+  label: external_exports.string().min(1).max(MAX_CODE_REFERENCE_LABEL_CHARACTERS),
+  path: external_exports.string().min(1).max(MAX_CODE_REFERENCE_PATH_CHARACTERS),
+  startLine: external_exports.number().int().positive().nullable().optional().default(null),
+  endLine: external_exports.number().int().positive().nullable().optional().default(null),
+  description: external_exports.string().max(MAX_CODE_REFERENCE_DESCRIPTION_CHARACTERS).nullable()
+}).strict().superRefine((reference, context) => {
+  if (reference.startLine === null !== (reference.endLine === null)) {
+    context.addIssue({
+      code: "custom",
+      message: "startLine\u3068endLine\u306F\u4E21\u65B9\u6307\u5B9A\u3059\u308B\u304B\u3001\u4E21\u65B9\u7701\u7565\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+    });
+    return;
+  }
+  if (reference.startLine !== null && reference.endLine !== null && reference.endLine < reference.startLine) {
+    context.addIssue({
+      code: "custom",
+      message: "endLine\u306FstartLine\u4EE5\u4E0A\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+    });
+  }
+});
+var optionalCodeReferences = external_exports.array(codeReferenceInputSchema).max(MAX_CODE_REFERENCES).optional();
+function requireRelatedCommitForReferences(input, context) {
+  if ((input.references?.length ?? 0) > 0 && !input.relatedCommitOid) {
+    context.addIssue({
+      code: "custom",
+      path: ["relatedCommitOid"],
+      message: "code reference\u3092\u6301\u3064comment post\u306B\u306FrelatedCommitOid\u304C\u5FC5\u8981\u3067\u3059\u3002"
+    });
+  }
+}
+var commentCreateInputSchema = external_exports.object({
+  pullRequest: nonEmptyString,
+  target: commentTargetInputSchema,
+  body: external_exports.string().min(1).refine((value) => value.trim().length > 0).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES, {
+    message: `body\u306FUTF-8\u3067${MAX_COMMENT_BODY_BYTES} bytes\uFF0864 KiB\uFF09\u4EE5\u4E0B\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+  }),
+  authorLabel: external_exports.string().max(MAX_AUTHOR_LABEL_CHARACTERS).nullable().optional(),
+  relatedCommitOid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN).nullable().optional(),
+  references: optionalCodeReferences
+}).strict().superRefine(requireRelatedCommitForReferences);
+var commentReplyInputSchema = external_exports.object({
+  body: external_exports.string().min(1).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES, {
+    message: `body\u306FUTF-8\u3067${MAX_COMMENT_BODY_BYTES} bytes\uFF0864 KiB\uFF09\u4EE5\u4E0B\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+  }),
+  authorLabel: external_exports.string().max(MAX_AUTHOR_LABEL_CHARACTERS).nullable().optional(),
+  relatedCommitOid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN).nullable().optional(),
+  references: optionalCodeReferences,
+  idempotencyKey
+}).strict().superRefine(requireRelatedCommitForReferences);
+var commentPostEditInputSchema = external_exports.object({
+  body: external_exports.string().min(1).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES, {
+    message: `body\u306FUTF-8\u3067${MAX_COMMENT_BODY_BYTES} bytes\uFF0864 KiB\uFF09\u4EE5\u4E0B\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+  }),
+  relatedCommitOid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN).nullable().optional(),
+  references: optionalCodeReferences
+}).strict();
+var pullRequestSyncInputSchema = external_exports.object({
+  pullRequest: nonEmptyString,
+  commentUpdates: external_exports.array(
+    external_exports.object({
+      commentRef: commentUri,
+      reply: external_exports.string().refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES, {
+        message: `reply\u306FUTF-8\u3067${MAX_COMMENT_BODY_BYTES} bytes\uFF0864 KiB\uFF09\u4EE5\u4E0B\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+      }),
+      resolve: external_exports.boolean(),
+      references: optionalCodeReferences,
+      idempotencyKey
+    }).strict()
+  ).max(500).optional()
+}).strict();
+var walkthroughContentInputSchema = external_exports.object({
+  sourceOid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN),
+  title: external_exports.string().min(1).max(MAX_WALKTHROUGH_TITLE_CHARACTERS),
+  body: external_exports.string().min(1).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_WALKTHROUGH_BODY_BYTES),
+  authorLabel: external_exports.string().max(MAX_AUTHOR_LABEL_CHARACTERS).nullable().optional(),
+  diagramBindings: external_exports.record(external_exports.string(), external_exports.string()).optional(),
+  references: external_exports.array(codeReferenceInputSchema).min(1).max(MAX_CODE_REFERENCES)
+}).strict();
+var walkthroughPublishInputSchema = walkthroughContentInputSchema.extend({
+  pullRequest: nonEmptyString
+});
+var walkthroughUpdateInputSchema = walkthroughContentInputSchema;
+var agentCommandInputSchemas = {
+  doctor: external_exports.object({ cwd: nonEmptyString }).strict(),
+  "pr.refresh": external_exports.object({ reference: nonEmptyString }).strict(),
+  "pr.sync": pullRequestSyncInputSchema.extend({
+    repositoryPath: nonEmptyString.optional(),
+    allowUntracked: external_exports.boolean().default(false)
+  }),
+  "pr.attach": external_exports.object({ reference: nonEmptyString, repositoryPath: nonEmptyString }).strict(),
+  "pr.reset.preview": external_exports.object({ reference: nonEmptyString }).strict(),
+  "pr.reset": external_exports.object({ reference: nonEmptyString, confirmed: external_exports.literal(true) }).strict(),
+  "comment.list": external_exports.object({
+    reference: nonEmptyString,
+    resolved: external_exports.boolean().optional(),
+    limit: external_exports.number().int().min(1).max(MAX_COMMENT_LIST_LIMIT).default(DEFAULT_COMMENT_LIST_LIMIT),
+    offset: external_exports.number().int().min(0).default(0)
+  }).strict(),
+  "comment.watch": external_exports.object({
+    cursor: external_exports.string().min(1).max(512).optional(),
+    limit: external_exports.number().int().min(1).max(MAX_COMMENT_WATCH_LIMIT)
+  }).strict(),
+  "comment.create": commentCreateInputSchema,
+  "comment.get": external_exports.object({ uri: commentUri, live: external_exports.boolean().default(false) }).strict(),
+  "comment.reply": external_exports.object({ uri: commentUri, reply: commentReplyInputSchema }).strict(),
+  "comment.edit": external_exports.object({ uri: commentUri, postId: nonEmptyString, edit: commentPostEditInputSchema }).strict(),
+  "comment.resolve": external_exports.object({ uri: commentUri }).strict(),
+  "comment.reopen": external_exports.object({ uri: commentUri }).strict(),
+  "walkthrough.get": external_exports.object({ uri: walkthroughUri }).strict(),
+  "walkthrough.publish": walkthroughPublishInputSchema,
+  "walkthrough.update": external_exports.object({ uri: walkthroughUri, content: walkthroughUpdateInputSchema }).strict(),
+  "walkthrough.delete.preview": external_exports.object({ uri: walkthroughUri }).strict(),
+  "walkthrough.delete": external_exports.object({ uri: walkthroughUri, confirmed: external_exports.literal(true) }).strict()
+};
+
 // src/server/schemas.ts
 var nullableLine = external_exports.number().int().positive().nullable();
 var commentTargetSchema = external_exports.union([
@@ -32675,15 +33202,35 @@ var createCommentSchema = external_exports.object({
   pullRequestId: external_exports.uuid(),
   target: commentTargetSchema,
   body: external_exports.string().min(1).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES),
-  authorLabel: external_exports.string().max(MAX_AUTHOR_LABEL_CHARACTERS).nullable().optional()
+  authorLabel: external_exports.string().max(MAX_AUTHOR_LABEL_CHARACTERS).nullable().optional(),
+  relatedCommitOid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN).nullable().optional(),
+  references: external_exports.array(codeReferenceInputSchema).optional()
+}).superRefine((input, context) => {
+  if ((input.references?.length ?? 0) > 0 && !input.relatedCommitOid) {
+    context.addIssue({
+      code: "custom",
+      path: ["relatedCommitOid"],
+      message: "code reference\u3092\u6301\u3064comment post\u306B\u306FrelatedCommitOid\u304C\u5FC5\u8981\u3067\u3059\u3002"
+    });
+  }
 });
 var replySchema = external_exports.object({
   body: external_exports.string().min(1).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES),
   relatedCommitOid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN).nullable().optional(),
-  authorLabel: external_exports.string().max(MAX_AUTHOR_LABEL_CHARACTERS).nullable().optional()
+  authorLabel: external_exports.string().max(MAX_AUTHOR_LABEL_CHARACTERS).nullable().optional(),
+  references: external_exports.array(codeReferenceInputSchema).optional()
+}).superRefine((input, context) => {
+  if ((input.references?.length ?? 0) > 0 && !input.relatedCommitOid) {
+    context.addIssue({
+      code: "custom",
+      path: ["relatedCommitOid"],
+      message: "code reference\u3092\u6301\u3064comment post\u306B\u306FrelatedCommitOid\u304C\u5FC5\u8981\u3067\u3059\u3002"
+    });
+  }
 });
 var editCommentPostSchema = external_exports.object({
-  body: external_exports.string().min(1).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES)
+  body: external_exports.string().min(1).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES),
+  references: external_exports.array(codeReferenceInputSchema).optional()
 });
 
 // src/server/app.ts
@@ -32935,6 +33482,8 @@ function createApp(service, options) {
           pullRequestId: input.pullRequestId,
           target: input.target,
           body: input.body,
+          ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid },
+          ...input.references === void 0 ? {} : { references: input.references },
           ...input.authorLabel === void 0 ? {} : { authorLabel: input.authorLabel }
         })
       },
@@ -32949,7 +33498,8 @@ function createApp(service, options) {
         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 }
+          ...input.authorLabel === void 0 ? {} : { authorLabel: input.authorLabel },
+          ...input.references === void 0 ? {} : { references: input.references }
         })
       },
       201
@@ -32959,11 +33509,14 @@ function createApp(service, options) {
     const input = editCommentPostSchema.parse(await context.req.json());
     return context.json({
       ok: true,
-      post: service.updateCommentPost(
+      post: input.references === void 0 ? await service.updateCommentPost(
         context.req.param("id"),
         context.req.param("postId"),
         input.body
-      )
+      ) : await service.editCommentPost(context.req.param("id"), context.req.param("postId"), {
+        body: input.body,
+        references: input.references
+      })
     });
   });
   app.delete(
@@ -33179,7 +33732,7 @@ async function startServer(service, options = {}) {
 }
 
 // src/server/agent-socket.ts
-import { createHash as createHash3, randomUUID as randomUUID4 } from "node:crypto";
+import { createHash as createHash5, randomUUID as randomUUID4 } from "node:crypto";
 import {
   chmodSync as chmodSync2,
   existsSync as existsSync5,
@@ -33193,88 +33746,6 @@ import {
 import net from "node:net";
 import os4 from "node:os";
 import path9 from "node:path";
-
-// src/application/agent-command-schemas.ts
-var nonEmptyString = external_exports.string().min(1);
-var commentUri = external_exports.string().regex(/^rvw:\/\/comment\//);
-var walkthroughUri = external_exports.string().regex(/^rvw:\/\/walkthrough\//);
-var commentReplyInputSchema = external_exports.object({
-  body: external_exports.string().min(1).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES),
-  authorLabel: external_exports.string().max(MAX_AUTHOR_LABEL_CHARACTERS).nullable().optional(),
-  relatedCommitOid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN).nullable().optional()
-}).strict();
-var pullRequestSyncInputSchema = external_exports.object({
-  pullRequest: nonEmptyString,
-  commentUpdates: external_exports.array(
-    external_exports.object({
-      commentRef: commentUri,
-      reply: external_exports.string().refine((value) => Buffer.byteLength(value, "utf8") <= MAX_COMMENT_BODY_BYTES),
-      resolve: external_exports.boolean()
-    }).strict()
-  ).max(500).optional()
-}).strict();
-var walkthroughReferenceInputSchema = external_exports.object({
-  id: external_exports.string().regex(/^[A-Za-z][A-Za-z0-9_-]{0,63}$/),
-  label: external_exports.string().min(1).max(MAX_WALKTHROUGH_REFERENCE_LABEL_CHARACTERS),
-  path: external_exports.string().min(1).max(MAX_WALKTHROUGH_REFERENCE_PATH_CHARACTERS),
-  startLine: external_exports.number().int().positive().nullable().optional().default(null),
-  endLine: external_exports.number().int().positive().nullable().optional().default(null),
-  description: external_exports.string().max(MAX_WALKTHROUGH_REFERENCE_DESCRIPTION_CHARACTERS).nullable()
-}).strict().superRefine((reference, context) => {
-  if (reference.startLine === null !== (reference.endLine === null)) {
-    context.addIssue({
-      code: "custom",
-      message: "startLine\u3068endLine\u306F\u4E21\u65B9\u6307\u5B9A\u3059\u308B\u304B\u3001\u4E21\u65B9\u7701\u7565\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
-    });
-    return;
-  }
-  if (reference.startLine !== null && reference.endLine !== null && reference.endLine < reference.startLine) {
-    context.addIssue({
-      code: "custom",
-      message: "endLine\u306FstartLine\u4EE5\u4E0A\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
-    });
-  }
-});
-var walkthroughContentInputSchema = external_exports.object({
-  sourceOid: external_exports.string().regex(GIT_OBJECT_ID_PATTERN),
-  title: external_exports.string().min(1).max(MAX_WALKTHROUGH_TITLE_CHARACTERS),
-  body: external_exports.string().min(1).refine((value) => Buffer.byteLength(value, "utf8") <= MAX_WALKTHROUGH_BODY_BYTES),
-  authorLabel: external_exports.string().max(MAX_AUTHOR_LABEL_CHARACTERS).nullable().optional(),
-  diagramBindings: external_exports.record(external_exports.string(), external_exports.string()).optional(),
-  references: external_exports.array(walkthroughReferenceInputSchema).min(1).max(MAX_WALKTHROUGH_REFERENCES)
-}).strict();
-var walkthroughPublishInputSchema = walkthroughContentInputSchema.extend({
-  pullRequest: nonEmptyString
-});
-var walkthroughUpdateInputSchema = walkthroughContentInputSchema;
-var agentCommandInputSchemas = {
-  doctor: external_exports.object({ cwd: nonEmptyString }).strict(),
-  "pr.refresh": external_exports.object({ reference: nonEmptyString }).strict(),
-  "pr.sync": pullRequestSyncInputSchema.extend({
-    repositoryPath: nonEmptyString.optional(),
-    allowUntracked: external_exports.boolean().default(false)
-  }),
-  "pr.attach": external_exports.object({ reference: nonEmptyString, repositoryPath: nonEmptyString }).strict(),
-  "pr.reset.preview": external_exports.object({ reference: nonEmptyString }).strict(),
-  "pr.reset": external_exports.object({ reference: nonEmptyString, confirmed: external_exports.literal(true) }).strict(),
-  "comment.list": external_exports.object({
-    reference: nonEmptyString,
-    resolved: external_exports.boolean().optional(),
-    limit: external_exports.number().int().min(1).max(MAX_COMMENT_LIST_LIMIT).default(DEFAULT_COMMENT_LIST_LIMIT),
-    offset: external_exports.number().int().min(0).default(0)
-  }).strict(),
-  "comment.get": external_exports.object({ uri: commentUri, live: external_exports.boolean().default(false) }).strict(),
-  "comment.reply": external_exports.object({ uri: commentUri, reply: commentReplyInputSchema }).strict(),
-  "comment.resolve": external_exports.object({ uri: commentUri }).strict(),
-  "comment.reopen": external_exports.object({ uri: commentUri }).strict(),
-  "walkthrough.get": external_exports.object({ uri: walkthroughUri }).strict(),
-  "walkthrough.publish": walkthroughPublishInputSchema,
-  "walkthrough.update": external_exports.object({ uri: walkthroughUri, content: walkthroughUpdateInputSchema }).strict(),
-  "walkthrough.delete.preview": external_exports.object({ uri: walkthroughUri }).strict(),
-  "walkthrough.delete": external_exports.object({ uri: walkthroughUri, confirmed: external_exports.literal(true) }).strict()
-};
-
-// src/server/agent-socket.ts
 var MAX_CLI_STDIN_BYTES = 40 * 1024 * 1024;
 var MAX_AGENT_MESSAGE_BYTES = MAX_CLI_STDIN_BYTES + 64 * 1024;
 var AGENT_SOCKET_PROTOCOL_VERSION = 1;
@@ -33302,7 +33773,7 @@ function agentSocketPath(databaseFilePath) {
   if (configuredPath) return configuredPath;
   const user = process.getuid?.() ?? os4.userInfo().username.replace(/[^A-Za-z0-9_-]/g, "_");
   const databasePath = path9.resolve(databaseFilePath ?? databasePathConfiguration().filePath);
-  const databaseKey = createHash3("sha256").update(databasePath).digest("hex").slice(0, 16);
+  const databaseKey = createHash5("sha256").update(databasePath).digest("hex").slice(0, 16);
   return path9.join(os4.tmpdir(), `rvw-agent-${user}`, `${databaseKey}.sock`);
 }
 function ensurePrivateSocketDirectory(socketPath) {
@@ -33407,6 +33878,16 @@ async function dispatchAgentSocketRequest(service, rawRequest) {
         offset: input.offset
       });
     }
+    case "comment.watch": {
+      const input = parseOperationInput("comment.watch", request.input);
+      return service.listCommentPostEvents(input.cursor, input.limit);
+    }
+    case "comment.create": {
+      const input = parseOperationInput("comment.create", request.input);
+      return await service.createCommentForReference(
+        input
+      );
+    }
     case "comment.get": {
       const input = parseOperationInput("comment.get", request.input);
       return await service.getCommentReviewContext(input.uri, { live: input.live });
@@ -33418,6 +33899,14 @@ async function dispatchAgentSocketRequest(service, rawRequest) {
         input.reply
       );
     }
+    case "comment.edit": {
+      const input = parseOperationInput("comment.edit", request.input);
+      return await service.editCommentPost(input.uri, input.postId, {
+        body: input.edit.body,
+        ...input.edit.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.edit.relatedCommitOid },
+        ...input.edit.references === void 0 ? {} : { references: input.edit.references }
+      });
+    }
     case "comment.resolve": {
       const input = parseOperationInput("comment.resolve", request.input);
       return service.setCommentResolved(input.uri, true);
@@ -33972,11 +34461,20 @@ var commentListOptionsSchema = external_exports.object({
   limit: external_exports.coerce.number().int().min(1).max(MAX_COMMENT_LIST_LIMIT).default(DEFAULT_COMMENT_LIST_LIMIT),
   offset: external_exports.coerce.number().int().min(0).default(0)
 });
+var commentWatchOptionsSchema = external_exports.object({
+  after: external_exports.string().min(1).max(512).optional(),
+  interval: external_exports.coerce.number().int().min(1).max(MAX_COMMENT_WATCH_INTERVAL_SECONDS).default(DEFAULT_COMMENT_WATCH_INTERVAL_SECONDS),
+  limit: external_exports.coerce.number().int().min(1).max(MAX_COMMENT_WATCH_LIMIT).default(DEFAULT_COMMENT_WATCH_LIMIT),
+  once: external_exports.boolean().optional().default(false),
+  jsonSeq: external_exports.literal(true)
+});
 var commentPullRequestOutputSchema = external_exports.object({
   url: external_exports.string(),
   owner: external_exports.string(),
   repository: external_exports.string(),
   number: external_exports.number().int(),
+  authorLogin: external_exports.string().nullable(),
+  headRepository: external_exports.object({ owner: external_exports.string(), name: external_exports.string(), url: external_exports.string() }).strict().nullable(),
   title: external_exports.string(),
   body: external_exports.string().optional(),
   baseRefName: external_exports.string(),
@@ -34055,11 +34553,20 @@ var commentPlacementOutputSchema = external_exports.union([
     path: external_exports.string().nullable()
   }).strict()
 ]);
+var codeReferenceOutputSchema = external_exports.object({
+  id: external_exports.string(),
+  label: external_exports.string(),
+  path: external_exports.string(),
+  startLine: external_exports.number().int().nullable(),
+  endLine: external_exports.number().int().nullable(),
+  description: external_exports.string().nullable()
+}).strict();
 var commentPostOutputSchema = external_exports.object({
   id: external_exports.string(),
   commentId: external_exports.string(),
   body: external_exports.string(),
   relatedCommitOid: external_exports.string().nullable(),
+  references: external_exports.array(codeReferenceOutputSchema),
   authorLabel: external_exports.string().nullable(),
   isRoot: external_exports.boolean(),
   createdAt: external_exports.string(),
@@ -34086,16 +34593,7 @@ var walkthroughOutputSchema = external_exports.object({
   body: external_exports.string(),
   authorLabel: external_exports.string().nullable(),
   diagramBindings: external_exports.record(external_exports.string(), external_exports.string()),
-  references: external_exports.array(
-    external_exports.object({
-      id: external_exports.string(),
-      label: external_exports.string(),
-      path: external_exports.string(),
-      startLine: external_exports.number().int().nullable(),
-      endLine: external_exports.number().int().nullable(),
-      description: external_exports.string().nullable()
-    }).strict()
-  ),
+  references: external_exports.array(codeReferenceOutputSchema),
   createdAt: external_exports.string()
 }).strict();
 var sourceExcerptOutputSchema = external_exports.object({
@@ -34124,6 +34622,8 @@ var commentGetOutputSchema = external_exports.object({
     liveCheckedAt: external_exports.string().nullable(),
     staleAgainstGitHub: external_exports.boolean().nullable(),
     live: external_exports.object({
+      authorLogin: external_exports.string().nullable(),
+      headRepository: external_exports.object({ owner: external_exports.string(), name: external_exports.string(), url: external_exports.string() }).strict().nullable(),
       title: external_exports.string(),
       body: external_exports.string().optional(),
       baseRefName: external_exports.string(),
@@ -34183,11 +34683,18 @@ function truncateUtf82(value, maxBytes) {
   return { value: result, truncated: true };
 }
 function formatPullRequest(pullRequest, options = {}) {
+  const headRepository = pullRequest.latestHeadRepositoryOwner && pullRequest.latestHeadRepositoryName ? {
+    owner: pullRequest.latestHeadRepositoryOwner,
+    name: pullRequest.latestHeadRepositoryName,
+    url: `https://github.com/${pullRequest.latestHeadRepositoryOwner}/${pullRequest.latestHeadRepositoryName}`
+  } : null;
   return {
     url: pullRequest.url,
     owner: pullRequest.owner,
     repository: pullRequest.repository,
     number: pullRequest.number,
+    authorLogin: pullRequest.latestAuthorLogin,
+    headRepository,
     title: pullRequest.latestTitle,
     ...options.includeBody ? { body: pullRequest.latestBody } : {},
     baseRefName: pullRequest.latestBaseRefName,
@@ -34245,6 +34752,12 @@ function formatCommentGetOutput(result, options = {}) {
       liveCheckedAt: result.githubState.liveCheckedAt,
       staleAgainstGitHub: result.githubState.staleAgainstGitHub,
       live: result.githubState.live ? {
+        authorLogin: result.githubState.live.authorLogin,
+        headRepository: result.githubState.live.headRepositoryOwner && result.githubState.live.headRepositoryName ? {
+          owner: result.githubState.live.headRepositoryOwner,
+          name: result.githubState.live.headRepositoryName,
+          url: `https://github.com/${result.githubState.live.headRepositoryOwner}/${result.githubState.live.headRepositoryName}`
+        } : null,
         title: result.githubState.live.title,
         ...options.includePrBody ? { body: result.githubState.live.body } : {},
         baseRefName: result.githubState.live.baseRefName,
@@ -34256,6 +34769,12 @@ function formatCommentGetOutput(result, options = {}) {
     }
   });
 }
+function formatCommentWatchEvent(item) {
+  return {
+    cursor: item.cursor,
+    event: item.event
+  };
+}
 function formatCommentListOutput(result, state) {
   return commentListOutputSchema.parse({
     ok: true,
@@ -34295,6 +34814,13 @@ function writeJson(value) {
   process.stdout.write(`${JSON.stringify(value)}
 `);
 }
+function writeJsonSequence(value) {
+  process.stdout.write(`${JSON.stringify(value)}
+`);
+}
+async function waitForCommentWatchInterval(milliseconds) {
+  await new Promise((resolve) => setTimeout(resolve, milliseconds));
+}
 function writeOutput(options, value, human) {
   if (options.json) writeJson(value);
   else process.stdout.write(`${human}
@@ -34668,9 +35194,13 @@ function createProgram(runtimeFactory = defaultRuntimeFactory) {
       appVersion: APP_VERSION,
       capabilities: [
         "agent.transport",
+        "comment.create",
         "comment.list",
+        "comment.watch",
         "comment.read",
         "comment.reply",
+        "comment.edit",
+        "comment.codeReferences",
         "comment.resolve",
         "comment.reopen",
         "pullRequest.sync",
@@ -34782,7 +35312,7 @@ function createProgram(runtimeFactory = defaultRuntimeFactory) {
       writeOutput(
         options,
         result2,
-        `\u524A\u9664\u5BFE\u8C61: \u30B3\u30E1\u30F3\u30C8${preview.counts.comments}\u3001\u8FD4\u4FE1${preview.counts.posts}\u3001\u5BFE\u8C61${preview.counts.targets}\u3001Walkthrough${preview.counts.walkthroughs}\u3001\u30B3\u30FC\u30C9\u53C2\u7167${preview.counts.walkthroughReferences}\u3001Git ref${preview.counts.gitRefs}
+        `\u524A\u9664\u5BFE\u8C61: \u30B3\u30E1\u30F3\u30C8${preview.counts.comments}\u3001\u8FD4\u4FE1${preview.counts.posts}\u3001\u30B3\u30E1\u30F3\u30C8\u5185\u30B3\u30FC\u30C9\u53C2\u7167${preview.counts.commentReferences}\u3001\u5BFE\u8C61${preview.counts.targets}\u3001Walkthrough${preview.counts.walkthroughs}\u3001Walkthrough\u30B3\u30FC\u30C9\u53C2\u7167${preview.counts.walkthroughReferences}\u3001Git ref${preview.counts.gitRefs}
 \u7D9A\u884C\u3059\u308B\u306B\u306F --yes \u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
       );
       process.exitCode = 2;
@@ -34870,6 +35400,75 @@ function createProgram(runtimeFactory = defaultRuntimeFactory) {
     );
     writeJson({ ok: true, deleted });
   });
+  comment.command("watch").description("\u5168\u767B\u9332PR\u3067\u8D77\u52D5\u5F8C\u306B\u4F5C\u6210\u3055\u308C\u305Froot comment\u3068reply\u3092\u76E3\u8996").option("--after <cursor>", "\u4EE5\u524D\u306Ewatch cursor\u304B\u3089\u518D\u958B").option(
+    "--interval <seconds>",
+    `poll\u9593\u9694\uFF08\u65E2\u5B9A: ${DEFAULT_COMMENT_WATCH_INTERVAL_SECONDS}\u79D2\uFF09`,
+    String(DEFAULT_COMMENT_WATCH_INTERVAL_SECONDS)
+  ).option(
+    "--limit <limit>",
+    `\u4E00\u5EA6\u306B\u53D6\u5F97\u3059\u308B\u6700\u5927event\u6570\uFF08\u65E2\u5B9A: ${DEFAULT_COMMENT_WATCH_LIMIT}\uFF09`,
+    String(DEFAULT_COMMENT_WATCH_LIMIT)
+  ).option("--once", "\u73FE\u5728\u53D6\u5F97\u53EF\u80FD\u306Aevent\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86").requiredOption("--json-seq", "RFC 7464 JSON text sequence\u3067\u51FA\u529B").action(async (rawOptions) => {
+    const options = commentWatchOptionsSchema.parse(rawOptions);
+    let cursor = options.after;
+    let first = true;
+    let stopping = false;
+    const stop = () => {
+      stopping = true;
+    };
+    process.once("SIGINT", stop);
+    process.once("SIGTERM", stop);
+    try {
+      do {
+        const result = await callService(
+          "comment.watch",
+          {
+            ...cursor === void 0 ? {} : { cursor },
+            limit: options.limit
+          },
+          () => getRuntime().service.listCommentPostEvents(cursor, options.limit)
+        );
+        if (first) {
+          writeJsonSequence({
+            type: "ready",
+            databaseId: result.databaseId,
+            cursor: result.startCursor,
+            anchoredAtCurrent: result.anchoredAtCurrent
+          });
+        }
+        for (const item of result.events) {
+          writeJsonSequence({ type: "comment-posted", ...formatCommentWatchEvent(item) });
+        }
+        cursor = result.cursor;
+        first = false;
+        if (options.once || stopping) break;
+        if (!result.hasMore) {
+          await waitForCommentWatchInterval(options.interval * 1e3);
+        }
+      } while (!stopping);
+      writeJsonSequence({ type: "stopped", cursor });
+    } finally {
+      process.off("SIGINT", stop);
+      process.off("SIGTERM", stop);
+    }
+  });
+  comment.command("create").requiredOption("--stdin", "stdin\u304B\u3089JSON\u3092\u8AAD\u3080").requiredOption("--json", "JSON\u3067\u51FA\u529B").description("\u767B\u9332\u6E08\u307FPR\u3078\u672A\u89E3\u6C7A\u30B3\u30E1\u30F3\u30C8\u3092\u4E00\u4EF6\u4F5C\u6210").action(async () => {
+    const input = commentCreateInputSchema.parse(await readStdinJson());
+    const request = {
+      pullRequest: input.pullRequest,
+      target: input.target,
+      body: input.body,
+      ...input.authorLabel === void 0 ? {} : { authorLabel: input.authorLabel },
+      ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid },
+      ...input.references === void 0 ? {} : { references: input.references }
+    };
+    const created = await callService(
+      "comment.create",
+      request,
+      async () => await getRuntime().service.createCommentForReference(request)
+    );
+    writeJson({ ok: true, comment: created });
+  });
   comment.command("list").argument("<pull-request>", "\u767B\u9332\u6E08\u307FPR URL\u307E\u305F\u306F\u756A\u53F7").option("--state <state>", "unresolved\u3001resolved\u3001all\uFF08\u65E2\u5B9A: unresolved\uFF09", "unresolved").option(
     "--limit <limit>",
     `1\u30DA\u30FC\u30B8\u306E\u6700\u5927\u4EF6\u6570\uFF08\u65E2\u5B9A: ${DEFAULT_COMMENT_LIST_LIMIT}\uFF09`,
@@ -34902,7 +35501,9 @@ function createProgram(runtimeFactory = defaultRuntimeFactory) {
     const reply = {
       body: input.body,
       ...input.authorLabel === void 0 ? {} : { authorLabel: input.authorLabel },
-      ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid }
+      ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid },
+      ...input.references === void 0 ? {} : { references: input.references },
+      ...input.idempotencyKey === void 0 ? {} : { idempotencyKey: input.idempotencyKey }
     };
     const post = await callService(
       "comment.reply",
@@ -34911,6 +35512,20 @@ function createProgram(runtimeFactory = defaultRuntimeFactory) {
     );
     writeJson({ ok: true, post });
   });
+  comment.command("edit").argument("<comment-uri>").requiredOption("--post <post-id>", "\u7DE8\u96C6\u3059\u308Bpost ID").requiredOption("--stdin", "stdin\u304B\u3089JSON\u3092\u8AAD\u3080").requiredOption("--json", "JSON\u3067\u51FA\u529B").action(async (uri, options) => {
+    const input = commentPostEditInputSchema.parse(await readStdinJson());
+    const edit = {
+      body: input.body,
+      ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid },
+      ...input.references === void 0 ? {} : { references: input.references }
+    };
+    const post = await callService(
+      "comment.edit",
+      { uri, postId: options.post, edit },
+      async () => await getRuntime().service.editCommentPost(uri, options.post, edit)
+    );
+    writeJson({ ok: true, post });
+  });
   comment.command("resolve").argument("<comment-uri>").requiredOption("--json", "JSON\u3067\u51FA\u529B").action(async (uri) => {
     const comment2 = await callService(
       "comment.resolve",
@@ -34958,13 +35573,15 @@ function createProgram(runtimeFactory = defaultRuntimeFactory) {
 }
 async function runCli(argv = process.argv) {
   const json3 = argv.includes("--json");
+  const jsonSequence = argv.includes("--json-seq");
   try {
     await createProgram().parseAsync(argv);
   } catch (error51) {
     const rvwError = error51 instanceof external_exports.ZodError ? new RvwError("INVALID_INPUT", "\u5165\u529B\u304CCLI schema\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002", {
       details: external_exports.treeifyError(error51)
     }) : asRvwError(error51);
-    if (json3) writeJson({ ok: false, error: rvwError.toJSON() });
+    if (jsonSequence) writeJsonSequence({ type: "error", error: rvwError.toJSON() });
+    else if (json3) writeJson({ ok: false, error: rvwError.toJSON() });
     else process.stderr.write(`rvw: ${rvwError.message}
 ${rvwError.suggestions.join("\n")}
 `);