@xlight-oss/visionary-dsh 0.7.1 → 0.7.3

package/lib/image-bridge/core.mjs

@@ -35,11 +35,11 @@ export function matchesRoute(provider, model, routes) {
  * untouched.
  *
  * The ORIGINAL method reference is kept separate from the patch so capability
- * sensing (`nativeImageCapable`) and the imageRouting consultation are never
- * poisoned by it — the patch is strictly an admission-release lever, and
- * without this separation every bridge route would read as "natively image
- * capable" and the rewrite would never run (images would hit the pi-ai second
- * gate and fail with UNSUPPORTED_CONTENT).
+ * sensing (`nativeImageCapable`) is never poisoned by it — the patch is
+ * strictly an admission-release lever, and without this separation every
+ * bridge route would read as "natively image capable" and the rewrite would
+ * never run (images would hit the pi-ai second gate and fail with
+ * UNSUPPORTED_CONTENT).
  *
  * Lifecycle: `install()` registers the patch and returns a disposer restoring
  * the original (re-assign, guarded so it never clobbers a later patch by
@@ -47,8 +47,23 @@ export function matchesRoute(provider, model, routes) {
  * unload/HMR reload always restores the original — otherwise a leftover patch
  * would be captured as the "original" by the next apply and poison capability
  * sensing forever.
+ *
+ * Feature detection (design D7): a host whose llm service has no
+ * `resolveModelInfo` cannot be bridged at all. Instead of throwing inside
+ * `apply` (which would kill the whole plugin row), the patch reports
+ * `available: false` and the caller skips the bridge.
  */
-export function makeModelInfoPatch({ llm, isEnabled, routeMatch = matchesRoute }) {
+export function makeModelInfoPatch({ llm, isEnabled, routeMatch = matchesRoute, logger }) {
+  if (typeof llm?.resolveModelInfo !== "function") {
+    logger?.warn?.(
+      "[visionary-image-bridge] ctx.llm.resolveModelInfo is not a function on this host; image bridging stays disabled"
+    );
+    return {
+      available: false,
+      original: undefined,
+      install: () => () => {},
+    };
+  }
   const original = llm.resolveModelInfo.bind(llm);
   const patched = async (provider, model, signal) => {
     const info = await original(provider, model, signal);
@@ -59,6 +74,7 @@ export function makeModelInfoPatch({ llm, isEnabled, routeMatch = matchesRoute }
     return { ...info, inputModalities: [...info.inputModalities, "image"] };
   };
   return {
+    available: true,
     /** The unpatched method, for capability sensing and consultations. */
     original,
     /** Install the patch; returns the disposer that restores the original. */

package/lib/image-bridge/index.mjs

@@ -17,20 +17,18 @@
 //      fires and the model only ever receives text. The rewrite acts on the
 //      request snapshot only — session logs / UI transcript keep the original
 //      images.
-//   3. forward compat — provides `ctx.imageRouting` (the community
-//      consultation contract) ONLY when the host does not already provide it;
-//      when the host provides it natively, the resolveModelInfo patch is not
-//      installed and the native hook handles admission.
+//   3. settings — the bridge config lives in its own namespace
+//      (`visionary-image-bridge`) via `installSection` + the native card.
 //
 // The bridge never changes the `deepseek_vision` tool contract, never touches
 // session logs, and with `enabled: false` restores the host's original
 // behavior (text-only models reject images again).
 //
 // Design source: openspec/changes/visionary-image-bridge (D2 admission patch,
-// D3 persistence, D4 llm/stream rewrite, D5 imageRouting, D6 settings, D7 TTL).
+// D3 persistence, D4 llm/stream rewrite, D6 settings, D7 TTL);
+// openspec/changes/adapt-dsh-0-1-5 (D2 installSection, D7 bridge route).
 
 import z from "@deepseek-ai/schemastery";
-import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import { ImagePersistence } from "./persistence.mjs";
 import { makeModelInfoPatch, makeStreamListener, matchesRoute } from "./core.mjs";
 // Same-package internal reuse (exported from the tools plugin row): the
@@ -53,8 +51,10 @@ export const DEFAULT_PROMPT_TEMPLATE = [
 /** Degradation placeholder when an image cannot be read or persisted. */
 export const IMAGE_PLACEHOLDER = "用户粘贴的图片处理失败，无法分析。";
 
-/** Settings namespace (panel section key in $DSH_HOME/settings.yaml). */
-export const SETTINGS_NAMESPACE = settingsNamespace("visionary-image-bridge");
+/** Settings namespace (panel card key + `$DSH_HOME/settings.yaml` section).
+ * Literal string: DSH validates namespaces as literal types since
+ * 0.1.2-alpha.2 and no longer ships the `settingsNamespace()` helper. */
+export const SETTINGS_NAMESPACE = "visionary-image-bridge";
 
 export const Config = z.object({
   enabled: z.boolean().default(true).description(
@@ -124,40 +124,21 @@ export function apply(ctx, config) {
     logger: ctx.logger,
   });
 
-  // Forward compat (design D5): when the host natively provides imageRouting,
-  // it handles admission — we neither register a duplicate service (cordis
-  // throws on that, failing the plugin row) nor install the resolveModelInfo
-  // patch. The llm/stream rewrite stays in both shapes: it self-adapts via the
-  // per-request native capability check.
-  const hostProvidesImageRouting = ctx.get("imageRouting") !== undefined;
-
+  // Admission release (design D2 of the original change; route decision in
+  // adapt-dsh-0-1-5 D7): the web host's gate hardcodes
+  // MODEL_DOES_NOT_SUPPORT_IMAGES and reads only `llm.resolveModelInfo`, with
+  // no waterfall to hook. The bridge therefore releases admission by wrapping
+  // that one read, then rewrites image blocks to text at `llm/stream`. The
+  // community alternative (registering a synthetic provider route that
+  // advertises `image`) cannot take over an existing provider id and forces
+  // the user to re-select a wrapped model, so it is not used here.
   const patch = makeModelInfoPatch({
     llm: ctx.llm,
     isEnabled: () => runtime.enabled,
     routeMatch: (provider, model) => matchesRoute(provider, model, runtime.routes),
+    logger: ctx.logger,
   });
 
-  if (!hostProvidesImageRouting) {
-    // Admission release + restore-on-unload (design D2). The disposer restores
-    // the original method, so an HMR reload never captures the leftover patch
-    // as the "original" and poisons capability sensing.
-    ctx.effect(patch.install, "visionary-image-bridge: resolveModelInfo patch");
-
-    // Community-shaped consultation (design D5): the web host calls
-    // resolveFallback(agent, current) when the selected model rejects image
-    // input and routes the request through the returned selection. This bridge
-    // never switches models — returning `current` means "keep this route, the
-    // bridge admits and rewrites images at the stream boundary".
-    ctx.provide("imageRouting", {
-      resolveFallback: async (_agent, current) => {
-        if (!runtime.enabled) return undefined;
-        if (!current) return undefined;
-        if (!matchesRoute(current.provider, current.model, runtime.routes)) return undefined;
-        return current;
-      },
-    });
-  }
-
   const rewrittenBatches = new WeakSet();
 
   // Deterministic-mode analysis hook (design D6): image -> text via the same
@@ -185,58 +166,83 @@ export function apply(ctx, config) {
     );
   };
 
-  // The unified rewrite point (design D4): every model request passes this
-  // waterfall, so one listener covers user pastes, read_image tool results,
-  // any tool-result image, and replay. prepend: true puts it outside the host
-  // llm-invariant; global: true makes it fire for the root event scope like
-  // the official dsh-session-title listener.
-  ctx.on(
-    "llm/stream",
-    makeStreamListener({
-      llm: ctx.llm,
-      originalResolveModelInfo: patch.original,
-      getRuntime: () => runtime,
-      persistence,
-      rewrittenBatches,
-      logger: ctx.logger,
-      analyzeImage,
-    }),
-    { global: true, prepend: true },
-  );
+  if (!patch.available) {
+    // Feature detection (task 2.6): a host without the readable method cannot
+    // be bridged. Keep the plugin row alive with the bridge disabled instead
+    // of throwing out of `apply`; the patch already logged the reason.
+    ctx.logger?.warn?.(
+      "[visionary-image-bridge] bridging disabled: the host llm service exposes no resolveModelInfo()"
+    );
+  } else {
+    // Restore-on-unload (design D2): the disposer restores the original method,
+    // so an HMR reload never captures the leftover patch as the "original" and
+    // poisons capability sensing.
+    ctx.effect(patch.install, "visionary-image-bridge: resolveModelInfo patch");
+
+    // The unified rewrite point (design D4): every model request passes this
+    // waterfall, so one listener covers user pastes, read_image tool results,
+    // any tool-result image, and replay. prepend: true puts it outside the host
+    // llm-invariant; global: true makes it fire for the root event scope like
+    // the official dsh-session-title listener.
+    ctx.on(
+      "llm/stream",
+      makeStreamListener({
+        llm: ctx.llm,
+        originalResolveModelInfo: patch.original,
+        getRuntime: () => runtime,
+        persistence,
+        rewrittenBatches,
+        logger: ctx.logger,
+        analyzeImage,
+      }),
+      { global: true, prepend: true },
+    );
+  }
 
   // Settings section (design D6): settings panel + settings.yaml, hot reload.
-  installSettingsSection(ctx, SETTINGS_NAMESPACE, Config, config, {
-    setSource: (thunk) => {
-      source = thunk;
-    },
-    onChange: () => {
-      const next = { ...source() };
-      // cleanPasted 是一次性触发器：切为 true 即触发清理，并把运行态复位为
-      // false（不再视为常态配置），再回写 settings 文档复位持久化值，避免
-      // 每次启动/切换都重复全量清理（design：打开一次触发一次）。
-      const triggered = next.cleanPasted === true;
-      if (triggered) next.cleanPasted = false;
-      runtime = next;
-      validateConfig(runtime); // belt-and-braces; validate hook already rejects bad writes
-      if (triggered) {
-        persistence
-          .cleanup({ all: true })
-          .then((removed) => {
-            ctx.logger.info(`[visionary-image-bridge] cleaned ${removed} pasted file(s)`);
-          })
-          .catch((err) => {
-            ctx.logger.warn(`[visionary-image-bridge] cleanPasted cleanup failed: ${err?.message ?? err}`);
-          });
-        const settings = ctx.get?.("settings");
-        if (settings && typeof settings.update === "function") {
-          settings.update(SETTINGS_NAMESPACE, { cleanPasted: false }).catch(() => {
-            // best-effort reset; runtime is already flipped, panel stays truthful
-          });
+  // The service is optional: inject waits for it, and installSection falls back
+  // to the composition entry when the provider detaches (adapt-dsh-0-1-5 D2).
+  ctx.inject(["settings"], (settingsCtx) => {
+    const settings = settingsCtx.settings;
+    if (typeof settings?.installSection !== "function") {
+      ctx.logger?.warn?.(
+        "[visionary-image-bridge] the mounted settings service has no installSection(); keeping the composition entry config"
+      );
+      return;
+    }
+    settings.installSection(ctx, SETTINGS_NAMESPACE, Config, config, {
+      setSource: (thunk) => {
+        source = thunk;
+      },
+      onChange: () => {
+        const next = { ...source() };
+        // cleanPasted 是一次性触发器：切为 true 即触发清理，并把运行态复位为
+        // false（不再视为常态配置），再回写 settings 文档复位持久化值，避免
+        // 每次启动/切换都重复全量清理（design：打开一次触发一次）。
+        const triggered = next.cleanPasted === true;
+        if (triggered) next.cleanPasted = false;
+        runtime = next;
+        validateConfig(runtime); // belt-and-braces; validate hook already rejects bad writes
+        if (triggered) {
+          persistence
+            .cleanup({ all: true })
+            .then((removed) => {
+              ctx.logger.info(`[visionary-image-bridge] cleaned ${removed} pasted file(s)`);
+            })
+            .catch((err) => {
+              ctx.logger.warn(`[visionary-image-bridge] cleanPasted cleanup failed: ${err?.message ?? err}`);
+            });
+          const settingsService = ctx.get?.("settings");
+          if (settingsService && typeof settingsService.update === "function") {
+            settingsService.update(SETTINGS_NAMESPACE, { cleanPasted: false }).catch(() => {
+              // best-effort reset; runtime is already flipped, panel stays truthful
+            });
+          }
         }
-      }
-      ctx.logger.info("[visionary-image-bridge] configuration updated");
-    },
-    validate: validateConfig,
+        ctx.logger.info("[visionary-image-bridge] configuration updated");
+      },
+      validate: validateConfig,
+    });
   });
 
   // Lazy TTL cleanup at startup (design D7); later cleanups run after persists.

package/lib/index.mjs

@@ -14,7 +14,6 @@
 
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import z from "@deepseek-ai/schemastery";
-import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import { spawn } from "node:child_process";
 import { statSync, readFileSync } from "node:fs";
 import { promises as fs } from "node:fs";
@@ -24,8 +23,12 @@ import path from "node:path";
 const name = "visionary-vision";
 const inject = ["tools", "systemPrompt"];
 
-/** Settings namespace（面板 / settings.yaml 双入口，规范：dsh-plugin 设置面板上传路径配置）。 */
-const SETTINGS_NAMESPACE = settingsNamespace("visionary-vision");
+/**
+ * Settings namespace（面板 / settings.yaml 双入口，规范：dsh-plugin 设置面板上传路径配置）。
+ * 字面量字符串：DSH 自 0.1.2-alpha.2 起以编译期字面量类型校验命名空间，
+ * 旧的 `settingsNamespace()` 运行时 helper 已不存在（`/^[a-z][a-z0-9-]*$/`）。
+ */
+const SETTINGS_NAMESPACE = "visionary-vision";
 
 // Keep in lockstep with the Rust binary's minor version: tools rely on the
 // CLI's `--json` output shape. Bump when the binary's contract changes.
@@ -297,13 +300,27 @@ function apply(ctx, config) {
   // 而不是冻结的 config —— 设置面板切换 modelType（vision|ocr）无需重启 DSH。
   let runtime = { ...config };
   let source = () => config;
-  installSettingsSection(ctx, SETTINGS_NAMESPACE, Config, config, {
-    setSource: (thunk) => {
-      source = thunk;
-    },
-    onChange: () => {
-      runtime = { ...source() };
-    },
+  // settings 服务可选：inject(["settings"], …) 在 provider 就绪（或之后出现）时
+  // 才注册命名空间，provider 脱离时 installSection 会把 source 回退到 entry，
+  // 因此「无 settings 服务」表现为按组合 entry 配置运行，而不是插件行报错。
+  ctx.inject(["settings"], (settingsCtx) => {
+    const settings = settingsCtx.settings;
+    if (typeof settings?.installSection !== "function") {
+      // 契约不符（早于 0.1.2-alpha.2 的宿主）：降级为 entry 配置并明确提示，
+      // 不让整行插件在加载期死掉。
+      ctx.logger?.warn?.(
+        "[visionary-vision] the mounted settings service has no installSection(); keeping the composition entry config"
+      );
+      return;
+    }
+    settings.installSection(ctx, SETTINGS_NAMESPACE, Config, config, {
+      setSource: (thunk) => {
+        source = thunk;
+      },
+      onChange: () => {
+        runtime = { ...source() };
+      },
+    });
   });
 
   const loginSeconds = (() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xlight-oss/visionary-dsh",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "DeepSeek Visionary native plugin for DeepSeek Harness: deepseek_vision / status / login / logout native tools plus the text-model image bridge, all backed by the visionary-server CLI (DeepSeek web vision model, no API key).",
   "type": "module",
   "main": "lib/index.mjs",
@@ -11,10 +11,9 @@
     "./image-bridge": {
       "default": "./lib/image-bridge/index.mjs"
     },
-    "./settings-card": {
-      "default": "./lib/settings-card/index.mjs"
+    "./client": {
+      "default": "./lib/client.js"
     },
-    "./settings-card/package.json": "./lib/settings-card/package.json",
     "./cordis.patch.yml": "./cordis.patch.yml",
     "./package.json": "./package.json"
   },
@@ -26,26 +25,34 @@
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-settings",
+        "@deepseek-ai/dsh-client-ui-settings-plugins"
+      ]
     }
   },
   "publishConfig": {
     "access": "public"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-attachment": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/schemastery": "^3.18.1"
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-tools": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-attachment": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.1.5-rc.1",
+    "@deepseek-ai/schemastery": "^3.18.2"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-attachment": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/schemastery": "^3.18.1"
+    "@deepseek-ai/cordis": "4.0.2",
+    "@deepseek-ai/dsh-tools": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.5-rc.2",
+    "@deepseek-ai/schemastery": "3.18.2"
   },
   "repository": {
     "type": "git",

package/lib/image-bridge/trust-fence.mjs

@@ -1,85 +0,0 @@
-// Browser-trust fence for the visionary settings HTTP routes.
-//
-// Behavioral mirror of the /api gateway's fence in @deepseek-ai/dsh-client-connection
-// (api-request-trust.ts, BSD-3-Clause). The DSH settings RPC domain only serves
-// allowlisted namespaces to configuration clients, so a third-party plugin's
-// namespace is unreachable through `connection.api.settings.*`. The
-// settings-card host mounts its own fenced JSON routes instead (see
-// lib/settings-route.mjs `visionary/api`, serving both the vision-tools and
-// image-bridge namespaces); the fence below is a DNS-rebinding / cross-site
-// defense, NOT authentication — the web browser is already same-origin with
-// the host.
-//
-// Dependency-free (pure functions over node:http headers) so unit tests run
-// without a node_modules install.
-
-/** The request facts the fence reads (structural subset of IncomingMessage). */
-function header(headers, name) {
-  const value = headers[name];
-  return typeof value === "string" ? value : undefined;
-}
-
-/** Normalized URL of a Host-header authority, or undefined when unparsable. */
-function parseAuthority(authority) {
-  try {
-    return new URL(`http://${authority}`);
-  } catch {
-    return undefined;
-  }
-}
-
-/** Whether a normalized URL hostname names the local loopback authority. */
-export function isLoopbackHostname(hostname) {
-  if (hostname === "localhost" || hostname === "[::1]") return true;
-  const parts = hostname.split(".");
-  return (
-    parts.length === 4 &&
-    parts[0] === "127" &&
-    parts.every((part) => /^\d{1,3}$/.test(part) && Number(part) <= 255)
-  );
-}
-
-/** Canonical authority form: hostname, or hostname:port when a port was written. */
-function canonicalAuthority(entry, entryUrl) {
-  const port =
-    entryUrl.port !== ""
-      ? entryUrl.port
-      : new URL(`https://${entry}`).port;
-  return port === "" ? entryUrl.hostname : `${entryUrl.hostname}:${port}`;
-}
-
-/** Whether the request authority matches a trustedHosts entry (exact or port-less). */
-function isTrustedAuthority(hostUrl, trustedHosts) {
-  return trustedHosts.some((entry) => {
-    const entryUrl = parseAuthority(entry);
-    if (entryUrl === undefined) return false;
-    return canonicalAuthority(entry, entryUrl) === entryUrl.hostname
-      ? entryUrl.hostname === hostUrl.hostname
-      : entryUrl.host === hostUrl.host;
-  });
-}
-
-/**
- * Decide whether one request may reach the plugin's routes.
- * @param request - node HTTP request facts (headers).
- * @param trustedHosts - non-loopback authorities this deployment serves.
- * @returns true when the Host is ours (loopback or trusted) and browser
- *  markers are same-origin.
- */
-export function isTrustedApiRequest(request, trustedHosts) {
-  const host = header(request.headers, "host");
-  if (host === undefined) return false;
-  const hostUrl = parseAuthority(host);
-  if (hostUrl === undefined) return false;
-  if (!isLoopbackHostname(hostUrl.hostname) && !isTrustedAuthority(hostUrl, trustedHosts)) {
-    return false;
-  }
-  if (header(request.headers, "sec-fetch-site") === "cross-site") return false;
-  const origin = header(request.headers, "origin");
-  if (origin === undefined) return true;
-  try {
-    return new URL(origin).host === hostUrl.host;
-  } catch {
-    return false;
-  }
-}