@dsh-plus/llm-pi 0.1.35 → 0.1.37

package/lib/index.js

@@ -815,7 +815,13 @@ var DeepseekRouteRegistrar = class {
 				if (current === void 0) throw new kit.LlmError(`llm-pi: deepseek route "${route}" 已注销`, "INVALID_REQUEST");
 				return current.connection;
 			},
-			resolveApiKey: this.resolveApiKey,
+			resolveAuth: (async (connection) => ({ headers: { "x-api-key": await this.resolveApiKey(connection) } })),
+			discoverModels: (provider) => {
+				const connection = routes().get(route)?.connection ?? built.connection;
+				const catalogModelInfo = kit.deepseek?.catalogModelInfo;
+				if (catalogModelInfo === void 0) return Promise.resolve([]);
+				return Promise.resolve(connection.models.map((model) => catalogModelInfo(provider, model)));
+			},
 			resolveUserId: () => this.resolveUserId(),
 			resolveAttachments: () => ctx.get("attachments"),
 			resolveImageAccess: (attachments, ref) => kit.resolveImageAttachmentAccess(attachments, (hostPath) => ctx.get("fs")?.processPathFromHostPath(hostPath), ref),
@@ -1803,9 +1809,9 @@ function authContextFrom(ctx) {
 * dsh-llm-pi-ai / dsh-llm / pi-ai 之上，从而 dsh 升级即自动跟随上游。
 *
 * 解析策略（全部模块同源地整体成功或整体回退，杜绝跨源混用）：
-* 1. dsh-tree：从 process.argv[1]（systemd/CLI 启动的 dsh 即 bin.js  shim，
-*    realpath 后落在 dsh 安装树内）向上找到同时含有
-*    node_modules/@deepseek-ai/dsh-llm-pi-ai 与 node_modules/@earendil-works/pi-ai
+* 1. dsh-tree：锚点链 = profileContext.installAnchor（CLI/桌面端同一事实，
+*    桌面端 Electron 下 argv[1] 探测走不通）→ realpath(argv[1]) 向上找到同时
+*    含 node_modules/@deepseek-ai/dsh-llm-pi-ai 与 node_modules/@earendil-works/pi-ai
 *    的目录，按文件路径动态 import——与 dsh 官方插件共享同一模块实例；
 * 2. vendored：回退到本插件 dependencies 里的固定版本副本（裸 import）。
 *
@@ -1851,6 +1857,7 @@ function checkDeepseekShape(kit) {
 	if (typeof kit.DeepSeekAdapter !== "function") problems.push("DeepSeekAdapter 不是类");
 	else if (typeof kit.DeepSeekAdapter.prototype["stream"] !== "function") problems.push("DeepSeekAdapter.prototype.stream 缺失");
 	if (typeof kit.resolveAdapterOptions !== "function") problems.push("resolveAdapterOptions 缺失");
+	if (typeof kit.catalogModelInfo !== "function") problems.push("catalogModelInfo 缺失");
 	if (typeof kit.getOrCreateAnonymousUserId !== "function") problems.push("getOrCreateAnonymousUserId 缺失");
 	return problems;
 }
@@ -1915,7 +1922,8 @@ async function importTreeDeepseek(root) {
 		const kit = {
 			DeepSeekAdapter: deepseek["DeepSeekAdapter"],
 			resolveAdapterOptions: deepseek["resolveAdapterOptions"],
-			getOrCreateAnonymousUserId: anonId["getOrCreateAnonymousUserId"]
+			getOrCreateAnonymousUserId: anonId["getOrCreateAnonymousUserId"],
+			catalogModelInfo: deepseek["catalogModelInfo"]
 		};
 		const problems = checkDeepseekShape(kit);
 		if (problems.length > 0) return { problem: `形状不兼容：${problems.join("；")}` };
@@ -2001,7 +2009,8 @@ function loadVendoredDeepseek() {
 	const kit = {
 		DeepSeekAdapter: vendoredDeepseek.DeepSeekAdapter,
 		resolveAdapterOptions: vendoredDeepseek.resolveAdapterOptions,
-		getOrCreateAnonymousUserId: vendoredAnonId.getOrCreateAnonymousUserId
+		getOrCreateAnonymousUserId: vendoredAnonId.getOrCreateAnonymousUserId,
+		catalogModelInfo: vendoredDeepseek.catalogModelInfo
 	};
 	return checkDeepseekShape(kit).length === 0 ? kit : void 0;
 }
@@ -2055,12 +2064,20 @@ function loadVendoredKit() {
 	assertKitShape(kit, "vendored");
 	return kit;
 }
-/** 定位 dsh 安装树根：realpath(argv[1]) 向上查找；argv 异常时返回 undefined。 */
-function dshTreeAnchor() {
-	const entry = process.argv[1];
-	if (entry === void 0) return void 0;
+/**
+* 定位 dsh 安装树根：优先 `profileContext.installAnchor`（CLI 与桌面端同一
+* 事实——桌面端 Electron 启动时 argv[1] 是 Electron 自身、走不通 argv 探测，
+* 锚点是唯一可靠来源），其次 realpath(argv[1]) 向上查找；均失败返回 undefined。
+* argvEntry 参数仅测试注入（缺省 process.argv[1]）。
+*/
+function dshTreeAnchor(installAnchor, argvEntry = process.argv[1]) {
+	if (installAnchor !== void 0 && installAnchor.length > 0) {
+		const anchored = findDshTreeRoot(dirname(installAnchor));
+		if (anchored !== void 0) return anchored;
+	}
+	if (argvEntry === void 0) return void 0;
 	try {
-		return findDshTreeRoot(dirname(realpathSync(entry)));
+		return findDshTreeRoot(dirname(realpathSync(argvEntry)));
 	} catch {
 		return;
 	}
@@ -2069,10 +2086,11 @@ function dshTreeAnchor() {
 * 解析运行时套件：优先 dsh 安装树（自动跟随上游），失败回退 vendored 副本；
 * 两者都过不了形状自检时抛错（调用方应记日志并放弃注册 route）。
 * 返回的 diagnostics 记录回退原因，供配置卡片与日志展示。
+* @param installAnchor profile 的 dsh 安装锚点（`ctx.profileContext.installAnchor`）。
 */
-async function resolveDshKit() {
+async function resolveDshKit(installAnchor) {
 	const diagnostics = [];
-	const anchor = dshTreeAnchor();
+	const anchor = dshTreeAnchor(installAnchor);
 	if (anchor !== void 0) {
 		const treePkgDir = join(anchor, "node_modules", "@deepseek-ai", "dsh-llm-pi-ai");
 		try {
@@ -2099,7 +2117,7 @@ async function resolveDshKit() {
 		} catch (error) {
 			diagnostics.push(`dsh 安装树套件不可用（${anchor}）：${error instanceof Error ? error.message : String(error)}；回退 vendored 副本`);
 		}
-	} else diagnostics.push("未能从 process.argv[1] 定位 dsh 安装树；回退 vendored 副本");
+	} else diagnostics.push("未能从 profileContext.installAnchor / process.argv[1] 定位 dsh 安装树；回退 vendored 副本");
 	const kit = loadVendoredKit();
 	if (kit.deepseek === void 0) diagnostics.push("vendored 副本的 dsh-llm-deepseek 形状不兼容；adapter: deepseek 的 route 不可用");
 	return {
@@ -2132,7 +2150,7 @@ function makeResolveApiKey(ctx, kit) {
 async function startRuntime(ctx, rawConfig) {
 	const logger = ctx.logger("llm-pi");
 	const fields = hasVolatileRefs(rawConfig) ? rawConfig : Config(rawConfig ?? {});
-	const { kit, diagnostics } = await resolveDshKit();
+	const { kit, diagnostics } = await resolveDshKit(ctx.get("profileContext")?.installAnchor);
 	for (const line of diagnostics) logger.warn(line);
 	logger.info(`运行时套件来源：${kit.source}`);
 	let snapshot = unwrapVolatile(fields);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/llm-pi",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "description": "dsh-plus service+ui plugin: 基于 PiAiAdapter 的自定义 LLM 路由（全量 compat、模型继承、models.dev 目录兜底）",
   "type": "module",
   "main": "lib/index.js",
@@ -32,40 +32,41 @@
   },
   "dependencies": {
     "https-proxy-agent": "^9.1.0",
-    "@dsh-plus/shared": "0.1.24"
+    "@dsh-plus/shared": "0.1.27"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-anonymous-user-id": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-home-paths": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-launch-environment": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-llm-deepseek": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-llm-pi-ai": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-settings": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-util-values": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-anonymous-user-id": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-credentials": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-home-paths": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-launch-environment": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm-deepseek": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm-pi-ai": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-util-values": "^0.2.0-rc.1",
     "@deepseek-ai/schemastery": "^3.18.4",
     "@earendil-works/pi-ai": "^0.85.1"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.4",
-    "@deepseek-ai/dsh-anonymous-user-id": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-atomic-write": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-attachment": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-credentials": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-home-paths": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-host-webserver": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-launch-environment": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-llm-deepseek": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-timeout": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-util-crypto": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-util-values": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-anonymous-user-id": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-app-boot": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-atomic-write": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-attachment": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-credentials": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-home-paths": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-launch-environment": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm-deepseek": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-settings": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-timeout": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-typert-protocol": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-util-crypto": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-util-values": "0.2.0-rc.1",
     "@deepseek-ai/schemastery": "3.18.4",
     "@earendil-works/pi-ai": "0.85.1",
     "@types/react": "~18.3.31",

package/src/deepseek-routes.ts

@@ -130,7 +130,19 @@ export class DeepseekRouteRegistrar {
         }
         return current.connection
       },
-      resolveApiKey: this.resolveApiKey as never,
+      // 0.2.0 起认证由 resolveAuth 一次性给出请求头（resolveApiKey 已删），
+      // 头形与官方 llm-deepseek-api-key 接线一致（x-api-key）。
+      resolveAuth: (async (connection: { apiKeyEnv: unknown }) => ({
+        headers: { 'x-api-key': await this.resolveApiKey(connection) },
+      })) as never,
+      // 0.2.0 起 listModels 改读 discoverModels（缺省即空目录，模型选择器无项）：
+      // 与官方 llm-deepseek-api-key 同款——现取当前物化 connection 的 models。
+      discoverModels: (provider: string) => {
+        const connection = routes().get(route)?.connection ?? built.connection
+        const catalogModelInfo = kit.deepseek?.catalogModelInfo
+        if (catalogModelInfo === undefined) return Promise.resolve([])
+        return Promise.resolve(connection.models.map((model) => catalogModelInfo(provider, model)))
+      },
       resolveUserId: () => this.resolveUserId() as never,
       resolveAttachments: () => ctx.get('attachments') as never,
       // 附件宿主路径 → 模型工具执行世界只读路径桥（官方接线同款，见

package/src/resolve-dsh.ts

@@ -3,9 +3,9 @@
  * dsh-llm-pi-ai / dsh-llm / pi-ai 之上，从而 dsh 升级即自动跟随上游。
  *
  * 解析策略（全部模块同源地整体成功或整体回退，杜绝跨源混用）：
- * 1. dsh-tree：从 process.argv[1]（systemd/CLI 启动的 dsh 即 bin.js  shim，
- *    realpath 后落在 dsh 安装树内）向上找到同时含有
- *    node_modules/@deepseek-ai/dsh-llm-pi-ai 与 node_modules/@earendil-works/pi-ai
+ * 1. dsh-tree：锚点链 = profileContext.installAnchor（CLI/桌面端同一事实，
+ *    桌面端 Electron 下 argv[1] 探测走不通）→ realpath(argv[1]) 向上找到同时
+ *    含 node_modules/@deepseek-ai/dsh-llm-pi-ai 与 node_modules/@earendil-works/pi-ai
  *    的目录，按文件路径动态 import——与 dsh 官方插件共享同一模块实例；
  * 2. vendored：回退到本插件 dependencies 里的固定版本副本（裸 import）。
  *
@@ -31,6 +31,7 @@ import type { CredentialKey } from '@deepseek-ai/dsh-credentials'
 import type * as DshLlm from '@deepseek-ai/dsh-llm'
 import * as vendoredLlm from '@deepseek-ai/dsh-llm'
 import type {
+  catalogModelInfo as catalogModelInfoType,
   DeepSeekAdapter as DeepSeekAdapterType,
   resolveAdapterOptions as resolveDeepSeekOptionsType,
 } from '@deepseek-ai/dsh-llm-deepseek'
@@ -68,6 +69,8 @@ export interface DeepSeekKit {
   DeepSeekAdapter: typeof DeepSeekAdapterType
   resolveAdapterOptions: typeof resolveDeepSeekOptionsType
   getOrCreateAnonymousUserId: typeof getAnonIdType
+  /** 目录项 → LlmModelInfo（0.2.0 起 listModels 经 discoverModels 消费）。 */
+  catalogModelInfo: typeof catalogModelInfoType
 }
 
 /** profile 解析面（官方 config.ts resolveProfiles 的签名；包根未导出，见文件头）。 */
@@ -178,6 +181,7 @@ function checkDeepseekShape(kit: DeepSeekKit): string[] {
     problems.push('DeepSeekAdapter.prototype.stream 缺失')
   }
   if (typeof kit.resolveAdapterOptions !== 'function') problems.push('resolveAdapterOptions 缺失')
+  if (typeof kit.catalogModelInfo !== 'function') problems.push('catalogModelInfo 缺失')
   if (typeof kit.getOrCreateAnonymousUserId !== 'function') {
     problems.push('getOrCreateAnonymousUserId 缺失')
   }
@@ -268,6 +272,7 @@ async function importTreeDeepseek(root: string): Promise<{ kit?: DeepSeekKit; pr
       getOrCreateAnonymousUserId: anonId[
         'getOrCreateAnonymousUserId'
       ] as DeepSeekKit['getOrCreateAnonymousUserId'],
+      catalogModelInfo: deepseek['catalogModelInfo'] as DeepSeekKit['catalogModelInfo'],
     }
     const problems = checkDeepseekShape(kit)
     if (problems.length > 0) return { problem: `形状不兼容：${problems.join('；')}` }
@@ -381,6 +386,7 @@ function loadVendoredDeepseek(): DeepSeekKit | undefined {
     DeepSeekAdapter: vendoredDeepseek.DeepSeekAdapter,
     resolveAdapterOptions: vendoredDeepseek.resolveAdapterOptions,
     getOrCreateAnonymousUserId: vendoredAnonId.getOrCreateAnonymousUserId,
+    catalogModelInfo: vendoredDeepseek.catalogModelInfo,
   }
   return checkDeepseekShape(kit).length === 0 ? kit : undefined
 }
@@ -444,12 +450,23 @@ export function loadVendoredKit(): DshKit {
   return kit
 }
 
-/** 定位 dsh 安装树根：realpath(argv[1]) 向上查找；argv 异常时返回 undefined。 */
-function dshTreeAnchor(): string | undefined {
-  const entry = process.argv[1]
-  if (entry === undefined) return undefined
+/**
+ * 定位 dsh 安装树根：优先 `profileContext.installAnchor`（CLI 与桌面端同一
+ * 事实——桌面端 Electron 启动时 argv[1] 是 Electron 自身、走不通 argv 探测，
+ * 锚点是唯一可靠来源），其次 realpath(argv[1]) 向上查找；均失败返回 undefined。
+ * argvEntry 参数仅测试注入（缺省 process.argv[1]）。
+ */
+export function dshTreeAnchor(
+  installAnchor?: string | undefined,
+  argvEntry: string | undefined = process.argv[1],
+): string | undefined {
+  if (installAnchor !== undefined && installAnchor.length > 0) {
+    const anchored = findDshTreeRoot(dirname(installAnchor))
+    if (anchored !== undefined) return anchored
+  }
+  if (argvEntry === undefined) return undefined
   try {
-    return findDshTreeRoot(dirname(realpathSync(entry)))
+    return findDshTreeRoot(dirname(realpathSync(argvEntry)))
   } catch {
     return undefined
   }
@@ -459,13 +476,14 @@ function dshTreeAnchor(): string | undefined {
  * 解析运行时套件：优先 dsh 安装树（自动跟随上游），失败回退 vendored 副本；
  * 两者都过不了形状自检时抛错（调用方应记日志并放弃注册 route）。
  * 返回的 diagnostics 记录回退原因，供配置卡片与日志展示。
+ * @param installAnchor profile 的 dsh 安装锚点（`ctx.profileContext.installAnchor`）。
  */
-export async function resolveDshKit(): Promise<{
+export async function resolveDshKit(installAnchor?: string | undefined): Promise<{
   kit: DshKit
   diagnostics: string[]
 }> {
   const diagnostics: string[] = []
-  const anchor = dshTreeAnchor()
+  const anchor = dshTreeAnchor(installAnchor)
   if (anchor !== undefined) {
     const treePkgDir = join(anchor, 'node_modules', '@deepseek-ai', 'dsh-llm-pi-ai')
     try {
@@ -502,7 +520,9 @@ export async function resolveDshKit(): Promise<{
       )
     }
   } else {
-    diagnostics.push('未能从 process.argv[1] 定位 dsh 安装树；回退 vendored 副本')
+    diagnostics.push(
+      '未能从 profileContext.installAnchor / process.argv[1] 定位 dsh 安装树；回退 vendored 副本',
+    )
   }
   const kit = loadVendoredKit()
   if (kit.deepseek === undefined) {

package/src/service.ts

@@ -11,6 +11,9 @@
  * @module llm-pi/service
  */
 import type { Context } from '@deepseek-ai/cordis'
+// 平台类型面：profileContext.installAnchor（dsh 安装锚点，桌面端关键来源）。
+// 纯类型导入，按开发规范仅需 devDeps。
+import type {} from '@deepseek-ai/dsh-app-boot'
 import type { CredentialRef } from '@deepseek-ai/dsh-credentials'
 import { launchEnvironmentOf } from '@deepseek-ai/dsh-launch-environment'
 import type { DirectoryRegistrationHandle } from '@deepseek-ai/dsh-llm'
@@ -90,7 +93,7 @@ export async function startRuntime(
   const fields: LlmPiConfigFields = hasVolatileRefs(rawConfig)
     ? (rawConfig as LlmPiConfigFields)
     : Config((rawConfig ?? {}) as LlmPiConfigInput)
-  const { kit, diagnostics } = await resolveDshKit()
+  const { kit, diagnostics } = await resolveDshKit(ctx.get('profileContext')?.installAnchor)
   for (const line of diagnostics) logger.warn(line)
   logger.info(`运行时套件来源：${kit.source}`)