@gehennawu/dsh-service 2.0.7 → 2.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gehennawu/dsh-service",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "DSH Web 运维面板：安全重启、健康监控、备份和 Linux 权限维护。",
   "type": "module",
   "scripts": {
@@ -25,6 +25,13 @@
     "quota-routes.js",
     "subagent-routes.js",
     "backup-routes.js",
+    "model-workbench.js",
+    "model-workbench-routes.js",
+    "model-workbench-settings.js",
+    "model-config-routes.js",
+    "provider-availability.js",
+    "model-config-schema.js",
+    "model-smart-fill.js",
     "plugin-health.js",
     "client.js",
     "cordis.patch.yml",
@@ -52,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"
@@ -64,7 +71,8 @@
     "client": {
       "inject": [
         "@deepseek-ai/dsh-client-connection",
-        "@deepseek-ai/dsh-api-remotes"
+        "@deepseek-ai/dsh-api-remotes",
+        "@deepseek-ai/dsh-client-ui-primitives"
       ],
       "platform": "web"
     }

package/provider-availability.js

@@ -0,0 +1,84 @@
+// Profile-owned policy: configuration and credentials never move or disappear.
+export function createProviderAvailability(store) {
+  let disabled = new Set()
+  let disabledModels = new Set()
+  const modelKey = (provider, model) => JSON.stringify([provider, model])
+  let ready = false
+  const loading = store.load().then((state) => {
+    disabled = new Set(Object.entries(state.disabledProviders ?? {}).filter(([, value]) => value === true).map(([id]) => id))
+    disabledModels = new Set(Object.entries(state.disabledModels ?? {}).filter(([, value]) => value === true).map(([key]) => key))
+    ready = true
+  })
+  const enabled = (provider) => !disabled.has(provider)
+  const modelEnabled = (provider, model) => !disabledModels.has(modelKey(provider, model))
+  const assertEnabled = (provider, model) => {
+    if (!ready || !enabled(provider) || model !== undefined && !modelEnabled(provider, model)) {
+      const code = !ready ? 'provider-availability-loading' : !enabled(provider) ? 'provider-disabled' : 'model-disabled'
+      const error = new Error(code)
+      error.code = code.toUpperCase().replaceAll('-', '_')
+      throw error
+    }
+  }
+  let changes = Promise.resolve()
+  const set = (provider, value, expected) => {
+    const result = changes.then(async () => {
+      await loading
+      if (enabled(provider) !== expected) throw new Error('conflict')
+      await store.mutate((state) => {
+        state.disabledProviders ??= {}
+        if (value) delete state.disabledProviders[provider]
+        else Object.defineProperty(state.disabledProviders, provider, { value: true, enumerable: true, configurable: true, writable: true })
+      })
+      if (value) disabled.delete(provider); else disabled.add(provider)
+      return { route: provider, enabled: value }
+    })
+    changes = result.catch(() => {})
+    return result
+  }
+  const setModel = (provider, model, value, expected) => {
+    const result = changes.then(async () => {
+      await loading
+      if (modelEnabled(provider, model) !== expected) throw new Error('conflict')
+      const key = modelKey(provider, model)
+      await store.mutate((state) => {
+        state.disabledModels ??= {}
+        if (value) delete state.disabledModels[key]
+        else Object.defineProperty(state.disabledModels, key, { value: true, enumerable: true, configurable: true, writable: true })
+      })
+      if (value) disabledModels.delete(key); else disabledModels.add(key)
+      return { route: provider, modelId: model, enabled: value }
+    })
+    changes = result.catch(() => {})
+    return result
+  }
+  return { loading, enabled, modelEnabled, assertEnabled, set, setModel }
+}
+
+// Filter the shared catalog and guard exact routing, including inherited routes.
+// Keep every original method and restore it when the owning Fiber is disposed.
+export function installProviderAvailability(llm, policy, notify = () => {}) {
+  const originals = new Map()
+  const wrappers = new Map()
+  const wrap = (key, factory) => {
+    if (typeof llm[key] !== 'function') return
+    const original = llm[key]
+    const wrapper = factory(original.bind(llm))
+    originals.set(key, original); wrappers.set(key, wrapper); llm[key] = wrapper
+  }
+  wrap('listProviders', (original) => () => original().filter((row) => policy.enabled(row.id)))
+  wrap('listModels', (original) => async (provider, ...args) => { await policy.loading; return policy.enabled(provider) ? (await original(provider, ...args)).filter((row) => policy.modelEnabled(provider, row.id)) : [] })
+  wrap('resolveModelInfo', (original) => async (provider, ...args) => { await policy.loading; policy.assertEnabled(provider, args[0]); return original(provider, ...args) })
+  wrap('resolveCallConfig', (original) => async (config, ...args) => { await policy.loading; policy.assertEnabled(config.provider, config.model); return original(config, ...args) })
+  wrap('prepareCall', (original) => async (config, ...args) => {
+    await policy.loading; policy.assertEnabled(config.provider, config.model)
+    const prepared = await original(config, ...args)
+    return { ...prepared, stream: async function* (options) {
+      policy.assertEnabled(config.provider, config.model)
+      yield* prepared.stream(options)
+    } }
+  })
+  wrap('stream', (original) => async function* (options) { await policy.loading; policy.assertEnabled(options.provider, options.model); yield* original(options) })
+  let disposed = false
+  policy.loading.then(() => { if (!disposed) notify() }, () => {})
+  return () => { disposed = true; for (const [key, original] of originals) if (llm[key] === wrappers.get(key)) llm[key] = original; notify() }
+}

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

@@ -17,11 +17,13 @@ export function createSubagentRoutes({
   listSubagentDispatches,
   listSubagentModels,
   rpcTechnicalFailure,
+  providerAvailability,
 }) {
   return {
     'subagent-route': { feature: 'subagentRoute', handle: async (payload, rpcEndpoint) => {
       try {
         await subagentRouteLoadPromise
+        if (providerAvailability) await providerAvailability.loading
         const llm = ctx.get('llm')
         // 模型清单沿用 skills-models 的白名单口径（llm.listProviders × listModels，单渠道失败跳过），
         // 并对每个精确模型附加 adapter 的 reasoning metadata（resolveModelInfo 缺席时保留原目录项）；
@@ -34,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 {
@@ -47,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 } : {}),
           },
@@ -127,7 +150,42 @@ 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
+            if (primary.provider) providerAvailability.assertEnabled(primary.provider, primary.model)
+            for (const fallback of fallbacks) providerAvailability.assertEnabled(fallback.provider, fallback.model)
+          }
           config.mode = mode
           if (mode === 'custom') {
             config.provider = primary.provider
@@ -145,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)