@dsh-plus/llm-pi 0.1.7 → 0.1.9

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,63 @@ 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, drafts) {
+	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
+	}));
+	const draftEntries = drafts.map(({ route, displayName }) => ({
+		provider: route,
+		displayName,
+		settingsNs,
+		settingsPath: ["providers", route],
+		declared: true
+	}));
+	return [
+		...piEntries,
+		...deepseekEntries,
+		...draftEntries
+	];
+}
+/**
+* 提交目录条目；整批被原子拒绝时逐个剔除冲突条目重试（每轮至多剔一个，
+* 轮数不超过条目数，必然终止）。非冲突错误原样上抛。
+*/
+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();
@@ -1154,14 +1211,24 @@ function materializeRouteModels(route, profile, deps, defaultInput) {
 	};
 }
 /**
+* 草稿路由：adapter pi、无 models 且无 provider 级 extends——占位待补
+* （用户先建路由、后填模型的工作流）。草稿不注册进 adapter（无模型可服务），
+* 但仍出现在可配置 provider 目录里（Models 页/配置卡片可见可编辑）。
+*/
+function isDraftRoute(profile) {
+	return (profile.adapter ?? "pi") === "pi" && (profile.models === void 0 || profile.models.length === 0) && profile.extends === void 0;
+}
+/**
 * 校验并物化全部 route。任一 route 不可服务即整体抛错——
 * settings 写入校验与运行期 profiles 回调共用本函数，
 * 保证"写入时被拒"与"运行期不可能拿到坏配置"互为表里。
+* 草稿路由（isDraftRoute）跳过物化，不参与 adapter 注册。
 */
 function buildProfiles(providers, deps) {
 	const resolved = /* @__PURE__ */ new Map();
 	for (const [route, profile] of Object.entries(providers ?? {})) {
 		if ((profile.adapter ?? "pi") === "deepseek") continue;
+		if (isDraftRoute(profile)) continue;
 		if (route.length === 0) throw new Error("llm-pi: provider 名不能为空");
 		if (profile.baseURL !== void 0 && profile.baseURL.length === 0) invalid(route, "baseURL 为空");
 		if (profile.displayName !== void 0 && profile.displayName.length === 0) invalid(route, "displayName 为空");
@@ -1541,29 +1608,25 @@ 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
+	/** 草稿路由（无模型占位）从原始配置直读——它们不进 adapter profiles。 */
+	const draftRoutes = () => {
+		const providers = current().providers ?? {};
+		return Object.entries(providers).filter(([, profile]) => isDraftRoute(profile)).map(([route, profile]) => ({
+			route,
+			displayName: profile.displayName ?? route
 		}));
-		const entries = [...piEntries, ...deepseekEntries];
+	};
+	const ensureDirectory = () => {
+		const entries = buildDirectoryEntries(kit, SETTINGS_NS, profiles(), deepseekRoutes(), draftRoutes());
 		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.9",
   "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,82 @@
+/**
+ * 可配置 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>,
+  drafts: ReadonlyArray<{ route: string; displayName: string }>,
+): 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,
+  }))
+  // 草稿路由不进 adapter，但要在目录里可见（Models 页/配置卡片入口）
+  const draftEntries = drafts.map(({ route, displayName }) => ({
+    provider: route,
+    displayName,
+    settingsNs,
+    settingsPath: ['providers', route],
+    declared: true,
+  }))
+  return [...piEntries, ...deepseekEntries, ...draftEntries]
+}
+
+/**
+ * 提交目录条目；整批被原子拒绝时逐个剔除冲突条目重试（每轮至多剔一个，
+ * 轮数不超过条目数，必然终止）。非冲突错误原样上抛。
+ */
+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/profiles.ts

@@ -295,10 +295,24 @@ function materializeRouteModels(
   return { models, configuredMaxTokens }
 }
 
+/**
+ * 草稿路由：adapter pi、无 models 且无 provider 级 extends——占位待补
+ * （用户先建路由、后填模型的工作流）。草稿不注册进 adapter（无模型可服务），
+ * 但仍出现在可配置 provider 目录里（Models 页/配置卡片可见可编辑）。
+ */
+export function isDraftRoute(profile: ProviderProfileConfig): boolean {
+  return (
+    (profile.adapter ?? 'pi') === 'pi' &&
+    (profile.models === undefined || profile.models.length === 0) &&
+    profile.extends === undefined
+  )
+}
+
 /**
  * 校验并物化全部 route。任一 route 不可服务即整体抛错——
  * settings 写入校验与运行期 profiles 回调共用本函数，
  * 保证"写入时被拒"与"运行期不可能拿到坏配置"互为表里。
+ * 草稿路由（isDraftRoute）跳过物化，不参与 adapter 注册。
  */
 export function buildProfiles(
   providers: Record<string, ProviderProfileConfig> | undefined,
@@ -308,6 +322,7 @@ export function buildProfiles(
   for (const [route, profile] of Object.entries(providers ?? {})) {
     // adapter: deepseek 的 route 由 profiles-deepseek.ts 物化（官方 DeepSeekAdapter 链路）
     if ((profile.adapter ?? 'pi') === 'deepseek') continue
+    if (isDraftRoute(profile)) continue // 草稿路由：占位待补，不进 adapter
     if (route.length === 0) throw new Error('llm-pi: provider 名不能为空')
     // 注意：不做"route 名与内置 provider 名重名"的静态校验——内置名 ≠ 已注册
     // route（如官方 llm-pi-ai 配置清空后 anthropic 名可用）。真实冲突只在注册期

package/src/service.ts

@@ -16,12 +16,12 @@ 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 { assertServiceable, buildProfiles, isDraftRoute } from './profiles.ts'
 import { buildDeepseekRoutes, type ResolvedDeepseekRoute } from './profiles-deepseek.ts'
 import { type DshKit, resolveDshKit } from './resolve-dsh.ts'
 
@@ -212,30 +212,37 @@ export async function startRuntime(ctx: Context, rawConfig: LlmPiConfig): Promis
 
   let directory: { replace: (entries: unknown[]) => void } | undefined
   let directoryFacts: unknown
+  /** 草稿路由（无模型占位）从原始配置直读——它们不进 adapter profiles。 */
+  const draftRoutes = (): { route: string; displayName: string }[] => {
+    const providers = current().providers ?? {}
+    return Object.entries(providers)
+      .filter(([, profile]) => isDraftRoute(profile))
+      .map(([route, profile]) => ({ route, displayName: profile.displayName ?? route }))
+  }
   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(),
+      draftRoutes(),
+    )
+    // 备忘键为目标全集（含被冲突跳过的条目）：目标不变不重复尝试/告警
     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
   }