@dsh-plus/llm-pi 0.1.4 → 0.1.6

package/src/profiles.ts

@@ -14,18 +14,22 @@
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import type { ResolvedPiAiProviderProfile } from '@deepseek-ai/dsh-llm-pi-ai'
 
-import { inheritedCatalogEntries, builtinProviderBaseUrl, type ModelBase } from './catalog/builtin.ts'
+import {
+  builtinProviderBaseUrl,
+  inheritedCatalogEntries,
+  type ModelBase,
+} from './catalog/builtin.ts'
 import type { ModelsDevSource } from './catalog/models-dev.ts'
 import { mergeCompat, validateCompat } from './compat.ts'
 import {
   DEFAULT_CONTEXT_WINDOW,
-  DEFAULT_MAX_TOKENS,
   DEFAULT_MAX_REQUEST_IMAGE_BYTES,
+  DEFAULT_MAX_TOKENS,
   DEFAULT_STREAM_IDLE_TIMEOUT_MS,
   MAX_TIMER_DELAY_MS,
-  THINKING_LEVELS,
   type ModelEntryConfig,
   type ProviderProfileConfig,
+  THINKING_LEVELS,
 } from './config.ts'
 import { ExtendsError, resolveModelBase } from './inherit.ts'
 import type { DshKit } from './resolve-dsh.ts'
@@ -52,7 +56,9 @@ function invalid(provider: string, detail: string): never {
 }
 
 /** 条目的声明模态；缺省/空数组都视为"无答案"，交下一级（同官方 declaredInput）。 */
-function declaredInput(configured: readonly ('text' | 'image')[] | undefined): ('text' | 'image')[] | undefined {
+function declaredInput(
+  configured: readonly ('text' | 'image')[] | undefined,
+): ('text' | 'image')[] | undefined {
   return configured === undefined || configured.length === 0 ? undefined : [...configured]
 }
 
@@ -73,7 +79,9 @@ function resolveModelReasoning(
       reasoning: base.reasoning,
       ...(base.thinkingLevelMap === undefined
         ? {}
-        : { thinkingLevelMap: base.thinkingLevelMap as Record<string, string | null> }),
+        : {
+            thinkingLevelMap: base.thinkingLevelMap as Record<string, string | null>,
+          }),
     }
   }
   if (efforts === false) return { reasoning: false }
@@ -84,12 +92,15 @@ function resolveModelReasoning(
     const wire = (efforts as Record<string, string | null | undefined>)[level]
     if (wire === undefined) continue
     if (wire === null) {
-      if (level !== 'off') invalid(provider, `model "${entry.id}" reasoningEfforts.${level} 需要线值；仅 off 可留空`)
+      if (level !== 'off')
+        invalid(provider, `model "${entry.id}" reasoningEfforts.${level} 需要线值；仅 off 可留空`)
     } else if (wire.length === 0) {
       invalid(provider, `model "${entry.id}" reasoningEfforts.${level} 不能为空字符串`)
     }
   }
-  const declared = THINKING_LEVELS.filter((level) => (efforts as Record<string, unknown>)[level] !== undefined)
+  const declared = THINKING_LEVELS.filter(
+    (level) => (efforts as Record<string, unknown>)[level] !== undefined,
+  )
   if (!declared.some((level) => level !== 'off')) {
     invalid(provider, `model "${entry.id}" reasoningEfforts 只有 off；声明思考档位或置 false`)
   }
@@ -107,7 +118,10 @@ function harnessApiKeyAuth(name: string) {
   return {
     name,
     resolve: ({ credential }: { credential?: { key?: string } }) =>
-      Promise.resolve({ auth: credential?.key === undefined ? {} : { apiKey: credential.key }, source: name }),
+      Promise.resolve({
+        auth: credential?.key === undefined ? {} : { apiKey: credential.key },
+        source: name,
+      }),
   }
 }
 
@@ -142,7 +156,9 @@ function materializeModel(
   const api = profile.api ?? base.api ?? routeApi
   if (api === undefined) {
     if (deps.lenient) {
-      deps.warn?.(`llm-pi: provider "${route}" model "${entry.id}" 无法获得 api（继承源缺失），已跳过该模型`)
+      deps.warn?.(
+        `llm-pi: provider "${route}" model "${entry.id}" 无法获得 api（继承源缺失），已跳过该模型`,
+      )
       return null
     }
     invalid(route, `model "${entry.id}" 需要 api：继承源未提供，请在 route 上设置 api`)
@@ -150,16 +166,27 @@ function materializeModel(
   const baseUrl = profile.baseURL ?? base.baseUrl ?? providerBaseUrl
   if (baseUrl === undefined) {
     if (deps.lenient) {
-      deps.warn?.(`llm-pi: provider "${route}" model "${entry.id}" 无法获得 baseURL（继承源缺失），已跳过该模型`)
+      deps.warn?.(
+        `llm-pi: provider "${route}" model "${entry.id}" 无法获得 baseURL（继承源缺失），已跳过该模型`,
+      )
       return null
     }
     invalid(route, `model "${entry.id}" 需要 baseURL：继承源未提供，请在 route 上设置 baseURL`)
   }
-  const contextWindow = entry.contextWindow ?? base.contextWindow ?? profile.defaultContextWindow ?? DEFAULT_CONTEXT_WINDOW
-  const maxTokens = entry.maxTokens ?? base.maxTokens ?? profile.defaultMaxTokens ?? DEFAULT_MAX_TOKENS
+  const contextWindow =
+    entry.contextWindow ??
+    base.contextWindow ??
+    profile.defaultContextWindow ??
+    DEFAULT_CONTEXT_WINDOW
+  const maxTokens =
+    entry.maxTokens ?? base.maxTokens ?? profile.defaultMaxTokens ?? DEFAULT_MAX_TOKENS
   if (entry.maxTokens !== undefined) configuredMaxTokens.set(entry.id, entry.maxTokens)
   validateCompat(api, profile.compat as Record<string, unknown> | undefined, `provider "${route}"`)
-  validateCompat(api, entry.compat as Record<string, unknown> | undefined, `provider "${route}" model "${entry.id}"`)
+  validateCompat(
+    api,
+    entry.compat as Record<string, unknown> | undefined,
+    `provider "${route}" model "${entry.id}"`,
+  )
   const compat = mergeCompat(
     base.api === api ? base.compat : undefined,
     profile.compat as Record<string, unknown> | undefined,
@@ -188,7 +215,10 @@ function materializeRouteModels(
   profile: ProviderProfileConfig,
   deps: BuildDeps,
   defaultInput: ('text' | 'image')[],
-): { models: MaterializedModel[]; configuredMaxTokens: Map<string, number> } | null {
+): {
+  models: MaterializedModel[]
+  configuredMaxTokens: Map<string, number>
+} | null {
   const configuredMaxTokens = new Map<string, number>()
   const providerBaseUrl =
     profile.extends === undefined ? undefined : builtinProviderBaseUrl(deps.kit, profile.extends)
@@ -247,14 +277,19 @@ function materializeRouteModels(
     .filter((model): model is MaterializedModel => model !== null)
   if (models.length === 0) {
     if (deps.lenient) {
-      deps.warn?.(`llm-pi: provider "${route}" 当前没有可服务的模型（继承源漂移），已跳过该 route 的注册`)
+      deps.warn?.(
+        `llm-pi: provider "${route}" 当前没有可服务的模型（继承源漂移），已跳过该 route 的注册`,
+      )
       return null
     }
     invalid(route, 'route 内没有可服务的模型')
   }
   const finalApis = new Set(models.map((m) => m.api))
   if (finalApis.size > 1) {
-    invalid(route, `route 内模型协议不一致（${[...finalApis].join(', ')}）；一个 route 只能服务一种协议`)
+    invalid(
+      route,
+      `route 内模型协议不一致（${[...finalApis].join(', ')}）；一个 route 只能服务一种协议`,
+    )
   }
   return { models, configuredMaxTokens }
 }
@@ -274,8 +309,10 @@ export function buildProfiles(
     // 注意：不做"route 名与内置 provider 名重名"的静态校验——内置名 ≠ 已注册
     // route（如官方 llm-pi-ai 配置清空后 anthropic 名可用）。真实冲突只在注册期
     // 暴露（DUPLICATE_ADAPTER），由 service 层逐个 route 注册降级处理。
-    if (profile.baseURL !== undefined && profile.baseURL.length === 0) invalid(route, 'baseURL 为空')
-    if (profile.displayName !== undefined && profile.displayName.length === 0) invalid(route, 'displayName 为空')
+    if (profile.baseURL !== undefined && profile.baseURL.length === 0)
+      invalid(route, 'baseURL 为空')
+    if (profile.displayName !== undefined && profile.displayName.length === 0)
+      invalid(route, 'displayName 为空')
     const streamIdleTimeoutMs = profile.streamIdleTimeoutMs ?? DEFAULT_STREAM_IDLE_TIMEOUT_MS
     if (
       !Number.isFinite(streamIdleTimeoutMs) ||
@@ -290,9 +327,15 @@ export function buildProfiles(
     const catalog = materializeRouteModels(route, profile, deps, defaultInput)
     if (catalog === null) continue // lenient 下 route 无模型可服务，跳过注册
     const api = catalog.models[0]?.api
-    const factory = api === undefined ? undefined : deps.kit.protocolFactories[api as keyof DshKit['protocolFactories']]
+    const factory =
+      api === undefined
+        ? undefined
+        : deps.kit.protocolFactories[api as keyof DshKit['protocolFactories']]
     if (factory === undefined) {
-      invalid(route, `api ${JSON.stringify(api)} 本插件无法服务（支持：openai-completions/openai-responses/anthropic-messages）`)
+      invalid(
+        route,
+        `api ${JSON.stringify(api)} 本插件无法服务（支持：openai-completions/openai-responses/anthropic-messages）`,
+      )
     }
     const piProvider = deps.kit.createProvider({
       id: route,
@@ -319,7 +362,9 @@ export function buildProfiles(
       ),
       ...(profile.headers === undefined ? {} : { headers: { ...profile.headers } }),
       ...(profile.reasoning === undefined ? {} : { reasoning: profile.reasoning }),
-      ...(profile.thinkingBudgets === undefined ? {} : { thinkingBudgets: { ...profile.thinkingBudgets } }),
+      ...(profile.thinkingBudgets === undefined
+        ? {}
+        : { thinkingBudgets: { ...profile.thinkingBudgets } }),
       ...(profile.cacheRetention === undefined ? {} : { cacheRetention: profile.cacheRetention }),
       ...(profile.transport === undefined ? {} : { transport: profile.transport }),
       ...(profile.timeoutMs === undefined ? {} : { timeoutMs: profile.timeoutMs }),

package/src/resolve-dsh.ts

@@ -16,18 +16,16 @@
 import { existsSync, realpathSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import { pathToFileURL } from 'node:url'
-
-import type { PiAiAdapter as PiAiAdapterType } from '@deepseek-ai/dsh-llm-pi-ai'
 import type * as DshLlm from '@deepseek-ai/dsh-llm'
+import * as vendoredLlm from '@deepseek-ai/dsh-llm'
+import type { PiAiAdapter as PiAiAdapterType } from '@deepseek-ai/dsh-llm-pi-ai'
+import * as vendoredPiAiAdapter from '@deepseek-ai/dsh-llm-pi-ai'
 import type * as PiAi from '@earendil-works/pi-ai'
-
 import * as vendoredPiAi from '@earendil-works/pi-ai'
-import * as vendoredCatalog from '@earendil-works/pi-ai/providers/all'
 import { anthropicMessagesApi as vendoredAnthropic } from '@earendil-works/pi-ai/api/anthropic-messages.lazy'
 import { openAICompletionsApi as vendoredCompletions } from '@earendil-works/pi-ai/api/openai-completions.lazy'
 import { openAIResponsesApi as vendoredResponses } from '@earendil-works/pi-ai/api/openai-responses.lazy'
-import * as vendoredLlm from '@deepseek-ai/dsh-llm'
-import * as vendoredPiAiAdapter from '@deepseek-ai/dsh-llm-pi-ai'
+import * as vendoredCatalog from '@earendil-works/pi-ai/providers/all'
 
 import type { ProtocolId } from './config.ts'
 
@@ -55,7 +53,13 @@ function assertKitShape(kit: DshKit, origin: string): void {
   const problems: string[] = []
   if (typeof kit.PiAiAdapter !== 'function') problems.push('PiAiAdapter 不是类')
   else {
-    for (const method of ['current', 'stream', 'listModels', 'resolveModel', 'providerInfo'] as const) {
+    for (const method of [
+      'current',
+      'stream',
+      'listModels',
+      'resolveModel',
+      'providerInfo',
+    ] as const) {
       if (typeof (kit.PiAiAdapter.prototype as Record<string, unknown>)[method] !== 'function') {
         problems.push(`PiAiAdapter.prototype.${method} 缺失`)
       }
@@ -182,7 +186,10 @@ function dshTreeAnchor(): string | undefined {
  * 两者都过不了形状自检时抛错（调用方应记日志并放弃注册 route）。
  * 返回的 diagnostics 记录回退原因，供配置卡片与日志展示。
  */
-export async function resolveDshKit(): Promise<{ kit: DshKit; diagnostics: string[] }> {
+export async function resolveDshKit(): Promise<{
+  kit: DshKit
+  diagnostics: string[]
+}> {
   const diagnostics: string[] = []
   const anchor = dshTreeAnchor()
   if (anchor !== undefined) {

package/src/service.ts

@@ -18,10 +18,10 @@ 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 { discoverModels } from './discovery.ts'
 import { assertServiceable, buildProfiles } from './profiles.ts'
-import { resolveDshKit, type DshKit } from './resolve-dsh.ts'
+import { type DshKit, resolveDshKit } from './resolve-dsh.ts'
 
 export interface LlmPiRuntime {
   /** 当前生效配置（settings 用户层解析结果或 cordis 行级 config）。 */
@@ -46,7 +46,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 +57,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',
@@ -92,7 +96,11 @@ 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()
     lastRaw = raw
     memoized = next
@@ -132,7 +140,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 +155,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 +181,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')
@@ -204,11 +219,9 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
   ensureRegistration()
   ensureDirectory()
 
-  let settingsBound = false
   installSettingsSection(ctx, SETTINGS_NS, Config, config, {
     validate: (cfg: LlmPiConfig) => assertServiceable(cfg, deps),
     setSource: (source: () => LlmPiConfig) => {
-      settingsBound = true
       current = source
     },
     onChange: () => {