dsh-vision-router 2.2.8 → 2.3.0

package/lib/settings-client-loader-lifecycle.js

@@ -0,0 +1,129 @@
+import { injectClientCarrierHtml, installClientScriptCarriers } from './client-script-carrier.js'
+import {
+  LOCAL_PERMISSION_CLIENT_BOUNDARY_SOURCE,
+  LOCAL_REMOTE_SETTINGS_PERMISSION_FIELD,
+  LOCAL_REMOTE_SETTINGS_PERMISSION_PATH,
+} from './local-remote-settings-permission.js'
+import { REMOTE_SETTINGS_RISK_CLIENT_BOUNDARY_SOURCE } from './remote-settings-risk-client-boundary.js'
+
+// Keep the legacy marker value so mixed-generation/HMR pages do not install
+// a second lifecycle wrapper after the source/API rename.
+const SETTINGS_CLIENT_LOADER_LIFECYCLE_MARK = 'data-vision-router-settings-rc8-lifecycle'
+
+/**
+ * Supported Hosts can replace ModuleLoader.load() inside loader.create(). This
+ * compatibility owner only re-attaches the current local-permission and
+ * remote-risk product boundaries after that queue-to-live transition; product
+ * semantics stay in their capability owners.
+ */
+export const SETTINGS_CLIENT_LOADER_LIFECYCLE_PRELUDE = String.raw`(function(){
+  'use strict';
+  var TARGET = 'dsh-vision-router';
+  ${LOCAL_PERMISSION_CLIENT_BOUNDARY_SOURCE}
+  var localPermissionBoundary = createLocalRemoteSettingsPermissionClientBoundary({
+    endpoint: '${LOCAL_REMOTE_SETTINGS_PERMISSION_PATH}',
+    field: '${LOCAL_REMOTE_SETTINGS_PERMISSION_FIELD}',
+    fetchImpl: typeof fetch === 'function'
+      ? function(url, options) { return fetch(url, options); }
+      : undefined
+  });
+
+  ${REMOTE_SETTINGS_RISK_CLIENT_BOUNDARY_SOURCE}
+  var riskBoundary = createRemoteSettingsRiskClientBoundary({
+    confirmImpl: function(message) {
+      return typeof window.confirm === 'function' && window.confirm(message) === true;
+    },
+    alertImpl: function(message) {
+      try { if (typeof window.alert === 'function') window.alert(message); } catch (_) {}
+    },
+    locale: function() {
+      try {
+        return String((document && document.documentElement && document.documentElement.lang)
+          || (navigator && navigator.language) || '');
+      } catch (_) { return ''; }
+    },
+    location: function() {
+      try { return window && window.location; } catch (_) { return undefined; }
+    },
+    normalizeLoopback: true
+  });
+
+  function patchLiveLoader(loader) {
+    if (!loader || typeof loader.load !== 'function' || loader.load.__visionRouterSettingsRc8Lifecycle) return;
+    var original = loader.load;
+    function load(spec) {
+      if (spec && spec.id === TARGET && typeof spec.factory === 'function') {
+        var factory = spec.factory;
+        spec = Object.assign({}, spec, {
+          factory: function(require) {
+            var exports = factory(require);
+            if (exports && typeof exports.apply === 'function' && !exports.apply.__visionRouterSettingsRc8Lifecycle) {
+              var apply = exports.apply;
+              var wrappedApply = function(ctx) {
+                var rest = Array.prototype.slice.call(arguments, 1);
+                var nextCtx = riskBoundary.wrapContext(localPermissionBoundary.wrapContext(ctx));
+                return apply.apply(exports, [nextCtx].concat(rest));
+              };
+              Object.defineProperty(wrappedApply, '__visionRouterSettingsRc8Lifecycle', { value: true });
+              exports.apply = wrappedApply;
+            }
+            return exports;
+          }
+        });
+      }
+      return original.call(this, spec);
+    }
+    Object.defineProperty(load, '__visionRouterSettingsRc8Lifecycle', { value: true });
+    loader.load = load;
+  }
+
+  function patchCreate(loader) {
+    if (!loader || typeof loader.create !== 'function' || loader.create.__visionRouterSettingsRc8Lifecycle) return;
+    var originalCreate = loader.create;
+    function create() {
+      var result = originalCreate.apply(this, arguments);
+      patchLiveLoader(loader);
+      return result;
+    }
+    Object.defineProperty(create, '__visionRouterSettingsRc8Lifecycle', { value: true });
+    loader.create = create;
+    if (loader.mode === 'live') patchLiveLoader(loader);
+  }
+
+  function install() {
+    if (window.__ModuleLoader__) {
+      patchCreate(window.__ModuleLoader__);
+      return;
+    }
+    var descriptor = Object.getOwnPropertyDescriptor(window, '__ModuleLoader__');
+    if (descriptor && descriptor.configurable === false) return;
+    var previousGet = descriptor && descriptor.get;
+    var previousSet = descriptor && descriptor.set;
+    var stored = descriptor && Object.prototype.hasOwnProperty.call(descriptor, 'value') ? descriptor.value : undefined;
+    Object.defineProperty(window, '__ModuleLoader__', {
+      configurable: true,
+      enumerable: !descriptor || descriptor.enumerable !== false,
+      get: function(){ return previousGet ? previousGet.call(window) : stored; },
+      set: function(value) {
+        if (previousSet) previousSet.call(window, value); else stored = value;
+        try { patchCreate(previousGet ? previousGet.call(window) : value); } catch (_) {}
+      }
+    });
+    if (stored) patchCreate(stored);
+  }
+
+  try { install(); } catch (_) {}
+})();`
+
+export function injectSettingsClientLoaderLifecyclePrelude(html) {
+  return injectClientCarrierHtml(html, SETTINGS_CLIENT_LOADER_LIFECYCLE_MARK, SETTINGS_CLIENT_LOADER_LIFECYCLE_PRELUDE)
+}
+
+export function installSettingsClientLoaderLifecycle(ctx) {
+  installClientScriptCarriers(ctx, {
+    marker: SETTINGS_CLIENT_LOADER_LIFECYCLE_MARK,
+    prelude: SETTINGS_CLIENT_LOADER_LIFECYCLE_PRELUDE,
+    label: 'vision-router: settings client loader lifecycle',
+    injectHtml: injectSettingsClientLoaderLifecyclePrelude,
+  })
+}

package/lib/sharp-runtime.js

@@ -10,7 +10,6 @@ import { Worker } from 'node:worker_threads'
 import { createRequire } from 'node:module'
 import { pathToFileURL } from 'node:url'
 import { promisify } from 'node:util'
-import { appendPromptToImageOnlyMessage, fetchWithOpenAICompatibility } from './http-compat.js'
 import {
   directSessionAffinityHeaders,
   isOfficialOpenCodeGoUrl,
@@ -19,12 +18,6 @@ import {
   sessionIdentityOf,
 } from './session-affinity.js'
 import { runWithVisionSessionAffinity, streamWithVisionSessionAffinity } from './session-affinity-runtime.js'
-import {
-  routingCorrectionFor,
-  toAnthropicMessages,
-  callAnthropicCompatible,
-  anthropicMediaType,
-} from './catalog-corrections.js'
 import { createCachedUpdateChecker } from './update-check.js'
 import { probeLocalBackends } from './local-connection-probe.js'
 import { detectDshSelfUpdatePlan, runDshPluginUpdate } from './self-update.js'

package/lib/structured-flow-hardening.js

@@ -4,6 +4,7 @@ import {
 } from './turn-budget-context.js'
 import { runWithDepthConfig } from './depth-guidance.js'
 import { runtimeLanguageFor } from './runtime-i18n.js'
+import { visionRouterMessageSource } from './session-message-source-compat.js'
 
 const STRUCTURED_EVIDENCE_TOOLS = new Set([
   'vision_describe',
@@ -440,7 +441,7 @@ function appendGuardMessage(decision, payload, state, config) {
               ? '已达到本轮设置的深挖次数上限。不要再调用视觉工具；请基于已经获得的证据作答，并明确仍存在的不确定性。'
               : '连续多次后续视觉调用都没有产出可用证据。不要继续重复调用视觉工具；请基于已经获得的证据作答，并明确仍存在的不确定性。',
       }],
-      source: { kind: 'plugin', plugin: 'dsh-vision-router' },
+      source: visionRouterMessageSource(payload?.agent?.session),
     }
     return appendSyntheticGuardOnce(decision, baseMessages, state, message, true)
   }
@@ -461,7 +462,7 @@ function appendGuardMessage(decision, payload, state, config) {
         ? 'The structured bootstrap is complete, but no usable task-directed visual evidence has been produced yet. Call at least one vision tool that can add or verify evidence, then answer after it succeeds.'
         : '结构化预识别已经完成，但目前还没有产出可用的任务定向视觉证据。请至少调用一个能新增或验证证据的视觉工具，成功后再作答。',
     }],
-    source: { kind: 'plugin', plugin: 'dsh-vision-router' },
+    source: visionRouterMessageSource(payload?.agent?.session),
   }
   return appendSyntheticGuardOnce(decision, baseMessages, state, message)
 }

package/lib/vision-backend-runtime-policy.js

@@ -215,7 +215,7 @@ function failureStream(message, code = 'VISION_IMAGE_DELIVERY_UNAVAILABLE') {
   }
 }
 
-function directStream(ctx, core, plan, call, logger, source) {
+function directStream(ctx, core, plan, call, logger, source, providerTransport) {
   return {
     async *[Symbol.asyncIterator]() {
       const started = Date.now()
@@ -252,6 +252,7 @@ function directStream(ctx, core, plan, call, logger, source) {
             maxTokens: call.maxTokens ?? 4096,
             signal: call.signal,
             sessionId: call.sessionId,
+            providerTransport,
             resolveCredential: async (ref) => ref === keyRef ? apiKey : undefined,
           },
         )
@@ -349,7 +350,7 @@ function llmWithRuntimePolicy(ctx, llm, options) {
                 )
                 return
               }
-              yield* directStream(ctx, core, plan, call, logger, source)
+              yield* directStream(ctx, core, plan, call, logger, source, options.providerTransport)
               return
             }
 

package/lib/vision-capability-benchmark-service.js

@@ -307,6 +307,7 @@ export function createExactCapabilityInvoker(ctx, core, candidate, config, optio
             maxTokens: benchmarkMaxTokensForProvider(exactHttpProvider),
             signal: callSignal,
             affinityId: benchmarkAffinityId,
+            providerTransport: options.providerTransport,
             resolveCredential: (ref) => resolvedCredentialValue(ctx, ref),
           }),
           fixtureTimeoutMs,

package/lib/vision-diagnostics-routes.js

@@ -0,0 +1,216 @@
+import { probeLocalBackends } from './local-connection-probe.js'
+import {
+  METADATA_RESPONSE_MAX_BYTES,
+  readResponseJsonBounded,
+} from './http-body-limit.js'
+
+export const VISION_TEST_CONNECTION_PATH = '/_dsh/vision-router/test-connection'
+export const VISION_MODEL_CAPABILITIES_PATH = '/_dsh/vision-router/model-capabilities'
+
+function adapterAvailable(llm, provider) {
+  if (!llm || typeof llm.registration !== 'function') return false
+  try {
+    llm.registration(provider)
+    return true
+  } catch {
+    return false
+  }
+}
+
+async function probeModels(fetchImpl, baseURL, expectedModel, startedAt) {
+  try {
+    const response = await fetchImpl(`${String(baseURL).replace(/\/$/, '')}/models`, {
+      method: 'GET',
+      signal: AbortSignal.timeout(8000),
+    })
+    const latencyMs = Date.now() - startedAt
+    if (!response.ok) {
+      return { ok: false, latencyMs, status: response.status, error: `HTTP ${response.status}` }
+    }
+    const data = await readResponseJsonBounded(
+      response,
+      METADATA_RESPONSE_MAX_BYTES,
+      { label: 'vision backend /models response' },
+    ).catch(() => undefined)
+    const models = data && Array.isArray(data.data) ? data.data : undefined
+    const count = models ? models.length : undefined
+    if (
+      typeof expectedModel === 'string' &&
+      expectedModel !== '' &&
+      models &&
+      !models.some((entry) => entry && String(entry.id) === expectedModel)
+    ) {
+      return {
+        ok: false,
+        latencyMs,
+        status: response.status,
+        models: count,
+        endpoint: baseURL,
+        error: `configured model "${expectedModel}" was not returned by /models`,
+      }
+    }
+    return { ok: true, latencyMs, status: response.status, models: count, endpoint: baseURL }
+  } catch (error) {
+    return {
+      ok: false,
+      latencyMs: Date.now() - startedAt,
+      error: error && error.message ? error.message : String(error),
+    }
+  }
+}
+
+function getArray(factory) {
+  const value = typeof factory === 'function' ? factory() : factory
+  return Array.isArray(value) ? value : []
+}
+
+/**
+ * Product diagnostics/settings-support routes kept outside visual Core.
+ *
+ * The caller supplies three coherent domain faces instead of a Core facade:
+ * connection candidates/probes, capability snapshot production, and the
+ * Host-ownership state rendered in the connection response. Authentication
+ * and remote/local capability policy stay outside this module in the existing
+ * scoped WebServer boundary.
+ */
+export function installVisionDiagnosticsRoutes(ctx, options = {}) {
+  if (!ctx || typeof ctx.inject !== 'function') return ctx
+
+  const connection = options.connection ?? {}
+  const capabilities = options.capabilities ?? {}
+  const ownership = options.ownership ?? {}
+  const resolveCapability = connection.resolveCapability
+  const collectCapabilities = capabilities.collect
+  if (typeof resolveCapability !== 'function') {
+    throw new TypeError('vision diagnostics routes require a connection capability resolver')
+  }
+  if (typeof collectCapabilities !== 'function') {
+    throw new TypeError('vision diagnostics routes require a capability collector')
+  }
+
+  const llm = ctx.llm
+  const httpRoute = typeof connection.httpRoute === 'string' && connection.httpRoute !== ''
+    ? connection.httpRoute
+    : 'vision-http'
+  const fetchImpl = typeof options.fetchImpl === 'function' ? options.fetchImpl : globalThis.fetch
+
+  const probeConnection = async () => {
+    const started = Date.now()
+    let first
+    for (const pair of getArray(connection.candidatePairs)) {
+      if (!pair) continue
+      if (pair.provider !== httpRoute && !adapterAvailable(llm, pair.provider)) continue
+      const capability = await resolveCapability(pair.provider, pair.model)
+      if (capability?.attemptable !== false) {
+        first = pair
+        break
+      }
+    }
+
+    const localProbe = await probeLocalBackends(
+      getArray(connection.localBackends),
+      (provider) => probeModels(fetchImpl, provider.baseURL, provider.model, started),
+      started,
+    )
+    if (localProbe !== undefined) return localProbe
+
+    const httpBackends = getArray(connection.httpBackends)
+    if (first !== undefined && first.provider === httpRoute) {
+      const entry = httpBackends.find((provider) => `${provider.name}/${provider.model}` === first.model)
+      if (entry !== undefined) return probeModels(fetchImpl, entry.baseURL, entry.model, started)
+    }
+
+    if (first !== undefined) {
+      try {
+        await llm.resolveModelInfo(first.provider, first.model)
+        return {
+          ok: true,
+          latencyMs: Date.now() - started,
+          detail: `${first.provider}/${first.model} metadata resolved (no network call)`,
+        }
+      } catch (error) {
+        return {
+          ok: false,
+          latencyMs: Date.now() - started,
+          error: error && error.message ? error.message : String(error),
+        }
+      }
+    }
+
+    const httpFirst = httpBackends[0]
+    if (httpFirst !== undefined) return probeModels(fetchImpl, httpFirst.baseURL, httpFirst.model, started)
+    return { ok: false, error: 'no usable vision provider configured' }
+  }
+
+  ctx.inject(['webServer'], (webCtx) => {
+    webCtx.effect(() => {
+      return webCtx.webServer.register({
+        kind: 'exact',
+        path: VISION_TEST_CONNECTION_PATH,
+        handler: async (req, res) => {
+          if (req.method !== 'GET') {
+            res.setHeader('Allow', 'GET')
+            res.writeHead(405)
+            res.end()
+            return
+          }
+          try {
+            const result = await probeConnection()
+            const officialRouteAvailable = adapterAvailable(llm, 'deepseek-official')
+            result.stealth = {
+              configured: ownership.stealthConfigured,
+              active: false,
+              reason: ownership.hostOwnsOfficialDeepSeek && !officialRouteAvailable
+                ? 'host-owned-official-unavailable'
+                : undefined,
+              hostOwned: ownership.hostOwnsOfficialDeepSeek,
+            }
+            res.writeHead(result.ok ? 200 : 502, { 'content-type': 'application/json' })
+            res.end(JSON.stringify(result))
+          } catch (error) {
+            res.writeHead(500, { 'content-type': 'application/json' })
+            res.end(JSON.stringify({
+              ok: false,
+              error: error && error.message ? error.message : String(error),
+            }))
+          }
+        },
+      })
+    }, 'vision-router: test-connection route')
+  })
+
+  ctx.inject(['webServer'], (webCtx) => {
+    webCtx.effect(
+      () => webCtx.webServer.register({
+        kind: 'exact',
+        path: VISION_MODEL_CAPABILITIES_PATH,
+        handler: async (req, res) => {
+          if (req.method !== 'GET') {
+            res.setHeader('Allow', 'GET')
+            res.writeHead(405)
+            res.end()
+            return
+          }
+          try {
+            const snapshot = await collectCapabilities()
+            res.writeHead(200, { 'content-type': 'application/json' })
+            res.end(JSON.stringify({
+              capabilities: snapshot,
+              builtinFallback: getArray(capabilities.builtinFallback),
+              anonymousRpmPerModel: 2,
+            }))
+          } catch (error) {
+            res.writeHead(500, { 'content-type': 'application/json' })
+            res.end(JSON.stringify({
+              capabilities: {},
+              error: error && error.message ? error.message : String(error),
+            }))
+          }
+        },
+      }),
+      'vision-router: model capabilities route',
+    )
+  })
+
+  return ctx
+}

package/lib/vision-evidence-guidance.js

@@ -1,3 +1,5 @@
+import { visionRouterMessageSource } from './session-message-source-compat.js'
+
 export const VISION_SUCCESS_GUIDANCE =
   'Vision Router trusted execution metadata: the preceding vision_describe call SUCCEEDED. ' +
   'This metadata is not image content. If that successful evidence resolves the visual fact needed for the current task, stop making additional vision calls for that fact and continue the remaining user task from this evidence. ' +
@@ -34,6 +36,6 @@ export function visionDescribeSuccessContext(exec, result) {
     role: 'user',
     id: `vision-router-evidence-success-${String(exec.callId)}`,
     content: [{ type: 'text', text: VISION_SUCCESS_GUIDANCE }],
-    source: { kind: 'plugin', plugin: 'dsh-vision-router' },
+    source: visionRouterMessageSource(exec.agent.session),
   }
 }

package/lib/vision-provider-transport.js

@@ -33,8 +33,6 @@ const moduleFetch =
     ? globalThis.fetch.bind(globalThis)
     : undefined
 
-const installed = []
-
 function live(value) {
   return typeof value === 'function' ? value() : value
 }
@@ -175,30 +173,3 @@ export function createVisionProviderTransport({
     },
   })
 }
-
-/**
- * Scoped process/profile carrier for Router-owned compatibility calls whose
- * mature signatures do not yet accept an explicit VisionProviderTransport.
- * The registry never patches global fetch and is released with the public
- * plugin lifecycle. Remove it only after every production compatibility caller
- * receives the transport explicitly and no production code reads
- * currentVisionProviderTransport().
- */
-export function installVisionProviderTransport(transport) {
-  if (!transport || typeof transport.fetch !== 'function') {
-    throw new TypeError('invalid vision provider transport')
-  }
-  const token = Object.freeze({ transport })
-  installed.push(token)
-  let active = true
-  return () => {
-    if (!active) return
-    active = false
-    const index = installed.indexOf(token)
-    if (index >= 0) installed.splice(index, 1)
-  }
-}
-
-export function currentVisionProviderTransport() {
-  return installed[installed.length - 1]?.transport
-}

package/lib/vision-toggle-root-hardening.js

@@ -251,6 +251,7 @@ const CLIENT_PRELUDE = String.raw`(function(){
   var listeners = new Set();
   var pending = new WeakMap();
   var recoveries = new WeakMap();
+  var selectionGenerations = new WeakMap();
   var inFlight = null;
   var refreshedAt = 0;
   function emit(){ listeners.forEach(function(fn){ try { fn(); } catch (_) {} }); }
@@ -302,13 +303,29 @@ const CLIENT_PRELUDE = String.raw`(function(){
     var key = JSON.stringify(selection || {});
     var held = pending.get(directory);
     if (held && held.key === key) return held.promise;
+    var generation = (selectionGenerations.get(directory) || 0) + 1;
+    selectionGenerations.set(directory, generation);
+    var current = function(){ return selectionGenerations.get(directory) === generation; };
     var recovery = recoveryFor(directory);
     recovery.clear();
     var promise = Promise.resolve().then(function(){ return directory.select(selection); }).then(
-      function(value){ recovery.clear(); return value; },
-      function(error){ recovery.fail(error); throw error; }
+      function(value){
+        if (!current()) return value;
+        if (value && value.ok === false) {
+          var failure = value.error;
+          var message = failure && failure.message
+            ? String(failure.message)
+            : String(failure || 'model operation failed');
+          if (failure && failure.code) message = String(failure.code) + ': ' + message;
+          recovery.fail(new Error(message));
+          return value;
+        }
+        recovery.clear();
+        return value;
+      },
+      function(error){ if (current()) recovery.fail(error); throw error; }
     );
-    pending.set(directory, { key: key, promise: promise });
+    pending.set(directory, { key: key, promise: promise, generation: generation });
     promise.finally(function(){
       var latest = pending.get(directory);
       if (latest && latest.promise === promise) pending.delete(directory);
@@ -391,8 +408,8 @@ export function hardenVisionClientSource(source) {
 
   next = replaceAll(
     next,
-    `                  try {\n                    return Promise.resolve(directory.select(selection)).then(\n                      function(){ return true; },\n                      function(){ return false; }\n                    );\n                  } catch (_) {\n                    return Promise.resolve(false);\n                  }`,
-    `                  var hardening = window.__dshVisionRouterRootHardening;\n                  var operation;\n                  try { operation = hardening ? hardening.select(directory, selection) : Promise.resolve(directory.select(selection)); }\n                  catch (_) { return Promise.resolve(false); }\n                  return Promise.resolve(operation).then(function(){ return true; }, function(){ return false; });`,
+    `                  try {\n                    return Promise.resolve(directory.select(selection)).then(\n                      function(result){ return !result || result.ok !== false; },\n                      function(){ return false; }\n                    );\n                  } catch (_) {\n                    return Promise.resolve(false);\n                  }`,
+    `                  var hardening = window.__dshVisionRouterRootHardening;\n                  var operation;\n                  try { operation = hardening ? hardening.select(directory, selection) : Promise.resolve(directory.select(selection)); }\n                  catch (_) { return Promise.resolve(false); }\n                  return Promise.resolve(operation).then(function(result){ return !result || result.ok !== false; }, function(){ return false; });`,
   )
 
   next = replaceAll(

package/lib/vision-tool-runtime-boundary.js

@@ -540,7 +540,11 @@ function wrapLlm(llm, runtimeState) {
             : state?.callConfigAuthority === 'transparent'
               ? projectTransparentCallConfig(options, state, runtimeState)
               : options
-          return stream.call(target, projected)
+          const signal = combineSignals(projected?.signal, state?.signal)
+          const call = signal === undefined || signal === projected?.signal
+            ? projected
+            : { ...(projected ?? {}), signal }
+          return stream.call(target, call)
         }
       }
       if (property === 'registerAdapter') {

package/lib/web/remote-settings-client.js

@@ -1,6 +1,6 @@
 import { injectClientCarrierHtml, installClientScriptCarriers } from '../client-script-carrier.js'
 import { installVisionRouterRemoteSettingsBridge } from '../remote-settings-bridge.js'
-import { installSettingsRc8ClientLifecycle } from '../settings-client-rc8-lifecycle.js'
+import { installSettingsClientLoaderLifecycle } from '../settings-client-loader-lifecycle.js'
 
 const SETTINGS_CONFIG_FORMS_MARK = 'data-vision-router-settings-configforms-compat'
 
@@ -202,6 +202,6 @@ export function installSettingsConfigFormsCompat(ctx) {
 export function installVisionRemoteSettingsClient(ctx, logger) {
   installVisionRouterRemoteSettingsBridge(ctx, logger)
   installSettingsConfigFormsCompat(ctx)
-  installSettingsRc8ClientLifecycle(ctx)
+  installSettingsClientLoaderLifecycle(ctx)
   return ctx
 }