@wisdoverse/dsh-inline-media-viewer 1.0.8 → 1.0.10-alpha.1

package/CHANGELOG.md

@@ -1,14 +1,29 @@
 # Changelog
 
-## 1.0.8
+## 1.0.10-alpha.1
+
+- Adapt to DSH v0.1.3-alpha.1: register host settings through `settings.register`,
+  register client projections through `uiConversation.events`, and use the
+  authenticated two-argument RPC registration contract.
+- Remove the unused settings package peer dependency; consume the host-provided
+  settings service and add a real-dependency host registration check.
+
+## 1.0.9
+
+- Collect media paths from tool-call arguments as well as the assistant's final
+  text, so every image read during a turn remains available in its preview.
+
+## 1.0.8 (deprecated)
 
 - Preserve output-directory context across assistant steps in one turn, so a
   later final answer containing only media filenames still renders previews.
+- Superseded by 1.0.9 because tool-call-only media references were not retained.
 
-## 1.0.7
+## 1.0.7 (deprecated)
 
 - Resolve backticked media filenames against a preceding backticked directory,
   matching the common "output directory plus file list" response format.
+- Superseded by 1.0.9 because it only inspected assistant text.
 
 ## 1.0.6
 

package/README.md

@@ -59,12 +59,14 @@ audio/sound.mp3                    →  <audio controls>
 
 ## Installation
 
+Targets DSH **v0.1.3-alpha.1**. For older DSH versions, use plugin **1.0.9**.
+
 ### From npm
 
 Install and activate the bundle in your Web profile:
 
 ```bash
-dsh plugin --profile web add @wisdoverse/dsh-inline-media-viewer
+dsh plugin --profile web add @wisdoverse/dsh-inline-media-viewer@1.0.10-alpha.1
 ```
 
 Restart the Web profile after installation.

package/README.zh-CN.md

@@ -57,12 +57,14 @@ audio/sound.mp3                    →  <audio controls>
 
 ## 安装
 
+适配 DSH **v0.1.3-alpha.1**；旧版 DSH 请使用插件 **1.0.9**。
+
 ### 通过 npm 安装
 
 在 Web profile 中安装并启用 Bundle：
 
 ```bash
-dsh plugin --profile web add @wisdoverse/dsh-inline-media-viewer
+dsh plugin --profile web add @wisdoverse/dsh-inline-media-viewer@1.0.10-alpha.1
 ```
 
 安装后重启 Web profile。

package/client/client.js

@@ -80,6 +80,11 @@ window.__ModuleLoader__.load({
       const found = [];
       const seen = new Set();
       let directory = "";
+      const ext = Array.from(MEDIA_EXTENSIONS).join("|");
+      const directories = new Set(Array.from(text.matchAll(
+        /[`'"]((?:\/|\.\.?\/|[\w.-]+\/)[^`'"\n]*[\/\\])[`'"]/g,
+      ), (match) => cleanCandidate(match[1])));
+      const soleDirectory = directories.size === 1 ? directories.values().next().value : "";
       const add = (raw) => {
         const source = cleanCandidate(raw);
         const kind = mediaKind(source);
@@ -95,7 +100,10 @@ window.__ModuleLoader__.load({
       plain = plain.replace(/`([^`\n]+)`/g, (match, source) => {
         const value = cleanCandidate(source);
         if (/[/\\]$/.test(value)) directory = value;
-        else add(directory && !/[/\\]/.test(value) ? `${directory}${value}` : value);
+        else {
+          const base = directory || soleDirectory;
+          add(base && !/[/\\]/.test(value) ? `${base}${value}` : value);
+        }
         return " ".repeat(match.length);
       });
       plain = plain.replace(/https?:\/\/[^\s<>"'`]+/gi, (source) => {
@@ -103,7 +111,11 @@ window.__ModuleLoader__.load({
         return " ".repeat(source.length);
       });
 
-      const ext = Array.from(MEDIA_EXTENSIONS).join("|");
+      if (soleDirectory) {
+        const filenamePattern = new RegExp(String.raw`[\x60'"]([^\x60'"/\\\n]+\.(?:${ext})(?:\?[^\x60'"\s]*)?)[\x60'"]`, "gi");
+        for (const match of text.matchAll(filenamePattern)) add(`${soleDirectory}${match[1]}`);
+      }
+
       const pathPattern = new RegExp(
         String.raw`(?:\/|\.\.?\/|[\w.-]+\/)[^\s<>"'\x60()\[\]{}]+?\.(?:${ext})(?:\?[^\s<>"'\x60]*)?`,
         "gi",
@@ -112,10 +124,48 @@ window.__ModuleLoader__.load({
       return found;
     }
 
+    function toolArgumentText(raw) {
+      try {
+        const text = [];
+        const visit = (value) => {
+          if (typeof value === "string") text.push(value);
+          else if (value && typeof value === "object") Object.values(value).forEach(visit);
+        };
+        visit(JSON.parse(raw));
+        return text.join("\n");
+      } catch (_error) {
+        return raw;
+      }
+    }
+
+    const mediaMentionsDefinition = {
+      kind: "inline-media-mentions",
+      match: (event) => {
+        if (event.type === "turn/start") return { id: String(event.data.turn), role: "start" };
+        if (event.type === "tool/call") return { id: String(event.data.turn), role: "update" };
+        return null;
+      },
+      start: (_context, match) => ({ turn: match.event.data.turn, texts: [] }),
+      update: (context, match) => typeof match.event.data.arguments !== "string" ? context.state : {
+        ...context.state,
+        texts: [...context.state.texts, { seq: match.event.seq, text: toolArgumentText(match.event.data.arguments) }],
+      },
+      buildLocationData: (context, scope) => scope !== "turn" || context.state === undefined ? null : {
+        kind: "turn",
+        turn: context.state.turn,
+        key: "inline-media-mentions",
+        value: { texts: context.state.texts },
+      },
+    };
+
     function selectMedia(owner) {
       const settings = readSettings();
       if (!settings.autoRender) return null;
       const text = [];
+      const mentions = owner.turn.data && owner.turn.data.get("inline-media-mentions");
+      if (mentions) {
+        text.push(...mentions.texts.filter((entry) => entry.seq <= owner.seq).map((entry) => entry.text));
+      }
       for (const step of owner.turn.steps) {
         const assistant = step.data.get("assistant-step");
         if (!assistant || !assistant.finalNode || assistant.finalNode.seq > owner.seq || !Array.isArray(assistant.blocks)) continue;
@@ -492,10 +542,11 @@ window.__ModuleLoader__.load({
     }
 
     const name = "dsh-inline-media-viewer";
-    const inject = ["slots", "connection", "settingsScope", "locale"];
+    const inject = ["slots", "connection", "settingsScope", "locale", "uiConversation"];
 
     function apply(ctx) {
       const connection = ctx.get("connection");
+      ctx.uiConversation.events.register(mediaMentionsDefinition);
       ctx.effect(() => ctx.locale.register(SETTINGS_NS, SETTINGS_DICT), "inline-media: dictionaries");
       const t = ctx.locale.bind(SETTINGS_NS);
       const scope = ctx.settingsScope.bind({ namespace: SETTINGS_NAMESPACE });
@@ -518,7 +569,7 @@ window.__ModuleLoader__.load({
     exports.apply = apply;
     exports.inject = inject;
     exports.name = name;
-    exports.testing = Object.freeze({ extractCandidates, mediaTransport, selectMedia });
+    exports.testing = Object.freeze({ extractCandidates, mediaMentionsDefinition, mediaTransport, selectMedia, toolArgumentText });
     return module.exports;
   },
 });

package/index.js

@@ -20,7 +20,6 @@
 import { readFile, realpath, stat } from "node:fs/promises";
 import { isAbsolute, resolve } from "node:path";
 import z from "@deepseek-ai/schemastery";
-import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 
 import { COMFY_DEFAULT_ORIGIN, MAX_BYTES, comfyUrl, isInside, mimeOf, normalizeComfyOrigin, resolveSessionCwd, testing } from "./lib.js";
 
@@ -33,7 +32,7 @@ const CHANNEL = "/inline-media";
 const ENDPOINT = "read";
 
 /** Persistent user settings namespace for this plugin. */
-export const MEDIA_SETTINGS_NAMESPACE = settingsNamespace("inline-media");
+export const MEDIA_SETTINGS_NAMESPACE = "inline-media";
 
 /** Schema of the user settings section. */
 export const MEDIA_SETTINGS_SCHEMA = z.object({
@@ -157,28 +156,19 @@ async function handleRead(ctx, endpoint, payload, signal, resolveSettings) {
 }
 
 export function apply(ctx) {
-  let resolveSettings = () => MEDIA_SETTINGS_DEFAULTS;
+  const settings = ctx.settings.register(MEDIA_SETTINGS_NAMESPACE, MEDIA_SETTINGS_SCHEMA, {
+    base: MEDIA_SETTINGS_DEFAULTS,
+  });
+  const resolveSettings = () => settings.get();
   ctx.effect(() => {
     const dispose = ctx.connection.rpc.handle(
       CHANNEL,
       (endpoint, payload, signal) => handleRead(ctx, endpoint, payload, signal, resolveSettings),
-      { authority: "trusted-host" },
     );
     return () => {
       void dispose();
     };
   }, "inline-media: rpc");
-
-  // Register the user settings namespace (defaults + schema). The client reads
-  // and writes this section through the settings mirror. autoRender /
-  // displayCap / imageMaxPx are consumed client-side; comfyUrl is read here,
-  // per request, to decide which remote URLs to proxy and where to fetch them.
-  installSettingsSection(ctx, MEDIA_SETTINGS_NAMESPACE, MEDIA_SETTINGS_SCHEMA, MEDIA_SETTINGS_DEFAULTS, {
-    setSource: (source) => {
-      resolveSettings = source;
-    },
-    onChange: () => {},
-  });
 }
 
 export { MIME } from "./lib.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wisdoverse/dsh-inline-media-viewer",
-  "version": "1.0.8",
+  "version": "1.0.10-alpha.1",
   "description": "Persistent inline image, video, and audio previews for DeepSeek Harness Web conversations, with workspace-confined local reads and an optional ComfyUI proxy.",
   "repository": {
     "type": "git",
@@ -49,11 +49,11 @@
   ],
   "scripts": {
     "test": "node test.mjs",
-    "lint": "node --check index.js && node --check lib.js && node --check test.mjs"
+    "test:host": "node test.mjs --host",
+    "lint": "node --check index.js && node --check lib.js && node --check client/client.js && node --check test.mjs"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2",
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "dsh": {