dsh-plugin-choice-refresh 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -0,0 +1,27 @@
+# Changelog
+
+## [0.1.5] - 2026-09-04
+
+- 适配 dsh 0.1.2-rc.1：conversation.composer 链条目 select 入参由 `{interactions}` 改为 `{pendingInteraction}`（原生 PendingQuestion 单对象），按 `kind`/questions 鸭子类型认领，plan-review 继续放行；
+- 待答载体 PendingChoice 改为包装 PendingQuestion（`.answer({answers})` / `.cancel()` 直调，替代旧 `wait.respond` 协议）；
+- steer 兜底路径改为 `ctx.remote.session.prompt`（0.1.2 起 remote 命名空间为单数且要求 requestId）；主路径 sessions.binding().session.prompt 不变。
+# Changelog
+
+## [0.1.4] - 2026-08-29
+
+- 文档：兼容性补实测版本声明（DSH 0.1.1-rc.2）；
+- 元数据：description 加「生态唯一」钩子，keywords 10 → 16；
+- 新增英文版 README.en.md 与双语切换行；CHANGELOG.md 纳入 npm files。
+## [0.1.3] - 2026-08-25
+
+- 相关插件段新增 dsh-plugin-windows-guard（Windows 环境防坑守则 skill 插件，互相引流）。
+
+
+## [0.1.2] - 2026-08-21
+
+- README 新增「相关插件」互相引用段（列出同系列已发布插件，npm / GitHub 链接 + 一句话说明），互相引流。
+
+## [0.1.1] - 2026-08-19
+
+- 首发：选择增强（「重新生成选项」/「更多选项」按钮），纯前端实现，支持文字与图片选项卡。
+- 发布 npm、GitHub topics、dsh-market 收录（issue #40）。

package/README.en.md

@@ -0,0 +1,117 @@
+[中文](./README.md) | **English**
+
+# dsh-plugin-choice-refresh
+
+![npm version](https://img.shields.io/npm/v/dsh-plugin-choice-refresh)
+![License](https://img.shields.io/github/license/Pasumao/dsh-plugin-choice-refresh)
+![AI Assisted](https://img.shields.io/badge/AI-Assisted-8A2BE2)
+
+**The only choice-enhancement plugin in the dsh plugin market**: it adds two buttons to the choice cards of `ask_user_question` / `ask_user_choice` —
+not happy with any of the options? One click has the model come back with a completely different batch. Too few options? One click has the model add more.
+
+| Button | Scenario | Effect |
+| --- | --- | --- |
+| 🔄 **Regenerate options** (「重新生成选项」) | None of the offered options works for you | One click has the model re-ask with a completely different batch of options (new angle / style / dimension, 5–8 options) |
+| ➕ **More options** (「更多选项」) | Too few options to choose from | One click has the model re-ask while keeping the original options and adding new ones (6–10 options in total) |
+
+Purely client-side interaction, **registers no new tools and modifies no core packages**; works on both native text option cards and the
+[dsh-plugin-image-tools](https://github.com/Pasumao/dsh-plugin-image-tools) image option cards (image cards are rendered directly by this plugin, reusing its image routes).
+
+## Screenshot
+
+![choice-refresh in action: two buttons appear at the bottom of the choice card](docs/choice-buttons.png)
+
+Two extra buttons appear automatically at the bottom of the card:
+
+![choice-refresh in action: after clicking "More options", the model adds options and re-asks](docs/choice-more-options.png)
+
+After clicking "➕ More options": the model keeps the original options, adds new ones up to 6–10 total, and re-asks.
+
+> Real Web GUI screenshots.
+
+## Features
+
+- 🔄 **Regenerate options**: when none of the options offered by `ask_user_question` / `ask_user_choice` works for you, one click cancels the current question and has the model re-ask with a completely different batch of options (new angle / style / dimension, 5–8 options);
+- ➕ **More options**: when the options are too few to choose from, one click has the model keep the original options and add new ones (6–10 in total);
+- Purely client-side interaction, **registers no new tools and modifies no core packages**;
+- Works on native text option cards and `dsh-plugin-image-tools` image option cards alike;
+- Compatible with the `plan-review` plan review card, without affecting the native flow.
+
+## Configuration
+
+No configuration needed — install and it works:
+
+- Reads no environment variables, needs no API key / token, writes no config files;
+- Button labels follow `ctx.locale` (zh / en bilingual), with no extra setup;
+- Behavior is driven by the `【系统 · 选项刷新】` (system · option refresh) / `【系统 · 更多选项】` (system · more options) messages injected by the buttons; the model re-asks according to those instructions.
+
+## Installation
+
+```powershell
+# npm (recommended)
+dsh plugin --profile web add dsh-plugin-choice-refresh
+# or GitHub
+dsh plugin --profile web add github:Pasumao/dsh-plugin-choice-refresh
+```
+
+Install from source (local development / debugging):
+
+```bash
+git clone https://github.com/Pasumao/dsh-plugin-choice-refresh.git
+cd dsh-plugin-choice-refresh
+npm install        # or pnpm install
+# Mount into the profile via link:, see 设计说明.md (design notes) for details
+```
+
+Once installed, refresh the browser and it takes effect (hot-reloads automatically when the profile already has dsh-client-hmr — no restart needed).
+For local development, you can mount the plugin via `link:` instead — see `设计说明.md` (design notes) for details.
+
+## Usage
+
+When the model asks a question as usual via `ask_user_question` / `ask_user_choice` (e.g. following the novel-* skills), two extra buttons — **Regenerate options** and **More options** — appear at the bottom of the choice card:
+
+- Click **Regenerate options**: the current question is cancelled, and a `【系统 · 选项刷新】` user message is injected for the model, which immediately re-asks with a fresh set of options;
+- Click **More options**: same as above — a `【系统 · 更多选项】` message is injected, and the model keeps the original options and adds more.
+
+> The injected message stays short (one or two lines) and remains in the session as a user message so the model can understand the instruction;
+> the UI displays it verbatim.
+
+> Note: the refresh / top-up is done by the model, which re-invokes the question tool after reading the instruction — this is a "soft" enhancement, and the model may occasionally adjust the question itself. If you are still not satisfied with the result, click the button again or simply type what you want.
+
+## Self-check
+
+```powershell
+# In the plugin directory (local dev clone / link mount)
+npm run smoke   # selfcheck + smoke-client
+```
+
+## Compatibility
+
+- Tested on DSH `0.1.1-rc.2`; requires the DSH web GUI (an entry in the `conversation.composer` chain, priority -300).
+- Directly compatible with the image cards of a co-installed `dsh-plugin-image-tools`; without it, plain text options work as usual.
+- `plan-review` intents (plan review cards) are passed through to the native `PlanReviewPanel`, unaffected.
+- Depends on the client services `slots` / `locale` / `sessions` / `remote`.
+
+## Related plugins
+
+This plugin is part of **Pasumao's dsh plugin ecosystem**; the other published plugins in the series pair well with it:
+
+| Plugin (npm) | GitHub | Description |
+|---|---|---|
+| [dsh-notify](https://www.npmjs.com/package/dsh-notify) | [GitHub repo](https://github.com/Pasumao/dsh-plugin-notify) | Native Windows notifications + system tray |
+| [dsh-plugin-dev-kb](https://www.npmjs.com/package/dsh-plugin-dev-kb) | [GitHub repo](https://github.com/Pasumao/dsh-plugin-dev-kb) | Plugin development knowledge base (full mirror of the official docs + skill) |
+| [dsh-plugin-image-tools](https://www.npmjs.com/package/dsh-plugin-image-tools) | [GitHub repo](https://github.com/Pasumao/dsh-plugin-image-tools) | Image choice cards + inline images in replies + image handoff for text-only models |
+| [dsh-plugin-table-zoom](https://www.npmjs.com/package/dsh-plugin-table-zoom) | [GitHub repo](https://github.com/Pasumao/dsh-plugin-table-zoom) | Floating-window viewer for long chat tables + one-click Markdown copy |
+| [dsh-plugin-windows-guard](https://www.npmjs.com/package/dsh-plugin-windows-guard) | [GitHub repo](https://github.com/Pasumao/dsh-plugin-windows-guard) | Windows environment guard: rule skills + mojibake detection / dangerous-write blocking / encoding diagnostics & repair |
+| [dsh-plugin-workbench](https://www.npmjs.com/package/dsh-plugin-workbench) | [GitHub repo](https://github.com/Pasumao/dsh-plugin-workbench) | VS Code-style file explorer + editable preview |
+
+> For the rest of the series, see [Pasumao · dsh plugins](https://github.com/Pasumao); if you find them useful, a ⭐ on GitHub is always appreciated.
+
+## AI generation disclosure
+
+Code and documentation are AI-assisted (DeepSeek Harness), all human-reviewed and verified on a live install
+(`npm run smoke`: selfcheck + fake-client smoke test).
+
+## License
+
+[MIT](./LICENSE)

package/README.md

@@ -4,6 +4,8 @@
 ![License](https://img.shields.io/github/license/Pasumao/dsh-plugin-choice-refresh)
 ![AI Assisted](https://img.shields.io/badge/AI-Assisted-8A2BE2)
 
+[**中文**](./README.md) | [English](./README.en.md)
+
 **dsh 插件市场里唯一的选择增强插件**：给 `ask_user_question` / `ask_user_choice` 的选择卡加上两个按钮——
 选项都不满意？一键让模型换一批完全不同的。选项太少？一键让模型补充。
 
@@ -16,6 +18,18 @@
 [dsh-plugin-image-tools](https://github.com/Pasumao/dsh-plugin-image-tools) 的
 图片选项卡都生效（图片卡由本插件直接渲染，复用其图片路由）。
 
+## 效果图
+
+![choice-refresh 实机截图：选择卡底部出现「重新生成选项 / 更多选项」按钮](docs/choice-buttons.png)
+
+选择卡底部自动多出两个按钮：
+
+![choice-refresh 实机截图：点「更多选项」后模型补充选项并重新提问](docs/choice-more-options.png)
+
+点「➕ 更多选项」后：模型保留原选项、补充到 6~10 个并重新提问。
+
+> 真实 Web GUI 截图。
+
 ## 功能
 
 - 🔄 **重新生成选项**：`ask_user_question` / `ask_user_choice` 给出的选项都不满意时，
@@ -78,7 +92,7 @@ npm run smoke   # selfcheck + smoke-client
 
 ## 兼容性
 
-- 需要 DSH web GUI（`conversation.composer` 链条目，priority -300）。
+- 实测于 DSH `0.1.2-rc.1`（0.1.5 起适配该版的 `pendingInteraction` / `PendingQuestion` 新协议）；需要 DSH web GUI（`conversation.composer` 链条目，priority -300）。
 - 与 `dsh-plugin-image-tools` 共存的图片卡直接兼容；未安装时纯文字选项照常。
 - `plan-review` 意图（计划审阅卡）放行给原生 `PlanReviewPanel`，不受影响。
 - 依赖客户端服务：`slots` / `locale` / `sessions` / `remote`。
@@ -93,7 +107,7 @@ npm run smoke   # selfcheck + smoke-client
 | [dsh-plugin-dev-kb](https://www.npmjs.com/package/dsh-plugin-dev-kb) | [GitHub 仓库](https://github.com/Pasumao/dsh-plugin-dev-kb) | 插件开发知识库（官方文档完整镜像 + 技能） |
 | [dsh-plugin-image-tools](https://www.npmjs.com/package/dsh-plugin-image-tools) | [GitHub 仓库](https://github.com/Pasumao/dsh-plugin-image-tools) | 图片选择卡 + 回复内嵌图片 + 盲模型收图 |
 | [dsh-plugin-table-zoom](https://www.npmjs.com/package/dsh-plugin-table-zoom) | [GitHub 仓库](https://github.com/Pasumao/dsh-plugin-table-zoom) | 聊天长表格浮窗查看 + 一键复制 Markdown |
-| [dsh-plugin-windows-guard](https://www.npmjs.com/package/dsh-plugin-windows-guard) | [GitHub 仓库](https://github.com/Pasumao/dsh-plugin-windows-guard) | Windows 环境防坑守则 skill（编码/转义/路径/进程/乱码预防） |
+| [dsh-plugin-windows-guard](https://www.npmjs.com/package/dsh-plugin-windows-guard) | [GitHub 仓库](https://github.com/Pasumao/dsh-plugin-windows-guard) | Windows 环境防坑：守则技能 + 乱码检测 / 危险写拦截 / 编码诊断修复 |
 | [dsh-plugin-workbench](https://www.npmjs.com/package/dsh-plugin-workbench) | [GitHub 仓库](https://github.com/Pasumao/dsh-plugin-workbench) | VS Code 风格文件浏览器 + 可编辑预览 |
 
 > 本系列其余插件见 [Pasumao · dsh 插件](https://github.com/Pasumao)；觉得好用欢迎到 GitHub 点 ⭐。

package/lib/client.js

@@ -178,23 +178,20 @@ window.__ModuleLoader__.load({
     }
 
     // ------------------------------------------------------------------
-    // 待答载体（与服务端回答协议一致）
+    // 待答载体（dsh 0.1.2 起 composer 链的 matched 即原生 PendingQuestion：
+    // .answer({answers}) / .cancel() / .key / .sessionId / .questions，
+    // 这里包一层维持组件既有协议）
     // ------------------------------------------------------------------
     var PendingChoice = class {
-      constructor(wait) { this.wait = wait; }
-      get key() { return this.wait.key; }
-      get sessionId() { return this.wait.sessionId; }
-      get questions() { return this.wait.payload.questions; }
+      constructor(matched) { this.matched = matched; }
+      get key() { return this.matched.key; }
+      get sessionId() { return this.matched.sessionId; }
+      get questions() { return this.matched.questions; }
       async answer(answer) {
-        var receipt = await this.wait.respond({ ok: true, value: { sessionId: this.wait.sessionId, answer: answer } });
-        if (!receipt.accepted) throw new Error('question response rejected: ' + receipt.reason);
+        await this.matched.answer(answer);
       }
       async cancel() {
-        var receipt = await this.wait.respond({
-          ok: false,
-          error: { code: 'cancelled', message: 'the user closed this question request', details: {} }
-        });
-        if (!receipt.accepted) throw new Error('question cancellation rejected: ' + receipt.reason);
+        await this.matched.cancel();
       }
     };
 
@@ -420,8 +417,12 @@ window.__ModuleLoader__.load({
         if (binding !== void 0 && binding.session !== void 0 && typeof binding.session.prompt === 'function') {
           return binding.session.prompt([{ type: 'text', text: text }], 'steer');
         }
-        if (ctx.remote !== void 0 && ctx.remote.sessions !== void 0 && typeof ctx.remote.sessions.prompt === 'function') {
-          return ctx.remote.sessions.prompt({ sessionId: sessionId, mode: 'steer', content: [{ type: 'text', text: text }] });
+        if (ctx.remote !== void 0 && ctx.remote.session !== void 0 && typeof ctx.remote.session.prompt === 'function') {
+          // dsh 0.1.2 起 remote 命名空间为 session（单数）且要求 requestId。
+          var requestId = typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function'
+            ? crypto.randomUUID()
+            : 'dsr-' + Date.now() + '-' + Math.random().toString(36).slice(2);
+          return ctx.remote.session.prompt({ requestId: requestId, sessionId: sessionId, mode: 'steer', content: [{ type: 'text', text: text }] });
         }
         throw new Error('choice-refresh: no session prompt transport available');
       };
@@ -758,18 +759,22 @@ window.__ModuleLoader__.load({
      * 认领所有「非 plan-review」的 question 交互（priority -300，先于
      * image-tools 的 -100 与原生 UI 的 0）。plan-review 意图放行给原生
      * PlanReviewPanel；纯文字 / 带图片标记的问题都归本插件渲染。
+     * dsh 0.1.2 起 select 入参为 { pendingInteraction }（单对象，即原生
+     * PendingQuestion 实例；无交互时为 null），不再是 { interactions } 数组。
      */
+    function isPendingQuestion(value) {
+      return value !== null && typeof value === 'object'
+        && Array.isArray(value.questions)
+        && typeof value.answer === 'function'
+        && typeof value.cancel === 'function';
+    }
     function selectChoice(_ref) {
-      var interactions = _ref.interactions;
-      for (var i = 0; i < interactions.length; i++) {
-        var item = interactions[i];
-        if (item.kind !== 'question') continue;
-        var payload = item.payload;
-        var questions = payload !== null && typeof payload === 'object' && Array.isArray(payload.questions) ? payload.questions : [];
-        if (isPlanReviewBatch(questions)) continue;
-        return item;
-      }
-      return null;
+      var pendingInteraction = _ref.pendingInteraction;
+      if (!isPendingQuestion(pendingInteraction)) return null;
+      if (pendingInteraction.kind === 'plan-review') return null;
+      // 兜底再判一次 plan-review 意图（老版本宿主无 kind 字段时仍能放行）。
+      if (isPlanReviewBatch(pendingInteraction.questions)) return null;
+      return pendingInteraction;
     }
 
     // ------------------------------------------------------------------

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plugin-choice-refresh",
-  "description": "DSH 选择增强插件：在 ask_user_question / ask_user_choice 的选择卡上提供「重新生成选项」（都不满意一键刷新）与「更多选项」（选项太少一键补充）按钮。纯前端交互实现（取消当前问题 + steer 提示模型重新提问），不改核心包、不新增工具。",
-  "version": "0.1.3",
+  "description": "DSH 选择增强插件（生态唯一）：给 ask_user_question / ask_user_choice 的选择卡加「重新生成选项 / 更多选项」两个按钮——选项都不满意一键换一批（换角度/维度，5~8 个），选项太少一键补充到 6~10 个。纯前端交互实现，不改核心包、不新增工具，原生文字卡与图片选择卡通吃。",
+  "version": "0.1.5",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -12,8 +12,11 @@
   "files": [
     "lib",
     "scripts",
+    "docs",
     "cordis.patch.yml",
     "README.md",
+    "README.en.md",
+    "CHANGELOG.md",
     "LICENSE",
     "设计说明.md"
   ],
@@ -33,6 +36,10 @@
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1"
   },
+  "devDependencies": {
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
+  },
   "engines": {
     "node": ">=18"
   },
@@ -45,7 +52,13 @@
     "plugin",
     "choice",
     "refresh",
-    "regenerate",
+    "regenerate-options",
+    "more-options",
+    "ask-user",
+    "question",
+    "ux",
+    "chat-ui",
+    "frontend",
     "options"
   ],
   "license": "MIT",

package/scripts/selfcheck.mjs

@@ -10,9 +10,11 @@ import { strict as assert } from 'node:assert'
 
 const require = createRequire(import.meta.url)
 const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..')
-const profileRequire = createRequire(join('C:/Users/18303/.dsh/profiles/node_modules', 'noop.cjs'))
-const reactRoot = dirname(profileRequire.resolve('react'))
-const reactModule = profileRequire('react')
+// 优先用插件自带的 devDependencies react（0.1.5 起 dsh-app 根部的 react 不再保证
+// 是 17+、无 jsx-runtime）；本地没有时退回 profile 共享树。
+const localRequire = createRequire(join(ROOT, 'noop.cjs'))
+const reactRoot = dirname(localRequire.resolve('react'))
+const reactModule = localRequire('react')
 
 // 1) 模拟浏览器模块加载器并物化 factory
 let spec = null
@@ -107,26 +109,36 @@ ok('parseRecommendedLabel strips suffix', () => {
   assert.deepEqual(mod.parseRecommendedLabel('A'), { label: 'A', recommended: false })
 })
 
-// --- selectChoice ---
+// --- selectChoice（dsh 0.1.2 协议：入参 { pendingInteraction }，载体即原生
+// PendingQuestion——questions 直挂、带 answer()/cancel()） ---
+function fakePending(questions, extra) {
+  return {
+    kind: 'question',
+    key: 'q:test',
+    sessionId: 's1',
+    questions,
+    answer: async () => {},
+    cancel: async () => {},
+    ...extra,
+  }
+}
 ok('selectChoice claims normal question', () => {
-  const q = { kind: 'question', key: 'q:1', sessionId: 's1', payload: { questions: [{ id: 'a', question: 'q', options: [{ label: 'A' }] }] } }
-  assert.equal(mod.selectChoice({ interactions: [q] }), q)
+  const pending = fakePending([{ id: 'a', question: 'q', options: [{ label: 'A' }] }])
+  assert.equal(mod.selectChoice({ pendingInteraction: pending }), pending)
 })
-ok('selectChoice skips plan-review and approval', () => {
-  const plan = { kind: 'question', key: 'q:1', sessionId: 's1', payload: { questions: [{ id: 'a', question: 'q', detail: 'plan', intent: { kind: 'plan-review', approve: '执行' }, options: [{ label: '执行' }] }] } }
-  const approval = { kind: 'approval', key: 'a:1', sessionId: 's1', payload: {} }
-  assert.equal(mod.selectChoice({ interactions: [approval, plan] }), null, 'plan-review 应放行给原生 PlanReviewPanel')
+ok('selectChoice passes plan-review to native', () => {
+  const plan = fakePending([{ id: 'a', question: 'q', detail: 'plan', intent: { kind: 'plan-review', approve: '执行' }, options: [{ label: '执行' }] }], { kind: 'plan-review' })
+  assert.equal(mod.selectChoice({ pendingInteraction: plan }), null, 'plan-review 应放行给原生 PlanReviewPanel')
 })
-ok('selectChoice prefers question over approval and falls through to later', () => {
-  const q = { kind: 'question', key: 'q:2', sessionId: 's2', payload: { questions: [{ id: 'b', question: 'q2' }] } }
-  const approval = { kind: 'approval', key: 'a:1', sessionId: 's1', payload: {} }
-  assert.equal(mod.selectChoice({ interactions: [approval, q] }), q)
-  assert.equal(mod.selectChoice({ interactions: [approval] }), null)
+ok('selectChoice rejects non-question values', () => {
+  assert.equal(mod.selectChoice({ pendingInteraction: null }), null)
+  assert.equal(mod.selectChoice({ pendingInteraction: { questions: [] } }), null)
+  assert.equal(mod.selectChoice({}), null)
 })
 ok('selectChoice claims image-marked question too', () => {
   const marker = '<!--dsh-pick:v1:' + encodeBase64Url(JSON.stringify({ pickId: 'p1', images: [0] })) + '-->'
-  const q = { kind: 'question', key: 'q:3', sessionId: 's3', payload: { questions: [{ id: 'c', question: '选图', detail: marker, options: [{ label: 'A' }] }] } }
-  assert.equal(mod.selectChoice({ interactions: [q] }), q, '带图问题应由本插件渲染（含刷新/更多按钮）')
+  const pending = fakePending([{ id: 'c', question: '选图', detail: marker, options: [{ label: 'A' }] }])
+  assert.equal(mod.selectChoice({ pendingInteraction: pending }), pending, '带图问题应由本插件渲染（含刷新/更多按钮）')
 })
 
 console.log(`\n[dsh-plugin-choice-refresh] ${passed} checks passed`)

package/scripts/smoke-client.mjs

@@ -18,11 +18,13 @@ import { strict as assert } from 'node:assert'
 
 const require = createRequire(import.meta.url)
 const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..')
-const profileRequire = createRequire(join('C:/Users/18303/.dsh/profiles/node_modules', 'noop.cjs'))
-const reactRoot = dirname(profileRequire.resolve('react'))
+// 优先用插件自带的 devDependencies react（0.1.5 起 dsh-app 根部 react 可能被降级
+// 到 16.8、无 jsx-runtime，与 react-dom 19 不同源）；本地没有时退回 profile 共享树。
+const localRequire = createRequire(join(ROOT, 'noop.cjs'))
+const reactRoot = dirname(localRequire.resolve('react'))
 const jsxRuntime = join(reactRoot, 'jsx-runtime.js')
-const reactModule = profileRequire('react')
-const reactDomServer = profileRequire('react-dom/server')
+const reactModule = localRequire('react')
+const reactDomServer = localRequire('react-dom/server')
 
 // 1) 模拟浏览器模块加载器
 let spec = null
@@ -70,21 +72,20 @@ function encodeBase64Url(json) {
 }
 
 // 2) 纯文字问题：渲染卡片 + 两个增强按钮
+// （dsh 0.1.2 起 matched 即原生 PendingQuestion：questions 直挂、answer()/cancel()）
 const plainWait = {
+  kind: 'question',
   key: 'q:1',
   sessionId: 's1',
-  payload: {
-    type: 'question/requested',
-    sessionId: 's1',
-    questions: [
-      { id: 'a', question: '选一个封面风格', header: '封面', detail: '请选择你喜欢的风格', multiSelect: false, options: [
-        { label: '赛博 (Recommended)', description: '霓虹质感' },
-        { label: '水墨' },
-        { label: '极简' },
-      ] },
-    ],
-  },
-  respond: async (r) => ({ accepted: true }),
+  questions: [
+    { id: 'a', question: '选一个封面风格', header: '封面', detail: '请选择你喜欢的风格', multiSelect: false, options: [
+      { label: '赛博 (Recommended)', description: '霓虹质感' },
+      { label: '水墨' },
+      { label: '极简' },
+    ] },
+  ],
+  answer: async () => {},
+  cancel: async () => {},
 }
 let html = renderToString(reactModule.createElement(mod.ChoiceComposer, { matched: plainWait, t: fakeT, ctx: fakeCtx }))
 assert.ok(html.includes('dsr-card'), '卡片未渲染')
@@ -98,20 +99,18 @@ assert.ok(!html.includes('<!--dsh-pick:v1:'), '图片标记不应出现')
 // 3) 带图片标记的问题：渲染图片卡片（image-tools 路由）
 const marker = '<!--dsh-pick:v1:' + encodeBase64Url(JSON.stringify({ pickId: 'pick-7', images: [0, 2] })) + '-->'
 const imageWait = {
+  kind: 'question',
   key: 'q:2',
   sessionId: 's2',
-  payload: {
-    type: 'question/requested',
-    sessionId: 's2',
-    questions: [
-      { id: 'b', question: '选一张封面图', detail: marker, multiSelect: false, options: [
-        { label: '深海' },
-        { label: '极光' },
-        { label: '沙漠' },
-      ] },
-    ],
-  },
-  respond: async (r) => ({ accepted: true }),
+  questions: [
+    { id: 'b', question: '选一张封面图', detail: marker, multiSelect: false, options: [
+      { label: '深海' },
+      { label: '极光' },
+      { label: '沙漠' },
+    ] },
+  ],
+  answer: async () => {},
+  cancel: async () => {},
 }
 html = renderToString(reactModule.createElement(mod.ChoiceComposer, { matched: imageWait, t: fakeT, ctx: fakeCtx }))
 assert.ok(html.includes('/dsh-plugin-image-tools/pick-7/0'), '第一张图片 URL 缺失')
@@ -121,21 +120,18 @@ assert.ok(html.includes('放大查看'), '放大触发按钮缺失')
 assert.ok(html.includes('重新生成选项'), '带图问题的刷新按钮缺失')
 assert.ok(!html.includes('<!--dsh-pick:v1:'), '图片标记不应泄漏到界面')
 
-// 4) plan-review 批放行
+// 4) plan-review 批放行（dsh 0.1.2：载体 kind 即为 'plan-review'）
 const planWait = {
-  kind: 'question',
+  kind: 'plan-review',
   key: 'q:3',
   sessionId: 's3',
-  payload: {
-    type: 'question/requested',
-    sessionId: 's3',
-    questions: [
-      { id: 'c', question: '确认执行计划', detail: '# 计划\n1. 做 A', intent: { kind: 'plan-review', approve: '确认执行' }, options: [{ label: '确认执行' }, { label: '拒绝' }] },
-    ],
-  },
-  respond: async (r) => ({ accepted: true }),
+  questions: [
+    { id: 'c', question: '确认执行计划', detail: '# 计划\n1. 做 A', intent: { kind: 'plan-review', approve: '确认执行' }, options: [{ label: '确认执行' }, { label: '拒绝' }] },
+  ],
+  answer: async () => {},
+  cancel: async () => {},
 }
-assert.equal(mod.selectChoice({ interactions: [planWait] }), null, 'plan-review 不应被本插件认领')
+assert.equal(mod.selectChoice({ pendingInteraction: planWait }), null, 'plan-review 不应被本插件认领')
 
 // 5) Lightbox 单独渲染
 const lightboxHtml = renderToString(reactModule.createElement(mod.Lightbox, {