@dsh-plus/llm-pi 0.1.5 → 0.1.7

package/src/service.ts

@@ -18,10 +18,12 @@ import { deepEqualJson, installSettingsSection } from '@deepseek-ai/dsh-settings
 
 import { hasBuiltinProvider } from './catalog/builtin.ts'
 import { ModelsDevSource } from './catalog/models-dev.ts'
-import { Config, SETTINGS_NS, type LlmPiConfig } from './config.ts'
+import { Config, type LlmPiConfig, SETTINGS_NS } from './config.ts'
+import { DeepseekRouteRegistrar } from './deepseek-routes.ts'
 import { discoverModels } from './discovery.ts'
 import { assertServiceable, buildProfiles } from './profiles.ts'
-import { resolveDshKit, type DshKit } from './resolve-dsh.ts'
+import { buildDeepseekRoutes, type ResolvedDeepseekRoute } from './profiles-deepseek.ts'
+import { type DshKit, resolveDshKit } from './resolve-dsh.ts'
 
 export interface LlmPiRuntime {
   /** 当前生效配置（settings 用户层解析结果或 cordis 行级 config）。 */
@@ -46,7 +48,10 @@ function registrationFacts(profiles: ReadonlyMap<string, ResolvedPiAiProviderPro
 
 /** 凭据解析（逐行对齐官方 resolveApiKey）：凭据服务优先，缺失时启动环境兜底。 */
 function makeResolveApiKey(ctx: Context, kit: DshKit) {
-  return async (provider: string, profile: ResolvedPiAiProviderProfile): Promise<string | undefined> => {
+  return async (
+    provider: string,
+    profile: ResolvedPiAiProviderProfile,
+  ): Promise<string | undefined> => {
     const ref = profile.apiKeyEnv
     if (ref === undefined) return undefined
     const credentials = ctx.get('credentials')
@@ -54,7 +59,8 @@ function makeResolveApiKey(ctx: Context, kit: DshKit) {
       credentials !== undefined
         ? (await credentials.resolve(ref as CredentialRef))?.value
         : launchEnvironmentOf(ctx).get(ref as unknown as string)?.value
-    if (hit !== undefined && hit.length > 0) return kit.assertUsableApiKey(hit, 'llm-pi', ref as unknown as string)
+    if (hit !== undefined && hit.length > 0)
+      return kit.assertUsableApiKey(hit, 'llm-pi', ref as unknown as string)
     throw new kit.LlmError(
       `llm-pi: provider route "${provider}" 的凭据引用 ${String(ref)} 未解析到值——` +
         '请经凭据服务（web Models 页）存放或导出环境变量；仅当该 provider 应使用 pi-ai 自有环境发现时才移除 apiKeyEnv',
@@ -85,6 +91,7 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
   let current: () => LlmPiConfig = () => config
   let lastRaw: LlmPiConfig | undefined
   let memoized: Map<string, ResolvedPiAiProviderProfile> | undefined
+  let memoizedDeepseek: Map<string, ResolvedDeepseekRoute> | undefined
   const deps = { kit, modelsDev }
   /** 当前已解析 profiles，按原始 config identity 备忘（官方同款模式）。
    *  运行期走 lenient：数据源漂移时降级/跳过并告警，而非抛错弄挂整个 route。 */
@@ -92,12 +99,28 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
     const raw = current()
     if (raw === lastRaw && memoized !== undefined) return memoized
     const next = raw.enabled
-      ? buildProfiles(raw.providers, { ...deps, lenient: true, warn: (message) => logger.warn(message) })
+      ? buildProfiles(raw.providers, {
+          ...deps,
+          lenient: true,
+          warn: (message) => logger.warn(message),
+        })
+      : new Map()
+    memoizedDeepseek = raw.enabled
+      ? buildDeepseekRoutes(raw.providers, {
+          kit,
+          lenient: true,
+          warn: (message) => logger.warn(message),
+        })
       : new Map()
     lastRaw = raw
     memoized = next
     return next
   }
+  /** deepseek 路由物化表（与 profiles 同一次备忘窗口）。 */
+  const deepseekRoutes = (): Map<string, ResolvedDeepseekRoute> => {
+    profiles()
+    return memoizedDeepseek ?? new Map()
+  }
   profiles() // 行级 config 不可服务则启动即失败（官方同款 fail-fast）
 
   const adapter = new kit.PiAiAdapter({
@@ -132,7 +155,10 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
   let registrations: RegistrationGroup[] | undefined
   let registeredFacts: unknown
 
-  const registerGroup = (routes: string[], fallback: (error: unknown) => void): RegistrationGroup[] => {
+  const registerGroup = (
+    routes: string[],
+    fallback: (error: unknown) => void,
+  ): RegistrationGroup[] => {
     try {
       const handle = ctx.llm.registerAdapter(routes, adapter as never)
       return [{ routes, handle }]
@@ -144,7 +170,9 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
           const handle = ctx.llm.registerAdapter([route], adapter as never)
           groups.push({ routes: [route], handle })
         } catch (routeError) {
-          logger.error(`llm-pi: route "${route}" 注册失败（可能与其他 adapter 重名），该 route 不可用`)
+          logger.error(
+            `llm-pi: route "${route}" 注册失败（可能与其他 adapter 重名），该 route 不可用`,
+          )
           logger.error(routeError)
         }
       }
@@ -168,9 +196,11 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
       })
     } else {
       try {
-        registrations[0]!.handle.replace(routes)
-        for (let i = 1; i < registrations.length; i += 1) registrations[i]!.handle.replace([])
-        registrations = [{ routes, handle: registrations[0]!.handle }]
+        const [first, ...rest] = registrations
+        if (first === undefined) throw new Error('registrations 为空（此前整批注册全部失败）')
+        first.handle.replace(routes)
+        for (const group of rest) group.handle.replace([])
+        registrations = [{ routes, handle: first.handle }]
       } catch (error) {
         // 原子 replace 被拒（含冲突）：保留此前注册（官方同款护栏）
         logger.error('llm-pi: 更新被拒，保留此前注册的 route')
@@ -183,13 +213,21 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
   let directory: { replace: (entries: unknown[]) => void } | undefined
   let directoryFacts: unknown
   const ensureDirectory = (): void => {
-    const entries = [...profiles().entries()].map(([provider, profile]) => ({
+    const piEntries = [...profiles().entries()].map(([provider, profile]) => ({
       provider,
       displayName: profile.displayName,
       settingsNs: SETTINGS_NS,
       settingsPath: ['providers', provider],
       declared: !hasBuiltinProvider(kit, provider),
     }))
+    const deepseekEntries = [...deepseekRoutes().values()].map((built) => ({
+      provider: built.route,
+      displayName: built.displayName,
+      settingsNs: SETTINGS_NS,
+      settingsPath: ['providers', built.route],
+      declared: true,
+    }))
+    const entries = [...piEntries, ...deepseekEntries]
     if (deepEqualJson(entries, directoryFacts)) return
     if (entries.length === 0) {
       // 空目录不可注册（INVALID_DIRECTORY）；等 settings 用户层供数后在 onChange 注册
@@ -201,14 +239,21 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
     directoryFacts = entries
   }
 
+  const deepseekRegistrar = new DeepseekRouteRegistrar({
+    ctx,
+    kit,
+    logger: { warn: (m) => logger.warn(m), error: (m) => logger.error(m) },
+    routes: deepseekRoutes,
+  })
+  const ensureDeepseek = (): void => deepseekRegistrar.sync(deepseekRoutes())
+
   ensureRegistration()
+  ensureDeepseek()
   ensureDirectory()
 
-  let settingsBound = false
   installSettingsSection(ctx, SETTINGS_NS, Config, config, {
     validate: (cfg: LlmPiConfig) => assertServiceable(cfg, deps),
     setSource: (source: () => LlmPiConfig) => {
-      settingsBound = true
       current = source
     },
     onChange: () => {
@@ -218,6 +263,12 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
         logger.error('llm-pi: 更新被拒，保留此前注册的 route')
         logger.error(error)
       }
+      try {
+        ensureDeepseek()
+      } catch (error) {
+        logger.error('llm-pi: deepseek route 更新失败，保留此前注册')
+        logger.error(error)
+      }
       try {
         ensureDirectory()
       } catch (error) {