@oadank/dsh-input-tools 0.3.11 → 0.3.12

package/lib/client.js

@@ -32,6 +32,10 @@ window.__ModuleLoader__.load({
 
     // ── 附件槽桥：官方 onAddImages 由 attachments 槽组件挂载时存入，left 按钮调用 ──
     let sharedOnAddImages = null;
+    // [2026-08-21] draft 图片共享：attachments 槽挂载时把当前 draft 图（ComposerAttachment[]）
+    // 与移除回调存入模块级，语音发送时可一起带上、发完清掉（解决"选了图发语音图被留下"）。
+    let sharedDraftImages = [];
+    let sharedRemoveImage = null;
 
     // ── [2026-08-21] 语音气泡（聊天界面 DOM 注入，安装即用，不依赖 dsh 源码支持）────
     // 录音 → 存服务器（/voice/outbox/save）→ ASR 转文本 → 发【用户语音】标记文本；
@@ -158,13 +162,38 @@ window.__ModuleLoader__.load({
           if (voiceErrorTimerRef.current !== null) window.clearTimeout(voiceErrorTimerRef.current);
           voiceErrorTimerRef.current = window.setTimeout(() => setVoiceError(null), 6000);
         };
-        const sendAsText = async (text) => {
+        // [2026-08-21] draft 图片转 image content（File→base64），语音可与图片一起发送
+        const draftImageContents = async () => {
+          const imgs = Array.isArray(sharedDraftImages) ? sharedDraftImages : [];
+          const out = [];
+          for (const a of imgs) {
+            const file = a?.file;
+            if (!file) continue;
+            const b64 = await new Promise((resolve) => {
+              const r = new FileReader();
+              r.onload = () => resolve(String(r.result).split(",")[1] ?? "");
+              r.onerror = () => resolve("");
+              r.readAsDataURL(file);
+            });
+            if (b64 !== "") out.push({ type: "image", mediaType: file.type || "image/jpeg", data: b64, name: file.name });
+          }
+          return out;
+        };
+        // [2026-08-21] 语音发送成功后清掉 draft 图片（否则图还留在输入框上）
+        const clearDraftImages = () => {
+          const imgs = Array.isArray(sharedDraftImages) ? sharedDraftImages : [];
+          if (typeof sharedRemoveImage === "function") {
+            for (const a of imgs) { try { sharedRemoveImage(a.id); } catch { /* ignore */ } }
+          }
+          sharedDraftImages = [];
+        };
+        const sendAsText = async (text, images) => {
           // [2026-08-21] 降级路径：XDN(npm rc.7) 不支持 voice content。带【用户语音】标记让 AI
           // 知道这是语音转的文本，可以按规则(自动 TTS)回复。
           const marked = "【用户语音】" + text;
           const response = await connection.api.sessions.prompt({
             sessionId, mode: "queue",
-            content: [{ type: "text", text: marked }],
+            content: [{ type: "text", text: marked }, ...images],
           });
           const result = response?.result;
           if (!result || !result.ok) {
@@ -172,25 +201,26 @@ window.__ModuleLoader__.load({
               ? result.error.message : "语音发送失败，请重试");
           }
         };
-        const sendAsVoice = async () => {
+        const sendAsVoice = async (images) => {
           // 首选：多模态直发（AI 能听原音，消息渲染为语音气泡）——本机 lecoo / dev rc.8 支持
           const response = await connection.api.sessions.prompt({
             sessionId, mode: "queue",
-            content: [{ type: "voice", mediaType, data }],
+            content: [{ type: "voice", mediaType, data }, ...images],
           });
           return response?.result;
         };
         try {
+          const images = await draftImageContents();
           // [2026-08-21 修] 先直发 voice，失败时降级 ASR 转文本（rc.7 兼容）。
           // 这样本机/rc.8 享受多模态（AI 听到原音 + 语音消息气泡），XDN/rc.7 自动降级不报错。
           let result;
           try {
-            result = await sendAsVoice();
+            result = await sendAsVoice(images);
           } catch (voiceErr) {
             result = null;
           }
           // 直发成功（rc.8/dev）：result.ok true
-          if (result && result.ok) return;
+          if (result && result.ok) { clearDraftImages(); return; }
           // 失败或不支持：尝试降级
           const errMsg = result?.error?.message ?? "";
           // 只有"contract/payload"类错误才降级；其他业务错误直接提示
@@ -216,7 +246,8 @@ window.__ModuleLoader__.load({
           if (!td?.ok) { fail(td?.error ?? "语音识别失败，请检查 ASR 配置"); return; }
           const text = typeof td?.text === "string" ? td.text.trim() : "";
           if (text === "") { fail("没听清，请再说一次"); return; }
-          await sendAsText(text);
+          await sendAsText(text, images);
+          clearDraftImages();
         } catch (e) {
           fail(String(e && typeof e.message === "string" && e.message !== "" ? e.message : e));
         }
@@ -318,6 +349,12 @@ window.__ModuleLoader__.load({
         if (typeof onAddImages === "function") sharedOnAddImages = onAddImages;
       }, [onAddImages]);
 
+      // [2026-08-21] draft 图同步到模块级（语音发送一起带 + 发完清掉）
+      useEffect(() => {
+        sharedDraftImages = Array.isArray(attachments) ? attachments : [];
+        if (typeof onRemoveImage === "function") sharedRemoveImage = onRemoveImage;
+      }, [attachments, onRemoveImage]);
+
       useEffect(() => {
         if (zoom !== null && !items.some((a) => a.id === zoom.id)) setZoom(null);
       }, [items, zoom]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oadank/dsh-input-tools",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "private": false,
   "type": "module",
   "main": "lib/index.js",