@dsh-plus/llm-pi 0.1.8 → 0.1.10

package/lib/index.js

@@ -449,20 +449,23 @@ var DeepseekRouteRegistrar = class {
 		for (const [route, built] of target) {
 			const existing = this.registrations.get(route);
 			if (existing !== void 0) {
-				this.refreshPolicy(route, built, existing);
+				this.refreshRegistration(route, built, existing);
 				continue;
 			}
 			this.register(route, built);
 		}
 	}
-	refreshPolicy(route, built, registration) {
-		const policy = built.connection.retryPolicy;
-		if (deepEqualJson(policy, registration.retryPolicy)) return;
+	/** retryPolicy 或 displayName 变化时原地 replace（两者均为注册期捕获事实）。 */
+	refreshRegistration(route, built, registration) {
+		const policyUnchanged = deepEqualJson(built.connection.retryPolicy, registration.retryPolicy);
+		const nameUnchanged = built.displayName === registration.displayName;
+		if (policyUnchanged && nameUnchanged) return;
 		try {
 			registration.handle.replace([route]);
-			registration.retryPolicy = policy;
+			registration.retryPolicy = built.connection.retryPolicy;
+			registration.displayName = built.displayName;
 		} catch (error) {
-			this.deps.logger.error(`llm-pi: deepseek route "${route}" 重试策略更新被拒，保留此前注册`);
+			this.deps.logger.error(`llm-pi: deepseek route "${route}" 注册事实更新被拒，保留此前注册`);
 			this.deps.logger.error(error);
 		}
 	}
@@ -484,11 +487,16 @@ var DeepseekRouteRegistrar = class {
 			resolveUserId: () => this.resolveUserId(),
 			resolveAttachments: () => ctx.get("attachments")
 		});
+		adapter.providerInfo = (provider) => ({
+			id: provider,
+			name: routes().get(route)?.displayName ?? built.displayName
+		});
 		try {
 			const handle = ctx.llm.registerAdapter([route], adapter);
 			this.registrations.set(route, {
 				handle,
-				retryPolicy: built.connection.retryPolicy
+				retryPolicy: built.connection.retryPolicy,
+				displayName: built.displayName
 			});
 		} catch (error) {
 			logger.error(`llm-pi: deepseek route "${route}" 注册失败（可能与其他 adapter 重名），该 route 不可用`);
@@ -508,7 +516,7 @@ var DeepseekRouteRegistrar = class {
 * @module llm-pi/directory
 */
 /** 组装当前全部 route 的目录条目（pi + deepseek 两族）。 */
-function buildDirectoryEntries(kit, settingsNs, piProfiles, deepseekRoutes) {
+function buildDirectoryEntries(kit, settingsNs, piProfiles, deepseekRoutes, drafts) {
 	const piEntries = [...piProfiles.entries()].map(([provider, profile]) => ({
 		provider,
 		displayName: profile.displayName,
@@ -523,7 +531,18 @@ function buildDirectoryEntries(kit, settingsNs, piProfiles, deepseekRoutes) {
 		settingsPath: ["providers", built.route],
 		declared: true
 	}));
-	return [...piEntries, ...deepseekEntries];
+	const draftEntries = drafts.map(({ route, displayName }) => ({
+		provider: route,
+		displayName,
+		settingsNs,
+		settingsPath: ["providers", route],
+		declared: true
+	}));
+	return [
+		...piEntries,
+		...deepseekEntries,
+		...draftEntries
+	];
 }
 /**
 * 提交目录条目；整批被原子拒绝时逐个剔除冲突条目重试（每轮至多剔一个，
@@ -1200,14 +1219,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 为空");
@@ -1587,8 +1616,16 @@ async function startRuntime(ctx, rawConfig) {
 	};
 	let directory;
 	let directoryFacts;
+	/** 草稿路由（无模型占位）从原始配置直读——它们不进 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 ensureDirectory = () => {
-		const entries = buildDirectoryEntries(kit, SETTINGS_NS, profiles(), deepseekRoutes());
+		const entries = buildDirectoryEntries(kit, SETTINGS_NS, profiles(), deepseekRoutes(), draftRoutes());
 		if (deepEqualJson(entries, directoryFacts)) return;
 		if (entries.length === 0) {
 			directoryFacts = entries;

package/package.json

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

package/src/deepseek-routes.ts

@@ -25,6 +25,8 @@ interface RouteRegistration {
   handle: AdapterRegistrationHandle
   /** 注册期捕获的重试策略（变化才 replace）。 */
   retryPolicy: unknown
+  /** 注册期捕获的展示名（providerInfo 是注册期捕获事实，变化才 replace）。 */
+  displayName: string
 }
 
 export interface DeepseekRegistrarDeps {
@@ -80,25 +82,28 @@ export class DeepseekRouteRegistrar {
     for (const [route, built] of target) {
       const existing = this.registrations.get(route)
       if (existing !== undefined) {
-        this.refreshPolicy(route, built, existing)
+        this.refreshRegistration(route, built, existing)
         continue
       }
       this.register(route, built)
     }
   }
 
-  private refreshPolicy(
+  /** retryPolicy 或 displayName 变化时原地 replace（两者均为注册期捕获事实）。 */
+  private refreshRegistration(
     route: string,
     built: ResolvedDeepseekRoute,
     registration: RouteRegistration,
   ): void {
-    const policy = built.connection.retryPolicy
-    if (deepEqualJson(policy, registration.retryPolicy)) return
+    const policyUnchanged = deepEqualJson(built.connection.retryPolicy, registration.retryPolicy)
+    const nameUnchanged = built.displayName === registration.displayName
+    if (policyUnchanged && nameUnchanged) return
     try {
       registration.handle.replace([route])
-      registration.retryPolicy = policy
+      registration.retryPolicy = built.connection.retryPolicy
+      registration.displayName = built.displayName
     } catch (error) {
-      this.deps.logger.error(`llm-pi: deepseek route "${route}" 重试策略更新被拒，保留此前注册`)
+      this.deps.logger.error(`llm-pi: deepseek route "${route}" 注册事实更新被拒，保留此前注册`)
       this.deps.logger.error(error)
     }
   }
@@ -126,9 +131,20 @@ export class DeepseekRouteRegistrar {
       resolveUserId: () => this.resolveUserId() as never,
       resolveAttachments: () => ctx.get('attachments') as never,
     })
+    // 官方 providerInfo 硬编码 name: "DeepSeek"——覆盖为按路由动态读取的
+    // displayName，否则自定义 deepseek 路由在模型选择器里与 deepseek-official
+    // 撞名（两个 "DeepSeek" 分组，无法区分）。
+    adapter.providerInfo = (provider: string) => ({
+      id: provider,
+      name: routes().get(route)?.displayName ?? built.displayName,
+    })
     try {
       const handle = ctx.llm.registerAdapter([route], adapter as never)
-      this.registrations.set(route, { handle, retryPolicy: built.connection.retryPolicy })
+      this.registrations.set(route, {
+        handle,
+        retryPolicy: built.connection.retryPolicy,
+        displayName: built.displayName,
+      })
     } catch (error) {
       logger.error(
         `llm-pi: deepseek route "${route}" 注册失败（可能与其他 adapter 重名），该 route 不可用`,

package/src/directory.ts

@@ -26,6 +26,7 @@ export function buildDirectoryEntries(
   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,
@@ -41,7 +42,15 @@ export function buildDirectoryEntries(
     settingsPath: ['providers', built.route],
     declared: true,
   }))
-  return [...piEntries, ...deepseekEntries]
+  // 草稿路由不进 adapter，但要在目录里可见（Models 页/配置卡片入口）
+  const draftEntries = drafts.map(({ route, displayName }) => ({
+    provider: route,
+    displayName,
+    settingsNs,
+    settingsPath: ['providers', route],
+    declared: true,
+  }))
+  return [...piEntries, ...deepseekEntries, ...draftEntries]
 }
 
 /**

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

@@ -21,7 +21,7 @@ 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,8 +212,21 @@ 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 entries = buildDirectoryEntries(kit, SETTINGS_NS, profiles(), deepseekRoutes())
+    const entries = buildDirectoryEntries(
+      kit,
+      SETTINGS_NS,
+      profiles(),
+      deepseekRoutes(),
+      draftRoutes(),
+    )
     // 备忘键为目标全集（含被冲突跳过的条目）：目标不变不重复尝试/告警
     if (deepEqualJson(entries, directoryFacts)) return
     if (entries.length === 0) {