@dsh-plus/llm-pi 0.1.13 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/llm-pi",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "dsh-plus service+ui plugin: 基于 PiAiAdapter 的自定义 LLM 路由（全量 compat、模型继承、models.dev 目录兜底）",
   "type": "module",
   "main": "lib/index.js",
@@ -23,9 +23,8 @@
   "dsh": {
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-client-ui-renderer",
         "@deepseek-ai/dsh-api-remotes"
       ],
       "platform": "web"
@@ -33,35 +32,40 @@
   },
   "dependencies": {
     "https-proxy-agent": "^7.0.6",
-    "@dsh-plus/shared": "0.1.5"
+    "@dsh-plus/shared": "0.1.6"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@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/dsh-anonymous-user-id": "^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-credentials": "^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-home-paths": "^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-launch-environment": "^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-llm": "^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-llm-deepseek": "^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-llm-pi-ai": "^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.1",
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@earendil-works/pi-ai": "^0.82.1"
+    "@earendil-works/pi-ai": "^0.84.2"
   },
   "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/dsh-anonymous-user-id": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-atomic-write": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-attachment": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-credentials": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-home-paths": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-host-webserver": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-launch-environment": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-llm": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-llm-deepseek": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-settings": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-timeout": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-util-crypto": "0.1.2-alpha.1",
     "@deepseek-ai/schemastery": "3.18.1",
-    "@earendil-works/pi-ai": "0.82.1",
+    "@earendil-works/pi-ai": "0.84.2",
     "@types/react": "~18.3.1",
     "react": "^18.2.0"
   },

package/src/auth-inline.ts

@@ -0,0 +1,177 @@
+/**
+ * PiAiAdapter 认证注入的内联实现（官方 llm-pi-ai/src/auth.ts 的等价移植）。
+ *
+ * 官方 credentialStoreFrom/authContextFrom 仅在 @deepseek-ai/dsh-llm-pi-ai 的
+ * src/auth.ts 子路径导出（包根只导出 recordKeyFor），而 npm 发布形态不携带
+ * src/（lib/index.js 单 bundle）——dsh 树 dev 布局优先经 src 子路径走官方
+ * 实现（见 resolve-dsh.ts 探测），本文件在其余形态（npm 布局的 dsh 树 /
+ * vendored 兜底）下按官方语义逐行等价实现，并经 assertKitShape 自检兜底。
+ * recordKeyFor 由调用方注入（与 PiAiAdapter 同源模块的包根导出，保证记录
+ * 键格式与官方写入方一致）。
+ * @module llm-pi/auth-inline
+ */
+import { access } from 'node:fs/promises'
+import { homedir } from 'node:os'
+import { resolve as resolvePath } from 'node:path'
+
+import type { Context } from '@deepseek-ai/cordis'
+import type {
+  CredentialKey,
+  CredentialProvider,
+  CredentialRecord,
+} from '@deepseek-ai/dsh-credentials'
+import {
+  credentialKeyId,
+  credentialKeyScope,
+  credentialRef,
+  isCredentialKeySegment,
+  isCredentialRefName,
+} from '@deepseek-ai/dsh-credentials'
+import { launchEnvironmentOf } from '@deepseek-ai/dsh-launch-environment'
+import { LlmError } from '@deepseek-ai/dsh-llm'
+import type {
+  AuthContext,
+  Credential,
+  CredentialInfo,
+  CredentialStore,
+} from '@earendil-works/pi-ai'
+
+/** 官方 RECORD_SCOPE 常量（llm-pi-ai/src/auth.ts）——读写作用域必须与官方一致。 */
+export const INLINE_RECORD_SCOPE = 'llm-pi-ai'
+
+/** 官方 jsonImage：pi-ai 凭据里显式 undefined 成员 JSON 序列化为缺省/数组 null。 */
+function jsonImage(value: unknown): unknown {
+  if (Array.isArray(value))
+    return value.map((entry) => (entry === undefined ? null : jsonImage(entry)))
+  if (
+    typeof value === 'object' &&
+    value !== null &&
+    Object.getPrototypeOf(value) === Object.prototype
+  ) {
+    const image: Record<string, unknown> = {}
+    for (const [key, member] of Object.entries(value)) {
+      if (member !== undefined) image[key] = jsonImage(member)
+    }
+    return image
+  }
+  return value
+}
+
+/** 官方 toPiCredential：api-key 记录按字段重建；grant 载荷原样透传。 */
+function toPiCredential(record: CredentialRecord | undefined): Credential | undefined {
+  if (record === undefined) return undefined
+  if (record.kind === 'api-key') {
+    return {
+      type: 'api_key',
+      ...(record.key === undefined ? {} : { key: record.key }),
+      ...(record.env === undefined ? {} : { env: { ...record.env } }),
+    }
+  }
+  return record.payload as Credential
+}
+
+/** 官方 toRecord：pi-ai 凭据 → 可存储的记录联合。 */
+function toRecord(credential: Credential): CredentialRecord {
+  if (credential.type === 'api_key') {
+    return {
+      kind: 'api-key',
+      ...(credential.key === undefined ? {} : { key: credential.key }),
+      ...(credential.env === undefined ? {} : { env: { ...credential.env } }),
+    }
+  }
+  return { kind: 'grant', payload: jsonImage(credential) }
+}
+
+/** 官方 writableStore：写路径需要凭据服务，缺失时抛 NO_CREDENTIAL_STORE。 */
+function writableStore(ctx: Context): CredentialProvider {
+  const credentials = ctx.get('credentials')
+  if (credentials === undefined) {
+    throw new LlmError(
+      'llm-pi: 当前组合未挂载凭据服务（dsh-credentials-local），登录产生的凭据无处存储',
+      'NO_CREDENTIAL_STORE',
+    )
+  }
+  return credentials
+}
+
+/**
+ * pi-ai `CredentialStore`（官方 credentialStoreFrom 等价实现）。
+ * 路由键任意而记录 id 受语法约束：语法外的 id 读答"未存储"、删除无事可做、
+ * modify 拒绝（写不落地不能报成功）。
+ */
+export function credentialStoreFrom(
+  ctx: Context,
+  recordKeyFor: (providerId: string) => CredentialKey,
+): CredentialStore {
+  return {
+    async read(providerId) {
+      const credentials = ctx.get('credentials')
+      if (credentials === undefined) return undefined
+      if (!isCredentialKeySegment(providerId)) return undefined
+      return toPiCredential(await credentials.readRecord(recordKeyFor(providerId)))
+    },
+    async list(): Promise<readonly CredentialInfo[]> {
+      const stored = (await ctx.get('credentials')?.listRecords()) ?? []
+      const mine: CredentialInfo[] = []
+      for (const entry of stored) {
+        if (credentialKeyScope(entry.key) !== INLINE_RECORD_SCOPE) continue
+        mine.push({
+          providerId: credentialKeyId(entry.key),
+          type: entry.kind === 'api-key' ? 'api_key' : 'oauth',
+        })
+      }
+      return mine
+    },
+    async modify(providerId, mutate) {
+      if (!isCredentialKeySegment(providerId)) {
+        throw new LlmError(
+          `llm-pi: provider id "${providerId}" 无法寻址存储的凭据记录（记录 id 是小写连字符标识）；` +
+            '该 route 请改用 apiKeyEnv 认证',
+          'UNSTORABLE_PROVIDER_ID',
+        )
+      }
+      const stored = await writableStore(ctx).modifyRecord(
+        recordKeyFor(providerId),
+        async (current) => {
+          const next = await mutate(toPiCredential(current))
+          return next === undefined ? undefined : toRecord(next)
+        },
+      )
+      return toPiCredential(stored)
+    },
+    async delete(providerId) {
+      if (!isCredentialKeySegment(providerId)) return
+      await writableStore(ctx).deleteRecord(recordKeyFor(providerId))
+    },
+  }
+}
+
+/**
+ * pi-ai `AuthContext`（官方 authContextFrom 等价实现）：
+ * env() 先查凭据服务（存储的环境值对 provider 自发现可见），再回退启动环境；
+ * fileExists() 问宿主进程文件系统（~/.aws/credentials 等是本进程所在机器的事实）。
+ */
+export function authContextFrom(ctx: Context): AuthContext {
+  return {
+    async env(name) {
+      if (isCredentialRefName(name)) {
+        const credentials = ctx.get('credentials')
+        const hit = await credentials?.resolve(credentialRef(name))
+        if (hit !== undefined) return hit.value
+      }
+      return launchEnvironmentOf(ctx).get(name)?.value
+    },
+    async fileExists(path) {
+      const expanded =
+        path.startsWith('~/') || path === '~'
+          ? resolvePath(homedir(), path.slice(1).replace(/^\//, ''))
+          : path
+      try {
+        await access(expanded)
+        return true
+      } catch {
+        return false
+      }
+    },
+  }
+}

package/src/catalog/official.ts

@@ -17,7 +17,6 @@ export interface OfficialModelBase {
   input?: ('text' | 'image')[]
   imagePixelBudget?: number
   imageMaxBytes?: number
-  imageDetail?: 'auto' | 'low'
 }
 
 interface OfficialCatalog {
@@ -46,7 +45,6 @@ function catalogOf(kit: DshKit): OfficialCatalog {
         : { 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 }

package/src/client/api.ts

@@ -1,7 +1,8 @@
 /**
- * 自定义端点通道：仅剩「模型目录」（配置读写已迁移到官方 settingsScope
- * 传输，见 scope.ts 与 card.tsx）。目录响应附带 kitSource 与 models-dev
- * 状态，供卡片的状态行展示（运行期诊断，非配置数据）。
+ * 自定义端点通道：仅剩「模型目录」（配置读写已迁移到 ctx.remote.settings
+ * 直连传输，0.1.2-alpha.1 起 connection.api.settings 已移除；见 scope.ts 与
+ * card.tsx）。目录响应附带 kitSource 与 models-dev 状态，供卡片的状态行
+ * 展示（运行期诊断，非配置数据）。
  * @module llm-pi/client/api
  */
 

package/src/client/card.tsx

@@ -1,7 +1,7 @@
 /**
  * 「LLM 路由」配置卡片：注册进 settings.plugin.item 插槽（官方插件配置页）。
  * 顶部：enabled / catalogUrl / catalogRefreshHours / 只读状态行（kitSource、
- * modelsDevStatus，来自模型目录端点）+ 保存（settings.replace 全量）与
+ * modelsDevStatus，来自模型目录端点）+ 保存（settings.update 全量深合并）与
  * 错误/成功提示；下方为 providers 路由列表（新增/删除/字段编辑/compat/模型
  * 目录，见 views/）。外壳与基础控件走 @dsh-plus/shared/client 套件。
  * @module llm-pi/client/card
@@ -12,12 +12,11 @@ import {
   type CardStatusState,
   CheckRow,
   IDLE_STATUS,
+  type NamespaceSettingsApi,
   type Scope,
-  type SettingsApi,
   TextField,
 } from '@dsh-plus/shared/client'
 import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
-import { SETTINGS_NS } from '../ns.ts'
 import { type ConfigValue, fetchCatalog, refreshCatalog, type WireModelsDevStatus } from './api.ts'
 import {
   type Draft,
@@ -32,7 +31,7 @@ import { ProvidersSection } from './views/providers.tsx'
 export interface CardProps {
   t(key: string): string
   scope: Scope
-  api: SettingsApi
+  api: NamespaceSettingsApi
 }
 
 function modelsDevText(status: WireModelsDevStatus | null, t: (key: string) => string): string {
@@ -129,15 +128,8 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
     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 } : {}),
-      })
-      .then(async (response) => {
-        if (!response.result.ok) {
-          throw new Error(response.result.error?.message ?? t('saveFailed'))
-        }
+      .update(toPatch(draft) as unknown as Record<string, unknown>, revision)
+      .then(async () => {
         await scope.load()
         const next = scope.getSnapshot().value as ConfigValue | undefined
         if (next !== undefined) setDraft(draftFromValue(next))

package/src/client/client.ts

@@ -3,21 +3,23 @@
  * 构建产物为 window.__ModuleLoader__.load({id, factory}) 形式的 CJS factory
  * （包装见 tsdown.config.ts）；样式沿用官方 data-plugin-css 约定，HMR 据此卸载。
  *
- * 类型说明：浏览器半只用到 slots/locale/connection/remote 的很窄一面，
- * scope 与基础控件走 @dsh-plus/shared/client 套件（收编自本插件原实现）；
- * 运行时契约以官方 dsh-client-ui-settings-plugins 的
- * settings.plugin.item 插槽与 dsh-client-connection 的 settings RPC 面为准。
- * rc7 起该插槽为 keyed 槽位：key 必须是卡片编辑的 settings 命名空间
+ * 类型说明：浏览器半只用到 slots/locale/remote 的很窄一面，
+ * scope 与基础控件走 @dsh-plus/shared/client 套件（收编自本插件原实现）。
+ * 该插槽为 keyed 槽位：key 必须是卡片编辑的 settings 命名空间
  * （即服务端 settingsNamespace() 注册的同一字面量，见 ../ns.ts），
  * 官方配置页按此 key 与 Host 已注册命名空间配对分发。
- * 配置读写经官方 settings RPC 直连（rc7 起第三方命名空间全量开放；
- * 不复用 settingsScope 服务——非 loopback 页面下它无数据，见 scope.ts）；
- * 自定义端点仅剩「模型目录」（api.ts，含 kitSource/models-dev
- * 运行期诊断）。
+ * 配置读写经 ctx.remote.settings 直连（0.1.2-alpha.1 起 connection.api.settings
+ * 已移除；不复用 settingsScope 服务——非 loopback 页面下它固定 memory 模式无数据，
+ * 见 @dsh-plus/shared/client scope.ts）；自定义端点仅剩「模型目录」
+ * （api.ts，含 kitSource/models-dev 运行期诊断）。
  * @module @dsh-plus/llm-pi/client
  */
 import type { Context } from '@deepseek-ai/cordis'
-import { createApiScope } from '@dsh-plus/shared/client'
+import {
+  createNamespaceApi,
+  createSettingsScope,
+  type SettingsRemoteFace,
+} from '@dsh-plus/shared/client'
 import { SETTINGS_NS } from '../ns.ts'
 import { LlmPiCard } from './card.tsx'
 import { en, NS, zh } from './i18n.ts'
@@ -26,7 +28,7 @@ import { injectStyle } from './styles.ts'
 export const name = 'dsh-plus-llm-pi'
 
 /** 浏览器半需要的 cordis 服务 key（loader 据此注入；package.json 的 dsh.client.inject 管包加载顺序）。 */
-export const inject = ['slots', 'locale', 'connection', 'remote'] as const
+export const inject = ['slots', 'locale', 'remote', 'remote.settings'] as const
 
 interface SlotsLike {
   inject(key: string, callback: () => unknown): unknown
@@ -39,17 +41,13 @@ interface LocaleLike {
 }
 
 interface RemoteLike {
+  settings: SettingsRemoteFace
   $on(event: string, listener: (payload?: unknown) => void): () => void
 }
 
-interface ConnectionLike {
-  api: { settings: Parameters<typeof createApiScope>[0] }
-}
-
 interface ClientContext {
   slots: SlotsLike
   locale: LocaleLike
-  get(key: 'connection'): ConnectionLike
   get(key: 'remote'): RemoteLike
   on(event: string, listener: () => void): () => void
   effect(execute: () => () => void, label?: string): unknown
@@ -65,8 +63,8 @@ export function apply(ctx: Context): void {
     'llm-pi: style',
   )
   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, 'llm-pi: settings scope')
+  const scope = createSettingsScope(c, SETTINGS_NS, 'llm-pi: settings scope')
+  const api = createNamespaceApi(c.get('remote').settings, SETTINGS_NS)
   c.slots.inject('settings.plugin.item', () =>
     c.slots.register(
       {

package/src/client/constants.ts

@@ -29,13 +29,18 @@ export const BUDGET_KEYS = ['minimal', 'low', 'medium', 'high'] as const
 
 type CompatValue = 'boolean' | 'object' | readonly string[]
 
-/** 逐协议 compat 字段表（来源：compat.ts FIELDS_BY_PROTOCOL）。 */
+/**
+ * 逐协议 compat 字段表（来源：compat.ts，逐字段镜像官方 catalog.ts COMPAT_GATES）。
+ * 只列 offer 字段（withhold 字段官方写时拒绝，UI 不提供）；取值约束对齐官方
+ * config.ts compatProfile schema。
+ */
 const COMPAT_FIELDS: Record<string, Record<string, CompatValue>> = {
   'openai-completions': {
     supportsStore: 'boolean',
     supportsDeveloperRole: 'boolean',
     supportsReasoningEffort: 'boolean',
     supportsUsageInStreaming: 'boolean',
+    supportsFinishReason: 'boolean',
     maxTokensField: ['max_completion_tokens', 'max_tokens'],
     requiresToolResultName: 'boolean',
     requiresAssistantAfterToolResult: 'boolean',
@@ -43,9 +48,10 @@ const COMPAT_FIELDS: Record<string, Record<string, CompatValue>> = {
     requiresReasoningContentOnAssistantMessages: 'boolean',
     thinkingFormat: [
       'openai',
-      'openrouter',
       'deepseek',
+      'openrouter',
       'together',
+      'baseten',
       'zai',
       'qwen',
       'chat-template',
@@ -54,36 +60,25 @@ const COMPAT_FIELDS: Record<string, Record<string, CompatValue>> = {
       'ant-ling',
     ],
     chatTemplateKwargs: 'object',
-    openRouterRouting: 'object',
-    vercelGatewayRouting: 'object',
-    zaiToolStream: 'boolean',
-    supportsOpenAIGrammarTools: 'boolean',
+    chatTemplateArgs: 'object',
+    supportsThinkingTokenBudget: 'boolean',
     supportsStrictMode: 'boolean',
     cacheControlFormat: ['anthropic'],
-    sendSessionAffinityHeaders: 'boolean',
-    deferredToolsMode: ['kimi'],
-    sessionAffinityFormat: ['openai', 'openai-nosession', 'openrouter'],
     supportsLongCacheRetention: 'boolean',
   },
   'openai-responses': {
     supportsDeveloperRole: 'boolean',
-    sessionAffinityFormat: ['openai', 'openai-nosession', 'openrouter'],
-    supportsLongCacheRetention: 'boolean',
     supportsStrictMode: 'boolean',
-    supportsOpenAIGrammarTools: 'boolean',
-    supportsToolSearch: 'boolean',
-    supportsExplicitPromptCacheMode: 'boolean',
+    supportsLongCacheRetention: 'boolean',
   },
   'anthropic-messages': {
     supportsEagerToolInputStreaming: 'boolean',
     supportsLongCacheRetention: 'boolean',
-    sendSessionAffinityHeaders: 'boolean',
     supportsCacheControlOnTools: 'boolean',
     supportsTemperature: 'boolean',
     forceAdaptiveThinking: 'boolean',
     allowEmptySignature: 'boolean',
     supportsStrictTools: 'boolean',
-    supportsToolReferences: 'boolean',
   },
 }