@gehennawu/dsh-service 2.0.7 → 2.0.9

package/index.js

@@ -20,6 +20,46 @@ import { createSessionsRoutes } from './session-routes.js'
 import { createQuotaRoutes } from './quota-routes.js'
 import { createSubagentRoutes } from './subagent-routes.js'
 import { createBackupRoutes } from './backup-routes.js'
+import { createModelConfigRoutes } from './model-config-routes.js'
+import { createProviderAvailability, installProviderAvailability } from './provider-availability.js'
+import { createWorkbenchStore, loadPiAiCatalog } from './model-workbench.js'
+import {
+  WORKBENCH_SIDECAR_VERSION,
+  applySuggestions,
+  applyUndo,
+  arbitrateModelSuggestions,
+  buildPiAiIndex,
+  abilityPatch,
+  consensusFields,
+  createFreshnessManager,
+  deriveKeyRefFor,
+  diffModelLists,
+  emptyWorkbenchSidecar,
+  fetchModelsProbe,
+  hostnameOf,
+  indexModelParamsDev,
+  isPrivateIpAddress,
+  loadModelParamsSnapshot,
+  loadWorkbenchSidecar,
+  modelParamsCandidates,
+  modelParamsDevEfforts,
+  modelPatchFromPiAi,
+  openRouterModelFacts,
+  openRouterVerifySource,
+  pickOpenRouterMatch,
+  modelsProbeLookup,
+  normalizeBaseURLForMatch,
+  parseModelListing,
+  probeBaseURLCheck,
+  profileFingerprint,
+  readLlmProfiles,
+  saveModelParamsSnapshot,
+  saveWorkbenchSidecar,
+  selfCheckModelsPatch,
+  suggestRouteId,
+  suggestionId,
+  undoPreviewModels,
+} from './model-workbench.js'
 import { collectPluginHealth, pluginCheckItem, restartPluginEntry } from './plugin-health.js'
 import {
   buildCliproxyAccountPlan as buildCliproxyAccountPlanAdapter,
@@ -88,6 +128,8 @@ const DEFAULT_FEATURE_SETTINGS = Object.freeze({
   // v1.8 新增：composer 模型按钮显示厂家/渠道图标（宽态加在模型名前，
   // 窄态替换官方默认图标；未适配渠道保留官方默认图标）。
   modelProviderIcons: true,
+  // v1.10 新增：模型配置工作台（供应商与模型 / 子代理路由），写路径经两段式确认。
+  modelCatalog: true,
 })
 /** 标记为「可热更新」的 Config 字段（0.1.7-alpha.1 的表单与原地热更新以此为准）。 */
 const volatileField = (schema) => (typeof schema?.extra === 'function' ? schema.extra('volatile', true) : schema)
@@ -3993,6 +4035,7 @@ async function listSubagentModels(llm, agentDefaultModel) {
 
 /** 子代理路由配置的空档（inherit）：与未安装本功能的原生行为完全一致。 */
 function createEmptySubagentRoute() {
+  // 不含 preset 键：空预设不落盘，磁盘形状与 v2.0.8 及之前逐字节兼容（注入端按 absent = 跟随父代）。
   return { version: SUBAGENT_ROUTE_VERSION, mode: 'inherit' }
 }
 
@@ -4031,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 } : {}),
   }
 }
 
@@ -4236,7 +4283,7 @@ function subagentRouteCandidates(request, config, options = {}) {
 
 function resolveSubagentInjection(request, config, options = {}) {
   for (const candidate of subagentRouteCandidates(request, config, options)) {
-    if (options.isRoutable !== undefined && !options.isRoutable(candidate.provider)) {
+    if (options.isRoutable !== undefined && !options.isRoutable(candidate.provider, candidate.model)) {
       options.note?.(`${candidate.provider}/${candidate.model} skipped (not routable)`)
       continue
     }
@@ -4301,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
 }
 
@@ -5120,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 的退避/冷却闸门：旧失败是旧凭据造成的，
@@ -5348,6 +5399,18 @@ function apply(ctx, featureConfig) {
   // 版本一变即自然失效，不必手工清理。
   const releaseNotesCache = new Map()
   const quotaThrottle = createQuotaThrottle()
+  // 模型配置工作台（v1.10）：侧车仓库持有写前快照/绑定/验证摘要/人工恢复态。
+  // 写串行化在仓库内部；目录随 DSH 升级才变，进程内缓存一次。
+  const modelProfileDir = ctx.get('profileContext')?.dir ?? process.env.DSH_PROFILE_DIR
+  const workbenchStore = createWorkbenchStore(typeof modelProfileDir === 'string' && modelProfileDir !== '' ? modelProfileDir : join(dshHome, 'dsh-service-model-config', 'legacy'))
+  const providerAvailability = createProviderAvailability(workbenchStore)
+  const notifyProviderAvailability = () => ctx.emit('llm/adapters-updated')
+  ctx.inject(['llm'], (scope) => {
+    const llm = scope.get('llm') ?? ctx.get('llm')
+    if (!llm) return
+    const dispose = installProviderAvailability(llm, providerAvailability, notifyProviderAvailability)
+    scope.effect(() => dispose)
+  })
   // 技能管理（v0.22）：侧车索引缓存 + 批量补全状态。批量随 Fiber 销毁中止。
   // 可重赋值的 let 一律以 { current } 箱体跨模块传递：端点工厂解构是值快照，
   // let 重赋值不会穿过解构边界；箱体靠对象身份保持活绑定。
@@ -5432,7 +5495,8 @@ function apply(ctx, featureConfig) {
     const hasActivation = typeof subagents?.startActivation === 'function'
     const hasLegacyStarts = typeof subagents?.start === 'function' && typeof subagents?.startContinuable === 'function'
     if (!hasActivation && !hasLegacyStarts) return
-    const isRoutable = (provider) => {
+    const isRoutable = (provider, model) => {
+      if (model !== undefined && !providerAvailability.modelEnabled(provider, model)) return false
       const llm = ctx.get('llm')
       if (llm === undefined || typeof llm.listProviders !== 'function') return false
       try {
@@ -5483,6 +5547,8 @@ function apply(ctx, featureConfig) {
       return quotaProviderUnusable(view) === false
     }
     const applyInjection = (request) => {
+      const explicit = request?.agentOptions?.provider
+      if (typeof explicit === 'string' && explicit) providerAvailability.assertEnabled(explicit, request?.agentOptions?.model)
       // 功能关闭：零记录（完全静默，与原生行为一致）——记录是 subagentRoute 功能的一部分。
       if (!featureEnabled('subagentRoute')) return { request, dispatch: undefined }
       const routeOptions = {
@@ -5493,7 +5559,7 @@ function apply(ctx, featureConfig) {
       }
       const injected = resolveSubagentInjection(request, subagentRouteRef.current, routeOptions)
       const routeCandidates = injected === undefined ? [] : subagentRouteCandidates(request, subagentRouteRef.current, routeOptions)
-        .filter((candidate) => isRoutable(candidate.provider) && isQuotaHealthy(candidate.provider) !== false)
+        .filter((candidate) => isRoutable(candidate.provider, candidate.model) && isQuotaHealthy(candidate.provider) !== false)
         .filter((candidate, index, candidates) => candidates.findIndex((item) => item.provider === candidate.provider && item.model === candidate.model) === index)
       const injectedIndex = routeCandidates.findIndex((candidate) => candidate.provider === injected?.provider && candidate.model === injected?.model)
       const eligibleRoutes = injectedIndex < 0 ? [] : routeCandidates.slice(injectedIndex)
@@ -5517,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)
@@ -5525,17 +5630,23 @@ function apply(ctx, featureConfig) {
     const originalStart = subagents.start
     const originalStartContinuable = subagents.startContinuable
     if (hasActivation) {
-      subagents.startActivation = (spec) => {
+      subagents.startActivation = async (spec) => {
+        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 = (name, request) => {
+      subagents.start = async (name, request) => {
+        await providerAvailability.loading
         const { request: decorated, dispatch } = applyInjection(request)
         return runWithDispatch(dispatch, () => originalStart.call(subagents, name, decorated))
       }
-      subagents.startContinuable = (spec) => {
+      subagents.startContinuable = async (spec) => {
+        await providerAvailability.loading
         const { request: decorated, dispatch } = applyInjection(spec.request)
         return runWithDispatch(dispatch, () => originalStartContinuable.call(subagents, { ...spec, request: decorated }))
       }
@@ -6201,8 +6312,29 @@ function apply(ctx, featureConfig) {
     createSkillsRoutes({ ctx, describeJobs, dshHome, makeDescribeJobLogger, registerSkillCall, serializeSkillsIndexWrite, skillFileCache, skillsActiveControllers, skillsBatchRef, skillsIndexRef, SKILL_DESCRIPTION_MAX_CHARS, SKILL_USAGE_MAX_CHARS, bodyHashOf, describeSkillDraft, evaluateSkillFile, fixLegacySkillInvocationKeys, listSkillModels, locateSkillFrontmatter, mutateSkillEntryById, name, normalizeSkillDescribeLang, publicSkillEntry, rpcTechnicalFailure, sanitizeSkillDraftText, scanSkillEntries, selectSkillBatchCandidates, setSkillInvocationKey }),
     createSessionsRoutes({ ctx, dshHome, sessionBytesCache, sessionDeletePlans, sessionTitleCache, sessionTitlesReady, sessionViewCache, SESSIONS_BYTES_MAX_IDS, SESSIONS_DELETE_PLAN_TTL_MS, SESSIONS_VIEW_PAGE_SIZE, listSessionsForManage, loadDeletedSessions, name, resolveSessionBytesForIds, resolveSessionForDelete, rpcFailure, rpcTechnicalFailure, saveDeletedSessions, searchSessionsContent, sessionExists, sessionIsLive, viewSessionPage }),
     createQuotaRoutes({ ctx, kickQuotaRefresh, quotaThrottle, refreshQuotaConfigCache, serializeQuotaConfigWrite, MAX_QUOTA_PROVIDER_NAME, MAX_QUOTA_RESET_CARDS, MAX_QUOTA_RESET_CARDS_PER_PROVIDER, MAX_QUOTA_RESET_CARD_ACCOUNT, canonicalResetCardExpiresAt, QUOTA_ADAPTER_BY_KIND, name, quotaCredentialConfigured, quotaCredentialEndpoint, quotaCredentialHintNames, readQuotaProfiles, resolveQuotaKind, rpcTechnicalFailure }),
-    createSubagentRoutes({ ctx, dispatchRing, serializeSubagentRouteWrite, subagentRouteRef, subagentRouteLoadPromise, subagentSeamRef, MAX_SUBAGENT_ROUTE_FIELD, SUBAGENT_ROUTE_FALLBACK_MAX, SUBAGENT_ROUTE_MODES, listSubagentDispatches, listSubagentModels, rpcTechnicalFailure }),
+    createSubagentRoutes({ ctx, providerAvailability, dispatchRing, serializeSubagentRouteWrite, subagentRouteRef, subagentRouteLoadPromise, subagentSeamRef, MAX_SUBAGENT_ROUTE_FIELD, SUBAGENT_ROUTE_FALLBACK_MAX, SUBAGENT_ROUTE_MODES, listSubagentDispatches, listSubagentModels, rpcTechnicalFailure }),
     createBackupRoutes({ ctx, backupIntegrity, backupProgress, clearBackupProgress, downloadTokens, dshHome, dshVersion, setBackupProgress, withBackupLock, backupNameVersionSuffix, createBackup, deleteBackup, exportBackup, formatBackupTimestamp, importBackup, listBackups, listLocalProfiles, name, rpcFailure }),
+    createModelConfigRoutes({
+      ctx,
+      loadPiCatalog: loadPiAiCatalog,
+      workbenchStore,
+      providerAvailability,
+      notifyProviderAvailability,
+      // 移除守卫的只读引用面：子代理路由配置 + 官方默认模型选择（都是宿主侧事实，浏览器不参与）。
+      loadSubagentRoute: async () => {
+        await subagentRouteLoadPromise
+        return subagentRouteRef.current
+      },
+      loadAgentDefaultModelSelection: () => {
+        const service = ctx.get('agentDefaultModel')
+        if (service === undefined || typeof service.currentSelection !== 'function') return undefined
+        return service.currentSelection()
+      },
+      writeSubagentRoute: serializeSubagentRouteWrite,
+      listSubagentModels,
+      dshHome,
+      pluginVersion,
+    }),
   ])
 
   const dispatchEndpoint = createRpcDispatcher({ endpoints: rpcEndpoints, featureEnabled, logger: ctx.logger })
@@ -6312,6 +6444,45 @@ export {
   saveUnifiedConfig,
   updateUnifiedConfigSection,
   sanitizeSettingsNavConfig,
+  // 模型配置工作台（v1.10）：领域纯函数经 index.js 再导出，测试从 '../index.js' 导入的
+  // 既有约定保持不变（旧分支 test/workbench.test.js 即此形状）。
+  WORKBENCH_SIDECAR_VERSION,
+  applySuggestions,
+  applyUndo,
+  arbitrateModelSuggestions,
+  buildPiAiIndex,
+  createWorkbenchStore,
+  deriveKeyRefFor,
+  diffModelLists,
+  emptyWorkbenchSidecar,
+  fetchModelsProbe,
+  hostnameOf,
+  isPrivateIpAddress,
+  loadWorkbenchSidecar,
+  modelPatchFromPiAi,
+  modelsProbeLookup,
+  normalizeBaseURLForMatch,
+  parseModelListing,
+  probeBaseURLCheck,
+  profileFingerprint,
+  readLlmProfiles,
+  saveWorkbenchSidecar,
+  selfCheckModelsPatch,
+  suggestRouteId,
+  suggestionId,
+  undoPreviewModels,
+  // P3.5 补充源（modelparams.dev）与多源共识：同样经 index.js 再导出供测试直达。
+  abilityPatch,
+  consensusFields,
+  createFreshnessManager,
+  indexModelParamsDev,
+  loadModelParamsSnapshot,
+  modelParamsCandidates,
+  modelParamsDevEfforts,
+  openRouterModelFacts,
+  openRouterVerifySource,
+  pickOpenRouterMatch,
+  saveModelParamsSnapshot,
 }
 // 插件 Config：0.1.7-alpha.1 起宿主配置面由 Profile 的插件 Config 托管；声明它即可让
 // 功能开关出现在插件管理页，并让宿主经 `loader/volatile-update` 热更新（无需重启）。