@yanglaofish/dsh-proxy-pro 2.0.1 → 2.0.3

package/lib/proxy-core.js

@@ -110,6 +110,21 @@ export function normalizeProxyUrl(value) {
   return url.toString().replace(/\/+$/, '')
 }
 
+/** 仅用于状态展示；传输层和可编辑配置继续使用完整的原始地址。 */
+export function redactProxyUrl(value) {
+  if (typeof value !== 'string' || value === '') return ''
+  try {
+    const url = new URL(value)
+    if (!url.username && !url.password) return value
+    url.username = ''
+    url.password = ''
+    return url.toString().replace(/\/+$/, '')
+  } catch {
+    // 无效地址也不能把 user:password 原样带入错误提示。
+    return value.replace(/(https?:\/\/)[^\s/?#]*@/gi, '$1[redacted]@')
+  }
+}
+
 /**
  * Parse a Windows `ProxyServer` string: single `host:port` (both protocols)
  * or `http=...;https=...` form; `socks=` ignored (undici speaks HTTP CONNECT).
@@ -324,7 +339,7 @@ export function summarize(snapshot) {
     active: effective?.active === true,
     enabled: config?.enabled === true,
     mode: config?.mode ?? 'none',
-    url: effective?.url ?? '',
+    url: redactProxyUrl(effective?.url ?? ''),
     noProxy: effective?.noProxy ?? composeNoProxy(config?.noProxy),
     reason: effective?.reason ?? 'unknown',
     source: config?.mode === 'system' ? 'system' : config?.mode === 'custom' ? 'custom' : 'none',
@@ -342,7 +357,7 @@ export function summarize(snapshot) {
 export function keepaliveHint(message = '', proxyUrl = '') {
   const text = typeof message === 'string' ? message : ''
   if (!/407|NTLM|proxy authentication|authentication required/i.test(text)) return ''
-  const example = typeof proxyUrl === 'string' && proxyUrl !== '' ? proxyUrl : 'http://localhost:7890'
+  const example = typeof proxyUrl === 'string' && proxyUrl !== '' ? redactProxyUrl(proxyUrl) : 'http://localhost:7890'
   return `该代理要求 NTLM 认证，undici 无法自行协商。最近一次 curl/浏览器到同一代理的连接会保持一段已认证窗口——先执行一次 \`curl -x ${example} -I https://github.com\`，然后重试。`
 }
 

package/lib/tool-schemas.js

@@ -1,7 +1,7 @@
 /**
  * dsh-proxy-pro — tool schema specs (pure data, no imports).
  *
- * These are the author-facing dsh-tools value-schema specs for the three agent
+ * These are the author-facing dsh-tools value-schema specs for the four agent
  * tools. They live in their own module for ONE reason: `test/tool-schema.test.mjs`
  * compiles them with the real `@deepseek-ai/dsh-tools` compiler before the app
  * ever boots, so a schema-DSL violation can no longer surface only as a
@@ -72,6 +72,16 @@ const PROBE_RESULT_SCHEMA = {
   },
 }
 
+// 通道徽标由双通道诊断产生；无效 URL 提前返回时可省略整个徽标。
+const PROBE_BADGE_SCHEMA = {
+  type: 'object',
+  additionalProperties: false,
+  properties: {
+    text: { type: 'string', required: true },
+    tone: { type: 'string', enum: ['ok', 'warn', 'bad'], required: true },
+  },
+}
+
 /** Output schema of `proxy_test`. Dual-channel: forces both legs in parallel
  * (走代理 / 直连), then combines them into one human verdict + recommendation
  * (2026-09-18: single-side probes cannot tell WHO answered, so a strategy
@@ -90,6 +100,8 @@ export const PROXY_TEST_SCHEMA = {
     short: { type: 'string', required: true },
     why: { type: 'string', required: true },
     fix: { type: 'string', required: true },
+    proxyBadge: PROBE_BADGE_SCHEMA,
+    directBadge: PROBE_BADGE_SCHEMA,
     hint: { type: 'string' },
   },
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yanglaofish/dsh-proxy-pro",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "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",
@@ -53,10 +53,10 @@
     "client": {
       "platform": "web",
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-settings",
         "@deepseek-ai/dsh-client-ui-conversation"
       ]
     }
   }
-}
+}