@gehennawu/dsh-service 2.0.8 → 2.0.9

package/index.js

@@ -4035,6 +4035,7 @@ async function listSubagentModels(llm, agentDefaultModel) {
 
 /** 子代理路由配置的空档（inherit）：与未安装本功能的原生行为完全一致。 */
 function createEmptySubagentRoute() {
+  // 不含 preset 键：空预设不落盘，磁盘形状与 v2.0.8 及之前逐字节兼容（注入端按 absent = 跟随父代）。
   return { version: SUBAGENT_ROUTE_VERSION, mode: 'inherit' }
 }
 
@@ -4073,12 +4074,16 @@ function parseSubagentRouteText(text) {
   if (parsed.mode === 'custom' && (provider === '' || model === '')) return fallback
   // reasoningEffort 是可选的 adapter 自有等级 ID：只有字符串、trim 后非空才保留（空串视为默认）。
   const reasoningEffort = provider !== '' && model !== '' && typeof parsed.reasoningEffort === 'string' ? parsed.reasoningEffort.trim().slice(0, MAX_SUBAGENT_ROUTE_FIELD) : ''
+  // 独立 Agent 预设（v2.0.9）：与模式无关的全局字段；空串 = 跟随父代。存在性校验在保存端做
+  // （磁盘配置容忍失效 id——旧宿主/预设被删时注入端按 provider 能力门跳过，不阻塞派生）。
+  const preset = typeof parsed.preset === 'string' ? parsed.preset.trim().slice(0, MAX_SUBAGENT_ROUTE_FIELD) : ''
   return {
     version: SUBAGENT_ROUTE_VERSION,
     mode: parsed.mode,
     ...(provider !== '' && model !== '' ? { provider, model } : {}),
     ...(reasoningEffort !== '' ? { reasoningEffort } : {}),
     ...(fallbacks.length > 0 ? { fallbacks } : {}),
+    ...(preset !== '' ? { preset } : {}),
   }
 }
 
@@ -4343,6 +4348,8 @@ function buildSubagentDispatchRecord(agent, parent, dispatch, options = {}) {
   }
   if (typeof turn === 'number' && Number.isFinite(turn)) record.turn = turn
   if (reasoningEffort !== undefined) record.reasoningEffort = reasoningEffort
+  // 独立 Agent 预设（v2.0.9）：仅记录插件注入的值；调用方显式携带时不记（来源不是本插件）。
+  if (typeof dispatch?.preset === 'string' && dispatch.preset !== '') record.preset = dispatch.preset
   return record
 }
 
@@ -5162,7 +5169,9 @@ async function quotaCredentialEndpoint(ctx, refreshQuotaConfig, throttle, payloa
       try {
         await credentials.set(name, value)
       } catch (error) {
-        // 典型拒绝：进程环境层正在遮蔽该名字（describe().writable=false）——seam 契约的显式报错。
+        // 可写性由宿主凭据服务裁决后回传：0.2.1-alpha.3 起托管存储优先、env 层不再只读，
+        // 旧版「进程环境层遮蔽 ⇒ describe().writable=false 且 set 必拒」的成因已不适用；
+        // 这里不预判成因，宿主报什么错就透传什么（seam 契约的显式报错）。
         return { ok: false, error: 'credential-write-failed', detail: sanitizeQuotaErrorDetail(error?.message) }
       }
       // 新凭据落库即清掉该 provider 的退避/冷却闸门：旧失败是旧凭据造成的，
@@ -5574,6 +5583,45 @@ function apply(ctx, featureConfig) {
       const effort = typeof reasoningEffort === 'string' && reasoningEffort !== '' ? reasoningEffort : undefined
       return { request: decorated, dispatch: { parent: request?.parent, provider: injected.provider, model: injected.model, ...(effort !== undefined ? { reasoningEffort: effort } : {}), routeCandidates: eligibleRoutes } }
     }
+    // 独立 Agent 预设（v2.0.9）：官方 0.2.1-alpha.3 起 startActivation 的请求面新增
+    // request.agentPreset（统一设置子代理角色与工具；省略 = 跟随父代当前预设）。注入门完全
+    // 对齐官方 tool-subagent 的 assertProvider：provider.capabilities.agentPreset === true 且
+    // !provider.inheritsParentContext（fork 类继承父代上下文的 provider 不支持）。调用方显式
+    // 携带的 agentPreset 永远赢。其余一切不明朗情形（服务缺席、清单读不到、预设已删/broken、
+    // 能力不明）一律 fail-closed 不注入——给不支持的 provider 注入该字段会被宿主
+    // assertCapabilities 拒绝、派生直接失败，「不生效」永远好过「失败」。每次派发现查清单
+    // （预设集极小、变更低频），保证预设被删后自动回落跟随父代。仅 startActivation 路径装饰：
+    // 旧版 start/startContinuable 的宿主请求类型没有该字段，其 provider 能力面也不含 agentPreset。
+    const resolvePresetForSpec = async (spec, request) => {
+      const configured = typeof subagentRouteRef.current.preset === 'string' ? subagentRouteRef.current.preset : ''
+      if (configured === '') return undefined
+      if (typeof request?.agentPreset === 'string' && request.agentPreset !== '') return undefined
+      let declared
+      try {
+        const registry = ctx.get('agentPresets')
+        if (registry === undefined || registry === null || typeof registry.list !== 'function') return undefined
+        declared = await registry.list()
+      } catch (_) {
+        return undefined
+      }
+      const hit = (Array.isArray(declared) ? declared : []).find((entry) => entry !== null && typeof entry === 'object' && entry.id === configured)
+      if (hit === undefined || (typeof hit.broken === 'string' && hit.broken !== '')) {
+        ctx.logger?.info?.(`dsh-service: subagent preset "${configured}" skipped: not in the host preset list`)
+        return undefined
+      }
+      let provider
+      try {
+        provider = typeof subagents.getProvider === 'function' ? subagents.getProvider(spec?.provider) : undefined
+      } catch (_) {
+        provider = undefined
+      }
+      if (provider === null || typeof provider !== 'object') return undefined
+      if (provider.capabilities?.agentPreset !== true || provider.inheritsParentContext === true) {
+        ctx.logger?.info?.(`dsh-service: subagent preset "${configured}" skipped: provider "${spec?.provider ?? ''}" does not support independent presets`)
+        return undefined
+      }
+      return configured
+    }
     const runWithDispatch = (dispatch, work) => {
       if (dispatch === undefined) return work()
       return pendingDispatchStorage.run(dispatch, work)
@@ -5586,7 +5634,10 @@ function apply(ctx, featureConfig) {
         await providerAvailability.loading
         const { request: decorated, dispatch } = applyInjection(spec.request)
         if (dispatch === undefined) return originalStartActivation.call(subagents, spec)
-        return runWithDispatch(dispatch, () => originalStartActivation.call(subagents, { ...spec, request: decorated }))
+        const preset = await resolvePresetForSpec(spec, decorated)
+        const finalRequest = preset !== undefined ? { ...decorated, agentPreset: preset } : decorated
+        if (preset !== undefined) dispatch.preset = preset
+        return runWithDispatch(dispatch, () => originalStartActivation.call(subagents, { ...spec, request: finalRequest }))
       }
     } else {
       subagents.start = async (name, request) => {

package/model-config-routes.js

@@ -279,6 +279,9 @@ export function createModelConfigRoutes({ ctx, workbenchStore, loadPiCatalog = l
           name: defaultEntry?.name ?? id,
           api: defaultEntry?.api ?? 'openai-completions',
           baseURL: defaultEntry?.baseUrl ?? '',
+          // 混合协议目录（v2.0.9）：pi-ai 1.1.0 起 azure 等渠道单目录含多种 api。路由级 `api`
+          // 会覆盖该路由全部模型（官方语义），客户端据此提示「钉协议前先确认全部模型同协议」。
+          apis: [...new Set(records.map((x) => x.api).filter(Boolean))],
           models: records,
         }
       })
@@ -317,6 +320,11 @@ export function createModelConfigRoutes({ ctx, workbenchStore, loadPiCatalog = l
         }
       } catch (_) { /* Missing status must not prevent configuration editing. */ }
       if (builtin(catalog, id)) dto.catalogModels = [...catalog.byModelId.entries()].flatMap(([modelId, records]) => records.filter((x) => x.channel === id).map((x) => ({ id: modelId, api: x.api, ...displayProfile({ models: [{ id: modelId, ...x }] }).models[0] })))
+      // 混合协议目录（v2.0.9）：≥2 种 api 才下发，客户端据它在路由编辑器里提示路由级 api 的覆盖语义。
+      if (Array.isArray(dto.catalogModels)) {
+        const apis = [...new Set(dto.catalogModels.map((entry) => entry.api).filter(Boolean))]
+        if (apis.length > 1) dto.catalogApis = apis
+      }
       dto.resolved = {
         displayName: effectiveRaw.displayName ?? dto.effective.displayName ?? defaultEntry?.name ?? id,
         api: dto.resolvedApi,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gehennawu/dsh-service",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "DSH Web 运维面板：安全重启、健康监控、备份和 Linux 权限维护。",
   "type": "module",
   "scripts": {
@@ -59,7 +59,7 @@
   "homepage": "https://github.com/gehennawu/dsh-service#readme",
   "engines": {
     "node": ">=22",
-    "dsh": ">=0.1.1-rc.2 <0.2.1-alpha.3"
+    "dsh": ">=0.1.1-rc.2 <0.2.1-alpha.4"
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.3"

package/quota-adapters.js

@@ -1270,6 +1270,37 @@ async function fetchCliproxyUsage({ profile, config, credential, signal, request
   return windows
 }
 
+// Non-monetary points retain decimal strings instead of implying a currency or quota denominator.
+function normalizePoePoints(payload) {
+  const raw = payload?.current_point_balance
+  const text = typeof raw === 'string' ? raw : typeof raw === 'number' && Number.isFinite(raw) ? String(raw) : ''
+  if (text.length > 64 || !/^-?\d+(?:\.\d+)?$/.test(text)) return { windows: [] }
+  return { windows: [{ id: 'points', kindKey: 'points', text: `${text} points`, unit: 'points' }] }
+}
+
+function normalizeVercelCredits(payload) {
+  // The API declares USD decimal strings. Lifetime spend is not a quota denominator.
+  const balance = payload?.balance
+  if (typeof balance !== 'string' || balance.length > 64 || !/^\d+(?:\.\d+)?$/.test(balance)
+    || !Number.isFinite(Number(balance)) || Number(balance) > Number.MAX_SAFE_INTEGER) return { windows: [] }
+  return { windows: [{ id: 'balance', kindKey: 'balance', text: `$${balance}`, unit: 'usd' }] }
+}
+
+function normalizeClinePassUsage(payload) {
+  if (payload?.success !== true || !Array.isArray(payload?.data?.limits)) return { windows: [] }
+  const windows = []
+  for (const [type, id] of [['five_hour', 'five-hour'], ['weekly', 'weekly'], ['monthly', 'monthly']]) {
+    const matches = payload.data.limits.filter((entry) => entry?.type === type)
+    if (matches.length > 1) return { windows: [] }
+    const entry = matches[0]
+    if (typeof entry?.percentUsed !== 'number' || !Number.isFinite(entry.percentUsed) || entry.percentUsed < 0) continue
+    const resetsAt = typeof entry.resetsAt === 'string' && /^\d{4}-\d{2}-\d{2}T.*(?:Z|[+-]\d{2}:\d{2})$/.test(entry.resetsAt)
+      ? normalizeResetTimestamp(entry.resetsAt) : undefined
+    windows.push({ id, percent: Math.min(100, Math.round(entry.percentUsed)), ...(resetsAt !== undefined ? { resetsAt } : {}) })
+  }
+  return { windows }
+}
+
 function createQuotaAdapterCatalog() {
   return Object.freeze([
     createEndpointAdapter({
@@ -1330,6 +1361,30 @@ function createQuotaAdapterCatalog() {
       keyHints: ['SILICONFLOW_API_KEY'],
       hosts: ['siliconflow.cn'],
     }),
+    createEndpointAdapter({
+      kind: 'vercel-ai-gateway',
+      normalize: normalizeVercelCredits,
+      endpoints: ['https://ai-gateway.vercel.sh/v1/credits'],
+      keyHints: ['AI_GATEWAY_API_KEY'],
+      hosts: ['ai-gateway.vercel.sh'],
+      routeIds: ['vercel-ai-gateway'],
+    }),
+    createEndpointAdapter({
+      kind: 'poe',
+      normalize: normalizePoePoints,
+      endpoints: ['https://api.poe.com/usage/current_balance'],
+      keyHints: ['POE_API_KEY'],
+      hosts: ['api.poe.com'],
+      routeIds: ['poe'],
+    }),
+    createEndpointAdapter({
+      kind: 'clinepass',
+      normalize: normalizeClinePassUsage,
+      endpoints: ['https://api.cline.bot/api/v1/users/me/plan/usage-limits'],
+      keyHints: ['CLINEPASS_API_KEY'],
+      hosts: ['api.cline.bot'],
+      routeIds: ['clinepass'],
+    }),
     createEndpointAdapter({
       kind: 'deepseek',
       normalize: normalizeDeepseekBalance,

package/screenshots/README.md

@@ -16,9 +16,10 @@ README 使用的中英文界面截图。文件名与对应功能如下：
 | `session-manager.png` | `session-manager_en.png` | 会话管理 |
 | `mobile-adaptation.png` | `mobile-adaptation_en.png` | 移动端适配 |
 | `plugin-config.png` | `plugin-config_en.png` | 插件配置 |
-| `maintenance.png` | `maintenance_en.png` | 六页导航的「维护」聚合页 |
-| `configuration.png` | `configuration_en.png` | 六页导航的「配置」聚合页 |
+| `maintenance.png` | `maintenance_en.png` | 维护聚合页 |
+| `configuration.png` | `configuration_en.png` | 配置聚合页 |
+| `model-configuration.png` | `model-configuration_en.png` | 模型配置：渠道与模型 |
 
 截图宽度建议 800–1200px，PNG 格式。README 新增截图引用时，必须同时加入本目录并通过 `test/docs-static.test.js`；本目录由 `package.json#files` 打入 npm 包。
 
-本目录截图已按 v0.40 六页信息架构更新。后续替换时保持现有文件名不变，并确保截图不暴露 API key、Cookie、Oasis-Token、管理密钥、会话正文或其他凭据/隐私数据。
+后续替换保持现有文件名，并确保截图不暴露 API key、Cookie、Oasis-Token、管理密钥、会话正文或其他凭据/隐私数据。

package/subagent-routes.js

@@ -36,6 +36,24 @@ export function createSubagentRoutes({
           current = catalog.current
         }
         const config = subagentRouteRef.current
+        // 独立 Agent 预设（v2.0.9）：清单来自宿主 agentPresets 服务（0.2.1-alpha.3+；旧宿主缺席
+        // ⇒ 空清单 + presetSupported:false，客户端禁用选择器）。broken 的声明照常下发但带标记，
+        // 保存端拒绝选中它。
+        let presets = []
+        let presetSupported = false
+        const presetRegistry = ctx.get('agentPresets')
+        if (presetRegistry !== undefined && presetRegistry !== null && typeof presetRegistry.list === 'function') {
+          presetSupported = true
+          try {
+            const declared = await presetRegistry.list()
+            presets = (Array.isArray(declared) ? declared : [])
+              .filter((entry) => entry !== null && typeof entry === 'object' && typeof entry.id === 'string' && entry.id !== '')
+              .map((entry) => ({ id: entry.id, ...(typeof entry.name === 'string' && entry.name !== '' ? { name: entry.name } : {}), ...(typeof entry.broken === 'string' && entry.broken !== '' ? { broken: entry.broken } : {}) }))
+              .sort((a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0)
+          } catch (_) {
+            presets = []
+          }
+        }
         // 自定义路由草稿（v1.4.12）：三模式统一下发——客户端据此回填表单，切换模式不丢配置。
         const routePresent = typeof config.provider === 'string' && config.provider !== '' && typeof config.model === 'string' && config.model !== ''
         return {
@@ -49,6 +67,9 @@ export function createSubagentRoutes({
               ...(typeof config.reasoningEffort === 'string' && config.reasoningEffort !== '' ? { reasoningEffort: config.reasoningEffort } : {}),
             } : {}),
             ...(Array.isArray(config.fallbacks) && config.fallbacks.length > 0 ? { fallbacks: config.fallbacks } : {}),
+            ...(typeof config.preset === 'string' && config.preset !== '' ? { preset: config.preset } : {}),
+            presetSupported,
+            presets,
             models,
             ...(current !== undefined ? { current } : {}),
           },
@@ -129,6 +150,36 @@ export function createSubagentRoutes({
             fallbacks.push(normalized)
           }
         }
+        // 独立 Agent 预设（v2.0.9）：与模式无关，payload 携带 `preset` 键才生效（缺省 = 保留原值，
+        // 与 fallbacks 的草稿语义一致）；空串 = 清除（跟随父代）。非空值必须在 agentPresets 清单内
+        // 且未 broken——宿主在派生端还会按 provider 能力二次把关，这里只挡「明显无效」的引用。
+        let preset
+        if (Object.prototype.hasOwnProperty.call(payload ?? {}, 'preset')) {
+          const rawPreset = payload.preset
+          if (rawPreset === undefined || rawPreset === null || rawPreset === '') {
+            preset = ''
+          } else if (typeof rawPreset !== 'string') {
+            return { ok: false, error: 'invalid-preset' }
+          } else {
+            const candidate = rawPreset.trim().slice(0, MAX_SUBAGENT_ROUTE_FIELD)
+            if (candidate === '') {
+              preset = ''
+            } else {
+              const registry = ctx.get('agentPresets')
+              if (registry === undefined || registry === null || typeof registry.list !== 'function') return { ok: false, error: 'preset-unavailable' }
+              let declared = []
+              try {
+                declared = await registry.list()
+              } catch (_) {
+                declared = []
+              }
+              const hit = (Array.isArray(declared) ? declared : []).find((entry) => entry !== null && typeof entry === 'object' && entry.id === candidate)
+              if (hit === undefined) return { ok: false, error: 'invalid-preset' }
+              if (typeof hit.broken === 'string' && hit.broken !== '') return { ok: false, error: 'invalid-preset' }
+              preset = candidate
+            }
+          }
+        }
         return await serializeSubagentRouteWrite(async (config) => {
           if (providerAvailability) {
             await providerAvailability.loading
@@ -152,12 +203,19 @@ export function createSubagentRoutes({
             if (fallbacks.length > 0) config.fallbacks = fallbacks
             else delete config.fallbacks
           }
+          // 预设：与模式无关；只有本轮 payload 携带了 `preset` 键才写/清。空值一律不落盘
+          // （磁盘形状与不认识该字段的旧版本逐字节兼容；注入端 absent = 跟随父代）。
+          if (preset !== undefined) {
+            if (preset === '') delete config.preset
+            else config.preset = preset
+          }
+          if (config.preset === '') delete config.preset
           const routePresent = typeof config.provider === 'string' && config.provider !== '' && typeof config.model === 'string' && config.model !== ''
           return { value: { ok: true, mode: config.mode, ...(routePresent ? {
             provider: config.provider,
             model: config.model,
             ...(typeof config.reasoningEffort === 'string' && config.reasoningEffort !== '' ? { reasoningEffort: config.reasoningEffort } : {}),
-          } : {}), ...(Array.isArray(config.fallbacks) && config.fallbacks.length > 0 ? { fallbacks: config.fallbacks } : {}) } }
+          } : {}), ...(Array.isArray(config.fallbacks) && config.fallbacks.length > 0 ? { fallbacks: config.fallbacks } : {}), ...(typeof config.preset === 'string' && config.preset !== '' ? { preset: config.preset } : {}) } }
         })
       } catch (error) {
         return rpcTechnicalFailure(error)