opencode-plannotator-tui 0.2.1 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.3.0
+
+- Select older completed replies with `/annotate 2`, `/annotate 3`, and so on.
+  Bare `/annotate` and `/annotate 1` still select the latest reply.
+- Count only eligible completed text replies across history pages; report missing
+  replies and invalid numbers without opening a different source.
+- `/annotate-last` now always selects the latest reply and ignores arguments.
+  **Migration:** replace `/annotate-last file.md` with `/annotate file.md`.
+- Verify numbered feedback delivery and fixed latest-reply selection in the real
+  terminal smoke test, alongside 21 behavior tests.
+
+## 0.2.2
+
+- All confirmation dialogs, status notices, errors, and the feedback header sent
+  to the assistant are now in English.
+
 ## 0.2.1
 
 - Use an English command description in the slash menu and command palette.

package/README.md

@@ -13,12 +13,14 @@ official OpenCode or Plannotator release.
 
 ```text
 /annotate                         Review the last completed assistant reply
+/annotate 2                       Review the second most recent reply
+/annotate 3                       Review the third most recent reply
 /annotate docs/plan.md            Review a Markdown document
 /annotate "docs/release plan.md"  Review a path containing spaces
 /annotate ~/Documents/notes.txt   Review a plain-text document
 ```
 
-`/annotate-last` is an alias with the same optional file argument.
+`/annotate-last` always reviews the latest completed reply; any supplied argument is ignored.
 
 ## Install
 
@@ -61,8 +63,8 @@ Manual configuration, preserving other entries:
 3. Press `c` to comment, `a` for “looks good,” or `d` to request deletion.
    Without a selection, `c` comments on the current block. Enter saves a comment.
 4. Press **`q`** to return to OpenCode.
-5. Choose **发送并继续** (“Send and continue”) to submit the annotations. Escape or
-   **取消** cancels. The adapter's confirmation and status messages are currently Chinese.
+5. Choose **Send and continue** to submit the annotations. Escape or **Cancel**
+   cancels.
 
 The upstream **`E`** action copies to the clipboard. This adapter's automatic
 delivery path is **q → confirm** and does not need clipboard access.
@@ -75,6 +77,9 @@ cancelled reviews submit nothing.
 
 **Replies:** the latest completed text reply, with paginated history lookup.
 Reasoning, in-progress messages and tool-call commentary are excluded.
+Pass a positive integer to select the Nth most recent eligible reply: `1` is the
+default, `2` is the previous reply, and so on. If there are too few replies, the
+plugin reports that instead of opening another reply.
 
 **Documents:** local UTF-8 `.md`, `.mdx`, `.markdown` and `.txt` files up to 2 MiB.
 Relative paths resolve against the captured session's working directory, not the
@@ -160,9 +165,10 @@ See [release instructions](docs/releasing.md) and [changelog](CHANGELOG.md).
 这是 **Plannotator TUI 的非官方 OpenCode 适配插件**。
 
 - `/annotate`：批注上一条完整回复。
+- `/annotate 2`：批注倒数第二条，`3`、`4` 依次往前；`1` 等同于默认。
 - `/annotate 文档.md`：批注文档，支持中文、空格和相对路径。
-- `/annotate-last`：同义入口，也可带文件路径。
-- 选中文字 → `c` 写批注 → Enter 保存 → `q` 返回 →「发送并继续」。
+- `/annotate-last`：固定批注最新一条完整回复，忽略附带参数。
+- 选中文字 → `c` 写批注 → Enter 保存 → `q` 返回 →「Send and continue」。
 - 文档采用独立快照，反馈附原文件路径，确认后发回发起批注的会话。
 - 更新：`opencode plugin update opencode-plannotator-tui@latest`，然后重新打开终端客户端。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-plannotator-tui",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Unofficial OpenCode adapter for Plannotator TUI: annotate replies and documents without leaving your terminal.",
   "license": "MIT",
   "type": "module",
@@ -13,16 +13,42 @@
     "check": "node --check review.mjs && npm test && npm pack --dry-run",
     "prepublishOnly": "npm run check"
   },
-  "files": ["tui.ts", "review.mjs", "README.md", "LICENSE", "CHANGELOG.md"],
-  "engines": { "node": ">=22" },
-  "peerDependencies": { "@opencode/plugin": ">=2.0.22 <3" },
-  "peerDependenciesMeta": { "@opencode/plugin": { "optional": true } },
+  "files": [
+    "tui.ts",
+    "review.mjs",
+    "README.md",
+    "LICENSE",
+    "CHANGELOG.md"
+  ],
+  "engines": {
+    "node": ">=22"
+  },
+  "peerDependencies": {
+    "@opencode/plugin": ">=2.0.22 <3"
+  },
+  "peerDependenciesMeta": {
+    "@opencode/plugin": {
+      "optional": true
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nxxxsooo/opencode-plannotator-tui.git"
   },
   "homepage": "https://github.com/nxxxsooo/opencode-plannotator-tui#readme",
-  "bugs": { "url": "https://github.com/nxxxsooo/opencode-plannotator-tui/issues" },
-  "keywords": ["opencode", "opencode-plugin", "plannotator", "tui", "annotation", "markdown", "review"],
-  "publishConfig": { "access": "public" }
+  "bugs": {
+    "url": "https://github.com/nxxxsooo/opencode-plannotator-tui/issues"
+  },
+  "keywords": [
+    "opencode",
+    "opencode-plugin",
+    "plannotator",
+    "tui",
+    "annotation",
+    "markdown",
+    "review"
+  ],
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/review.mjs

@@ -15,26 +15,26 @@ async function documentSource(input, client, sessionID, signal) {
     target = target.slice(1, -1)
   }
   if (!target || !documentExtensions.has(path.extname(target).toLowerCase())) {
-    throw new Error("请指定一个 Markdown 或纯文本文件（.md、.mdx、.markdown、.txt）。")
+    throw new Error("Choose a Markdown or plain-text file (.md, .mdx, .markdown, .txt).")
   }
-  if (/^[a-z][a-z0-9+.-]*:\/\//i.test(target)) throw new Error("请指定本地文件路径。")
+  if (/^[a-z][a-z0-9+.-]*:\/\//i.test(target)) throw new Error("Use a local file path.")
   if (target.startsWith("~/")) target = path.join(os.homedir(), target.slice(2))
   const session = await client.session.get({ sessionID }, { signal })
   const directory = session.location?.directory
-  if (!path.isAbsolute(target) && !directory) throw new Error("无法确定当前会话的工作目录。")
+  if (!path.isAbsolute(target) && !directory) throw new Error("Can't determine the current session's working directory.")
   const filePath = path.isAbsolute(target) ? path.normalize(target) : path.resolve(directory, target)
   try {
     const info = await stat(filePath)
-    if (!info.isFile()) throw new Error("目标不是文件。")
-    if (info.size > maxDocumentBytes) throw new Error("文件超过 2 MiB，请先选取较小的文档。")
+    if (!info.isFile()) throw new Error("The target is not a file.")
+    if (info.size > maxDocumentBytes) throw new Error("The file is larger than 2 MiB. Choose a smaller document.")
     const bytes = await readFile(filePath, { signal })
-    if (bytes.length > maxDocumentBytes) throw new Error("文件超过 2 MiB。")
-    if (bytes.includes(0)) throw new Error("文件包含二进制内容。")
+    if (bytes.length > maxDocumentBytes) throw new Error("The file is larger than 2 MiB.")
+    if (bytes.includes(0)) throw new Error("The file contains binary content.")
     let text
     try {
       text = new TextDecoder("utf-8", { fatal: true }).decode(bytes)
     } catch {
-      throw new Error("请使用 UTF-8 编码的文本文件。")
+      throw new Error("Use a UTF-8 text file.")
     }
     return {
       text, filePath,
@@ -43,11 +43,16 @@ async function documentSource(input, client, sessionID, signal) {
     }
   } catch (error) {
     if (signal.aborted) throw error
-    throw new Error(`无法读取文档「${filePath}」：${error.code === "ENOENT" ? "文件不存在。" : error.message}`)
+    throw new Error(`Can't read document "${filePath}": ${error.code === "ENOENT" ? "file not found." : error.message}`)
   }
 }
 
 export function selectReply(messages) {
+  return eligibleReplies(messages)[0]
+}
+
+function eligibleReplies(messages) {
+  const replies = []
   const newest = [...messages].sort((a, b) =>
     b.time.created - a.time.created || b.id.localeCompare(a.id),
   )
@@ -55,12 +60,14 @@ export function selectReply(messages) {
     if (message.type !== "assistant" || message.time.completed === undefined || message.error) continue
     if (["tool-calls", "error", "content-filter"].includes(message.finish)) continue
     const text = message.content.filter(part => part.type === "text").map(part => part.text).join("\n\n")
-    if (text.trim()) return { id: message.id, text }
+    if (text.trim()) replies.push({ id: message.id, text })
   }
+  return replies
 }
 
-async function latestReply(client, sessionID, signal) {
+async function latestReply(client, sessionID, signal, position = 1) {
   const seen = new Set()
+  const messages = new Set()
   let cursor
   do {
     signal.throwIfAborted()
@@ -68,10 +75,13 @@ async function latestReply(client, sessionID, signal) {
       sessionID, type: "assistant", limit: 50,
       ...(cursor ? { cursor } : { order: "desc" }),
     }, { signal })
-    const reply = selectReply(page.data)
-    if (reply) return reply
+    for (const reply of eligibleReplies(page.data)) {
+      if (messages.has(reply.id)) continue
+      messages.add(reply.id)
+      if (--position === 0) return reply
+    }
     cursor = page.cursor?.next
-    if (cursor && seen.has(cursor)) throw new Error("读取会话历史时收到重复分页游标。")
+    if (cursor && seen.has(cursor)) throw new Error("Session history returned a repeated page cursor.")
     seen.add(cursor)
   } while (cursor)
 }
@@ -88,7 +98,7 @@ async function archivedNotes(data) {
 
 async function interactive({ binary, file, cwd, env, signal }) {
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
-    throw new Error("请在 OpenCode 完整终端界面中运行 /annotate。")
+    throw new Error("Run /annotate in the full OpenCode terminal interface.")
   }
   await new Promise((resolve, reject) => {
     const child = spawn(binary, [file], { cwd, env, stdio: "inherit", signal })
@@ -111,10 +121,10 @@ export function createReviewCommand(context, options = {}) {
 
   async function run(input = "") {
     if (disposed) return
-    if (active) return notice("已有批注正在进行。")
+    if (active) return notice("An annotation is already in progress.")
     // Capture before the first await: changing tabs must never redirect a review.
     const route = context.ui.router.current()
-    if (route.type !== "session") return notice("请先打开一个会话。")
+    if (route.type !== "session") return notice("Open a session first.")
     const sessionID = route.sessionID
     const title = context.data.session.get(sessionID)?.title ?? sessionID
     const controller = new AbortController()
@@ -125,11 +135,18 @@ export function createReviewCommand(context, options = {}) {
       // The UI cache contains only a recent page; a long tool run can push the last
       // completed reply out of it. Read the session-scoped history, newest first.
       const target = input.trim()
-      const source = target
+      const numeric = target !== "" && /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i.test(target)
+      const position = numeric ? Number(target) : 1
+      if (numeric && (!/^\d+$/.test(target) || !Number.isSafeInteger(position) || position < 1)) {
+        throw new Error("Choose a positive integer reply number (1 = latest, 2 = previous).")
+      }
+      const source = target && !numeric
         ? await documentSource(target, context.client, sessionID, controller.signal)
-        : await latestReply(context.client, sessionID, controller.signal)
+        : await latestReply(context.client, sessionID, controller.signal, position)
       if (controller.signal.aborted) return
-      if (!source) return notice("当前会话还没有已完成的助手回复。")
+      if (!source) return notice(position === 1
+        ? "This session has no completed assistant reply yet."
+        : `Can't find reply ${position}: this session has fewer completed assistant text replies.`)
 
       directory = await mkdtemp(path.join(options.tempRoot ?? os.tmpdir(), "opencode-annotate-"))
       keepDraft = true
@@ -171,42 +188,42 @@ export function createReviewCommand(context, options = {}) {
       })
       const feedback = stdout.trim()
       const archived = await archivedNotes(data)
-      const retainedArchive = archived ? `\n${archived} 条归档批注保留在 ${directory}。` : ""
+      const retainedArchive = archived ? `\n${archived} archived ${archived === 1 ? "note was" : "notes were"} kept in ${directory}.` : ""
       // Upstream 0.9.4 emits this sentinel rather than empty stdout.
       if (!feedback || feedback === "No annotations.") {
         keepDraft = archived > 0
-        return notice(archived ? `没有待发送的批注。${retainedArchive}` : "没有批注，已返回会话。", archived ? "warning" : "info")
+        return notice(archived ? `No annotations to send.${retainedArchive}` : "No annotations. Returned to the session.", archived ? "warning" : "info")
       }
-      if (!feedback.startsWith("# Annotations on ")) throw new Error("无法识别 TUI 的批注导出格式。")
+      if (!feedback.startsWith("# Annotations on ")) throw new Error("Can't recognize the TUI annotation export format.")
       const subject = source.filePath
-        ? `以下是我对文档 ${JSON.stringify(source.filePath)} 的批注，请按反馈处理该文件。\n批注基于打开时的文档快照（SHA-256：${source.sourceHash}）；修改前请重新读取原文件并核对引用。`
-        : `以下是我对你回复 ${source.id} 的批注，请按反馈处理。`
+        ? `Here are my annotations on the document ${JSON.stringify(source.filePath)}. Please apply the feedback to that file.\nThe annotations are based on a snapshot taken when the document was opened (SHA-256: ${source.sourceHash}). Re-read the file and check the quoted text before editing.`
+        : `Here are my annotations on your reply ${source.id}. Please address the feedback.`
       const text = `${subject}\n\n${feedback}`
       const feedbackPath = path.join(directory, "feedback.md")
       await writeFile(feedbackPath, text, { mode: 0o600 })
       const count = (feedback.match(/^## Annotation /gm) ?? []).length
       const confirmed = await context.ui.dialog.confirm({
-        title: "发送批注？",
-        message: `${source.filePath ? `文档：${source.filePath}\n` : ""}将 ${count} 条批注发送到「${title}」，并让助手继续处理？`,
-        label: { confirm: "发送并继续", cancel: "取消" },
+        title: "Send annotations?",
+        message: `${source.filePath ? `Document: ${source.filePath}\n` : ""}Send ${count} ${count === 1 ? "annotation" : "annotations"} to "${title}" and let the assistant continue?`,
+        label: { confirm: "Send and continue", cancel: "Cancel" },
       })
       if (controller.signal.aborted) return
       if (confirmed !== true) {
         keepDraft = archived > 0
-        return notice(`已取消发送。${retainedArchive}`)
+        return notice(`Sending cancelled.${retainedArchive}`)
       }
       await context.client.session.prompt({
         sessionID, id: promptID, text, delivery: "queue", resume: true,
       })
       keepDraft = archived > 0
-      notice(`已发送 ${count} 条批注。${retainedArchive}`, "success")
+      notice(`Sent ${count} ${count === 1 ? "annotation" : "annotations"}.${retainedArchive}`, "success")
     } catch (error) {
       if (!disposed) {
         const detail = error?.code === "ENOENT"
-          ? "找不到 plannotator-tui；请检查安装和 PATH。"
+          ? "Can't find plannotator-tui. Check that it is installed and on PATH."
           : error instanceof Error ? error.message : String(error)
         const recovery = keepDraft && directory
-          ? `\n草稿保留在 ${directory}；若已导出，反馈文件为 feedback.md。`
+          ? `\nThe draft was kept in ${directory}. If it was exported, the feedback is in feedback.md.`
           : ""
         notice(`${detail}${recovery}`, "error")
       }

package/tui.ts

@@ -14,11 +14,21 @@ export default Plugin.define({
           commands: [{
             id: "opencode-plannotator-tui.annotate",
             title: "Annotate reply or document (TUI)",
-            description: "Annotate the last reply or a file; press q, then confirm to send",
+            description: "Annotate a reply (1 = latest, 2 = previous) or a file; press q, then confirm to send",
             group: "Plannotator",
             palette: true,
-            slash: { name: "annotate", aliases: ["annotate-last"], arguments: true },
+            slash: { name: "annotate", arguments: true },
             run: review.run,
+          }, {
+            id: "opencode-plannotator-tui.annotate-last",
+            title: "Annotate last reply (TUI)",
+            description: "Annotate the latest completed reply; press q, then confirm to send",
+            group: "Plannotator",
+            palette: true,
+            // Keep slash submission with a trailing space local to the command.
+            // Any supplied argument is deliberately ignored: this always means latest.
+            slash: { name: "annotate-last", arguments: true },
+            run: () => review.run(),
           }],
         }))
         return null