dsh-plugin-image-tools 0.6.4 → 0.6.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.6.5] - 2026-09-04
+
+- 适配 dsh 0.1.2-rc.1：conversation.composer 链条目 select 入参由 `{interactions}` 改为 `{pendingInteraction}`（原生 PendingQuestion 单对象），按 questions/answer/cancel 鸭子类型认领带图片标记的问题批，plan-review 放行；
+- 待答载体 PendingChoice 改为包装 PendingQuestion（`.answer({answers})` / `.cancel()` 直调，替代旧 `wait.respond` 协议）；
+- DOM 增强部分（data-chat-flow 容器、dshimg 占位符、lightbox）经核验在新版 dsh-client-ui-chat 中锚点全部保留，无需改动。
+# Changelog
+
 ## [0.6.4] - 2026-08-29
 
 - 文档：「实现要点」整节下移到「模型用法示例」之后（访客先看价值再看原理）；

package/lib/client.js

@@ -140,22 +140,20 @@ window.__ModuleLoader__.load({
     }
 
     // ------------------------------------------------------------------
-    // 待答载体（与服务端回答协议一致；同 PendingQuestion 的 wire 编码）
+    // 待答载体（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 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();
       }
     };
 
@@ -1299,19 +1297,24 @@ window.__ModuleLoader__.load({
       return jsx(ImageChoiceFlow, { pending: pending, t: props.t }, pending.key);
     }
 
-    /** 认领“至少一题带图片标记”的 question 交互；其余交给原生 UI。 */
+    /**
+     * 认领“至少一题带图片标记”的 question 交互；其余交给原生 UI。
+     * 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 selectPickChoice(_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 : [];
-        var claimed = false;
-        for (var j = 0; j < questions.length; j++) {
-          if (parseMarker(questions[j].detail) !== null) { claimed = true; break; }
-        }
-        if (claimed) return item;
+      var pendingInteraction = _ref.pendingInteraction;
+      if (!isPendingQuestion(pendingInteraction)) return null;
+      if (pendingInteraction.kind === 'plan-review') return null;
+      var questions = pendingInteraction.questions;
+      for (var j = 0; j < questions.length; j++) {
+        if (questions[j] !== null && typeof questions[j] === 'object' && parseMarker(questions[j].detail) !== null) return pendingInteraction;
       }
       return null;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plugin-image-tools",
   "description": "DSH 图片插件，三个工具覆盖三种场景：ask_user_choice 图片/图文混合选择卡（Web GUI 渲染，可放大查看）+ show_images 回复内嵌图片（图文混排）+ save_received_images 盲模型收图存为工作区文件；聊天栏所有图片点击放大，支持滚轮缩放与拖拽平移。来源支持本地路径 / http(s) URL / base64 data URI。零 token 本地渲染，纯插件实现不改核心包。",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -29,6 +29,10 @@
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1"
   },
+  "devDependencies": {
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
+  },
   "engines": {
     "node": ">=18"
   },

package/scripts/smoke-client.mjs

@@ -19,12 +19,13 @@ import { buildPickMarker } from '../lib/index.js'
 
 const require = createRequire(import.meta.url)
 const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..')
-// 从 profile 的共享 node_modules 树解析 react（单实例：jsx-runtime/react-dom 同源）
-const profileRequire = createRequire(join('C:/Users/18303/.dsh/profiles/node_modules', 'noop.cjs'))
-const reactRoot = dirname(profileRequire.resolve('react'))
+// 优先用插件自带的 devDependencies react（0.6.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
@@ -121,24 +122,28 @@ assert.deepEqual(mod.extractImageTokenIds('📷 图片 dshimg:att-aaa111bbb222
 assert.deepEqual(mod.extractImageTokenIds('没有 token'), [])
 assert.deepEqual(mod.extractImageTokenIds(undefined), [])
 
-// 2) select：认领带标记问题，放过纯文字问题
+// 2) select：认领带标记问题，放过纯文字/plan-review（dsh 0.1.2 协议：
+// 入参 { pendingInteraction }，questions 直挂、带 answer()/cancel()）
 const markerDetail = buildPickMarker('pick-1', [0, 2]) + '\n\n请选择一张图'
-const withImage = {
+const fakePending = (questions, extra) => ({
   kind: 'question',
-  key: 'q:1',
+  key: 'q:x',
   sessionId: 's1',
-  payload: { type: 'question/requested', sessionId: 's1', questions: [{ id: 'a', question: '选图', detail: markerDetail, options: [{ label: 'A' }, { label: 'B' }, { label: 'C' }] }] },
-}
-const plain = {
-  kind: 'question',
-  key: 'q:2',
-  sessionId: 's2',
-  payload: { type: 'question/requested', sessionId: 's2', questions: [{ id: 'b', question: '纯文字', options: [{ label: 'X' }] }] },
-}
-const approval = { kind: 'approval', key: 'a:1', sessionId: 's1', payload: {} }
-assert.equal(mod.selectPickChoice({ interactions: [plain] }), null, '纯文字问题应放行')
-assert.equal(mod.selectPickChoice({ interactions: [approval, plain] }), null, '无图问题应放行')
-assert.equal(mod.selectPickChoice({ interactions: [plain, withImage] }), withImage, '带图问题应认领')
+  questions,
+  answer: async () => {},
+  cancel: async () => {},
+  ...extra,
+})
+const withImage = fakePending([{ id: 'a', question: '选图', detail: markerDetail, options: [{ label: 'A' }, { label: 'B' }, { label: 'C' }] }], { key: 'q:1' })
+const plain = fakePending([{ id: 'b', question: '纯文字', options: [{ label: 'X' }] }], { key: 'q:2', sessionId: 's2' })
+const planReview = fakePending(
+  [{ id: 'c', question: '确认计划', detail: '计划', intent: { kind: 'plan-review', approve: '执行' }, options: [{ label: '执行' }] }],
+  { key: 'q:3', kind: 'plan-review' },
+)
+assert.equal(mod.selectPickChoice({ pendingInteraction: plain }), null, '纯文字问题应放行')
+assert.equal(mod.selectPickChoice({ pendingInteraction: planReview }), null, 'plan-review 应放行')
+assert.equal(mod.selectPickChoice({ pendingInteraction: null }), null, '无 pendingInteraction 应放行')
+assert.equal(mod.selectPickChoice({ pendingInteraction: withImage }), withImage, '带图问题应认领')
 
 // 3) parseMarker 与服务端互通
 const parsed = mod.parseMarker(markerDetail)
@@ -148,10 +153,12 @@ assert.deepEqual({ pickId: parsed.pickId, images: parsed.images, human: parsed.h
 const { renderToString } = reactDomServer
 const fakeT = (key) => ({ 'nav.cancel': '取消', 'action.skip': '跳过', 'action.next': '下一步', 'submit': '提交', 'option.recommended': '推荐', 'custom.placeholder': '输入答案', 'image.failed': '加载失败', 'image.zoom': '放大查看', 'image.close': '关闭' }[key] ?? key)
 const fakeWait = {
+  kind: 'question',
   key: 'q:1',
   sessionId: 's1',
-  payload: { type: 'question/requested', sessionId: 's1', questions: [{ id: 'a', question: '选一张封面', header: '封面', detail: markerDetail, multiSelect: false, options: [{ label: 'A (Recommended)', description: '第一张' }, { label: 'B' }, { label: 'C' }] }] },
-  respond: async (r) => ({ accepted: true }),
+  questions: [{ id: 'a', question: '选一张封面', header: '封面', detail: markerDetail, multiSelect: false, options: [{ label: 'A (Recommended)', description: '第一张' }, { label: 'B' }, { label: 'C' }] }],
+  answer: async () => {},
+  cancel: async () => {},
 }
 const html = renderToString(reactModule.createElement(mod.ImageChoiceComposer, { matched: fakeWait, t: fakeT }))
 assert.ok(html.includes('dshpick-card'), '卡片未渲染')