@dsh-plus/llm-pi 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/llm-pi",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "dsh-plus service+ui plugin: 基于 PiAiAdapter 的自定义 LLM 路由（全量 compat、模型继承、models.dev 目录兜底）",
   "type": "module",
   "main": "lib/index.js",
@@ -36,25 +36,30 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-anonymous-user-id": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-credentials": "^0.1.0-rc.8",
     "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.8",
     "@deepseek-ai/dsh-launch-environment": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-llm-deepseek": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-llm-pi-ai": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8",
+    "@deepseek-ai/schemastery": "^3.18.1",
     "@earendil-works/pi-ai": "^0.82.1"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
+    "@deepseek-ai/dsh-anonymous-user-id": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-credentials": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-home-paths": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm-deepseek": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.1-rc.2",
     "@deepseek-ai/schemastery": "3.18.1",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-credentials": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-home-paths": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-launch-environment": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-host-webserver": "0.1.0-rc.8",
     "@earendil-works/pi-ai": "0.82.1",
     "@types/react": "~18.3.1",
     "react": "^18.2.0"

package/src/catalog/builtin.ts

@@ -19,7 +19,12 @@ export interface ModelBase {
   compat?: Record<string, unknown>
   contextWindow?: number
   maxTokens?: number
-  cost?: { input: number; output: number; cacheRead: number; cacheWrite: number }
+  cost?: {
+    input: number
+    output: number
+    cacheRead: number
+    cacheWrite: number
+  }
   headers?: Record<string, string>
 }
 
@@ -40,7 +45,11 @@ export function builtinModelIds(kit: DshKit, provider: string): string[] {
 }
 
 /** 查单个内置模型为继承 base；未命中返回 undefined。 */
-export function builtinModelBase(kit: DshKit, provider: string, modelId: string): ModelBase | undefined {
+export function builtinModelBase(
+  kit: DshKit,
+  provider: string,
+  modelId: string,
+): ModelBase | undefined {
   if (!hasBuiltinProvider(kit, provider)) return undefined
   const model = kit.getBuiltinModels(provider).find((m) => m.id === modelId)
   if (model === undefined) return undefined
@@ -50,8 +59,12 @@ export function builtinModelBase(kit: DshKit, provider: string, modelId: string)
     baseUrl: model.baseUrl,
     input: [...model.input],
     reasoning: model.reasoning,
-    ...(model.thinkingLevelMap === undefined ? {} : { thinkingLevelMap: { ...model.thinkingLevelMap } }),
-    ...(model.compat === undefined ? {} : { compat: { ...(model.compat as Record<string, unknown>) } }),
+    ...(model.thinkingLevelMap === undefined
+      ? {}
+      : { thinkingLevelMap: { ...model.thinkingLevelMap } }),
+    ...(model.compat === undefined
+      ? {}
+      : { compat: { ...(model.compat as Record<string, unknown>) } }),
     contextWindow: model.contextWindow,
     maxTokens: model.maxTokens,
     cost: { ...model.cost },

package/src/catalog/models-dev.ts

@@ -15,9 +15,10 @@
  * 视觉等模态须用户在条目上显式声明（防 over-claiming 导致会话重复失败请求）。
  * @module llm-pi/catalog/models-dev
  */
+
+import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
 import { request as httpRequest } from 'node:http'
 import { request as httpsRequest } from 'node:https'
-import { mkdirSync, readFileSync, writeFileSync, renameSync } from 'node:fs'
 import { dirname } from 'node:path'
 
 import HttpsProxyAgentModule from 'https-proxy-agent'
@@ -73,7 +74,8 @@ function fetchJson(url: string, proxy: string, timeoutMs: number): Promise<JsonR
   return new Promise((resolve, reject) => {
     const target = new URL(url)
     const request = target.protocol === 'https:' ? httpsRequest : httpRequest
-    const agent = target.protocol === 'https:' && proxy.length > 0 ? new HttpsProxyAgent(proxy) : undefined
+    const agent =
+      target.protocol === 'https:' && proxy.length > 0 ? new HttpsProxyAgent(proxy) : undefined
     const req = request(
       url,
       { agent, timeout: timeoutMs, headers: { accept: 'application/json' } },
@@ -89,7 +91,10 @@ function fetchJson(url: string, proxy: string, timeoutMs: number): Promise<JsonR
           chunks.push(chunk)
         })
         response.on('end', () => {
-          resolve({ status: response.statusCode ?? 0, body: Buffer.concat(chunks).toString('utf8') })
+          resolve({
+            status: response.statusCode ?? 0,
+            body: Buffer.concat(chunks).toString('utf8'),
+          })
         })
       },
     )
@@ -108,7 +113,8 @@ function toModelBase(entry: ModelsDevModelEntry): ModelBase {
   const base: ModelBase = {}
   if (typeof entry.name === 'string' && entry.name.length > 0) base.name = entry.name
   const context = entry.limit?.context
-  if (typeof context === 'number' && Number.isInteger(context) && context > 0) base.contextWindow = context
+  if (typeof context === 'number' && Number.isInteger(context) && context > 0)
+    base.contextWindow = context
   const output = entry.limit?.output
   if (typeof output === 'number' && Number.isInteger(output) && output > 0) base.maxTokens = output
   base.reasoning = entry.reasoning === true
@@ -178,7 +184,7 @@ export class ModelsDevSource {
 
   /** 全部 provider id（UI extends 选择器用）。 */
   providerIds(): string[] {
-  return Object.keys(this.document ?? {})
+    return Object.keys(this.document ?? {})
   }
 
   /** 某 provider 的模型 id 列表（UI extends 选择器用）。 */
@@ -209,7 +215,8 @@ export class ModelsDevSource {
   private loadCache(): void {
     try {
       const raw = JSON.parse(readFileSync(this.cacheFile, 'utf8')) as CacheFile
-      if (!isDocument(raw.data) || typeof raw.fetchedAt !== 'string') throw new Error('缓存形状非法')
+      if (!isDocument(raw.data) || typeof raw.fetchedAt !== 'string')
+        throw new Error('缓存形状非法')
       this.document = raw.data
       this.fetchedAt = raw.fetchedAt
     } catch {

package/src/catalog/official.ts

@@ -0,0 +1,71 @@
+/**
+ * 官方模型目录数据源：adapter: deepseek 的 route 的继承 base。
+ *
+ * 目录取自 dsh-llm-deepseek 的 resolveAdapterOptions({}, undefined)——
+ * 即官方 DEFAULT_MODELS 经 schema 默认值补全后的形态（含视觉模型的
+ * inputModalities / imagePixelBudget / imageMaxBytes），跟随 dsh 树升级
+ * 自动更新，不在本仓库复制一份硬编码副本。
+ * @module llm-pi/catalog/official
+ */
+import type { DshKit } from '../resolve-dsh.ts'
+
+/** 官方目录可提供的可继承模型字段（DeepSeekCatalogModel 的可继承子集）。 */
+export interface OfficialModelBase {
+  name?: string
+  contextWindow?: number
+  maxTokens?: number
+  input?: ('text' | 'image')[]
+  imagePixelBudget?: number
+  imageMaxBytes?: number
+  imageDetail?: 'auto' | 'low'
+}
+
+interface OfficialCatalog {
+  baseUrl: string
+  models: Map<string, OfficialModelBase>
+}
+
+/** 按 kit 备忘（kit 实例在进程内唯一，目录随 dsh 树版本固定）。 */
+const cache = new WeakMap<DshKit, OfficialCatalog>()
+
+function catalogOf(kit: DshKit): OfficialCatalog {
+  const hit = cache.get(kit)
+  if (hit !== undefined) return hit
+  if (kit.deepseek === undefined) {
+    throw new Error('llm-pi: 官方模型目录需要 dsh-llm-deepseek（当前运行时套件不含）')
+  }
+  const resolved = kit.deepseek.resolveAdapterOptions({} as never, undefined)
+  const models = new Map<string, OfficialModelBase>()
+  for (const model of resolved.models) {
+    models.set(model.id, {
+      ...(model.name === undefined ? {} : { name: model.name }),
+      ...(model.contextWindow === undefined ? {} : { contextWindow: model.contextWindow }),
+      ...(model.maxTokens === undefined ? {} : { maxTokens: model.maxTokens }),
+      ...(model.inputModalities === undefined
+        ? {}
+        : { input: [...model.inputModalities] as ('text' | 'image')[] }),
+      ...(model.imagePixelBudget === undefined ? {} : { imagePixelBudget: model.imagePixelBudget }),
+      ...(model.imageMaxBytes === undefined ? {} : { imageMaxBytes: model.imageMaxBytes }),
+      ...(model.imageDetail === undefined ? {} : { imageDetail: model.imageDetail }),
+    })
+  }
+  const catalog: OfficialCatalog = { baseUrl: resolved.baseURL, models }
+  cache.set(kit, catalog)
+  return catalog
+}
+
+/** 官方端点（route 配 extends: 'deepseek' 且未显式 baseURL 时的缺省值）。 */
+export function officialBaseUrl(kit: DshKit): string {
+  return catalogOf(kit).baseUrl
+}
+
+/** 查单个官方模型为继承 base；未命中返回 undefined。 */
+export function officialModelBase(kit: DshKit, modelId: string): OfficialModelBase | undefined {
+  const base = catalogOf(kit).models.get(modelId)
+  return base === undefined ? undefined : { ...base }
+}
+
+/** 官方目录的全部模型 id（route 级 extends: 'deepseek' 的全量继承与诊断用）。 */
+export function officialModelIds(kit: DshKit): string[] {
+  return [...catalogOf(kit).models.keys()]
+}

package/src/client/api.ts

@@ -23,7 +23,12 @@ export interface WireProvider {
   defaultMaxTokens?: number
   defaultInput?: string[]
   reasoning?: string
-  thinkingBudgets?: { minimal: number; low: number; medium: number; high: number }
+  thinkingBudgets?: {
+    minimal: number
+    low: number
+    medium: number
+    high: number
+  }
   cacheRetention?: string
   transport?: string
   timeoutMs?: number
@@ -74,14 +79,22 @@ async function parse<T>(res: Response): Promise<T> {
 }
 
 /** 目录查询：provider 为空时只返回该源的 provider 列表。 */
-export async function fetchCatalog(provider: string, source: 'builtin' | 'models-dev'): Promise<CatalogResult> {
+export async function fetchCatalog(
+  provider: string,
+  source: 'builtin' | 'models-dev',
+): Promise<CatalogResult> {
   const url = `${ROUTE_CATALOG}?provider=${encodeURIComponent(provider)}&source=${source}`
   return parse<CatalogResult>(await fetch(url, { credentials: 'same-origin' }))
 }
 
 /** 手动拉取 models.dev 目录：POST /catalog/refresh → 最新快照状态。 */
-export async function refreshCatalog(): Promise<{ status: WireModelsDevStatus }> {
+export async function refreshCatalog(): Promise<{
+  status: WireModelsDevStatus
+}> {
   return parse<{ status: WireModelsDevStatus }>(
-    await fetch(`${ROUTE_CATALOG}/refresh`, { method: 'POST', credentials: 'same-origin' }),
+    await fetch(`${ROUTE_CATALOG}/refresh`, {
+      method: 'POST',
+      credentials: 'same-origin',
+    }),
   )
 }

package/src/client/card.tsx

@@ -7,11 +7,18 @@
  * 交互对齐官方卡片与 notify-email：折叠/展开、staged draft、未保存标记。
  * @module llm-pi/client/card
  */
-import { useEffect, useMemo, useSyncExternalStore, useState, type ReactElement } from 'react'
+import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
 
 import { SETTINGS_NS } from '../ns.ts'
-import { fetchCatalog, refreshCatalog, type ConfigValue, type WireModelsDevStatus } from './api.ts'
-import { draftFromValue, emptyProviderDraft, numTextOk, toPatch, type Draft, type ProviderDraft } from './draft.ts'
+import { type ConfigValue, fetchCatalog, refreshCatalog, type WireModelsDevStatus } from './api.ts'
+import {
+  type Draft,
+  draftFromValue,
+  emptyProviderDraft,
+  numTextOk,
+  type ProviderDraft,
+  toPatch,
+} from './draft.ts'
 import { CheckRow, TextField } from './fields.tsx'
 import type { Scope, SettingsApi } from './scope.ts'
 import { ProvidersSection } from './views/providers.tsx'
@@ -75,7 +82,8 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
 
   const dirty = useMemo(
     () =>
-      value !== undefined && draft !== null &&
+      value !== undefined &&
+      draft !== null &&
       JSON.stringify(toPatch(draft)) !== JSON.stringify(toPatch(draftFromValue(value))),
     [value, draft],
   )
@@ -90,16 +98,26 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
   }, [draft])
 
   if (value === undefined || draft === null) {
-    return <li className="lpc-card"><p className="lpc-readOnly">{t('loading')}</p></li>
+    return (
+      <li className="lpc-card">
+        <p className="lpc-readOnly">{t('loading')}</p>
+      </li>
+    )
   }
 
   const setProvider = (route: string, patch: Partial<ProviderDraft>): void => {
     const current = draft.providers[route] ?? emptyProviderDraft()
-    setDraft({ ...draft, providers: { ...draft.providers, [route]: { ...current, ...patch } } })
+    setDraft({
+      ...draft,
+      providers: { ...draft.providers, [route]: { ...current, ...patch } },
+    })
     setStatus(IDLE_STATUS)
   }
   const onAddRoute = (key: string): void => {
-    setDraft({ ...draft, providers: { ...draft.providers, [key]: emptyProviderDraft() } })
+    setDraft({
+      ...draft,
+      providers: { ...draft.providers, [key]: emptyProviderDraft() },
+    })
     setStatus(IDLE_STATUS)
   }
   const onRemoveRoute = (route: string): void => {
@@ -111,11 +129,12 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
   const onSave = (): void => {
     setSaving(true)
     const revision = scope.getSnapshot().revision
-    api.replace({
-      ns: SETTINGS_NS,
-      section: toPatch(draft) as unknown as Record<string, unknown>,
-      ...(revision !== undefined ? { expectedRevision: revision } : {}),
-    })
+    api
+      .replace({
+        ns: SETTINGS_NS,
+        section: toPatch(draft) as unknown as Record<string, unknown>,
+        ...(revision !== undefined ? { expectedRevision: revision } : {}),
+      })
       .then(async (response) => {
         if (!response.result.ok) {
           throw new Error(response.result.error?.message ?? t('saveFailed'))
@@ -170,7 +189,11 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
       </button>
       {open ? (
         <div className="lpc-body">
-          {disabled ? <p className="lpc-readOnly" role="status">{t('readOnly')}</p> : null}
+          {disabled ? (
+            <p className="lpc-readOnly" role="status">
+              {t('readOnly')}
+            </p>
+          ) : null}
           <CheckRow
             id="lpc-enabled"
             label={t('enabled')}
@@ -217,9 +240,13 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
               setStatus(IDLE_STATUS)
             }}
           />
-          <p className="lpc-statusRow">{t('kitSource')}：{kitSource ?? ''}</p>
+          <p className="lpc-statusRow">
+            {t('kitSource')}：{kitSource ?? ''}
+          </p>
           <div className="lpc-statusRow">
-            <span>{t('modelsDevStatus')}：{modelsDevText(modelsDevStatus, t)}</span>
+            <span>
+              {t('modelsDevStatus')}：{modelsDevText(modelsDevStatus, t)}
+            </span>
             <button
               type="button"
               className="lpc-btn lpc-btnGhost lpc-btnSmall lpc-refreshBtn"
@@ -240,17 +267,27 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
           />
           <div className="lpc-footer">
             {status.kind !== 'idle' ? (
-              <p className={`lpc-status${status.kind === 'error' ? ' lpc-statusError' : ''}`} role="status">
+              <p
+                className={`lpc-status${status.kind === 'error' ? ' lpc-statusError' : ''}`}
+                role="status"
+              >
                 {status.text}
               </p>
             ) : null}
-            <button type="button" className="lpc-btn lpc-btnGhost" disabled={!dirty || saving}
-              onClick={onDiscard}>
+            <button
+              type="button"
+              className="lpc-btn lpc-btnGhost"
+              disabled={!dirty || saving}
+              onClick={onDiscard}
+            >
               {t('discard')}
             </button>
-            <button type="button" className="lpc-btn lpc-btnPrimary"
+            <button
+              type="button"
+              className="lpc-btn lpc-btnPrimary"
               disabled={!dirty || invalid || saving || disabled}
-              onClick={onSave}>
+              onClick={onSave}
+            >
               {t(saving ? 'saving' : 'save')}
             </button>
           </div>

package/src/client/client.ts

@@ -64,7 +64,12 @@ interface ClientContext {
  * （loopback 或 tailnet 信任域名）下行为一致。
  */
 function createApiScope(api: SettingsApi, ns: string, c: ClientContext): Scope {
-  let state: ScopeSnapshot = { status: 'loading', value: undefined, revision: undefined, writable: false }
+  let state: ScopeSnapshot = {
+    status: 'loading',
+    value: undefined,
+    revision: undefined,
+    writable: false,
+  }
   const listeners = new Set<() => void>()
   let generation = 0
   const publish = (next: ScopeSnapshot): void => {
@@ -73,7 +78,7 @@ function createApiScope(api: SettingsApi, ns: string, c: ClientContext): Scope {
   }
   const load = async (): Promise<void> => {
     const gen = ++generation
-    let response
+    let response: Awaited<ReturnType<SettingsApi['describe']>>
     try {
       response = await api.describe({})
     } catch {
@@ -83,10 +88,20 @@ function createApiScope(api: SettingsApi, ns: string, c: ClientContext): Scope {
     const writable = response.result.value?.writable ?? false
     const view = response.result.value?.namespaces.find((candidate) => candidate.ns === ns)
     if (view === undefined) {
-      publish({ status: 'unavailable', value: undefined, revision: undefined, writable })
+      publish({
+        status: 'unavailable',
+        value: undefined,
+        revision: undefined,
+        writable,
+      })
       return
     }
-    publish({ status: 'ready', value: view.value, revision: view.revision, writable })
+    publish({
+      status: 'ready',
+      value: view.value,
+      revision: view.revision,
+      writable,
+    })
   }
   const refresh = (namespace?: unknown): void => {
     if (namespace !== undefined && namespace !== ns) return
@@ -118,7 +133,6 @@ function createApiScope(api: SettingsApi, ns: string, c: ClientContext): Scope {
 }
 
 export function apply(ctx: Context): void {
-
   const c = ctx as unknown as ClientContext
   const tag = injectStyle()
   c.effect(
@@ -127,10 +141,7 @@ export function apply(ctx: Context): void {
     },
     'llm-pi: style',
   )
-  c.effect(
-    () => c.locale.register(NS, { zh, en }),
-    'llm-pi: locale',
-  )
+  c.effect(() => c.locale.register(NS, { zh, en }), 'llm-pi: locale')
   const api = c.get('connection').api.settings
   const scope = createApiScope(api, SETTINGS_NS, c)
   c.slots.inject('settings.plugin.item', () =>

package/src/client/constants.ts

@@ -6,7 +6,11 @@
  */
 
 /** 协议枚举（来源：config.ts PROTOCOL_IDS）。 */
-export const PROTOCOL_IDS = ['openai-completions', 'openai-responses', 'anthropic-messages'] as const
+export const PROTOCOL_IDS = [
+  'openai-completions',
+  'openai-responses',
+  'anthropic-messages',
+] as const
 
 /** thinking 档位（来源：config.ts THINKING_LEVELS）。 */
 export const THINKING_LEVELS = ['off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'] as const