dsh-plugin-choice-refresh 0.1.4 → 0.1.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # 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）；

package/README.md

@@ -92,7 +92,7 @@ npm run smoke   # selfcheck + smoke-client
 
 ## 兼容性
 
-- 实测于 DSH `0.1.1-rc.2`；需要 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`。

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 的选择卡加「重新生成选项 / 更多选项」两个按钮——选项都不满意一键换一批（换角度/维度，5~8 个），选项太少一键补充到 6~10 个。纯前端交互实现，不改核心包、不新增工具，原生文字卡与图片选择卡通吃。",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -36,6 +36,10 @@
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1"
   },
+  "devDependencies": {
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
+  },
   "engines": {
     "node": ">=18"
   },

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, {