@yanglaofish/dsh-proxy-pro 1.1.0 → 2.0.1

package/lib/proxy-core.js

@@ -21,42 +21,67 @@ export const DEFAULT_ENTRY_ID = 'dsh-proxy-pro'
 
 /**
  * Resolve this plugin's composition entry id — the settings namespace on
- * dsh >= 0.2 (LESSONS §33). Prefers the row whose fiber IS this context, then
- * the known bundle id; undefined when the editor cannot be read.
+ * dsh >= 0.2 (LESSONS §33). Core plugins read it straight off the fiber
+ * (`ctx.fiber.entry?.options.id`, e.g. dsh-experimental-speech-to-text); the
+ * config-editor row match is the fallback, then the known bundle id.
  */
-export function discoverEntryId(configEditor, ctx) {
+export function resolveEntryId(ctx, configEditor, fallback = DEFAULT_ENTRY_ID) {
+  const direct = ctx?.fiber?.entry?.options?.id
+  if (typeof direct === 'string' && direct.length > 0) return direct
   try {
     const rows = configEditor?.configuration?.() ?? []
     const own = rows.find((row) => row?.entry?.fiber === ctx?.fiber)
-      ?? rows.find((row) => row?.entry?.options?.id === DEFAULT_ENTRY_ID)
+      ?? rows.find((row) => row?.entry?.options?.id === fallback)
     const id = own?.entry?.options?.id
-    return typeof id === 'string' && id.length > 0 ? id : undefined
+    return typeof id === 'string' && id.length > 0 ? id : fallback
   } catch {
-    return undefined
+    return fallback
   }
 }
 
 /**
- * Effective config of one entry: the composed layers, then the profile patch.
- * Every Config field is a scalar, so a shallow merge is exact.
+ * Read one resolved Config field.
+ *
+ * Cordis' documented volatile contract (vendor loader README, LESSONS §36):
+ * a field declared `.volatile()` resolves to a `Volatile<T>` **reference**
+ * whose live value is read with `.get()`; Loader commits volatile-only edits
+ * into that same reference. Older cores (and our `.volatile()` guard on old
+ * schemastery) hand back a plain value, so both shapes are accepted.
  */
-export function readEntryConfig(configEditor, entryId, fallback) {
-  try {
-    const rows = configEditor?.configuration?.() ?? []
-    const own = rows.find((row) => row?.entry?.options?.id === entryId)
-    if (own !== undefined) return { ...fallback, ...(own.inherited ?? {}), ...(own.override ?? {}) }
-  } catch {
-    /* fall through to the apply-time config */
+export function readConfigField(config, field, fallback) {
+  const value = config?.[field]
+  if (value !== null && typeof value === 'object' && typeof value.get === 'function') {
+    try {
+      const live = value.get()
+      return live === undefined ? fallback : live
+    } catch {
+      return fallback
+    }
+  }
+  return value === undefined ? fallback : value
+}
+
+/** The plain, serializable configuration the tools/client/API consume. */
+export function readProxyConfig(config) {
+  return {
+    enabled: readConfigField(config, 'enabled', false) === true,
+    mode: readConfigField(config, 'mode', 'none'),
+    customUrl: readConfigField(config, 'customUrl', ''),
+    noProxy: readConfigField(config, 'noProxy', ''),
+    systemPollMs: readConfigField(config, 'systemPollMs', 0),
   }
-  return fallback
 }
 
 /**
  * Editable configuration payload for the client panel (`/config` API). The
  * browser cannot reach the settings transport on dsh >= 0.2, so the host hands
  * the panel exactly the fields it edits (LESSONS §33).
+ *
+ * @param resolved - the live configuration (see {@link readProxyConfig}).
+ * @param writable - whether this composition can persist a write at all; a
+ *   read-only composition must not offer enabled controls (review fix).
  */
-export function configPayload(resolved) {
+export function configPayload(resolved, writable = true) {
   return {
     config: {
       enabled: resolved?.enabled === true,
@@ -65,7 +90,7 @@ export function configPayload(resolved) {
       noProxy: resolved?.noProxy ?? '',
       systemPollMs: resolved?.systemPollMs ?? 0,
     },
-    writable: true,
+    writable: writable === true,
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yanglaofish/dsh-proxy-pro",
-  "version": "1.1.0",
+  "version": "2.0.1",
   "description": "DSH proxy manager: route model requests, web fetches and spawned tools through the Windows system proxy or a custom address; per-URL route diagnosis, one-click toggle from the conversation header, a dedicated Settings page, and keepalive-aware 407 hints.",
   "type": "module",
   "main": "./lib/index.js",
@@ -40,10 +40,10 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.0",
-    "@deepseek-ai/dsh-http-proxy": ">=0.1.5-rc.2 <0.3.0",
-    "@deepseek-ai/dsh-settings": ">=0.1.5-rc.2 <0.3.0",
-    "@deepseek-ai/dsh-system-prompt": ">=0.1.5-rc.2 <0.3.0",
-    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.2 <0.3.0",
+    "@deepseek-ai/dsh-http-proxy": ">=0.2.0-rc.2 <0.3.0",
+    "@deepseek-ai/dsh-settings": ">=0.2.0-rc.2 <0.3.0",
+    "@deepseek-ai/dsh-system-prompt": ">=0.2.0-rc.2 <0.3.0",
+    "@deepseek-ai/dsh-tools": ">=0.2.0-rc.2 <0.3.0",
     "@deepseek-ai/schemastery": "^3.18.0"
   },
   "dsh": {