@a9n-shoji/rvw 0.2.0 → 0.2.2

package/dist/cli.mjs

@@ -18754,12 +18754,23 @@ function mapPullRequest(row) {
     updatedAt: stringValue(row, "updated_at")
   };
 }
-function mapCommentPost(row) {
+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"),
@@ -19169,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);
@@ -19179,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"),
@@ -19189,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");
@@ -19212,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")
     };
   }
@@ -19258,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);
@@ -19267,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(
@@ -19305,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);
@@ -19363,8 +19382,17 @@ var RvwDatabase = class {
       ).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
@@ -19520,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"),
@@ -19533,7 +19562,14 @@ 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(mapCommentPost);
+    ).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) {
     let result;
@@ -19553,7 +19589,8 @@ var RvwDatabase = class {
           commentId,
           body: input.body,
           relatedCommitOid,
-          authorLabel
+          authorLabel,
+          references: input.references ?? []
         })
       );
       if (idempotencyKeyHash !== null) {
@@ -19566,15 +19603,14 @@ var RvwDatabase = class {
             );
           }
           const postId = stringValue(existingRow, "post_id");
-          const postRow = this.database.prepare("SELECT * FROM comment_posts WHERE id = ?").get(postId);
-          if (!postRow) {
+          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 } }
             );
           }
-          const existing = mapCommentPost(postRow);
           result = existing;
           return;
         }
@@ -19584,6 +19620,7 @@ var RvwDatabase = class {
       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, 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
@@ -19601,6 +19638,7 @@ var RvwDatabase = class {
         commentId,
         body: input.body,
         relatedCommitOid,
+        references: input.references ?? [],
         authorLabel,
         isRoot: false,
         createdAt: now,
@@ -19612,7 +19650,7 @@ var RvwDatabase = class {
     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, relatedCommitOid) {
+  updateCommentPost(commentId, postId, body, relatedCommitOid, references) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
     this.immediateTransaction(() => {
       const result = relatedCommitOid === void 0 ? this.database.prepare(
@@ -19626,10 +19664,14 @@ var RvwDatabase = class {
           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
@@ -19696,6 +19738,7 @@ var RvwDatabase = class {
           {
             body: update.reply,
             relatedCommitOid,
+            references: update.references ?? [],
             authorLabel: update.authorLabel ?? "Agent",
             ...update.idempotencyKey === void 0 ? {} : { idempotencyKey: update.idempotencyKey },
             ...update.idempotencyRequestHash === void 0 ? {} : { idempotencyRequestHash: update.idempotencyRequestHash }
@@ -19716,8 +19759,8 @@ import path5 from "node:path";
 import { TextDecoder as TextDecoder2 } from "node:util";
 
 // src/shared/constants.ts
-var APP_VERSION = "0.2.0";
-var PROTOCOL_VERSION = 2;
+var APP_VERSION = "0.2.2";
+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;
@@ -19732,12 +19775,12 @@ 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;
@@ -27837,7 +27880,7 @@ function assertLinePair(startLine, endLine) {
     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;
@@ -27931,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) => {
@@ -27960,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 {
@@ -28115,6 +28158,12 @@ 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);
@@ -28123,6 +28172,7 @@ var RvwService = class {
         commentId,
         reply: update.reply,
         resolve: update.resolve,
+        ...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 ? {} : {
@@ -28131,7 +28181,8 @@ var RvwService = class {
             commentId,
             reply: update.reply,
             resolve: update.resolve,
-            authorLabel
+            authorLabel,
+            references: update.references ?? []
           })
         }
       };
@@ -28157,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
@@ -28393,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") {
@@ -28454,13 +28602,24 @@ 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);
@@ -28468,6 +28627,8 @@ var RvwService = class {
       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 }
     });
   }
@@ -28630,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}`);
@@ -28691,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,
@@ -28729,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,
@@ -28744,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 }
           );
         }
@@ -28755,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
@@ -28770,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)
     );
   }
@@ -28799,26 +28906,31 @@ var RvwService = class {
       throw new RvwError("COMMENT_NOT_FOUND", "\u30B3\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002", { status: 404 });
     assertAuthorLabel(input.authorLabel);
     assertIdempotencyKey(input.idempotencyKey);
-    if (input.relatedCommitOid) {
-      await this.assertCommitAvailable(
-        this.getPullRequest(comment.pullRequestId),
-        input.relatedCommitOid
-      );
-    }
+    const pullRequest = this.getPullRequest(comment.pullRequestId);
     const body = assertTextBody(input.body);
-    return this.database.insertReply(id, {
+    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
+          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;
@@ -28828,8 +28940,19 @@ 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;
@@ -28837,18 +28960,24 @@ 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 });
     }
-    if (input.relatedCommitOid) {
-      await this.assertCommitAvailable(
-        this.getPullRequest(comment.pullRequestId),
-        input.relatedCommitOid
-      );
+    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
+      });
     }
-    return this.database.updateCommentPost(
-      commentId,
-      postId,
-      assertTextBody(input.body),
-      input.relatedCommitOid
-    );
+    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);
@@ -32875,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([
@@ -32912,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
@@ -33172,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 }
         })
       },
@@ -33186,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
@@ -33196,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(
@@ -33430,143 +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 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 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),
-  authorLabel: external_exports.string().max(MAX_AUTHOR_LABEL_CHARACTERS).nullable().optional()
-}).strict();
-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(),
-  idempotencyKey
-}).strict();
-var commentPostEditInputSchema = commentReplyInputSchema.pick({ body: true, relatedCommitOid: true }).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(),
-      idempotencyKey
-    }).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.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/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;
@@ -33724,7 +33903,8 @@ async function dispatchAgentSocketRequest(service, rawRequest) {
       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.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.edit.relatedCommitOid },
+        ...input.edit.references === void 0 ? {} : { references: input.edit.references }
       });
     }
     case "comment.resolve": {
@@ -34373,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(),
@@ -34404,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({
@@ -35020,6 +35200,7 @@ function createProgram(runtimeFactory = defaultRuntimeFactory) {
         "comment.read",
         "comment.reply",
         "comment.edit",
+        "comment.codeReferences",
         "comment.resolve",
         "comment.reopen",
         "pullRequest.sync",
@@ -35131,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;
@@ -35277,7 +35458,9 @@ function createProgram(runtimeFactory = defaultRuntimeFactory) {
       pullRequest: input.pullRequest,
       target: input.target,
       body: input.body,
-      ...input.authorLabel === void 0 ? {} : { authorLabel: input.authorLabel }
+      ...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",
@@ -35319,6 +35502,7 @@ function createProgram(runtimeFactory = defaultRuntimeFactory) {
       body: input.body,
       ...input.authorLabel === void 0 ? {} : { authorLabel: input.authorLabel },
       ...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(
@@ -35332,7 +35516,8 @@ function createProgram(runtimeFactory = defaultRuntimeFactory) {
     const input = commentPostEditInputSchema.parse(await readStdinJson());
     const edit = {
       body: input.body,
-      ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid }
+      ...input.relatedCommitOid === void 0 ? {} : { relatedCommitOid: input.relatedCommitOid },
+      ...input.references === void 0 ? {} : { references: input.references }
     };
     const post = await callService(
       "comment.edit",