dsh-vision-router 1.7.5 → 1.7.6

package/lib/adapter-update-coalescer.js

@@ -1,7 +1,84 @@
 const wrappedContexts = new WeakMap()
+const wrappedLlmServices = new WeakMap()
+const preparedAdapterCompat = new WeakMap()
 
 export const DEFAULT_ADAPTER_RECONCILE_MAX_PASSES = 32
 
+/**
+ * DSH 0.1.1 dispatches every model call through adapter.prepareCall(). Older
+ * Vision Router adapters are intentionally duck-typed objects and therefore do
+ * not inherit LlmAdapter's default implementation. Normalize only adapters
+ * registered through Vision Router's wrapped context so host/foreign adapters
+ * keep their native identity and behavior.
+ */
+export function ensureAdapterPrepareCall(adapter) {
+  if (!adapter || (typeof adapter !== 'object' && typeof adapter !== 'function')) return adapter
+  if (typeof adapter.prepareCall === 'function') return adapter
+
+  const cached = preparedAdapterCompat.get(adapter)
+  if (cached) return cached
+
+  const prepareCall = async (provider, model, signal) => {
+    const fallbackModel = { provider, id: model, name: model }
+    const resolved =
+      typeof adapter.resolveModel === 'function'
+        ? await adapter.resolveModel.call(adapter, provider, model, signal)
+        : fallbackModel
+    return {
+      model: resolved && typeof resolved === 'object' ? resolved : fallbackModel,
+      stream(options) {
+        return adapter.stream.call(adapter, options)
+      },
+    }
+  }
+
+  // Preserve the exact adapter object whenever possible. Some runtime paths
+  // retain registration.adapter and compare/reuse it later, so mutation is less
+  // surprising than substituting a wrapper. Frozen/sealed adapters fall back to
+  // a proxy that exposes only the missing contract method.
+  try {
+    Object.defineProperty(adapter, 'prepareCall', {
+      configurable: true,
+      writable: true,
+      value: prepareCall,
+    })
+    preparedAdapterCompat.set(adapter, adapter)
+    return adapter
+  } catch {
+    const wrapped = new Proxy(adapter, {
+      get(target, property) {
+        if (property === 'prepareCall') return prepareCall
+        const value = Reflect.get(target, property, target)
+        return typeof value === 'function' ? value.bind(target) : value
+      },
+    })
+    preparedAdapterCompat.set(adapter, wrapped)
+    return wrapped
+  }
+}
+
+function wrapLlmService(llm) {
+  if (!llm || (typeof llm !== 'object' && typeof llm !== 'function')) return llm
+  const cached = wrappedLlmServices.get(llm)
+  if (cached) return cached
+
+  const wrapped = new Proxy(llm, {
+    get(target, property) {
+      if (property === 'registerAdapter') {
+        const registerAdapter = Reflect.get(target, property, target)
+        if (typeof registerAdapter !== 'function') return registerAdapter
+        return (providers, adapter, ...rest) =>
+          registerAdapter.call(target, providers, ensureAdapterPrepareCall(adapter), ...rest)
+      }
+      const value = Reflect.get(target, property, target)
+      return typeof value === 'function' ? value.bind(target) : value
+    },
+  })
+
+  wrappedLlmServices.set(llm, wrapped)
+  return wrapped
+}
+
 /**
  * Turn a synchronous reconciliation pass into a bounded fixed-point runner.
  *
@@ -76,6 +153,10 @@ export function createCoalescingRunner(run, options = {}) {
  * registerAdapter() returns. Only Vision Router listeners registered through
  * this wrapped context are coalesced; host and other plugin listeners keep
  * their native event semantics.
+ *
+ * The same boundary also normalizes Vision Router-owned adapter registrations
+ * to the DSH 0.1.1 prepareCall contract. This stays scoped to the wrapped
+ * context instead of monkey-patching the Host LLM service process-wide.
  */
 export function contextWithCoalescedAdapterUpdates(ctx) {
   if (!ctx || (typeof ctx !== 'object' && typeof ctx !== 'function')) return ctx
@@ -84,6 +165,9 @@ export function contextWithCoalescedAdapterUpdates(ctx) {
 
   const wrapped = new Proxy(ctx, {
     get(target, property) {
+      if (property === 'llm') {
+        return wrapLlmService(Reflect.get(target, property, target))
+      }
       if (property === 'on') {
         const on = Reflect.get(target, property, target)
         if (typeof on !== 'function') return on

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vision-router",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "description": "Eyes for text-only DeepSeek Harness agents: built-in free vision chain (no key) + pixel-level vision tools (Q&A, grounding, crop, pixel diff, colors, OCR, SVG trace, cutout, screenshots). One-command install, no Python, image turns work like ordinary tool-calling turns.",
   "license": "MIT",
   "repository": {
@@ -69,7 +69,7 @@
     "sharp": "^0.35.3"
   },
   "scripts": {
-    "test": "node --test tests/core.test.js tests/capability-advisory.test.js tests/vision-execution-policy.test.js tests/vision-backend-diagnostics.test.js tests/vision-backend-smoke-test.test.js tests/live-model-discovery.test.js tests/live-model-credential-resolution.test.js tests/vision-model-registry.test.js tests/live-model-client-stability.test.js tests/provider-directory-fallback.test.js tests/settings-section-order.test.js tests/attachment-admission-policy.test.js tests/vision-resilience.test.js tests/client.test.js tests/client-presentation-boundary.test.js tests/remote-settings-bridge.test.js tests/remote-settings-risk-confirmation.test.js tests/local-remote-settings-permission.test.js tests/rc6-real-settings-persistence.test.js tests/artifact-path-security.test.js tests/http-compat.test.js tests/catalog-corrections.test.js tests/update-check.test.js tests/self-update.test.js tests/doctor.test.js tests/doctor-cli.test.js tests/legacy-session-repair.test.js tests/profile-pnpm-diagnostics.test.js tests/doctor-v2.test.js tests/doctor-cli-v2.test.js tests/doctor-runtime.test.js tests/session-repair-v2.test.js tests/bundle-defaults.test.js tests/file-logger.test.js tests/replay-delegation.test.js tests/adversarial-hardening.test.js tests/wrapper-directory.test.js tests/logging-ui.test.js tests/manifest-dependencies.test.js tests/structured-bootstrap.test.js tests/structured-bootstrap-gate.test.js tests/local-ollama.test.js tests/ollama-cold-start.test.js tests/ollama-cold-start-loaded.test.js tests/zero-regression-gate.test.js tests/runtime-e2e.test.js tests/local-vision-stabilizer.test.js tests/local-connection-probe.test.js tests/repetition-guard.test.js tests/guide-scroll-gate.test.js tests/settings-scroll-jank-regression.test.js tests/android-attachment-compat.test.js tests/free-cloud-first.test.js tests/rc6-rc7-compat.test.js tests/native-image-coexistence.test.js tests/pi-ai-bridge-wire-compat.test.js tests/mixed-router.test.js tests/depth-tier.test.js tests/depth-quota-behavior.test.js tests/structured-flow-hardening.test.js tests/vision-budget-activation.test.js tests/runtime-boundary-fixes.test.js tests/tesseract-node24-boot.test.js tests/session-vision-state.test.js tests/session-vision-state-integration.test.js tests/image-resource-governor.test.js tests/pixel-diff-stream.test.js tests/large-image-resource-integration.test.js tests/structured-guard-idempotency.test.js tests/qa-top5-reliability.test.js tests/qa-screenshot-runtime.test.js tests/qa-runtime-identity.test.js tests/qa-turn-budget-cancellation.test.js tests/qa-cancellation-publication.test.js tests/qa-reliability-tail.test.js tests/qa-endpoint-route-alias.test.js"
+    "test": "node --test tests/adapter-prepare-call-compat.test.js tests/core.test.js tests/capability-advisory.test.js tests/vision-execution-policy.test.js tests/vision-backend-diagnostics.test.js tests/vision-backend-smoke-test.test.js tests/live-model-discovery.test.js tests/live-model-credential-resolution.test.js tests/vision-model-registry.test.js tests/live-model-client-stability.test.js tests/provider-directory-fallback.test.js tests/settings-section-order.test.js tests/attachment-admission-policy.test.js tests/vision-resilience.test.js tests/client.test.js tests/client-presentation-boundary.test.js tests/remote-settings-bridge.test.js tests/remote-settings-risk-confirmation.test.js tests/local-remote-settings-permission.test.js tests/rc6-real-settings-persistence.test.js tests/artifact-path-security.test.js tests/http-compat.test.js tests/catalog-corrections.test.js tests/update-check.test.js tests/self-update.test.js tests/doctor.test.js tests/doctor-cli.test.js tests/legacy-session-repair.test.js tests/profile-pnpm-diagnostics.test.js tests/doctor-v2.test.js tests/doctor-cli-v2.test.js tests/doctor-runtime.test.js tests/session-repair-v2.test.js tests/bundle-defaults.test.js tests/file-logger.test.js tests/replay-delegation.test.js tests/adversarial-hardening.test.js tests/wrapper-directory.test.js tests/logging-ui.test.js tests/manifest-dependencies.test.js tests/structured-bootstrap.test.js tests/structured-bootstrap-gate.test.js tests/local-ollama.test.js tests/ollama-cold-start.test.js tests/ollama-cold-start-loaded.test.js tests/zero-regression-gate.test.js tests/runtime-e2e.test.js tests/local-vision-stabilizer.test.js tests/local-connection-probe.test.js tests/repetition-guard.test.js tests/guide-scroll-gate.test.js tests/settings-scroll-jank-regression.test.js tests/android-attachment-compat.test.js tests/free-cloud-first.test.js tests/rc6-rc7-compat.test.js tests/native-image-coexistence.test.js tests/pi-ai-bridge-wire-compat.test.js tests/mixed-router.test.js tests/depth-tier.test.js tests/depth-quota-behavior.test.js tests/structured-flow-hardening.test.js tests/vision-budget-activation.test.js tests/runtime-boundary-fixes.test.js tests/tesseract-node24-boot.test.js tests/session-vision-state.test.js tests/session-vision-state-integration.test.js tests/image-resource-governor.test.js tests/pixel-diff-stream.test.js tests/large-image-resource-integration.test.js tests/structured-guard-idempotency.test.js tests/qa-top5-reliability.test.js tests/qa-screenshot-runtime.test.js tests/qa-runtime-identity.test.js tests/qa-turn-budget-cancellation.test.js tests/qa-cancellation-publication.test.js tests/qa-reliability-tail.test.js tests/qa-endpoint-route-alias.test.js"
   },
   "pnpm": {
     "onlyBuiltDependencies": ["sharp"]