diff --git a/docs/acceptance/2026-10-22-diff-inline-feedback/README.md b/docs/acceptance/2026-10-22-diff-inline-feedback/README.md
new file mode 100644
index 00000000..f6541ce3
--- /dev/null
+++ b/docs/acceptance/2026-10-22-diff-inline-feedback/README.md
@@ -0,0 +1,43 @@
+# Diff 行内意见加入聊天草稿
+
+> 历史记录：以下截图基于 2026-10-22 的旧 #445 布局。同步 #445 紧凑工具栏后的
+> [2026-10-27 真实前后截图与验证](../2026-10-27-inline-feedback-current/README.md)
+> 已更新，#471 当前目标分支为 main。
+
+本次补的是多处代码审阅时反复退出、重新定位的问题。基线 `ed87d1dbdf3bc04c7935ca9c7b4fabfb67524e0e`（PR #445）已有文件、片段和行引用，但点击后立即关闭审阅窗口；没有在行旁输入意见并继续审阅的入口。核对当前 40 个待审 PR 后，没有发现已覆盖此流程的实现。
+
+## 竞品依据与选择
+
+对照的是二者公开文档描述的实际产品流程，不推断未公开的内部存储或组件实现。核对日期：2026-10-22。
+
+| 产品 | 公开流程 | 本次取舍 |
+| --- | --- | --- |
+| [Claude Code Desktop](https://code.claude.com/docs/en/desktop#review-changes-with-diff-view) | 在 Diff 行旁输入意见，可连续添加多条，再统一提交给 Claude | 采用就地输入和连续审阅；UC 的 Enter 保留多行输入，Ctrl/⌘+Enter 将当前意见加入草稿 |
+| [Codex app](https://learn.chatgpt.com/docs/code-review#inline-comments-for-feedback) | 通过行旁的 + 添加意见，完成后发送聊天消息让 Codex 处理 | 采用显式回到聊天检查并发送；添加意见本身不执行任务 |
+| Universal-Code 本次实现 | 行旁 + → 写意见 → 加入现有聊天草稿 → 继续看其它行 → 返回草稿发送 | 复用现有草稿文档、附件和冲突处理；不增加评论数据库、后端接口或新的模型调用 |
+
+每条意见携带原始来源、旧/新路径、差异片段、原始行文本和该版本的行号。输入时冻结这些来源；刷新后即使差异消失，也不会把意见重新绑定到另一行。原有引用操作和长行换行继续可用。意见加入草稿后可以编辑或删除；尚未点击“加入聊天草稿”的行内输入仅保留在当前审阅视图。
+
+## 依赖与兼容
+
+本 PR 叠加 #445，目标分支为 `Qiyuanqiii/review-diff-line-wrap`。`onAddComment` 是可选回调，原 `onFeedback` 与服务端合同不变。其它待审 PR 的依赖关系不变。特别核对 #437、#454、#458、#461、#465、#467、#469、#470 的对话、快捷键与草稿交互；#447/#451 使用另一套仓库 Diff 组件。
+
+## 真实浏览器验证
+
+使用仓库现有 `cmd/workbenchjourney`、真实 Go API 和 SQLite，在临时 Git 项目中通过 workspace import、thread、lifecycle、file-edit-proposal API 创建 `settings.ts` 提案。没有替换浏览器 API 响应。一个本机静态代理依次提供基线与候选生产包，并将 API 请求转发至同一个 Go 进程；两组截图使用同一持久化编辑记录、原始/提案哈希和 Diff。供应商使用现有离线 journey provider，审阅过程未请求模型推理。
+
+| 视口 | 变更前 | 变更后 |
+| --- | --- | --- |
+| 1280 × 900 | [仅可引用](before-desktop.png) | [就地输入意见](after-desktop.png) |
+| 390 × 844 | [窄屏 Diff](before-narrow.png) | [继续添加第二条意见](after-narrow.png) |
+
+[浏览器观测记录](observations.json) 保留浏览器版本、实际 Diff、布局尺寸及操作结果：
+
+- 两条意见连续加入同一草稿，原有空白和正文保留；审阅窗口保持打开。
+- 每条意见包含正确的源编辑 ID、新文件行号和原始代码；返回后可检查完整草稿，刷新重连后仍保留两条意见。
+- Ctrl+Enter 与 Meta+Enter 添加意见；Escape 只关闭当前行内输入；返回草稿聚焦编辑入口，窄屏折叠入口可展开继续编辑。
+- 窄屏编辑器位于视口内，开启换行后 Diff 无横向溢出。审阅操作期间无 API 写请求，无未捕获浏览器错误。
+
+通过：6 个相关测试文件的 68 项测试、`npm run build`（包含 TypeScript 检查）、`npm run check:api`、`go test -count=1 -tags desktop ./web ./internal/webui`。测试覆盖旧引用行为、Git 预览指纹、差异刷新、中文/英文、键盘与输入法事件、草稿冲突、保存失败、附件保留和跨任务隔离。
+
+本次真实浏览器为 Linux Chromium。Windows/macOS 原生壳、真实中文输入法及 macOS 硬件键盘未实测；Meta 与组合输入仅验证合成事件。Git 预览由组件测试覆盖，journey harness 未启用任务 Git API。上述结果不代表完整桌面发行验收。
diff --git a/docs/acceptance/2026-10-22-diff-inline-feedback/after-desktop.png b/docs/acceptance/2026-10-22-diff-inline-feedback/after-desktop.png
new file mode 100644
index 00000000..9e727c36
Binary files /dev/null and b/docs/acceptance/2026-10-22-diff-inline-feedback/after-desktop.png differ
diff --git a/docs/acceptance/2026-10-22-diff-inline-feedback/after-narrow.png b/docs/acceptance/2026-10-22-diff-inline-feedback/after-narrow.png
new file mode 100644
index 00000000..87a1fb52
Binary files /dev/null and b/docs/acceptance/2026-10-22-diff-inline-feedback/after-narrow.png differ
diff --git a/docs/acceptance/2026-10-22-diff-inline-feedback/before-desktop.png b/docs/acceptance/2026-10-22-diff-inline-feedback/before-desktop.png
new file mode 100644
index 00000000..7f54d1c2
Binary files /dev/null and b/docs/acceptance/2026-10-22-diff-inline-feedback/before-desktop.png differ
diff --git a/docs/acceptance/2026-10-22-diff-inline-feedback/before-narrow.png b/docs/acceptance/2026-10-22-diff-inline-feedback/before-narrow.png
new file mode 100644
index 00000000..1b68fbc3
Binary files /dev/null and b/docs/acceptance/2026-10-22-diff-inline-feedback/before-narrow.png differ
diff --git a/docs/acceptance/2026-10-22-diff-inline-feedback/observations.json b/docs/acceptance/2026-10-22-diff-inline-feedback/observations.json
new file mode 100644
index 00000000..7288175e
--- /dev/null
+++ b/docs/acceptance/2026-10-22-diff-inline-feedback/observations.json
@@ -0,0 +1,31 @@
+{
+  "base_commit": "ed87d1dbdf3bc04c7935ca9c7b4fabfb67524e0e",
+  "browser": "154.0.8037.57",
+  "platform": "Linux Chromium",
+  "same_persisted_fixture": true,
+  "thread_id": "thread-run-20261022031942-ee1059310b39",
+  "edit_id": "edit-20261022031942-fa4f5fd41508",
+  "patch": "--- a/settings.ts\n+++ b/settings.ts\n@@ -1,3 +1,3 @@\n-export const attempts = 3;\n-export const timeout = 1000;\n-export const endpoint = \"https://example.test/api\";\n+export const attempts = 0;\n+export const timeout = 0;\n+export const endpoint = \"https://example.test/long-path/long-path/long-path/long-path/long-path/long-path/long-path/long-path/long-path/long-path/long-path/long-path/\";\n",
+  "raw_diff_lines": [
+    "-export const attempts = 3;",
+    "-export const timeout = 1000;",
+    "-export const endpoint = \"https://example.test/api\";",
+    "+export const attempts = 0;",
+    "+export const timeout = 0;",
+    "+export const endpoint = \"https://example.test/long-path/long-path/long-path/long-path/long-path/long-path/long-path/long-path/long-path/long-path/long-path/long-path/\";"
+  ],
+  "narrow": {
+    "viewport": 390,
+    "document": 390,
+    "x": 39,
+    "width": 313,
+    "diffWidth": 337,
+    "diffScroll": 337
+  },
+  "comments_in_reloaded_draft": 2,
+  "api_writes_during_ui_flow": [],
+  "uncaught_browser_errors": [],
+  "escape_kept_review_open": true,
+  "synthetic_composing_escape_retained_input": true,
+  "return_draft_focused": true
+}
\ No newline at end of file
diff --git a/docs/acceptance/2026-10-27-inline-feedback-current/README.md b/docs/acceptance/2026-10-27-inline-feedback-current/README.md
new file mode 100644
index 00000000..53c2d670
--- /dev/null
+++ b/docs/acceptance/2026-10-27-inline-feedback-current/README.md
@@ -0,0 +1,46 @@
+# #471：同步 #445 后的真实页面对比
+
+2026-10-27 在 Windows / Microsoft Edge 156 中重新拍摄。此次对比替代 PR 正文里
+2026-10-22 的旧截图；旧记录保留为历史验收资料。
+
+- 变更前：`02ff2bcf4703e948e53c5eced24bec00bc2ea986`，已合入 #445 的 main。
+- 变更后：`803ac30f2c835e74c660cbbc9e03d1cb1a5eef1b`，#471 同步 #445 后的代码。
+- #471 当前目标分支为 `main`。两边都有 #445 的文件名旁紧凑换行按钮；
+  #471 在此基础上增加行旁评论与“返回聊天草稿”，没有恢复旧版独立换行工具栏。
+
+## 截图
+
+| 视口 | 变更前：#445 已合入 | 变更后：#471 行内评论 |
+| --- | --- | --- |
+| 1280 × 900 | ![桌面变更前](before-desktop.png) | ![桌面变更后](after-desktop.png) |
+| 480 × 900 | ![窄屏变更前](before-narrow.png) | ![窄屏变更后](after-narrow.png) |
+
+两组都开启长行换行，展示同一个 `settings.ts` 提案。桌面审阅正文滚动位置为
+377 px，窄屏为 562 px；同一视口下文件工具栏的位置一致。变更后截图的评论
+仍在行内输入框内，点击“加入聊天草稿”或 Ctrl+Enter 后才加入草稿。
+
+## 实际运行方式
+
+分别从以上两个提交执行 `npm run build`，使用各自的生产前端包。后端从
+`803ac30f` 以 `go build -tags workbenchjourney ./cmd/workbenchjourney` 构建，
+运行真实 Go API、SQLite 和一次性项目；通过工作区导入、创建任务、启动 Run、
+创建文件提案 API 准备数据。Vite preview 在同一个地址依次提供两个生产包并
+转发到同一个后端进程，提案和原始文件始终相同。没有替换接口响应或单独渲染
+组件。使用仓库离线 journey provider，没有调用外部模型。
+
+本次验证：
+
+- 两个版本的 TypeScript 检查和生产构建通过；保留已有 Vite 大包警告。
+- 480 px 下，来回切换换行，尚未加入草稿的评论内容不丢失，Diff 原始代码文本不变。
+- 评论输入框横向范围为 x=39 到 442 px，页面实际宽度与文档宽度均为 480 px。
+  截图中输入框和加入草稿按钮均可见、可操作。
+- 第一条意见通过 Ctrl+Enter 加入，第二条通过按钮加入；添加后审阅面板保持打开。
+- 返回聊天时保留原有草稿和两条意见，分别绑定新文件第 2、3 行及同一个正确的编辑记录；
+  焦点回到草稿。重新加载并连接后，这份草稿仍在。
+- 同一代码实现此前合流时的 `review-diff`、`task-overview`、`review-comment-draft`
+  三个测试文件共 26 项通过；修改后的 `task-overview` 6 项随后单独复跑通过。
+  本次仅追加截图与记录，没有变更应用代码。
+
+这是 Windows Edge 浏览器中的生产页面验收。此轮没有运行打包后的原生桌面窗口，
+也没有重测 Git 预览及真实中文输入法；这些截图不作为完整桌面发行验收。
+切换生产包时重启了预览代理，其间出现的连接重置属于这次对比的服务切换过程。
diff --git a/docs/acceptance/2026-10-27-inline-feedback-current/after-desktop.png b/docs/acceptance/2026-10-27-inline-feedback-current/after-desktop.png
new file mode 100644
index 00000000..eb056739
Binary files /dev/null and b/docs/acceptance/2026-10-27-inline-feedback-current/after-desktop.png differ
diff --git a/docs/acceptance/2026-10-27-inline-feedback-current/after-narrow.png b/docs/acceptance/2026-10-27-inline-feedback-current/after-narrow.png
new file mode 100644
index 00000000..4be183dd
Binary files /dev/null and b/docs/acceptance/2026-10-27-inline-feedback-current/after-narrow.png differ
diff --git a/docs/acceptance/2026-10-27-inline-feedback-current/before-desktop.png b/docs/acceptance/2026-10-27-inline-feedback-current/before-desktop.png
new file mode 100644
index 00000000..48cd85c2
Binary files /dev/null and b/docs/acceptance/2026-10-27-inline-feedback-current/before-desktop.png differ
diff --git a/docs/acceptance/2026-10-27-inline-feedback-current/before-narrow.png b/docs/acceptance/2026-10-27-inline-feedback-current/before-narrow.png
new file mode 100644
index 00000000..728cb496
Binary files /dev/null and b/docs/acceptance/2026-10-27-inline-feedback-current/before-narrow.png differ
diff --git a/web/src/v2/components/conversation-inspector-feedback.test.tsx b/web/src/v2/components/conversation-inspector-feedback.test.tsx
index bce0b93c..e4eccbea 100644
--- a/web/src/v2/components/conversation-inspector-feedback.test.tsx
+++ b/web/src/v2/components/conversation-inspector-feedback.test.tsx
@@ -88,6 +88,43 @@ it.each(["inspector", "conversation"] as const)("appends exact review context an
   expectNoWrites();
 });
 
+it.each(["inspector", "conversation"] as const)("collects two inline comments in the %s draft while keeping review open, then returns without sending", async (view) => {
+  const { container, expectNoWrites } = setup(view);
+  const user = userEvent.setup();
+  await user.click(await screen.findByRole("button", { name: "审阅改动" }));
+  const dialog = await screen.findByRole("dialog", { name: "审阅任务改动" });
+  await user.click(await within(dialog).findByText("查看这次编辑的差异"));
+  await user.click(within(dialog).getByRole("button", { name: "评论旧第 1 行" }));
+  const composing = within(dialog).getByRole("textbox");
+  fireEvent.change(composing, { target: { value: "正在输入的中文意见" } });
+  fireEvent.keyDown(composing, { key: "Escape", isComposing: true });
+  expect(dialog).toBeVisible();
+  expect(composing).toHaveValue("正在输入的中文意见");
+  await user.keyboard("{Escape}");
+  expect(dialog).toBeVisible();
+  expect(within(dialog).queryByRole("textbox")).not.toBeInTheDocument();
+  for (const [side, message] of [["旧", "保留旧逻辑的边界检查"], ["新", "增加空输入处理"]]) {
+    await user.click(within(dialog).getByRole("button", { name: `评论${side}第 1 行` }));
+    await user.type(within(dialog).getByRole("textbox"), message);
+    await user.keyboard("{Control>}{Enter}{/Control}");
+    expect(dialog).toBeVisible();
+    expect(within(dialog).getByRole("status")).toHaveTextContent("尚未发送");
+  }
+  const editor = container.querySelector<HTMLTextAreaElement>(".v2-shared-composer textarea")!;
+  expect(editor.value.startsWith(`${originalDraft}\n\n`)).toBe(true);
+  for (const part of ["保留旧逻辑的边界检查", "增加空输入处理", "任务：thread-a", "编辑记录：edit-original", "b".repeat(64)]) expect(editor.value).toContain(part);
+  expect(editor.value.match(/审阅意见：/gu)).toHaveLength(2);
+  expectNoWrites();
+  await user.click(within(dialog).getByRole("button", { name: "返回聊天草稿" }));
+  await waitFor(() => expect(editor).toHaveFocus());
+  expect(editor).toBeVisible();
+  expect(dialog).not.toBeInTheDocument();
+  await user.click(screen.getByRole("button", { name: "切到另一个任务" }));
+  await screen.findByText("Task thread-b");
+  expect(container.querySelector(".v2-shared-composer textarea")).toHaveValue("另一个任务的草稿");
+  expectNoWrites();
+});
+
 it.each(["inspector", "conversation"] as const)("reveals the %s draft when requesting an application startup, without starting or sending", async (view) => {
   const { container, client, expectNoWrites } = setup(view);
   const user = userEvent.setup();
diff --git a/web/src/v2/components/conversation.tsx b/web/src/v2/components/conversation.tsx
index 25126fef..aa97b1e4 100644
--- a/web/src/v2/components/conversation.tsx
+++ b/web/src/v2/components/conversation.tsx
@@ -44,6 +44,7 @@ import { useV2ThreadSubmissions, useV2ThreadTurn, V2SubmissionError, V2Recovered
 import { inspectV2SteeringRequest, inspectV2TurnRequest } from "../recovery-api";
 import { useV2RecoveryStore } from "../recovery-storage";
 import { settleRecoveryTurn } from "../recovery-session";
+import { appendReviewComment, type ReviewCommentResult } from "../review-comment-draft";
 import { assertV2DraftVersion, useV2DraftDocument } from "../draft-context";
 import type { V2DraftVersion } from "../draft-version";
 import { V2DraftConflict } from "./draft-conflict";
@@ -961,6 +962,15 @@ export function V2Conversation({ client, threadID, workspaces, onArchive, onMana
     setReviewOpen(false); setPreviewOpen(false); setContextOpen(false);
     setComposerFocusRequest({ threadID });
   };
+  const addReviewComment = (content: string): ReviewCommentResult => {
+    if (managedDraft) return appendReviewComment(managedDraft, content);
+    const current = composeTarget.current;
+    if (!current.onDraftChange) return "blocked";
+    const next = current.draft ? `${current.draft}\n\n${content}` : content;
+    current.onDraftChange(next, current.draft);
+    composeTarget.current = { ...current, draft: next };
+    return "added";
+  };
   const companionDocked = view === "conversation" && !compactPaneOpen;
   const companion = <>
     {activePane === "files" && <V2FileDrawer client={client} threadID={threadID}
@@ -1077,14 +1087,14 @@ export function V2Conversation({ client, threadID, workspaces, onArchive, onMana
     </V2LazySurface>}
     {reviewOpen && <V2LazySurface loadingText={t("正在加载改动审阅…", "Loading change review…")} errorLabel={t("改动审阅", "Change review")} resetKey={threadID}
       onDismiss={() => { setReviewOpen(false); workflowFocusTarget(reviewReturnFocus.current?.isConnected ? reviewReturnFocus.current : reviewTrigger.current)?.focus(); }}>
-      <V2TaskReview client={client} detail={detail} working={working}
+      <V2TaskReview key={threadID} client={client} detail={detail} working={working}
       onOpenWorktree={onOpenWorktree}
       initialFileTarget={reviewFileTarget}
       initialToolTarget={reviewToolTarget} toolMemoryRef={reviewMemoryRef}
       onClose={() => {
         if (!reviewReturnFocus.current?.isConnected) reviewReturnFocus.current = reviewTrigger.current;
         setReviewOpen(false);
-      }} returnFocusRef={reviewFocusTarget} onRequestChange={appendDraftAndReveal} /></V2LazySurface>}
+      }} returnFocusRef={reviewFocusTarget} onRequestChange={appendDraftAndReveal} onAddComment={onDraftChange ? addReviewComment : undefined} /></V2LazySurface>}
     <div className="v2-conversation-stage">
     <div className="v2-conversation-main-column">
     {view === "inspector" && !transcriptQuery.isLoading && <V2LazySurface loadingText={t("正在加载 Inspector…", "Loading Inspector…")}
diff --git a/web/src/v2/components/review-diff-comment.css b/web/src/v2/components/review-diff-comment.css
new file mode 100644
index 00000000..6e7fa80c
--- /dev/null
+++ b/web/src/v2/components/review-diff-comment.css
@@ -0,0 +1,7 @@
+.v2-task-delivery .v2-diff-comment-trigger { flex: 0 0 24px; align-self: start; min-height: 24px; padding: 0; margin-right: 6px; border-radius: 3px; font: inherit; }
+.v2-diff-comment { box-sizing: border-box; position: sticky; left: 0; width: 100%; padding: 12px; border-block: 1px solid var(--v2-border); background: var(--v2-control-hover); overflow-wrap: anywhere; }
+.v2-diff-comment label { display: block; margin-bottom: 6px; font-weight: 600; }
+.v2-diff-comment textarea { box-sizing: border-box; display: block; width: 100%; min-height: 80px; resize: vertical; padding: 8px; border: 1px solid var(--v2-border); border-radius: 6px; background: var(--v2-control); color: var(--v2-ink); font: inherit; }
+.v2-diff-comment > div { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; margin-top: 8px; }
+.v2-diff-comment span { color: var(--v2-muted); font-size: 12px; }
+.v2-review-comment-status p { flex: 1 1 240px; margin: 0; font-size: 13px; }
diff --git a/web/src/v2/components/review-diff.test.tsx b/web/src/v2/components/review-diff.test.tsx
index 88fcedb6..782ef468 100644
--- a/web/src/v2/components/review-diff.test.tsx
+++ b/web/src/v2/components/review-diff.test.tsx
@@ -1,12 +1,82 @@
 import type { ReactElement } from "react";
 import type { RenderOptions } from "@testing-library/react";
 import { LocaleProvider } from "../../lib/locale";
-import { render as renderComponent, screen, within } from "@testing-library/react";
+import { fireEvent, render as renderComponent, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { parseReviewDiff, ReviewDiff } from "./review-diff";
 
 const patch = "--- a/src/app.ts\n+++ b/src/app.ts\n@@ -7,3 +9,3 @@ result\n unchanged\n-old value\n+new value\n last\n\\ No newline at end of file";
 
+it("adds multiline inline feedback with the original source and restores keyboard focus without quoting", async () => {
+  const add = vi.fn().mockReturnValue("added"), quote = vi.fn();
+  render(<ReviewDiff patch={patch} source="edit identity and hashes" onFeedback={quote} onAddComment={add} />);
+  const user = userEvent.setup();
+  const trigger = screen.getByRole("button", { name: "评论旧第 8 行" });
+  await user.click(trigger);
+  const input = screen.getByRole("textbox", { name: "旧第 8 行的意见" });
+  expect(input).toHaveFocus();
+  expect(screen.getByRole("button", { name: "加入聊天草稿" })).toBeDisabled();
+  expect(screen.getByRole("button", { name: "评论新第 10 行" })).toBeDisabled();
+  await user.type(input, "Keep the guard.{Enter}Explain why.");
+  expect(add).not.toHaveBeenCalled();
+  await user.keyboard("{Control>}{Enter}{/Control}");
+  expect(add).toHaveBeenCalledOnce();
+  expect(add).toHaveBeenCalledWith(expect.stringContaining("edit identity and hashes\n旧文件路径：a/src/app.ts\n新文件路径：b/src/app.ts"));
+  expect(add).toHaveBeenCalledWith(expect.stringContaining("旧文件第 8 行：\n-old value"));
+  expect(add).toHaveBeenCalledWith(expect.stringContaining("要求：Keep the guard.\nExplain why."));
+  expect(quote).not.toHaveBeenCalled();
+  expect(screen.queryByRole("textbox")).not.toBeInTheDocument();
+  await waitFor(() => expect(trigger).toHaveFocus());
+});
+
+it("keeps a blocked comment, ignores IME submission and cancels without bubbling Escape", async () => {
+  const add = vi.fn().mockReturnValue("blocked"), key = vi.fn();
+  render(<div onKeyDown={key}><ReviewDiff patch={patch} source="source" onAddComment={add} /></div>);
+  const user = userEvent.setup();
+  await user.click(screen.getByRole("button", { name: "评论新第 10 行" }));
+  const input = screen.getByRole("textbox");
+  await user.type(input, "保留意见");
+  fireEvent.keyDown(input, { key: "Enter", ctrlKey: true, isComposing: true });
+  fireEvent.keyDown(input, { key: "Escape", isComposing: true });
+  fireEvent.keyDown(input, { key: "Escape", keyCode: 229 });
+  expect(input).toBeInTheDocument();
+  expect(input).toHaveValue("保留意见");
+  expect(add).not.toHaveBeenCalled();
+  await user.keyboard("{Meta>}{Enter}{/Meta}");
+  expect(screen.getByRole("alert")).toHaveTextContent("此处输入仍保留");
+  expect(input).toHaveValue("保留意见");
+  key.mockClear();
+  await user.keyboard("{Escape}");
+  expect(screen.queryByRole("textbox")).not.toBeInTheDocument();
+  expect(key).not.toHaveBeenCalled();
+});
+
+it("retains the original source when a refreshed patch replaces or removes the selected hunk", async () => {
+  const add = vi.fn().mockReturnValue("added");
+  const { rerender } = render(<ReviewDiff patch={patch} source="original edit hash" onAddComment={add} />);
+  const user = userEvent.setup();
+  await user.click(screen.getByRole("button", { name: "评论新第 10 行" }));
+  await user.type(screen.getByRole("textbox"), "Use an explicit default");
+  rerender(<ReviewDiff patch="Binary files differ" source="new edit hash" onAddComment={add} />);
+  expect(screen.getByRole("status")).toHaveTextContent("仍引用开始输入时的版本");
+  expect(screen.getByRole("textbox")).toHaveValue("Use an explicit default");
+  await user.click(screen.getByRole("button", { name: "加入聊天草稿" }));
+  expect(add).toHaveBeenCalledWith(expect.stringContaining("original edit hash"));
+  expect(add).toHaveBeenCalledWith(expect.stringContaining("新文件第 10 行：\n+new value"));
+  expect(add.mock.calls[0][0]).not.toContain("new edit hash");
+});
+
+it("offers English inline comments only on actual diff lines", async () => {
+  localStorage.setItem("prayu.locale.v1", "en-US");
+  const add = vi.fn().mockReturnValue("added");
+  renderComponent(<LocaleProvider><ReviewDiff patch={patch} source="source" onAddComment={add} /></LocaleProvider>);
+  expect(screen.getAllByRole("button", { name: /^Comment on/ })).toHaveLength(4);
+  await userEvent.setup().click(screen.getByRole("button", { name: "Comment on new line 10" }));
+  fireEvent.change(screen.getByRole("textbox"), { target: { value: "Please simplify" } });
+  await userEvent.setup().click(screen.getByRole("button", { name: "Add to chat draft" }));
+  expect(add).toHaveBeenCalledWith(expect.stringContaining("New file, line 10:\n+new value"));
+});
+
 it("toggles wrapping with the keyboard without changing source text, line references or excerpts", async () => {
   const feedback = vi.fn();
   const longLine = `+\tconst endpoint = "https://example.test/${"long-path/".repeat(30)}";  `;
diff --git a/web/src/v2/components/review-diff.tsx b/web/src/v2/components/review-diff.tsx
index 5971c9f4..a6c3b47c 100644
--- a/web/src/v2/components/review-diff.tsx
+++ b/web/src/v2/components/review-diff.tsx
@@ -1,5 +1,7 @@
-import { useMemo, useState } from "react";
+import { Fragment, useId, useMemo, useRef, useState, type Ref } from "react";
 import { WrapText } from "lucide-react";
+import type { ReviewCommentResult } from "../review-comment-draft";
+import "./review-diff-comment.css";
 import { useLocale, type LocaleText } from "../../lib/locale";
 export interface ReviewDiffLine { text: string; oldLine?: number; newLine?: number; kind: "context" | "add" | "remove" | "meta" }
 export interface ReviewDiffHunk { header: string; lines: ReviewDiffLine[]; oldPath?: string; newPath?: string; preamble: string }
@@ -53,37 +55,93 @@ function fileContext(hunk: ReviewDiffHunk, t: LocaleText): string {
   return t(`旧文件路径：${hunk.oldPath ?? t("未提供", "Not provided")}\n新文件路径：${hunk.newPath ?? t("未提供", "Not provided")}`, `Old file path: ${hunk.oldPath ?? t("未提供", "Not provided")}\nNew file path: ${hunk.newPath ?? t("未提供", "Not provided")}`);
 }
 
-export function DiffWrapButton({ wrapLines, onToggle }: { wrapLines: boolean; onToggle: () => void }) {
+function lineContext(source: string, hunk: ReviewDiffHunk, line: ReviewDiffLine, t: LocaleText): string {
+  const number = line.newLine ?? line.oldLine;
+  return t(`${source}\n${fileContext(hunk, t)}\n差异片段：${hunk.header}\n${line.kind === "remove" ? "旧文件" : "新文件"}第 ${number} 行：\n${line.text}\n行号只对应上述差异版本，请先核对当前内容。`, `${source}\n${fileContext(hunk, t)}\nDiff hunk: ${hunk.header}\n${line.kind === "remove" ? "Old file" : "New file"}, line ${number}:\n${line.text}\nLine numbers refer only to this diff revision. Check current content first.`);
+}
+
+interface CommentTarget { patch: string; hunk: number; line: number; context: string; label: string; text: string }
+
+export function DiffWrapButton({ wrapLines, onToggle, buttonRef }: { wrapLines: boolean; onToggle: () => void; buttonRef?: Ref<HTMLButtonElement> }) {
   const { t } = useLocale();
-  return <button className="v2-diff-wrap-toggle" type="button" aria-pressed={wrapLines}
+  return <button ref={buttonRef} className="v2-diff-wrap-toggle" type="button" aria-pressed={wrapLines}
     aria-label={t("长行换行", "Wrap long lines")} title={t("长行换行", "Wrap long lines")}
     onClick={onToggle}><WrapText size={16} aria-hidden="true" /></button>;
 }
 
-export function ReviewDiff({ patch, source, onFeedback, wrapLines: controlledWrapLines }: {
-  patch: string; source: string; onFeedback?: (context: string) => void; wrapLines?: boolean;
+export function ReviewDiff({ patch, source, onFeedback, onAddComment, wrapLines: controlledWrapLines }: {
+  patch: string; source: string; onFeedback?: (context: string) => void;
+  onAddComment?: (context: string) => ReviewCommentResult; wrapLines?: boolean;
 }) {
   const { t } = useLocale();
   const [localWrapLines, setLocalWrapLines] = useState(false);
   const wrapLines = controlledWrapLines ?? localWrapLines;
+  const [comment, setComment] = useState<CommentTarget | null>(null);
+  const [text, setText] = useState("");
+  const [blocked, setBlocked] = useState(false);
+  const trigger = useRef<HTMLButtonElement | null>(null);
+  const toolbar = useRef<HTMLButtonElement | null>(null);
+  const container = useRef<HTMLDivElement | null>(null);
+  const inputID = useId();
   const parsed = useMemo(() => parseReviewDiff(patch), [patch]);
-  if (!parsed.hunks.length) return <pre className="v2-delivery-patch">{patch}</pre>;
-  return <div className={`v2-delivery-diff${wrapLines ? " is-wrapped" : ""}`}>
+  const closeComment = () => {
+    setComment(null); setText(""); setBlocked(false);
+    requestAnimationFrame(() => (trigger.current?.isConnected ? trigger.current : toolbar.current ?? container.current)?.focus());
+  };
+  const addComment = () => {
+    if (!comment || !text.trim() || !onAddComment) return;
+    const result = onAddComment(t(`审阅意见：\n${comment.context}\n要求：${text}`, `Review comment:\n${comment.context}\nRequest: ${text}`));
+    if (result === "blocked") { setBlocked(true); return; }
+    closeComment();
+  };
+  const editor = comment && <div className="v2-diff-comment" onKeyDownCapture={(event) => {
+    if (event.nativeEvent.isComposing || event.nativeEvent.keyCode === 229) {
+      // Let the IME cancel its candidate without the modal's native Escape handler closing review.
+      if (event.key === "Escape") event.stopPropagation();
+      return;
+    }
+    if (event.key === "Escape") { event.preventDefault(); event.stopPropagation(); closeComment(); }
+    if (event.key === "Enter" && (event.ctrlKey || event.metaKey)) {
+      event.preventDefault(); event.stopPropagation(); addComment();
+    }
+  }}>
+    {comment.patch !== patch && <p role="status">{t("差异已更新；这条意见仍引用开始输入时的版本。", "The diff changed; this comment still refers to the revision you started with.")}</p>}
+    <label htmlFor={inputID}>{comment.label}</label>
+    {comment.patch !== patch && <pre>{comment.text}</pre>}
+    <textarea id={inputID} autoFocus rows={3} maxLength={4096} value={text}
+      onChange={(event) => setText(event.target.value)} placeholder={t("描述希望如何修改这一行…", "Describe the change you want on this line…")} />
+    {blocked && <p role="alert">{t("未能加入草稿。请返回聊天草稿检查版本冲突或保存问题；此处输入仍保留。", "Could not add this comment. Check the chat draft for conflicts or storage issues; your input is still here.")}</p>}
+    <div><button type="button" disabled={!text.trim() || !onAddComment} onClick={addComment}>{t("加入聊天草稿", "Add to chat draft")}</button>
+      <button type="button" onClick={closeComment}>{t("取消", "Cancel")}</button>
+      <span>{t("Ctrl / ⌘ + Enter 加入；返回聊天后发送", "Ctrl / ⌘ + Enter to add; send from chat")}</span></div>
+  </div>;
+  if (!parsed.hunks.length) return <>{editor}<pre className="v2-delivery-patch">{patch}</pre></>;
+  return <div ref={container} tabIndex={-1} className={`v2-delivery-diff${wrapLines ? " is-wrapped" : ""}`}>
+    {comment && comment.patch !== patch && editor}
     {parsed.hunks.map((hunk, ordinal) => <section key={ordinal} aria-label={t(`差异片段 ${ordinal + 1}`, `Diff hunk ${ordinal + 1}`)}>
       {hunk.preamble && <pre>{hunk.preamble}</pre>}
       <header><code>{hunk.header}</code><div className="v2-diff-hunk-actions">
         {ordinal === 0 && controlledWrapLines === undefined && <DiffWrapButton wrapLines={wrapLines}
-          onToggle={() => setLocalWrapLines((value) => !value)} />}
+          buttonRef={toolbar} onToggle={() => setLocalWrapLines((value) => !value)} />}
         {onFeedback && <button type="button" onClick={() => onFeedback(
-        t(`${source}\n${fileContext(hunk, t)}\n差异片段：${hunk.header}\n${hunk.lines.slice(0, 60).map((line) => line.text).join("\n")}${hunk.lines.length > 60 ? t("\n（摘录前60行）", "\n(first 60 lines)") : ""}`, `${source}\n${fileContext(hunk, t)}\nDiff hunk: ${hunk.header}\n${hunk.lines.slice(0, 60).map((line) => line.text).join("\n")}${hunk.lines.length > 60 ? t("\n（摘录前60行）", "\n(first 60 lines)") : ""}`))}>{t("引用此片段", "Quote this excerpt")}</button>}
-      </div></header>
-      <div className="v2-delivery-diff-lines">{hunk.lines.map((line, index) => <div className={`v2-diff-line ${line.kind}`} key={index}>
-        {onFeedback && line.kind !== "meta" ? <button type="button" className="v2-diff-line-ref"
-          aria-label={t(`引用${line.kind === "remove" ? t("旧", "Old") : t("新", "New")}第 ${line.newLine ?? line.oldLine} 行`, `Quote ${line.kind === "remove" ? "old" : "new"} line ${line.newLine ?? line.oldLine}`)}
-          onClick={() => onFeedback(t(`${source}\n${fileContext(hunk, t)}\n差异片段：${hunk.header}\n${line.kind === "remove" ? t("旧文件", "Old file") : t("新文件", "New file")}第 ${line.newLine ?? line.oldLine} 行：\n${line.text}\n行号只对应上述差异版本，请先核对当前内容。`, `${source}\n${fileContext(hunk, t)}\nDiff hunk: ${hunk.header}\n${line.kind === "remove" ? "Old file" : "New file"}, line ${line.newLine ?? line.oldLine}:\n${line.text}\nLine numbers refer only to this diff revision. Check current content first.`))}>
-          <span>{line.oldLine ?? ""}</span><span>{line.newLine ?? ""}</span></button> : <span className="v2-diff-line-ref" />}
-        <code>{line.text || " "}</code>
-      </div>)}</div>
+        t(`${source}\n${fileContext(hunk, t)}\n差异片段：${hunk.header}\n${hunk.lines.slice(0, 60).map((line) => line.text).join("\n")}${hunk.lines.length > 60 ? t("\n（摘录前60行）", "\n(first 60 lines)") : ""}`, `${source}\n${fileContext(hunk, t)}\nDiff hunk: ${hunk.header}\n${hunk.lines.slice(0, 60).map((line) => line.text).join("\n")}${hunk.lines.length > 60 ? t("\n（摘录前60行）", "\n(first 60 lines)") : ""}`))}>{t("引用此片段", "Quote this excerpt")}</button>}</div></header>
+      <div className="v2-delivery-diff-lines">{hunk.lines.map((line, index) => <Fragment key={index}>
+        <div className={`v2-diff-line ${line.kind}`}>
+          {onFeedback && line.kind !== "meta" ? <button type="button" className="v2-diff-line-ref"
+            aria-label={t(`引用${line.kind === "remove" ? "旧" : "新"}第 ${line.newLine ?? line.oldLine} 行`, `Quote ${line.kind === "remove" ? "old" : "new"} line ${line.newLine ?? line.oldLine}`)}
+            onClick={() => onFeedback(lineContext(source, hunk, line, t))}>
+            <span>{line.oldLine ?? ""}</span><span>{line.newLine ?? ""}</span></button> : <span className="v2-diff-line-ref" />}
+          {onAddComment && line.kind !== "meta" && <button type="button" className="v2-diff-comment-trigger" disabled={comment !== null}
+            aria-label={t(`评论${line.kind === "remove" ? "旧" : "新"}第 ${line.newLine ?? line.oldLine} 行`, `Comment on ${line.kind === "remove" ? "old" : "new"} line ${line.newLine ?? line.oldLine}`)}
+            onClick={(event) => {
+              trigger.current = event.currentTarget; setText(""); setBlocked(false);
+              setComment({ patch, hunk: ordinal, line: index, context: lineContext(source, hunk, line, t), text: line.text,
+                label: t(`${line.kind === "remove" ? "旧" : "新"}第 ${line.newLine ?? line.oldLine} 行的意见`, `Comment on ${line.kind === "remove" ? "old" : "new"} line ${line.newLine ?? line.oldLine}`) });
+            }}>+</button>}
+          <code>{line.text || " "}</code>
+        </div>
+        {comment?.patch === patch && comment.hunk === ordinal && comment.line === index && editor}
+      </Fragment>)}</div>
     </section>)}
     {parsed.trailing && <pre>{parsed.trailing}</pre>}
   </div>;
diff --git a/web/src/v2/components/task-git.test.tsx b/web/src/v2/components/task-git.test.tsx
index 14854b0f..67fc1c2a 100644
--- a/web/src/v2/components/task-git.test.tsx
+++ b/web/src/v2/components/task-git.test.tsx
@@ -74,17 +74,18 @@ function mount(f: ReturnType<typeof fixture>, threadID = "task-a", identity = sc
   let store!: V2RecoveryStore;
   const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false, staleTime: 5000 }, mutations: { retry: false } } });
   const onOpenWorktree = vi.fn(), onFeedback = vi.fn(), onPullRequest = vi.fn();
+  const onAddComment = vi.fn().mockReturnValue("added");
   function Probe() { store = useV2RecoveryStore()!; return null; }
   let currentThread = threadID;
   const tree = (id: string, visible = true) => <QueryClientProvider client={queryClient}>
     <V2RecoveryProvider client={f.client} scopeID={identity}><Probe />
       {/* The actual review owner remounts its task body on Run/tab changes. */}
       {visible && <TaskGit key={id} client={f.client} threadID={id} working={false} onFeedback={onFeedback}
-        onPullRequest={onPullRequest} onOpenWorktree={onOpenWorktree} />}
+        onPullRequest={onPullRequest} onOpenWorktree={onOpenWorktree} onAddComment={onAddComment} />}
     </V2RecoveryProvider>
   </QueryClientProvider>;
   const view = render(tree(threadID));
-  return { ...view, store: () => store, queryClient, onOpenWorktree, onFeedback, onPullRequest,
+  return { ...view, store: () => store, queryClient, onOpenWorktree, onFeedback, onPullRequest, onAddComment,
     selectThread: (id: string) => { currentThread = id; view.rerender(tree(id)); },
     showGit: (visible: boolean) => view.rerender(tree(currentThread, visible)) };
 }
@@ -103,6 +104,23 @@ async function selectCommit(message = "only the selected change") {
 beforeEach(() => window.localStorage.clear());
 afterEach(() => { cleanup(); vi.restoreAllMocks(); });
 
+it("adds a comment bound to the preview fingerprint without executing Git or closing the preview", async () => {
+  const f = fixture();
+  const view = mount(f);
+  await ready();
+  const user = await selectCommit();
+  await user.click(screen.getByRole("button", { name: "评论新第 1 行" }));
+  await user.type(screen.getByRole("textbox", { name: "新第 1 行的意见" }), "Check the fallback first");
+  await user.click(screen.getByRole("button", { name: "加入聊天草稿" }));
+  expect(view.onAddComment).toHaveBeenCalledWith(expect.stringContaining(`Git 预览：${fingerprint}`));
+  expect(view.onAddComment).toHaveBeenCalledWith(expect.stringContaining("新文件路径：b/chosen.txt"));
+  expect(view.onAddComment).toHaveBeenCalledWith(expect.stringContaining("要求：Check the fallback first"));
+  expect(screen.getByRole("region", { name: "Git 操作确认" })).toBeVisible();
+  expect(f.previews()).toHaveLength(1);
+  expect(f.executions()).toHaveLength(0);
+  expect(view.onFeedback).not.toHaveBeenCalled();
+});
+
 it("requires nonempty selection, exact preview and a separate confirmation before executing", async () => {
   const f = fixture();
   const view = mount(f);
diff --git a/web/src/v2/components/task-git.tsx b/web/src/v2/components/task-git.tsx
index 22f9fe7c..3136778d 100644
--- a/web/src/v2/components/task-git.tsx
+++ b/web/src/v2/components/task-git.tsx
@@ -6,6 +6,7 @@ import type { WorkspaceView } from "../../api/types";
 import { executeThreadGit, observeThreadGit, previewThreadGit, readThreadGit, type ThreadGitPreview, type ThreadGitResult, type ThreadGitSpec } from "../../api/task-delivery";
 import { ErrorState, LoadingState, StatusLabel } from "../../components/common";
 import { useV2PersistentState, useV2RecoveryStore } from "../recovery-storage";
+import type { ReviewCommentResult } from "../review-comment-draft";
 import { ReviewDiff } from "./review-diff";
 import { taskReviewKey } from "./task-overview";
 import { gitFormRepositoryID, gitFormRevision, useGitFormState } from "./git-form-state";
@@ -22,8 +23,9 @@ const validAttempt = (value: unknown, threadID: string): value is GitAttempt =>
   "operation" in value && typeof value.operation === "string" && Object.hasOwn(operationLabels((chinese) => chinese), value.operation));
 export const taskGitKey = (threadID: string) => ["thread", threadID, "git"] as const;
 
-export function TaskGit({ client, threadID, working, onFeedback, onPullRequest, onOpenWorktree }: {
+export function TaskGit({ client, threadID, working, onFeedback, onAddComment, onPullRequest, onOpenWorktree }: {
   client: APIClient; threadID: string; working: boolean; onFeedback: (context: string) => void; onPullRequest: () => void;
+  onAddComment?: (context: string) => ReviewCommentResult;
   onOpenWorktree?: (workspace: WorkspaceView) => void;
 }) {
   const { t } = useLocale();
@@ -288,7 +290,7 @@ export function TaskGit({ client, threadID, working, onFeedback, onPullRequest,
           {preview.target_commit_oid && <div><dt>{t("完整目标提交", "Full target commit")}</dt><dd>{preview.target_commit_oid}</dd></div>}
           <div><dt>{t("预览指纹", "Preview fingerprint")}</dt><dd>{preview.preview_fingerprint}</dd></div>
         </dl></details>
-        {preview.diff && <ReviewDiff patch={preview.diff} source={t(`Git 预览：${preview.preview_fingerprint}\n分支：${preview.branch}\n提交：${preview.head_oid}\n目录：${preview.repository_root}`, `Git preview: ${preview.preview_fingerprint}\nBranch: ${preview.branch}\nCommit: ${preview.head_oid}\nDirectory: ${preview.repository_root}`)} onFeedback={onFeedback} />}
+        {preview.diff && <ReviewDiff patch={preview.diff} source={t(`Git 预览：${preview.preview_fingerprint}\n分支：${preview.branch}\n提交：${preview.head_oid}\n目录：${preview.repository_root}`, `Git preview: ${preview.preview_fingerprint}\nBranch: ${preview.branch}\nCommit: ${preview.head_oid}\nDirectory: ${preview.repository_root}`)} onFeedback={onFeedback} onAddComment={onAddComment} />}
         {!preview.can_execute && <p role="alert">{preview.blocked_reason || t("此预览当前不能执行。", "This preview cannot currently be executed.")}</p>}
         {preview.spec.operation === "commit" && <p>{t("本次提交会跳过本地 hooks，生成无签名提交。请确认这种提交方式符合项目要求。", "This commit skips local hooks and is unsigned. Confirm this meets project requirements.")}</p>}
         <p>{t("确认后仅执行这份预览；内容或分支变化时需要重新预览。", "Confirmation executes only this preview. Content or branch changes require a new preview.")}</p>
diff --git a/web/src/v2/components/task-overview.test.tsx b/web/src/v2/components/task-overview.test.tsx
index 423f860a..8173a2a3 100644
--- a/web/src/v2/components/task-overview.test.tsx
+++ b/web/src/v2/components/task-overview.test.tsx
@@ -88,11 +88,12 @@ it("groups unapplied proposals without repeated status descriptions", async () =
 
 it("keeps wrapping beside file review actions and scopes it to the selected file", async () => {
   const onReviewFile = vi.fn();
+  const onAddComment = vi.fn().mockReturnValue("added");
   const value = review({ applied_changes: [], unapplied_changes: [change({ edit_id: "old-pending", status: "proposed" }),
     change({ run_id: "new-run", edit_id: "current-pending", path: "current.ts", status: "proposed" })] });
   render(<QueryClientProvider client={new QueryClient({ defaultOptions: { queries: { retry: false } } })}>
     <TaskOverview client={{ get: vi.fn().mockResolvedValue(value) } as unknown as APIClient}
-      threadID="task" onFeedback={vi.fn()} onReviewFile={onReviewFile} />
+      threadID="task" onFeedback={vi.fn()} onReviewFile={onReviewFile} onAddComment={onAddComment} />
   </QueryClientProvider>);
   const old = (await screen.findByText("src/app.ts")).closest("article")!;
   const current = screen.getByText("current.ts").closest("article")!;
@@ -106,8 +107,14 @@ it("keeps wrapping beside file review actions and scopes it to the selected file
   expect(old.querySelector(".v2-delivery-diff")).toHaveClass("is-wrapped");
   expect(current.querySelector(".v2-delivery-diff")).not.toHaveClass("is-wrapped");
   expect(within(old).getAllByRole("button", { name: "长行换行" })).toHaveLength(1);
+  await user.click(within(old).getAllByRole("button", { name: /^评论/ })[0]);
+  await user.type(within(old).getByRole("textbox"), "Preserve this guard");
   await user.click(toggle);
   expect(old.querySelector(".v2-delivery-diff")).not.toHaveClass("is-wrapped");
+  expect(within(old).getByRole("textbox")).toHaveValue("Preserve this guard");
+  await user.click(within(old).getByRole("button", { name: "加入聊天草稿" }));
+  expect(onAddComment).toHaveBeenCalledWith(expect.stringContaining("要求：Preserve this guard"));
+  expect(onAddComment).toHaveBeenCalledWith(expect.stringContaining("编辑记录：old-pending"));
   await user.click(within(old).getByRole("button", { name: "查看并审阅" }));
   expect(onReviewFile).toHaveBeenCalledWith({ runID: "old-run", editID: "old-pending", workspaceID: "physical-workspace" });
   expect(screen.queryByText("当前执行的提案")).not.toBeInTheDocument();
diff --git a/web/src/v2/components/task-overview.tsx b/web/src/v2/components/task-overview.tsx
index 1c573fb9..1c404f0f 100644
--- a/web/src/v2/components/task-overview.tsx
+++ b/web/src/v2/components/task-overview.tsx
@@ -8,6 +8,7 @@ import type { RunDetailView } from "../../api/types";
 import { ErrorState, LoadingState, StatusBadge } from "../../components/common";
 import type { FileEditReviewTarget } from "../../components/file-edit-panel";
 import { PlanDeliveryPanel } from "../../components/run-workspace";
+import type { ReviewCommentResult } from "../review-comment-draft";
 import { DiffWrapButton, parseReviewDiff, ReviewDiff } from "./review-diff";
 import "./task-delivery.css";
 
@@ -25,8 +26,9 @@ export function isCheckFailed(outcome: string): boolean {
   return normalized === "fail" || normalized === "failed" || normalized === "failure" || normalized === "error";
 }
 
-export function TaskOverview({ client, threadID, onFeedback, onGit, onPullRequest, onChecks, onReviewFile, currentRunDetail }: {
+export function TaskOverview({ client, threadID, onFeedback, onAddComment, onGit, onPullRequest, onChecks, onReviewFile, currentRunDetail }: {
   client: APIClient; threadID: string; onFeedback: (context: string) => void; onGit?: () => void;
+  onAddComment?: (context: string) => ReviewCommentResult;
   onPullRequest?: () => void; onChecks?: () => void;
   onReviewFile?: (target: FileEditReviewTarget) => void;
   currentRunDetail?: RunDetailView;
@@ -95,10 +97,10 @@ export function TaskOverview({ client, threadID, onFeedback, onGit, onPullReques
       {!review.unapplied_changes.length && <p>{t("没有已记录的待应用提案。", "No recorded proposals awaiting application.")}</p>}
       {[...review.unapplied_changes].sort((left, right) => Number(right.run_id === review.current_run_id) - Number(left.run_id === review.current_run_id))
         .map((change) => <TaskChange key={`${change.run_id}:${change.edit_id}`} change={change} observedAt={review.observed_at}
-          onFeedback={feedback} onReviewFile={onReviewFile} />)}
+          onFeedback={feedback} onAddComment={onAddComment} onReviewFile={onReviewFile} />)}
       <h3>{t("已应用的编辑 ", "Applied edits")}<span>({review.applied_changes.length})</span></h3>
       {!review.applied_changes.length && <p>{t("尚无已记录的应用编辑。工作目录的其他改动可在提交页面核对。", "No recorded applied edits. Check other working directory changes on the commit page.")}</p>}
-      {review.applied_changes.map((change) => <TaskChange key={`${change.run_id}:${change.edit_id}`} change={change} observedAt={review.observed_at} onFeedback={feedback} />)}
+      {review.applied_changes.map((change) => <TaskChange key={`${change.run_id}:${change.edit_id}`} change={change} observedAt={review.observed_at} onFeedback={feedback} onAddComment={onAddComment} />)}
       </section><section aria-label={t("任务检查", "Task checks")}>
       <h3>{t("检查结果 ", "Check results")}<span>({review.checks.length})</span></h3>
       {!review.checks.length && <p>{t("尚无已记录的检查结果。", "No recorded check results.")}</p>}
@@ -132,8 +134,9 @@ function CheckCard({ check, observedAt, isFetching, onFeedback }: {
     <button type="button" onClick={() => onFeedback(t(`检查：${check.title}\n结果：${check.outcome}\n版本状态：${check.revision_state}\n来源执行：${check.run_id}\n记录：${check.id}\n绑定版本：${check.recorded_revision_sha256 || t("未保存", "Not saved")}\n读取时间：${observedAt}`, `Check: ${check.title}\nResult: ${check.outcome}\nRevision status: ${check.revision_state}\nSource run: ${check.run_id}\nRecord: ${check.id}\nRecorded revision: ${check.recorded_revision_sha256 || t("未保存", "Not saved")}\nRead at: ${observedAt}`))}>{t("引用检查并继续修复", "Quote check and continue fixing")}</button>
   </article>;
 }
-function TaskChange({ change, observedAt, onFeedback, onReviewFile }: {
+function TaskChange({ change, observedAt, onFeedback, onAddComment, onReviewFile }: {
   change: ThreadReviewChange; observedAt: string; onFeedback: (context: string) => void;
+  onAddComment?: (context: string) => ReviewCommentResult;
   onReviewFile?: (target: FileEditReviewTarget) => void;
 }) {
   const { t } = useLocale();
@@ -149,7 +152,7 @@ function TaskChange({ change, observedAt, onFeedback, onReviewFile }: {
     </div></header>
     <details><summary>{t("查看这次编辑的差异", "View this edit's diff")}</summary>
       {(change.diff_truncated || change.redacted) && <p>{t("此差异", "This diff is ")}{change.diff_truncated ? t("已截断", "Truncated") : ""}{change.redacted ? t("已脱敏", "Redacted") : ""}{t("，只引用可见内容。", "; only visible content is quoted.")}</p>}
-      {change.diff ? <ReviewDiff patch={change.diff} source={source} onFeedback={onFeedback} wrapLines={wrapLines} /> : <p>{t("未保存可显示的文本差异。", "No displayable text diff was saved.")}</p>}
+      {change.diff ? <ReviewDiff patch={change.diff} source={source} onFeedback={onFeedback} wrapLines={wrapLines} onAddComment={onAddComment} /> : <p>{t("未保存可显示的文本差异。", "No displayable text diff was saved.")}</p>}
       <details><summary>{t("编辑来源", "Edit source")}</summary><pre>{source}</pre></details>
     </details></article>;
 }
diff --git a/web/src/v2/components/task-review.tsx b/web/src/v2/components/task-review.tsx
index 9664286f..557fbb05 100644
--- a/web/src/v2/components/task-review.tsx
+++ b/web/src/v2/components/task-review.tsx
@@ -23,6 +23,7 @@ import { TaskPullRequest } from "./task-pull-request";
 import { ProjectChecks } from "./project-checks";
 import { TaskReviewTools, type TaskReviewToolMemory, type TaskReviewToolReviews } from "./task-review-tools";
 import type { WorkspaceView } from "../../api/types";
+import type { ReviewCommentResult } from "../review-comment-draft";
 import "./task-review.css";
 
 type ReviewTab = "overview" | "git" | "pr" | "tools" | "files" | "checks" | "records" | "restore" | "evidence";
@@ -41,10 +42,11 @@ interface ReportAttempt {
 }
 const reportIntentKey = (runID: string) => ["run", runID, "standard-code-delivery-intent"] as const;
 
-export function V2TaskReview({ client, detail, working, onClose, onRequestChange, returnFocusRef, onOpenWorktree, initialFileTarget,
+export function V2TaskReview({ client, detail, working, onClose, onRequestChange, onAddComment, returnFocusRef, onOpenWorktree, initialFileTarget,
   initialToolTarget, toolMemoryRef }: {
   client: APIClient; detail: ThreadDetailView; working: boolean;
   onClose: () => void; onRequestChange: (context: string) => void;
+  onAddComment?: (context: string) => ReviewCommentResult;
   returnFocusRef: RefObject<HTMLElement | null>;
   onOpenWorktree?: (workspace: WorkspaceView) => void;
   initialFileTarget?: FileEditReviewTarget;
@@ -52,6 +54,12 @@ export function V2TaskReview({ client, detail, working, onClose, onRequestChange
   toolMemoryRef?: RefObject<TaskReviewToolMemory>;
 }) {
   const { t } = useLocale();
+  const [commentResult, setCommentResult] = useState<ReviewCommentResult | null>(null);
+  const addComment = onAddComment ? (context: string) => {
+    const result = onAddComment(t(`任务：${detail.thread.id}\n${context}`, `Task: ${detail.thread.id}\n${context}`));
+    setCommentResult(result);
+    return result;
+  } : undefined;
   const historyTabs: [ReviewTab, string][] = [["files", t("编辑明细", "Edit details")],
   ["records", t("执行记录", "Execution records")], ["evidence", t("参考资料", "References")], ["restore", t("撤销与恢复", "Undo and recovery")]];
   const primaryTabs = [{ value: "overview", label: t("查看改动", "View changes"), icon: FileDiff },
@@ -218,12 +226,12 @@ export function V2TaskReview({ client, detail, working, onClose, onRequestChange
         {!["overview", "git", "pr"].includes(tab) && <div className="v2-review-history-heading">
           <button onClick={() => selectTab("overview", true)} type="button"><ArrowLeft size={14} aria-hidden="true" />{t("返回任务改动", "Back to task changes")}</button>
           <h2>{primaryTabs.find((item) => item.value === tab)?.label ?? historyTabs.find(([value]) => value === tab)?.[1]}</h2></div>}
-        {tab === "overview" && <TaskOverview client={client} threadID={detail.thread.id} onFeedback={onRequestChange}
+        {tab === "overview" && <TaskOverview client={client} threadID={detail.thread.id} onFeedback={onRequestChange} onAddComment={addComment}
           onReviewFile={reviewFile} onGit={() => selectTab("git", true)}
           onPullRequest={() => selectTab("pr", true)}
           onChecks={() => selectTab("checks", true)}
           currentRunDetail={currentPlanQuery.data} />}
-        {tab === "git" && <TaskGit client={client} threadID={detail.thread.id} working={working} onFeedback={onRequestChange} onPullRequest={() => selectTab("pr", true)} onOpenWorktree={onOpenWorktree} />}
+        {tab === "git" && <TaskGit client={client} threadID={detail.thread.id} working={working} onFeedback={onRequestChange} onAddComment={addComment} onPullRequest={() => selectTab("pr", true)} onOpenWorktree={onOpenWorktree} />}
         {tab === "pr" && <TaskPullRequest client={client} threadID={detail.thread.id} working={working} onFeedback={onRequestChange} onGit={() => selectTab("git", true)} />}
         {!["overview", "git", "pr"].includes(tab) && !selectedRun && <p role="alert">{t("无法找到目标执行记录 ", "Could not find the target execution record ")}{selectedRunID}{t("，尚未打开审阅工具。请刷新任务后重试，或明确选择另一次执行。", ". Review tools have not opened. Refresh the task and retry, or select another run.")}</p>}
         {tab === "tools" && selectedRun && <TaskReviewTools client={client} runID={reviewedRunID}
@@ -314,8 +322,14 @@ export function V2TaskReview({ client, detail, working, onClose, onRequestChange
             runID={reviewedRunID} runStatus={selectedRun.status} />
         </>}
       </div>
-      <footer><span>{t("关闭面板会保留当前改动。", "Closing this panel preserves current changes.")}</span>
-        <button onClick={onClose} type="button">{t("返回对话", "Back to conversation")}</button></footer>
+      <footer className={onAddComment ? "v2-review-comment-status" : undefined}>
+        {onAddComment ? <p role={commentResult === "unsaved" ? "alert" : "status"}>{commentResult === "unsaved"
+          ? t("意见已加入本窗口草稿，但保存或版本有问题。请返回草稿处理，暂勿刷新或退出。", "Comment added in this window, but the draft has a storage or version issue. Return to the draft before reloading or leaving.")
+          : commentResult === "added" ? t("意见已加入聊天草稿，尚未发送。可继续评论其他行。", "Comment added to the chat draft, not sent. You can comment on more lines.")
+          : t("点击差异行旁的 + 写意见，加入聊天草稿后再发送。", "Use + beside a diff line to add feedback to your chat draft, then send from chat.")}</p> : <span>{t("关闭面板会保留当前改动。", "Closing this panel preserves current changes.")}</span>}
+        <button onClick={onAddComment ? () => onRequestChange("") : onClose} type="button">
+          {onAddComment ? t("返回聊天草稿", "Return to chat draft") : t("返回对话", "Back to conversation")}</button>
+      </footer>
     </section>
   </div>, document.body);
 }
diff --git a/web/src/v2/review-comment-draft.test.tsx b/web/src/v2/review-comment-draft.test.tsx
new file mode 100644
index 00000000..bb594d0f
--- /dev/null
+++ b/web/src/v2/review-comment-draft.test.tsx
@@ -0,0 +1,57 @@
+import { renderHook } from "@testing-library/react";
+import { DraftDocument, type DraftSnapshot } from "./draft-document";
+import { V2RecoveryProvider, useV2RecoveryStore } from "./recovery-storage";
+import { appendReviewComment } from "./review-comment-draft";
+
+const scope = { key: "thread:review-task", workspaceID: "review-project" };
+const original: DraftSnapshot = { text: "  Keep my draft.\n", files: [{ id: "file-a", path: "notes.txt", digest: "a".repeat(64), partial: false, redacted: false }],
+  images: [{ id: "image-a", workspace_id: scope.workspaceID, sha256: "b".repeat(64), mime_type: "image/png", byte_size: 48, width: 2, height: 3, name: "proof.png" }] };
+function setup() {
+  const store = renderHook(() => useV2RecoveryStore(), { wrapper: ({ children }) =>
+    <V2RecoveryProvider client={{ baseURL: "/api/v1" }} scopeID="review-comments">{children}</V2RecoveryProvider> }).result.current!;
+  const document = new DraftDocument(store);
+  const state = document.update(scope, original);
+  return { store, document, draft: { document, scope, state, changeText: vi.fn() } };
+}
+beforeEach(() => localStorage.clear());
+afterEach(() => vi.restoreAllMocks());
+
+it("appends against the latest draft, retaining whitespace, attachments and a different task across reload", () => {
+  const { store, document, draft } = setup();
+  const other = { ...scope, key: "thread:other-task" };
+  document.update(other, { text: "Other task" });
+  document.update(scope, { text: `${original.text}More recent text` });
+  expect(appendReviewComment(draft, "First line comment")).toBe("added");
+  expect(appendReviewComment(draft, "Second line comment")).toBe("added");
+  const reloaded = new DraftDocument(store);
+  expect(reloaded.read(scope).snapshot).toEqual({ ...original,
+    text: `${original.text}More recent text\n\nFirst line comment\n\nSecond line comment` });
+  expect(reloaded.read(other).snapshot.text).toBe("Other task");
+});
+
+it("blocks an append when another window has left conflicting versions", () => {
+  const { store, document, draft } = setup();
+  const other = new DraftDocument(store);
+  const remote = other.read(scope);
+  document.update(scope, { text: "Window A" }, draft.state.ref);
+  other.update(scope, { text: "Window B" }, remote.ref);
+  expect(document.read(scope).conflict).toBe(true);
+  const before = document.read(scope).heads;
+  expect(appendReviewComment(draft, "Do not lose either draft")).toBe("blocked");
+  expect(document.read(scope).heads).toEqual(before);
+});
+
+it("reports failed persistence while retaining the comment and attachments in memory, and blocks repeat appends", () => {
+  const { store, document, draft } = setup();
+  vi.spyOn(store, "write").mockImplementation(() => { throw new Error("Disk full"); });
+  expect(appendReviewComment(draft, "Retained feedback")).toBe("unsaved");
+  expect(document.read(scope).snapshot).toEqual({ ...original, text: `${original.text}\n\nRetained feedback` });
+  expect(appendReviewComment(draft, "Retained feedback")).toBe("blocked");
+  expect(document.read(scope).snapshot.text.match(/Retained feedback/gu)).toHaveLength(1);
+});
+
+it("preserves migration errors instead of bypassing the draft hook's guard", () => {
+  const { document, draft } = setup();
+  expect(appendReviewComment({ ...draft, state: { ...draft.state, error: "Unreadable legacy draft" } }, "feedback")).toBe("blocked");
+  expect(document.read(scope).snapshot).toEqual(original);
+});
diff --git a/web/src/v2/review-comment-draft.ts b/web/src/v2/review-comment-draft.ts
new file mode 100644
index 00000000..5499067d
--- /dev/null
+++ b/web/src/v2/review-comment-draft.ts
@@ -0,0 +1,15 @@
+import type { V2ManagedDraft } from "./draft-context";
+
+export type ReviewCommentResult = "added" | "unsaved" | "blocked";
+
+/** Append to the current document, preserving attachments and other windows' versions. */
+export function appendReviewComment(draft: V2ManagedDraft, comment: string): ReviewCommentResult {
+  if (draft.state.error) return "blocked";
+  const current = draft.document.read(draft.scope);
+  if (current.conflict || current.error) return "blocked";
+  const result = draft.document.update(draft.scope, (previous) => ({
+    ...previous, text: previous.text ? `${previous.text}\n\n${comment}` : comment,
+  }), current.ref);
+  // A failed local-storage write still retains the complete snapshot in memory.
+  return result.persisted && !result.error && !result.conflict ? "added" : "unsaved";
+}