diffity-resolve

Compare original and translation side by side

🇺🇸

Original

English

🇨🇳

Translation

Chinese

Diffity Resolve Skill

You are reading open review comments and resolving them by making the requested code changes.

你正在读取待处理的评审评论，并通过执行要求的代码变更来解决它们。

Arguments

参数

```
thread-id
```
(optional): Resolve a specific thread by ID instead of all open threads. Example:
```
/diffity-resolve abc123
```

```
thread-id
```
（可选）：通过ID解决特定线程，而非所有待处理线程。示例：
```
/diffity-resolve abc123
```

CLI Reference

CLI 参考

diffity agent diff
diffity agent list [--status open|resolved|dismissed] [--json]
diffity agent comment --file <path> --line <n> [--end-line <n>] [--side new|old] --body "<text>"
diffity agent general-comment --body "<text>"
diffity agent resolve <id> [--summary "<text>"]
diffity agent dismiss <id> [--reason "<text>"]
diffity agent reply <id> --body "<text>"

```
--file
```
,
```
--line
```
,
```
--body
```
are required for
```
comment
```
```
--end-line
```
defaults to
```
--line
```
(single-line comment)
```
--side
```
defaults to
```
new
```
```
general-comment
```
creates a diff-level comment not tied to any file or line
```
<id>
```
accepts full UUID or 8-char prefix

diffity agent diff
diffity agent list [--status open|resolved|dismissed] [--json]
diffity agent comment --file <path> --line <n> [--end-line <n>] [--side new|old] --body "<text>"
diffity agent general-comment --body "<text>"
diffity agent resolve <id> [--summary "<text>"]
diffity agent dismiss <id> [--reason "<text>"]
diffity agent reply <id> --body "<text>"

```
--file
```
,
```
--line
```
,
```
--body
```
是
```
comment
```
命令的必填参数
```
--end-line
```
默认值为
```
--line
```
（单行评论）
```
--side
```
默认值为
```
new
```
```
general-comment
```
用于创建不关联任何文件或行的差异级评论
```
<id>
```
支持完整UUID或8字符前缀

Prerequisites

前置条件

Check that
```
diffity
```
is available: run
```
which diffity
```
. If not found, install it with
```
npm install -g diffity
```
.
Check that a review session exists: run
```
diffity agent list
```
. If this fails with "No active review session", tell the user to start diffity first (e.g.
```
diffity
```
or /diffity-diff).

检查
```
diffity
```
是否可用：执行
```
which diffity
```
。如果未找到，通过
```
npm install -g diffity
```
安装。
检查是否存在评审会话：执行
```
diffity agent list
```
。如果失败并提示 "No active review session"，告知用户先启动diffity（例如
```
diffity
```
或 /diffity-diff）。

Instructions

操作步骤

List open comment threads with full details:
```
diffity agent list --status open --json
```
If a
```
thread-id
```
argument was provided, filter to just that thread. The JSON output includes the full comment body, file path, line numbers, and side for each thread.
If there are no open threads, tell the user there's nothing to resolve.
For each open thread, check the
```
comments
```
array and the
```
author.type
```
field (
```
"user"
```
or
```
"agent"
```
) on each comment: a. Skip general comments (filePath
```
__general__
```
) — these are summaries, not actionable code changes. b. Skip threads where the last comment is an agent reply that asks the user a question (e.g. "Could you clarify...?") and the user hasn't responded yet — the agent is waiting for user input. Still process threads where the agent left the original comment (code suggestion, review feedback, etc.) — those are actionable. c. [nit]
comments — these are minor suggestions but still actionable. Resolve them like any other comment. d. [question]
comments (from the user) — read the question, examine the relevant code, and resolve the thread with your answer as the summary:
```
diffity agent resolve <thread-id> --summary "Your answer here"
```
e. Comments phrased as questions without an explicit
```
[question]
```
tag (e.g. "should we add X?" or "can we rename this?") are suggestions — treat them as actionable requests and make the change. f. Read the comment body from the JSON output and understand what change is requested. Interpret the intent:
- If the comment suggests a code change, make the change.
- If the comment suggests adding documentation, add or update the relevant docs.
- If the comment asks a question that implies an action (e.g. "should we add X?"), treat it as a request to do that action.
- If the comment is genuinely unclear and you cannot determine what action to take, reply asking for clarification instead of silently skipping:
```
diffity agent reply <thread-id> --body "Could you clarify what change you'd like here?"
```
g. Read the relevant source file to understand the full context around the commented lines, then make the requested change using the Edit tool. h. After making the change, resolve the thread with a summary:
```
diffity agent resolve <thread-id> --summary "Fixed: <brief description of what was changed>"
```
After resolving all applicable threads, run
```
diffity agent list
```
to confirm status.
Tell the user to check the browser — resolved status will appear within 2 seconds via polling.

列出包含完整详情的待处理评论线程：
```
diffity agent list --status open --json
```
如果提供了
```
thread-id
```
参数，则仅筛选该线程。JSON输出包含每个线程的完整评论内容、文件路径、行号和侧边信息。
如果没有待处理线程，告知用户没有需要解决的内容。
针对每个待处理线程，检查
```
comments
```
数组以及每条评论的
```
author.type
```
字段（
```
"user"
```
或
```
"agent"
```
）： a. 跳过通用评论（文件路径为
```
__general__
```
）——这些是摘要，而非可执行的代码变更。 b. 跳过最后一条评论是Agent回复且向用户提问（例如 "Could you clarify...?"）但用户尚未回应的线程——Agent正在等待用户输入。对于Agent留下原始评论（代码建议、评审反馈等）的线程仍需处理——这些是可执行的。 c. [nit]
评论——这些是小建议，但仍需处理。按照其他评论的方式解决它们。 d. [question]
评论（来自用户）——阅读问题，检查相关代码，然后用你的答案作为摘要解决线程：
```
diffity agent resolve <thread-id> --summary "你的答案在此"
```
e. 未明确标记
```
[question]
```
但以问题形式表述的评论（例如 "should we add X?" 或 "can we rename this?"）属于建议——将其视为可执行请求并进行变更。 f. 读取JSON输出中的评论内容，理解所需的变更。解读意图：
- 如果评论建议代码变更，执行该变更。
- 如果评论建议添加文档，添加或更新相关文档。
- 如果评论提出的问题隐含操作要求（例如 "should we add X?"），将其视为执行该操作的请求。
- 如果评论内容确实不明确，无法确定要执行的操作，则回复请求澄清，而非默默跳过：
```
diffity agent reply <thread-id> --body "Could you clarify what change you'd like here?"
```
g. 读取相关源文件，理解评论行周围的完整上下文，然后使用编辑工具执行所需变更。 h. 完成变更后，用摘要解决线程：
```
diffity agent resolve <thread-id> --summary "已修复：<变更内容的简要描述>"
```
解决所有适用线程后，执行
```
diffity agent list
```
确认状态。
告知用户查看浏览器——通过轮询，解决状态将在2秒内显示。