dsh-tool-vision 0.6.0 → 0.6.1

package/README.md

@@ -169,7 +169,7 @@ Example endpoints (`baseURL`):
 >   once more** and the section appears. A dsh update overwrites the patch;
 >   the next plugin start re-applies it.
 > - Settings changes hot-apply (no restart needed).
-> - Tested against DSH `0.1.0-rc.6`.
+> - Tested against DSH `0.1.0-rc.6`, `0.1.0-rc.7`, and `0.1.0-rc.8`.
 
 ## Pixel-level vision tools (v0.6.0, ported from dsh-vision-router)
 

package/client.js

@@ -183,7 +183,7 @@ window.__ModuleLoader__.load({
       var [error, setError] = react.useState(null);
 
       react.useEffect(function () {
-        scope.load();
+        if (typeof scope.load === "function") scope.load();
         var alive = true;
         var sync = function () { if (alive) setSnapshot(scope.getSnapshot()); };
         var un = typeof scope.subscribe === "function" ? scope.subscribe(sync) : null;
@@ -246,7 +246,7 @@ window.__ModuleLoader__.load({
         });
         Promise.all(writes).then(function () {
           setBusy(false); setNotice(t("saved"));
-          if (scope.load) scope.load();
+          if (typeof scope.load === "function") scope.load();
         }).catch(function (e) {
           setBusy(false); setError(t("error") + ": " + String(e && e.message || e));
         });
@@ -482,7 +482,7 @@ window.__ModuleLoader__.load({
       var t = ctx.locale.bind(NS);
       ctx.effect(function () { return ctx.locale.register(NS, { zh: zh, en: en }); }, "dsh-tool-vision: dictionaries");
       var scope = ctx.settingsScope.bind({ namespace: "tool-vision" });
-      scope.load();
+      if (typeof scope.load === "function") scope.load();
       attachBridgePreview(ctx, scope);
       ctx.slots.inject("settings.section", function () {
         return ctx.slots.register({

package/cordis.patch.yml

@@ -1,8 +1,8 @@
-# dsh-tool-vision — bundle patch layer
-#
-# Declares the plugin as a Cordis loader entry, making the package a standard
-# profile bundle: `dsh plugin --profile <p> add dsh-tool-vision` installs and
-# mounts it without manual cordis.patch.yml edits.
-- insert:
-    - id: tool-vision
-      name: 'dsh-tool-vision'
+# dsh-tool-vision — bundle patch layer
+#
+# Declares the plugin as a Cordis loader entry, making the package a standard
+# profile bundle: `dsh plugin --profile <p> add dsh-tool-vision` installs and
+# mounts it without manual cordis.patch.yml edits.
+- insert:
+    - id: tool-vision
+      name: 'dsh-tool-vision'

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "dsh-tool-vision",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "description": "DeepSeek Harness 外置视觉模型插件：inspect_image 把本地图片或 http(s) 图片 URL 发给任意 OpenAI 兼容端点，视觉模型看图的文字回答直接带回对话；附 Web UI 设置栏。",
     "type": "module",
     "main": "index.js",
     "scripts": {
-        "test": "node tests/preview-regex.test.mjs && node tests/preview-route.test.mjs && node tests/auto-image.test.mjs && node --test tests/vision-tools.test.js tests/vision-tools-tools.test.js"
+        "test": "node tests/preview-regex.test.mjs && node tests/preview-route.test.mjs && node tests/auto-image.test.mjs && node --test tests/vision-tools.test.js tests/vision-tools-tools.test.js && node tests/settings-scope-compat.test.mjs"
     },
     "exports": {
         ".": "./index.js",

package/vendor/dsh-settings-expose.js

@@ -1,75 +1,75 @@
-/**
- * dsh-host-apiproxy exposes only namespaces listed in its hard-coded
- * WEB_SETTINGS_NAMESPACES allowlist to the Web settings client. A namespace
- * registered by a third-party plugin answers `settings-not-exposed` even
- * though it is registered — upstream explicitly defers letting plugins
- * expose their own configuration.
- *
- * This module idempotently patches that allowlist in the dsh installation
- * actually loaded by the host process, so the plugin's settings section
- * becomes visible in the Web UI without manual edits. A dsh update
- * overwrites the file; the next plugin start re-patches it.
- */
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { createRequire } from "node:module";
-import { dirname, join, sep } from "node:path";
-
-/**
- * Ensure `nsName` is present in dsh-host-apiproxy's WEB_SETTINGS_NAMESPACES.
- * No-op when already exposed or when the file cannot be located/patched.
- * @param {import("cordis").Context} ctx
- * @param {string} nsName - settings namespace short name (e.g. "tdai-memory").
- * @param {{info?: Function, warn?: Function}} logger - dsh logger.
- */
-export function ensureSettingsNamespaceExposed(ctx, nsName, logger) {
-  void ctx;
-  try {
-    const target = findApiproxyIndex();
-    if (!target) {
-      logger?.warn?.(`[settings-expose] could not locate dsh-host-apiproxy; add "${nsName}" to WEB_SETTINGS_NAMESPACES in dsh-host-apiproxy/lib/index.js to get a Web settings section`);
-      return;
-    }
-    let src;
-    try {
-      src = readFileSync(target, "utf8");
-    } catch (error) {
-      logger?.warn?.(`[settings-expose] cannot read ${target}: ${String(error)}`);
-      return;
-    }
-    const body = src.match(/const WEB_SETTINGS_NAMESPACES = \[([\s\S]*?)\];/)?.[1] ?? "";
-    if (body.includes(`"${nsName}"`)) return; // already exposed (manual or previous patch)
-    const patched = src.replace(/(const WEB_SETTINGS_NAMESPACES = \[[\s\S]*?)(\n\s*\];)/, (_, pre, post) => {
-      const trailingComma = /,\s*$/.test(pre) ? "" : ",";
-      const sep2 = pre.trimEnd().endsWith("[") ? "" : trailingComma;
-      return `${pre}${sep2}\n\t"${nsName}"${post}`;
-    });
-    if (patched === src) {
-      logger?.warn?.(`[settings-expose] allowlist pattern not found in ${target}; add "${nsName}" to WEB_SETTINGS_NAMESPACES manually`);
-      return;
-    }
-    writeFileSync(target, patched, "utf8");
-    logger?.info?.(`[settings-expose] added "${nsName}" to WEB_SETTINGS_NAMESPACES (${target}) — restart dsh web for the settings section to appear`);
-  } catch (error) {
-    logger?.warn?.(`[settings-expose] failed: ${String(error)}`);
-  }
-}
-
-function findApiproxyIndex() {
-  // 1) The host process has already loaded dsh-host-apiproxy: read the real
-  //    module path from the CommonJS module cache (any install layout).
-  try {
-    const Module = createRequire(import.meta.url)("module");
-    const cache = Module._cache ?? {};
-    for (const key of Object.keys(cache)) {
-      if (key.includes(`${sep}dsh-host-apiproxy${sep}`) && key.endsWith(`${sep}index.js`)) return key;
-    }
-  } catch { /* fall through */ }
-  // 2) Fallback: sibling of @deepseek-ai/dsh-settings (dsh's nested layout).
-  try {
-    const require = createRequire(import.meta.url);
-    const settingsEntry = require.resolve("@deepseek-ai/dsh-settings");
-    const candidate = join(dirname(dirname(dirname(settingsEntry))), "dsh-host-apiproxy", "lib", "index.js");
-    if (existsSync(candidate)) return candidate;
-  } catch { /* fall through */ }
-  return "";
-}
+/**
+ * dsh-host-apiproxy exposes only namespaces listed in its hard-coded
+ * WEB_SETTINGS_NAMESPACES allowlist to the Web settings client. A namespace
+ * registered by a third-party plugin answers `settings-not-exposed` even
+ * though it is registered — upstream explicitly defers letting plugins
+ * expose their own configuration.
+ *
+ * This module idempotently patches that allowlist in the dsh installation
+ * actually loaded by the host process, so the plugin's settings section
+ * becomes visible in the Web UI without manual edits. A dsh update
+ * overwrites the file; the next plugin start re-patches it.
+ */
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import { dirname, join, sep } from "node:path";
+
+/**
+ * Ensure `nsName` is present in dsh-host-apiproxy's WEB_SETTINGS_NAMESPACES.
+ * No-op when already exposed or when the file cannot be located/patched.
+ * @param {import("cordis").Context} ctx
+ * @param {string} nsName - settings namespace short name (e.g. "tdai-memory").
+ * @param {{info?: Function, warn?: Function}} logger - dsh logger.
+ */
+export function ensureSettingsNamespaceExposed(ctx, nsName, logger) {
+  void ctx;
+  try {
+    const target = findApiproxyIndex();
+    if (!target) {
+      logger?.warn?.(`[settings-expose] could not locate dsh-host-apiproxy; add "${nsName}" to WEB_SETTINGS_NAMESPACES in dsh-host-apiproxy/lib/index.js to get a Web settings section`);
+      return;
+    }
+    let src;
+    try {
+      src = readFileSync(target, "utf8");
+    } catch (error) {
+      logger?.warn?.(`[settings-expose] cannot read ${target}: ${String(error)}`);
+      return;
+    }
+    const body = src.match(/const WEB_SETTINGS_NAMESPACES = \[([\s\S]*?)\];/)?.[1] ?? "";
+    if (body.includes(`"${nsName}"`)) return; // already exposed (manual or previous patch)
+    const patched = src.replace(/(const WEB_SETTINGS_NAMESPACES = \[[\s\S]*?)(\n\s*\];)/, (_, pre, post) => {
+      const trailingComma = /,\s*$/.test(pre) ? "" : ",";
+      const sep2 = pre.trimEnd().endsWith("[") ? "" : trailingComma;
+      return `${pre}${sep2}\n\t"${nsName}"${post}`;
+    });
+    if (patched === src) {
+      logger?.warn?.(`[settings-expose] allowlist pattern not found in ${target}; add "${nsName}" to WEB_SETTINGS_NAMESPACES manually`);
+      return;
+    }
+    writeFileSync(target, patched, "utf8");
+    logger?.info?.(`[settings-expose] added "${nsName}" to WEB_SETTINGS_NAMESPACES (${target}) — restart dsh web for the settings section to appear`);
+  } catch (error) {
+    logger?.warn?.(`[settings-expose] failed: ${String(error)}`);
+  }
+}
+
+function findApiproxyIndex() {
+  // 1) The host process has already loaded dsh-host-apiproxy: read the real
+  //    module path from the CommonJS module cache (any install layout).
+  try {
+    const Module = createRequire(import.meta.url)("module");
+    const cache = Module._cache ?? {};
+    for (const key of Object.keys(cache)) {
+      if (key.includes(`${sep}dsh-host-apiproxy${sep}`) && key.endsWith(`${sep}index.js`)) return key;
+    }
+  } catch { /* fall through */ }
+  // 2) Fallback: sibling of @deepseek-ai/dsh-settings (dsh's nested layout).
+  try {
+    const require = createRequire(import.meta.url);
+    const settingsEntry = require.resolve("@deepseek-ai/dsh-settings");
+    const candidate = join(dirname(dirname(dirname(settingsEntry))), "dsh-host-apiproxy", "lib", "index.js");
+    if (existsSync(candidate)) return candidate;
+  } catch { /* fall through */ }
+  return "";
+}