dsh-tool-vision 0.6.1 → 0.6.2

package/README.md

@@ -10,10 +10,12 @@ Part of the [DeepSeek Harness Enhancement Suite](https://github.com/Scorp1o117/d
 
 External vision model for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness).
 
-DeepSeek's own models are text-only, and the harness derives every model
-request strictly from the session log (`llm/stream` requests must equal the
-durable derivation — the agent-loop invariant). This plugin bridges the gap
-in two ways:
+DSH 0.1.1 adds native image input for DeepSeek's vision catalog. This plugin
+remains useful when you want a separate OpenAI-compatible vision endpoint,
+pixel-level image tools, screenshots, or a text-model bridge. The harness
+derives every model request strictly from the session log (`llm/stream`
+requests must equal the durable derivation — the agent-loop invariant), so the
+bridge keeps its conversion inside that durable path:
 
 1. **`inspect_image` tool** — sends an image (local file, or http(s) URL) to
    **any OpenAI-compatible** `/chat/completions` endpoint that supports
@@ -164,12 +166,9 @@ Example endpoints (`baseURL`):
 > - This plugin is a standard **profile bundle** (`dsh.bundle.patch`):
 >   `dsh plugin --profile web add dsh-tool-vision` installs and mounts it in
 >   one step — no manual `cordis.patch.yml` edits needed.
-> - The settings section needs the `dsh-host-apiproxy` namespace allowlist;
->   the plugin patches it automatically on first start — **restart `dsh web`
->   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`, `0.1.0-rc.7`, and `0.1.0-rc.8`.
+> - Settings changes hot-apply (no restart needed).
+> - Tested against DSH `0.1.0-rc.6`, `0.1.0-rc.7`, `0.1.0-rc.8`, and
+>   `0.1.1-rc.1`.
 
 ## Pixel-level vision tools (v0.6.0, ported from dsh-vision-router)
 
@@ -231,3 +230,4 @@ enable desktop capture.
 MIT — bridge preview & integration: xing666173. Pixel vision tools ported
 from [dsh-vision-router](https://github.com/ysr666/dsh-vision-router)
 (© ysr666, MIT) with gratitude.
+

package/README.zh.md

@@ -8,7 +8,7 @@
 
 给 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 外接**视觉模型**的插件。
 
-DeepSeek 自家模型是纯文本的，而且 harness 的每次模型请求都**严格从会话日志推导**（`llm/stream` 请求必须与持久化推导一致，否则 agent-loop invariant 会报 `log-reconstruction desync`）。本插件用两条路径补上缺口：
+DSH 0.1.1 已为 DeepSeek 视觉模型目录加入原生图片输入。本插件继续提供独立的 OpenAI 兼容视觉端点、像素级图片工具、截图，以及文本模型图片桥。Harness 的每次模型请求都**严格从会话日志推导**（`llm/stream` 请求必须与持久化推导一致，否则 agent-loop invariant 会报 `log-reconstruction desync`），因此图片桥仍在可持久重建的路径内完成转换：
 
 1. **`inspect_image` 工具** —— 把图片（本地文件或 http(s) URL）发给任意支持 `image_url` 内容块的 OpenAI 兼容 `/chat/completions` 端点，把视觉模型的文字回答带回对话。
 2. **图片桥（v0.2.1）** —— 粘贴的图片在**进入持久化日志之前**就被转换成 `inspect_image` 指引文本，拦截点是 `agent/pre-step` waterfall（这是 harness 唯一允许插件替换"进入某一步的消息"的缝；替换后的消息会**成为**持久化的 `user/message` 日志，所以请求重建 invariant 天然满足）。旧版本已经写进日志的图片消息，会在该会话下一次 pre-step 时用 surface `replace` 惰性修复。只有 `multimodalModels` 白名单内的模型直收图片块；**不参考模型的 `inputModalities` 声明**——因为很多配置为了通过 prompt 准入检查，会给纯文本模型声明 `input: [text, image]`（那只是声明，不代表上游真的能吃 `image_url`）。

package/client.js

@@ -502,3 +502,4 @@ window.__ModuleLoader__.load({
     return module.exports;
   }
 });
+

package/index.js

@@ -42,7 +42,6 @@ import os from "node:os";
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
-import { ensureSettingsNamespaceExposed } from "./vendor/dsh-settings-expose.js";
 import { registerVisionTools, CONTENT_FILTER_RE } from "./lib/vision-tools.js";
 
 /** Cordis plugin name. */
@@ -556,12 +555,6 @@ function apply(ctx, config) {
     onChange: () => {},
   });
 
-  // dsh-host-apiproxy hard-codes which settings namespaces the Web client may
-  // see; without this, the settings section answers `settings-not-exposed`
-  // on any stock install. Patch the allowlist idempotently (self-heals after
-  // dsh updates overwrite the file).
-  ensureSettingsNamespaceExposed(ctx, "tool-vision", ctx.logger);
-
   // ── image bridge: pasted images become inspect_image hints on text-only models ──
   if (getConfig().bridgeTextOnly) {
     const exportDir = getConfig().bridgeExportDir || join(os.tmpdir(), "dsh-vision-bridge");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dsh-tool-vision",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "description": "DeepSeek Harness 外置视觉模型插件：inspect_image 把本地图片或 http(s) 图片 URL 发给任意 OpenAI 兼容端点，视觉模型看图的文字回答直接带回对话；附 Web UI 设置栏。",
     "type": "module",
     "main": "index.js",
@@ -59,8 +59,8 @@
     },
     "peerDependencies": {
         "react": "^18.2.0",
-        "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
-        "@deepseek-ai/dsh-tools": "^0.1.0-rc.6"
+        "@deepseek-ai/dsh-settings": "^0.1.0-rc.6 || ^0.1.1-rc.1",
+        "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-rc.1"
     },
     "optionalDependencies": {
         "potrace": "^2.1.8",
@@ -68,3 +68,4 @@
         "sharp": ">=0.35.3 <1"
     }
 }
+

package/vendor/dsh-settings-expose.js

@@ -1,75 +0,0 @@
-/**
- * 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 "";
-}