@dsh-plus/llm-pi 0.1.7 → 0.1.8

package/lib/client.js

@@ -230,7 +230,7 @@ window.__ModuleLoader__.load({
 					compat: provider.compat,
 					defaultContextWindow: toNum(provider.defaultContextWindow),
 					defaultMaxTokens: toNum(provider.defaultMaxTokens),
-					input: inputToWire(provider.input),
+					defaultInput: inputToWire(provider.input),
 					reasoning: provider.reasoning,
 					thinkingBudgets: budgetToWire(provider.thinkingBudgets),
 					cacheRetention: provider.cacheRetention,

package/lib/index.js

@@ -497,6 +497,52 @@ var DeepseekRouteRegistrar = class {
 	}
 };
 //#endregion
+//#region src/directory.ts
+/**
+* 可配置 provider 目录注册：条目组装与冲突降级。
+*
+* 官方 `registerConfigurableProviders`/`replace` 的拒绝语义是原子的——任一条目
+* 与既有声明冲突（典型：route 名撞官方内置 provider 目录条目，如 anthropic）则
+* 整批不落盘。此处按 registerAdapter 同款降级模式：逐个剔除冲突条目重试，
+* 让其余 route 的目录条目照常生效。
+* @module llm-pi/directory
+*/
+/** 组装当前全部 route 的目录条目（pi + deepseek 两族）。 */
+function buildDirectoryEntries(kit, settingsNs, piProfiles, deepseekRoutes) {
+	const piEntries = [...piProfiles.entries()].map(([provider, profile]) => ({
+		provider,
+		displayName: profile.displayName,
+		settingsNs,
+		settingsPath: ["providers", provider],
+		declared: !hasBuiltinProvider(kit, provider)
+	}));
+	const deepseekEntries = [...deepseekRoutes.values()].map((built) => ({
+		provider: built.route,
+		displayName: built.displayName,
+		settingsNs,
+		settingsPath: ["providers", built.route],
+		declared: true
+	}));
+	return [...piEntries, ...deepseekEntries];
+}
+/**
+* 提交目录条目；整批被原子拒绝时逐个剔除冲突条目重试（每轮至多剔一个，
+* 轮数不超过条目数，必然终止）。非冲突错误原样上抛。
+*/
+function commitDirectory(register, entries, warn) {
+	let rest = entries;
+	for (let attempts = 0; attempts <= entries.length; attempts++) try {
+		register(rest);
+		return;
+	} catch (error) {
+		const match = /configurable provider "([^"]+)" is already declared/.exec(error instanceof Error ? error.message : String(error));
+		const next = match === null ? [] : rest.filter((entry) => entry.provider !== match[1]);
+		if (match === null || next.length === rest.length) throw error;
+		warn(`llm-pi: 目录条目 "${match[1]}" 与既有声明冲突（通常为官方内置 provider 目录），已跳过该条目`);
+		rest = next;
+	}
+}
+//#endregion
 //#region src/catalog/official.ts
 /** 按 kit 备忘（kit 实例在进程内唯一，目录随 dsh 树版本固定）。 */
 const cache = /* @__PURE__ */ new WeakMap();
@@ -1542,28 +1588,16 @@ async function startRuntime(ctx, rawConfig) {
 	let directory;
 	let directoryFacts;
 	const ensureDirectory = () => {
-		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];
+		const entries = buildDirectoryEntries(kit, SETTINGS_NS, profiles(), deepseekRoutes());
 		if (deepEqualJson(entries, directoryFacts)) return;
 		if (entries.length === 0) {
 			directoryFacts = entries;
 			return;
 		}
-		if (directory === void 0) directory = ctx.llm.registerConfigurableProviders(entries);
-		else directory.replace(entries);
+		commitDirectory((batch) => {
+			if (directory === void 0) directory = ctx.llm.registerConfigurableProviders(batch);
+			else directory.replace(batch);
+		}, entries, (message) => logger.warn(message));
 		directoryFacts = entries;
 	};
 	const deepseekRegistrar = new DeepseekRouteRegistrar({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/llm-pi",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "dsh-plus service+ui plugin: 基于 PiAiAdapter 的自定义 LLM 路由（全量 compat、模型继承、models.dev 目录兜底）",
   "type": "module",
   "main": "lib/index.js",

package/src/client/draft.ts

@@ -285,7 +285,7 @@ function providerToWire(provider: ProviderDraft): WireProvider {
       compat: provider.compat,
       defaultContextWindow: toNum(provider.defaultContextWindow),
       defaultMaxTokens: toNum(provider.defaultMaxTokens),
-      input: inputToWire(provider.input),
+      defaultInput: inputToWire(provider.input),
       reasoning: provider.reasoning,
       thinkingBudgets: budgetToWire(provider.thinkingBudgets),
       cacheRetention: provider.cacheRetention,

package/src/directory.ts

@@ -0,0 +1,73 @@
+/**
+ * 可配置 provider 目录注册：条目组装与冲突降级。
+ *
+ * 官方 `registerConfigurableProviders`/`replace` 的拒绝语义是原子的——任一条目
+ * 与既有声明冲突（典型：route 名撞官方内置 provider 目录条目，如 anthropic）则
+ * 整批不落盘。此处按 registerAdapter 同款降级模式：逐个剔除冲突条目重试，
+ * 让其余 route 的目录条目照常生效。
+ * @module llm-pi/directory
+ */
+import { hasBuiltinProvider } from './catalog/builtin.ts'
+import type { ResolvedDeepseekRoute } from './profiles-deepseek.ts'
+import type { DshKit } from './resolve-dsh.ts'
+
+/** 一条可配置 provider 目录条目（registerConfigurableProviders 的入参形状）。 */
+export interface DirectoryEntry {
+  provider: string
+  displayName: string
+  settingsNs: string
+  settingsPath: string[]
+  declared: boolean
+}
+
+/** 组装当前全部 route 的目录条目（pi + deepseek 两族）。 */
+export function buildDirectoryEntries(
+  kit: DshKit,
+  settingsNs: string,
+  piProfiles: Map<string, { displayName: string }>,
+  deepseekRoutes: Map<string, ResolvedDeepseekRoute>,
+): DirectoryEntry[] {
+  const piEntries = [...piProfiles.entries()].map(([provider, profile]) => ({
+    provider,
+    displayName: profile.displayName,
+    settingsNs,
+    settingsPath: ['providers', provider],
+    declared: !hasBuiltinProvider(kit, provider),
+  }))
+  const deepseekEntries = [...deepseekRoutes.values()].map((built) => ({
+    provider: built.route,
+    displayName: built.displayName,
+    settingsNs,
+    settingsPath: ['providers', built.route],
+    declared: true,
+  }))
+  return [...piEntries, ...deepseekEntries]
+}
+
+/**
+ * 提交目录条目；整批被原子拒绝时逐个剔除冲突条目重试（每轮至多剔一个，
+ * 轮数不超过条目数，必然终止）。非冲突错误原样上抛。
+ */
+export function commitDirectory(
+  register: (entries: DirectoryEntry[]) => void,
+  entries: DirectoryEntry[],
+  warn: (message: string) => void,
+): void {
+  let rest = entries
+  for (let attempts = 0; attempts <= entries.length; attempts++) {
+    try {
+      register(rest)
+      return
+    } catch (error) {
+      const match = /configurable provider "([^"]+)" is already declared/.exec(
+        error instanceof Error ? error.message : String(error),
+      )
+      const next = match === null ? [] : rest.filter((entry) => entry.provider !== match[1])
+      if (match === null || next.length === rest.length) throw error
+      warn(
+        `llm-pi: 目录条目 "${match[1]}" 与既有声明冲突（通常为官方内置 provider 目录），已跳过该条目`,
+      )
+      rest = next
+    }
+  }
+}

package/src/service.ts

@@ -16,10 +16,10 @@ import { launchEnvironmentOf } from '@deepseek-ai/dsh-launch-environment'
 import type { ResolvedPiAiProviderProfile } from '@deepseek-ai/dsh-llm-pi-ai'
 import { deepEqualJson, installSettingsSection } from '@deepseek-ai/dsh-settings'
 
-import { hasBuiltinProvider } from './catalog/builtin.ts'
 import { ModelsDevSource } from './catalog/models-dev.ts'
 import { Config, type LlmPiConfig, SETTINGS_NS } from './config.ts'
 import { DeepseekRouteRegistrar } from './deepseek-routes.ts'
+import { buildDirectoryEntries, commitDirectory, type DirectoryEntry } from './directory.ts'
 import { discoverModels } from './discovery.ts'
 import { assertServiceable, buildProfiles } from './profiles.ts'
 import { buildDeepseekRoutes, type ResolvedDeepseekRoute } from './profiles-deepseek.ts'
@@ -213,29 +213,23 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
   let directory: { replace: (entries: unknown[]) => void } | undefined
   let directoryFacts: unknown
   const ensureDirectory = (): void => {
-    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]
+    const entries = buildDirectoryEntries(kit, SETTINGS_NS, profiles(), deepseekRoutes())
+    // 备忘键为目标全集（含被冲突跳过的条目）：目标不变不重复尝试/告警
     if (deepEqualJson(entries, directoryFacts)) return
     if (entries.length === 0) {
       // 空目录不可注册（INVALID_DIRECTORY）；等 settings 用户层供数后在 onChange 注册
       directoryFacts = entries
       return
     }
-    if (directory === undefined) directory = ctx.llm.registerConfigurableProviders(entries as never)
-    else directory.replace(entries)
+    commitDirectory(
+      (batch: DirectoryEntry[]) => {
+        if (directory === undefined)
+          directory = ctx.llm.registerConfigurableProviders(batch as never)
+        else directory.replace(batch)
+      },
+      entries,
+      (message) => logger.warn(message),
+    )
     directoryFacts = entries
   }