@yanglaofish/dsh-proxy-pro 1.0.9 → 1.1.0

package/lib/client.js

@@ -10,9 +10,10 @@
  *    NOT derived from settings), the editable config fields (mode / custom
  *    URL / NO_PROXY), and a per-URL route diagnostic.
  *
- * Both read and write the `proxy` settings namespace through the shared
- * `ctx.settingsScope` transport (same as dsh-plugin-proxy); runtime facts
- * come from the same-origin /dsh-proxy-pro/api endpoints served by the host
+ * Both read and write configuration through the host's own
+ * `/dsh-proxy-pro/api/config` endpoint (the browser settings transport
+ * `ctx.settingsScope` was removed in dsh 0.2 — LESSONS §33); runtime facts
+ * come from the same-origin `/dsh-proxy-pro/api` endpoints served by the host
  * half (browser-trust fenced, see lib/index.js).
  *
  * This hand-written module mirrors the loader format the in-repo client
@@ -107,18 +108,85 @@ window.__ModuleLoader__.load({
         .catch(function () { return null; });
     }
 
-    // ---- reactive settings scope (the `proxy` namespace) ----
-    /** @returns `{ value, writable, ready }` from a bound SettingsScope. */
-    function useProxySnapshot(scope) {
+    // ---- host-backed configuration store (dsh >= 0.2) ------------------
+    // The browser settings transport (`ctx.settingsScope`) was removed in dsh
+    // 0.2 (LESSONS §33), so the capsule and the settings page read/write the
+    // host's own /config API. The snapshot shape mirrors the old settings
+    // scope (`{ status, value, writable }`), so the render code below is
+    // unchanged; an older host simply has no /config route and the panel
+    // reports itself unavailable instead of crashing.
+    function createProxyStore() {
+      var listeners = [];
+      var snapshot = { status: "loading", value: undefined, writable: false };
+      var inflight = null;
+      function emit(next) {
+        snapshot = next;
+        listeners.slice().forEach(function (fn) {
+          try { fn(); } catch (error) { console.error("[dsh-proxy-pro] listener failed:", error); }
+        });
+      }
+      function accept(data) {
+        if (data === null || data.ok !== true || data.config === undefined || data.config === null) {
+          emit({ status: "unavailable", value: undefined, writable: false });
+          return false;
+        }
+        emit({ status: "ready", value: data.config, writable: data.writable !== false });
+        return true;
+      }
+      function refresh() {
+        if (inflight !== null) return inflight;
+        inflight = fetchJson("/config").then(function (data) {
+          inflight = null;
+          accept(data);
+          return data;
+        }, function () { inflight = null; return null; });
+        return inflight;
+      }
+      function set(field, value) {
+        var body = {};
+        body[field] = value;
+        return fetchJson("/config", {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify(body),
+        }).then(function (data) {
+          if (data === null || data.ok !== true) {
+            throw new Error((data && data.error) || "config write failed");
+          }
+          accept(data);
+        });
+      }
+      return {
+        subscribe: function (fn) {
+          listeners.push(fn);
+          return function () {
+            var index = listeners.indexOf(fn);
+            if (index >= 0) listeners.splice(index, 1);
+          };
+        },
+        getSnapshot: function () { return snapshot; },
+        refresh: refresh,
+        set: set,
+        setEnabled: function (next) { return set("enabled", next === true); },
+      };
+    }
+
+    /** Subscribe to the host-backed config store → `{ value, writable, ready }`. */
+    function useProxySettings(store) {
       var snapshot = useSyncExternalStore(
-        function (onChange) { return scope.subscribe(onChange); },
-        function () { return scope.getSnapshot(); }
+        function (onChange) {
+          var unsubscribe = store.subscribe(onChange);
+          store.refresh();
+          return unsubscribe;
+        },
+        function () { return store.getSnapshot(); }
       );
       var ready = snapshot.status === "ready" && snapshot.value !== undefined;
       return {
         value: ready ? snapshot.value : undefined,
         writable: snapshot.writable === true && ready,
         ready: snapshot.status === "unavailable" ? false : snapshot.status === "ready",
+        unavailable: snapshot.status === "unavailable",
       };
     }
 
@@ -177,26 +245,35 @@ window.__ModuleLoader__.load({
 
     // ---- conversation header capsule button ----
     function ProxyHeaderButton(props) {
-      var scope = props.scope;
-      var settings = useProxySnapshot(scope);
-      var busy = useState(false);
-      var setBusy = busy[1];
-      // Configuration-driven: the capsule mirrors the switch, resolved locally
-      // with zero requests. The host applies the change instantly when the
-      // settings revision lands (and follows external system-proxy changes on
-      // its own 30s poll), so polling here buys nothing (§17).
+      var store = props.store;
+      var settings = useProxySettings(store);
+      // Local optimistic value (2026-09-18): the capsule flips its visual
+      // immediately on click instead of waiting for scope.set's round-trip
+      // (the settings-page switch already behaves this way). null means no
+      // unconfirmed value — the capsule mirrors settings.value.
+      var optimistic = useState(null);
+      var setOptimistic = optimistic[1];
       var config = settings.value || {};
-      var active = config.enabled === true && config.mode !== "none";
-      var enabled = config.enabled === true;
+      var valueEnabled = config.enabled === true;
+      var shownEnabled = optimistic[0] !== null ? optimistic[0] : valueEnabled;
+      var active = shownEnabled === true && (config.mode || "system") !== "none";
       var mode = config.mode || "system";
       var modeLabel = mode === "system" ? "system" : mode === "custom" ? "custom" : "none";
+      // Once the host has committed the new value, drop the optimistic echo.
+      useEffect(function () {
+        if (optimistic[0] !== null && settings.ready && settings.value !== undefined && settings.value.enabled === optimistic[0]) {
+          setOptimistic(null);
+        }
+      }, [optimistic[0], settings.value, settings.ready]);
       function toggle() {
         if (!settings.writable) return;
-        setBusy(true);
-        var next = !enabled;
-        scope.set("enabled", next).catch(function (error) {
+        var next = !shownEnabled;
+        setOptimistic(next);
+        store.setEnabled(next).catch(function (error) {
           console.error("[dsh-proxy-pro] toggle failed:", error);
-        }).finally(function () { setBusy(false); });
+          // Roll back to the committed value on failure.
+          setOptimistic(null);
+        });
         // Toggle doubles as a manual "recheck now" even when the settings
         // panel is not mounted: pulling /status makes the host re-read the
         // system facts (idempotent — snapshot refresh unless the proxy really
@@ -216,7 +293,7 @@ window.__ModuleLoader__.load({
           "data-active": active ? "true" : "false",
           "data-proxy-toggle": true,
           onClick: toggle,
-          disabled: !settings.writable || busy[0],
+          disabled: !settings.writable,
           title: title,
           "aria-pressed": active,
         },
@@ -227,8 +304,8 @@ window.__ModuleLoader__.load({
 
     // ---- Settings page: 代理管理 ----
     function ProxyManagerPanel(props) {
-      var scope = props.scope;
-      var settings = useProxySnapshot(scope);
+      var store = props.store;
+      var settings = useProxySettings(store);
       // Re-fetch the host snapshot when the configuration changes (enabled /
       // mode / customUrl / noProxy are the only inputs that move the effKey);
       // no timed polling, mount + change-driven only (§17.3d).
@@ -251,7 +328,10 @@ window.__ModuleLoader__.load({
 
       if (!settings.ready) {
         return react.createElement("div", { className: "dsxprx", "data-proxy-settings": true },
-          react.createElement("p", { className: "dsxprx-hint" }, "代理设置加载中…"));
+          react.createElement("p", { className: "dsxprx-hint" },
+            settings.unavailable
+              ? "宿主未提供配置接口（/dsh-proxy-pro/api/config）——请确认插件已完整安装、宿主已重启。"
+              : "代理设置加载中…"));
       }
       var value = settings.value || { enabled: false, mode: "system", customUrl: "", noProxy: "" };
       var writable = settings.writable;
@@ -297,7 +377,7 @@ window.__ModuleLoader__.load({
 
       function setField(field) {
         return function (next) {
-          scope.set(field, next).catch(function (error) {
+          store.set(field, next).catch(function (error) {
             console.error("[dsh-proxy-pro] save failed:", error);
           });
         };
@@ -422,6 +502,7 @@ window.__ModuleLoader__.load({
                 ? react.createElement("span", null, "诊断失败：" + diag.error)
                 : [
                   react.createElement("span", { key: "r" }, "策略判定： " + diag.route + (diag.bypassed ? "（NO_PROXY 命中）" : "")),
+                  react.createElement("span", { key: "codes" }, "状态码: 走代理 " + ((diag.proxy && diag.proxy.status) || "—") + " · 直连 " + ((diag.direct && diag.direct.status) || "—")),
                   react.createElement("span", { key: "px", className: "dsxprx-diagprobe" },
                     react.createElement("span", { className: "dsxprx-diotag" }, "走代理"),
                     react.createElement("span", { className: "dsxprx-verdict", "data-tone": channelBadge("proxyBadge").tone }, channelBadge("proxyBadge").text)
@@ -447,12 +528,13 @@ window.__ModuleLoader__.load({
     }
 
     /**
-     * Browser plugin body: bind the `proxy` settings scope, then register the
-     * conversation header button and the 代理配置 settings section.
+     * Browser plugin body: create the host-backed config store, then register
+     * the conversation header button and the 代理配置 settings section.
      * @param ctx - client cordis context.
      */
     function apply(ctx) {
-      var scope = ctx.settingsScope.bind({ namespace: "proxy" });
+      var store = createProxyStore();
+      ctx.effect(function () { return function () { /* no timers to clear */ }; }, "dsh-proxy-pro: config store");
       ctx.slots.inject("settings.section", function () {
         return ctx.slots.register({
           name: "settings.section",
@@ -460,7 +542,7 @@ window.__ModuleLoader__.load({
           order: 20,
           label: "代理配置",
         }, function Section() {
-          return react.createElement(ProxyManagerPanel, { scope: scope });
+          return react.createElement(ProxyManagerPanel, { store: store });
         });
       });
       ctx.slots.inject("conversation.session.header.utilities", function () {
@@ -470,7 +552,7 @@ window.__ModuleLoader__.load({
           order: 10,
           label: "代理",
         }, function Header() {
-          return react.createElement(ProxyHeaderButton, { scope: scope });
+          return react.createElement(ProxyHeaderButton, { store: store });
         });
       });
     }
@@ -480,10 +562,11 @@ window.__ModuleLoader__.load({
     // Cordis service names the browser loader must wait for — NOT package
     // names (those belong in package.json's dsh.client.inject). Writing
     // package names here keeps the plugin permanently pending and blocks
-    // web boot (see docs/LESSONS.md §6).
+    // web boot (see docs/LESSONS.md §6). `settingsScope` was one of these
+    // until dsh 0.2 removed that service; requiring it now would keep the
+    // whole client half permanently pending (LESSONS §33).
     exports.inject = [
       "slots",
-      "settingsScope",
     ];
     return module.exports;
   },

package/lib/index.js

@@ -33,10 +33,14 @@ import {
   classifyProbeStatus,
   classifyTargetFailure,
   combineDualProbe,
+  configPayload,
+  DEFAULT_ENTRY_ID,
+  discoverEntryId,
   headNeedsGetRetry,
   keepaliveHint,
   makeSystemProxyReader,
   normalizeProxyUrl,
+  readEntryConfig,
   resolveProxyState,
   summarize,
   systemFactsEqual,
@@ -114,8 +118,7 @@ function makeEnvLike(effective) {
   }
 }
 
-/** Build the agent-facing status text from the latest sync snapshot. */
-function renderStatusText(snapshot) {
+/** Build the agent-facing status text from the latest sync snapshot. */function renderStatusText(snapshot) {
   const effective = snapshot?.effective
   const config = snapshot?.config
   if (effective === undefined || config === undefined) {
@@ -478,23 +481,39 @@ function apply(ctx, config) {
     return syncing
   }
 
-  // Configuration source: the `proxy` settings namespace layered over the
-  // composition entry; every committed change re-syncs live. Registration goes
-  // through the settings SERVICE — newer dsh-settings removed the
-  // `installSettingsSection` export entirely, so importing it throws a
-  // SyntaxError at boot and kills the whole profile (LESSONS §26).
-  // register() + scope.get()/watch() exist on every version we target, and
-  // update() recomputes registration.resolved, so scope.get() stays fresh.
+  // Configuration source — two settings generations (LESSONS §26, §33):
+  //  - dsh <= 0.1.x: a per-plugin namespace registered through the settings
+  //    service (register(ns, schema, {base}) → scope.get()/watch()).
+  //  - dsh >= 0.2: register()/watch() are gone. The plugin's OWN composition
+  //    entry IS the settings form (namespace = entry id, schema = this Config),
+  //    writes go through settings.update(entryId, patch) and every commit
+  //    emits `settings/document-updated`, which is what re-syncs us live.
   const settingsService = ctx.get('settings')
-  if (settingsService !== undefined && typeof settingsService.register === 'function') {
+  const configEditor = ctx.get('configEditor')
+  const legacyRegister = typeof settingsService?.register === 'function'
+  const entryId = discoverEntryId(configEditor, ctx) ?? DEFAULT_ENTRY_ID
+  if (legacyRegister) {
     const proxyScope = settingsService.register(PROXY_NS, Config, { base: config })
     source = () => proxyScope.get()
     proxyScope.watch(() => {
       void requestSync().catch(() => {})
     })
+  } else if (typeof settingsService?.update === 'function') {
+    source = () => readEntryConfig(configEditor, entryId, config)
+    ctx.on('settings/document-updated', (ns) => {
+      if (ns === entryId) void requestSync().catch(() => {})
+    })
+  }
+  // Without either generation the plugin still runs read-only on the
+  // composition config (source keeps returning it).
+
+  /** Persist one config patch through whichever settings generation is present. */
+  const writeSettings = async (patch) => {
+    if (settingsService === undefined) {
+      throw new Error('the settings service is unavailable in this composition — change the proxy configuration in the composition instead')
+    }
+    await settingsService.update(legacyRegister ? PROXY_NS : entryId, patch)
   }
-  // Without a settings service in this composition, `source` keeps the
-  // composition default (initialized above) and the plugin still runs, read-only.
 
   // ---------- Agent tools ----------
 
@@ -538,11 +557,11 @@ function apply(ctx, config) {
       }],
     },
     execute: async (args) => {
-      const settings = ctx.get('settings')
-      if (settings === undefined) {
-        throw new Error('proxy_set: the settings service is unavailable in this composition — change the proxy config instead')
+      try {
+        await writeSettings({ enabled: args.enabled === true })
+      } catch (error) {
+        throw new Error(`proxy_set: ${error?.message ?? error}`)
       }
-      await settings.update(PROXY_NS, { enabled: args.enabled === true })
       await requestSync()
       return summarize(snapshot)
     },
@@ -565,6 +584,7 @@ function apply(ctx, config) {
         const lines = [
           `路由: ${value.route}`,
           `NO_PROXY 命中: ${value.bypassed}`,
+          `状态码: 走代理 ${value.proxy?.status ?? '—'} · 直连 ${value.direct?.status ?? '—'}`,
           `走代理: ${badge(value.proxyBadge)}`,
           `直连:   ${badge(value.directBadge)}`,
           `结论: ${value.short ?? '未知'}`,
@@ -603,10 +623,6 @@ function apply(ctx, config) {
       }],
     },
     execute: async (args) => {
-      const settings = ctx.get('settings')
-      if (settings === undefined) {
-        throw new Error('proxy_config: the settings service is unavailable in this composition — change the proxy configuration in Settings instead')
-      }
       const patch = {}
       if (args.enabled !== undefined) patch.enabled = args.enabled === true
       if (args.mode !== undefined) patch.mode = args.mode
@@ -623,7 +639,7 @@ function apply(ctx, config) {
         }
       }
       if (args.noProxy !== undefined) patch.noProxy = String(args.noProxy).trim()
-      if (Object.keys(patch).length > 0) await settings.update(PROXY_NS, patch)
+      if (Object.keys(patch).length > 0) await writeSettings(patch)
       await requestSync()
       return summarize(snapshot)
     },
@@ -708,16 +724,58 @@ function apply(ctx, config) {
             }
             if (is('/toggle', 'POST')) {
               const body = await readJsonBody(req)
-              const settings = ctx.get('settings')
-              if (settings === undefined) {
-                sendJson(res, 503, { ok: false, error: 'settings service unavailable' })
+              try {
+                await writeSettings({ enabled: body.enabled === true })
+              } catch (error) {
+                sendJson(res, 503, { ok: false, error: String(error?.message ?? error) })
                 return
               }
-              await settings.update(PROXY_NS, { enabled: body.enabled === true })
               await requestSync()
               sendJson(res, 200, { ok: true, status: summarize(snapshot) })
               return
             }
+            // Editable configuration for the client panel. dsh >= 0.2 removed
+            // the browser settings transport (`ctx.settingsScope`), so the panel
+            // reads and writes through this API instead (LESSONS §33).
+            if (is('/config', 'GET')) {
+              sendJson(res, 200, { ok: true, ...configPayload(source()) })
+              return
+            }
+            if (is('/config', 'POST')) {
+              const body = await readJsonBody(req)
+              const patch = {}
+              if (body.enabled !== undefined) patch.enabled = body.enabled === true
+              if (body.mode !== undefined) {
+                if (body.mode !== 'system' && body.mode !== 'custom') {
+                  sendJson(res, 400, { ok: false, error: 'mode must be "system" or "custom"' })
+                  return
+                }
+                patch.mode = body.mode
+              }
+              if (body.customUrl !== undefined) {
+                const raw = String(body.customUrl).trim()
+                if (raw === '') {
+                  patch.customUrl = ''
+                } else {
+                  const normalized = normalizeProxyUrl(raw)
+                  if (normalized === null) {
+                    sendJson(res, 400, { ok: false, error: `"${body.customUrl}" is not a usable proxy address — expected http(s)://host:port` })
+                    return
+                  }
+                  patch.customUrl = normalized
+                }
+              }
+              if (body.noProxy !== undefined) patch.noProxy = String(body.noProxy).trim()
+              try {
+                if (Object.keys(patch).length > 0) await writeSettings(patch)
+              } catch (error) {
+                sendJson(res, 503, { ok: false, error: String(error?.message ?? error) })
+                return
+              }
+              await requestSync()
+              sendJson(res, 200, { ok: true, ...configPayload(source()) })
+              return
+            }
             sendJson(res, 404, { ok: false, error: 'not found' })
           } catch (error) {
             sendJson(res, 500, { ok: false, error: String(error?.message ?? error) })

package/lib/proxy-core.js

@@ -15,6 +15,60 @@
 const PROXY_REG_KEY = 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings'
 const LOCAL_ENTRIES = ['localhost', '127.0.0.1', '::1']
 
+/** Bundle row id (cordis.patch.yml) — also the settings namespace on dsh >= 0.2,
+ *  where a plugin's OWN composition entry is its settings form (LESSONS §33). */
+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.
+ */
+export function discoverEntryId(configEditor, ctx) {
+  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)
+    const id = own?.entry?.options?.id
+    return typeof id === 'string' && id.length > 0 ? id : undefined
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * Effective config of one entry: the composed layers, then the profile patch.
+ * Every Config field is a scalar, so a shallow merge is exact.
+ */
+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 */
+  }
+  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).
+ */
+export function configPayload(resolved) {
+  return {
+    config: {
+      enabled: resolved?.enabled === true,
+      mode: resolved?.mode ?? 'none',
+      customUrl: resolved?.customUrl ?? '',
+      noProxy: resolved?.noProxy ?? '',
+      systemPollMs: resolved?.systemPollMs ?? 0,
+    },
+    writable: true,
+  }
+}
+
 /** Normalize a bare `host:port` or already-schemed URL into an http(s) URL. */
 export function normalizeProxyUrl(value) {
   if (typeof value !== 'string') return null
@@ -429,14 +483,18 @@ export function classifyTargetFailure(error) {
  * 链路不通 → 截图"代理与直连均失败"误导（2026-09-18 用户实况）。
  */
 function dualBadge(probe) {
-  const detail = (s) => String(s ?? '').replace(/^HTTP \d+ — /, '')
+  // Keep the HTTP code in the copy (2026-09-18 用户要求：展示原因时直接看到
+  // 状态码，而不是只有人话）。连接层失败没有 status，保持原文案。
+  const detail = (s) => String(s ?? '')
   if (!probe) return { text: '结果未知', tone: 'warn' }
-  if (probe.verdict === 'usable') return { text: '链路通 · 目标正常响应', tone: 'ok' }
+  if (probe.verdict === 'usable') {
+    return { text: Number.isFinite(probe.status) ? `链路通 · 目标正常响应（HTTP ${probe.status}）` : '链路通 · 目标正常响应', tone: 'ok' }
+  }
   if (probe.verdict === 'degraded') {
     return { text: `链路通 · 目标拒绝（${detail(probe.short) || '请求被拒'}）`, tone: 'warn' }
   }
   if (probe.kind === 'gateway' || probe.kind === 'server-error') {
-    return { text: `链路通 · 目标/网关报错（${detail(probe.short) || String(probe.status ?? '5xx')}）`, tone: 'warn' }
+    return { text: `链路通 · 目标/网关报错（${detail(probe.short) || `HTTP ${probe.status ?? '5xx'}`}）`, tone: 'warn' }
   }
   if (probe.kind === 'auth') return { text: '链路不通 · 代理要求认证', tone: 'bad' }
   return { text: `链路不通 · ${detail(probe.short) || '连接失败'}`, tone: 'bad' }
@@ -474,7 +532,9 @@ export function combineDualProbe(proxyProbe, directProbe) {
     || (p.verdict === 'unusable' && /NTLM|407/.test(String(p.short ?? '')))
 
   const notReachable = (probe, label) => {
-    const detail = (probe?.short ?? '未知原因').replace(/^HTTP \d+ — /, '')
+    // Keep the HTTP code — the reason line should name the status
+    // (2026-09-18: user asked for the code to be visible where the cause is shown).
+    const detail = probe?.short ?? '未知原因'
     return `${label}：${detail}`
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yanglaofish/dsh-proxy-pro",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "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",
-    "@deepseek-ai/dsh-settings": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.5-rc.2",
+    "@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/schemastery": "^3.18.0"
   },
   "dsh": {