@aipanel/provider-deepseek 1.2.17 → 1.2.19

package/es/deepseek-web.d.ts

@@ -17,6 +17,9 @@ export declare class LaunchToken {
     recordOutput(stream: "stdout" | "stderr", text: string): void;
     /** 从子进程输出写入已解析的 token（幂等：只接受第一个） */
     set(token: string): void;
+    /** 报错时把 dsh web 启动的原始日志作为一条日志整体输出（幂等：每实例只打一次） */
+    private printed;
+    private printStartupOutput;
     /** 已解析的 token（未就绪时 undefined） */
     get(): string | undefined;
     /** 等待 token 就绪（默认 20s 超时；未打印则抛错并快速失败，调用方降级处理） */

package/es/deepseek-web.js

@@ -13,6 +13,8 @@ class LaunchToken {
     /** dsh 进程原始输出尾部缓存，超时报错时回填，便于定位真实根因 */
     __publicField(this, "stdoutTail", "");
     __publicField(this, "stderrTail", "");
+    /** 报错时把 dsh web 启动的原始日志作为一条日志整体输出（幂等：每实例只打一次） */
+    __publicField(this, "printed", false);
   }
   /** 记录 dsh 进程原始输出（只保留末尾，防止内存无限增长），用于超时报错时辅助诊断 */
   recordOutput(stream, text) {
@@ -31,6 +33,16 @@ class LaunchToken {
     }
     this.waiters = [];
   }
+  printStartupOutput() {
+    if (this.printed) return;
+    this.printed = true;
+    const stdout = this.stdoutTail.trim();
+    const stderr = this.stderrTail.trim();
+    const lines = ["dsh launch token was not captured; dsh web startup output:"];
+    lines.push(stdout || "(no dsh stdout captured)");
+    if (stderr) lines.push(`dsh web stderr: ${stderr}`);
+    log.warn(lines.join("\n"));
+  }
   /** 已解析的 token（未就绪时 undefined） */
   get() {
     return this.token;
@@ -41,16 +53,10 @@ class LaunchToken {
     if (this.failure) return Promise.reject(this.failure);
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
-        const detail = [
-          `dsh launch token was not captured from within ${timeoutMs}ms (dsh >= 0.1.2 should print the "dsh web: http://127.0.0.1:<port>/?token=..." URL)`
-        ];
-        if (this.stdoutTail.trim()) {
-          detail.push("-- last dsh stdout --", this.stdoutTail.trim());
-        }
-        if (this.stderrTail.trim()) {
-          detail.push("-- last dsh stderr --", this.stderrTail.trim());
-        }
-        const err = new Error(detail.join("\n"));
+        this.printStartupOutput();
+        const err = new Error(
+          `dsh launch token was not captured from stdout within ${timeoutMs}ms (dsh >= 0.1.2 should print the "dsh web: http://127.0.0.1:<port>/?token=..." URL)`
+        );
         this.failure = err;
         for (const w of this.waiters) {
           clearTimeout(w.timer);

package/es/dsh-install.d.ts

@@ -12,10 +12,14 @@ export declare function resolveDevDshPackageSource(metaUrl: string, subdir: stri
 export declare function dshProfileDir(home?: string): string;
 /** 某 @aipanel/dsh-* 包在 profile 的 node_modules 中是否可解析 */
 export declare function isDshPackageInstalled(profileDir: string, packageName: string): boolean;
+/** 读取 profile 内已安装的某包版本（可解析不到时返回 null） */
+export declare function readPackageVersion(profileDir: string, packageName: string): string | null;
+/** 读取当前 provider 包版本（运行时源码 lib/es 的上一级即 package.json） */
+export declare function readProviderVersion(metaUrl: string): string | null;
 /**
  * 确保某 @aipanel/dsh-* 包已安装且为最新（官方命令 dsh plugin add）。
  * 每次启动都执行（不跳过已安装）：dev 本地目录每次重装保证改代码生效，
  * 生产 npm 包每次检查 registry 拉取最新版本。安装失败返回 false（不阻塞启动，
  * 仅对应 overlay 行停用，如失去 chip 高亮 / 审查工具）。
  */
-export declare function ensureDshPackage(profileDir: string, packageName: string, target: string, home?: string): Promise<boolean>;
+export declare function ensureDshPackage(profileDir: string, packageName: string, target: string, home?: string, expectedVersion?: string | null): Promise<boolean>;

package/es/dsh-install.js

@@ -25,7 +25,24 @@ function dshProfileDir(home) {
 function isDshPackageInstalled(profileDir, packageName) {
   return fs.existsSync(packageJsonIn(profileDir, packageName));
 }
-async function ensureDshPackage(profileDir, packageName, target, home) {
+function readPackageVersion(profileDir, packageName) {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(packageJsonIn(profileDir, packageName), "utf8"));
+    return typeof pkg.version === "string" ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
+function readProviderVersion(metaUrl) {
+  try {
+    const pkgPath = path.resolve(path.dirname(fileURLToPath(metaUrl)), "../package.json");
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+    return typeof pkg.version === "string" ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
+async function ensureDshPackage(profileDir, packageName, target, home, expectedVersion) {
   try {
     log.debug(`installing ${target} into dsh profile via dsh plugin add`);
     await execa("dsh", ["plugin", "--profile", "web", "add", target], {
@@ -42,6 +59,16 @@ async function ensureDshPackage(profileDir, packageName, target, home) {
       });
       return false;
     }
+    const installed = readPackageVersion(profileDir, packageName);
+    if (expectedVersion && installed && installed !== expectedVersion) {
+      log.warn(
+        `${packageName} version ${installed} is out of sync with provider ${expectedVersion}`,
+        {
+          profileDir,
+          install: `dsh plugin --profile web add ${packageName}@${expectedVersion}`
+        }
+      );
+    }
     return true;
   } catch (e) {
     log.warn(`failed to install ${packageName} via dsh plugin add`, {
@@ -57,5 +84,7 @@ export {
   dshProfileDir,
   ensureDshPackage,
   isDshPackageInstalled,
+  readPackageVersion,
+  readProviderVersion,
   resolveDevDshPackageSource
 };

package/es/provider.js

@@ -20,6 +20,7 @@ import {
   DSH_PLUGIN_PACKAGE,
   dshProfileDir,
   ensureDshPackage,
+  readProviderVersion,
   resolveDevDshPackageSource
 } from "./dsh-install.js";
 const log = createLogger("DeepSeekWebProvider");
@@ -61,6 +62,7 @@ or run without installing:
       };
     }
     const version = await getDeepSeekVersion();
+    log.debug("Detected dsh version", { version: version ?? "unknown" });
     const compatible = version === null ? true : isDeepSeekVersionAtLeast(version);
     if (compatible === false) {
       return {
@@ -86,11 +88,14 @@ Please upgrade:
     const launchToken = new LaunchToken();
     this.api.setLaunchTokenSource(() => launchToken.wait());
     const devClientDir = resolveDevDshPackageSource(import.meta.url, "dsh-client", "lib/client.js");
+    const providerVersion = readProviderVersion(import.meta.url);
+    const clientTarget = devClientDir ?? (providerVersion ? `${DSH_CLIENT_PACKAGE}@${providerVersion}` : `${DSH_CLIENT_PACKAGE}@latest`);
     const clientAvailable = await ensureDshPackage(
       profileDir,
       DSH_CLIENT_PACKAGE,
-      devClientDir ?? DSH_CLIENT_PACKAGE,
-      this.opts.home
+      clientTarget,
+      this.opts.home,
+      providerVersion
     );
     if (!clientAvailable) {
       log.warn("@aipanel/dsh-client unavailable; @ menu chip highlight disabled", {
@@ -98,11 +103,13 @@ Please upgrade:
       });
     }
     const devPluginDir = resolveDevDshPackageSource(import.meta.url, "dsh-plugin", "dist/index.js");
+    const pluginTarget = devPluginDir ?? (providerVersion ? `${DSH_PLUGIN_PACKAGE}@${providerVersion}` : `${DSH_PLUGIN_PACKAGE}@latest`);
     const pluginAvailable = await ensureDshPackage(
       profileDir,
       DSH_PLUGIN_PACKAGE,
-      devPluginDir ?? DSH_PLUGIN_PACKAGE,
-      this.opts.home
+      pluginTarget,
+      this.opts.home,
+      providerVersion
     );
     if (!pluginAvailable) {
       log.warn("@aipanel/dsh-plugin unavailable; run_diagnostics & settings application disabled", {

package/lib/deepseek-web.cjs

@@ -35,6 +35,8 @@ class LaunchToken {
     /** dsh 进程原始输出尾部缓存，超时报错时回填，便于定位真实根因 */
     __publicField(this, "stdoutTail", "");
     __publicField(this, "stderrTail", "");
+    /** 报错时把 dsh web 启动的原始日志作为一条日志整体输出（幂等：每实例只打一次） */
+    __publicField(this, "printed", false);
   }
   /** 记录 dsh 进程原始输出（只保留末尾，防止内存无限增长），用于超时报错时辅助诊断 */
   recordOutput(stream, text) {
@@ -53,6 +55,16 @@ class LaunchToken {
     }
     this.waiters = [];
   }
+  printStartupOutput() {
+    if (this.printed) return;
+    this.printed = true;
+    const stdout = this.stdoutTail.trim();
+    const stderr = this.stderrTail.trim();
+    const lines = ["dsh launch token was not captured; dsh web startup output:"];
+    lines.push(stdout || "(no dsh stdout captured)");
+    if (stderr) lines.push(`dsh web stderr: ${stderr}`);
+    log.warn(lines.join("\n"));
+  }
   /** 已解析的 token（未就绪时 undefined） */
   get() {
     return this.token;
@@ -63,16 +75,10 @@ class LaunchToken {
     if (this.failure) return Promise.reject(this.failure);
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
-        const detail = [
-          `dsh launch token was not captured from within ${timeoutMs}ms (dsh >= 0.1.2 should print the "dsh web: http://127.0.0.1:<port>/?token=..." URL)`
-        ];
-        if (this.stdoutTail.trim()) {
-          detail.push("-- last dsh stdout --", this.stdoutTail.trim());
-        }
-        if (this.stderrTail.trim()) {
-          detail.push("-- last dsh stderr --", this.stderrTail.trim());
-        }
-        const err = new Error(detail.join("\n"));
+        this.printStartupOutput();
+        const err = new Error(
+          `dsh launch token was not captured from stdout within ${timeoutMs}ms (dsh >= 0.1.2 should print the "dsh web: http://127.0.0.1:<port>/?token=..." URL)`
+        );
         this.failure = err;
         for (const w of this.waiters) {
           clearTimeout(w.timer);

package/lib/deepseek-web.d.ts

@@ -17,6 +17,9 @@ export declare class LaunchToken {
     recordOutput(stream: "stdout" | "stderr", text: string): void;
     /** 从子进程输出写入已解析的 token（幂等：只接受第一个） */
     set(token: string): void;
+    /** 报错时把 dsh web 启动的原始日志作为一条日志整体输出（幂等：每实例只打一次） */
+    private printed;
+    private printStartupOutput;
     /** 已解析的 token（未就绪时 undefined） */
     get(): string | undefined;
     /** 等待 token 就绪（默认 20s 超时；未打印则抛错并快速失败，调用方降级处理） */

package/lib/dsh-install.cjs

@@ -32,6 +32,8 @@ __export(dsh_install_exports, {
   dshProfileDir: () => dshProfileDir,
   ensureDshPackage: () => ensureDshPackage,
   isDshPackageInstalled: () => isDshPackageInstalled,
+  readPackageVersion: () => readPackageVersion,
+  readProviderVersion: () => readProviderVersion,
   resolveDevDshPackageSource: () => resolveDevDshPackageSource
 });
 module.exports = __toCommonJS(dsh_install_exports);
@@ -62,7 +64,24 @@ function dshProfileDir(home) {
 function isDshPackageInstalled(profileDir, packageName) {
   return import_node_fs.default.existsSync(packageJsonIn(profileDir, packageName));
 }
-async function ensureDshPackage(profileDir, packageName, target, home) {
+function readPackageVersion(profileDir, packageName) {
+  try {
+    const pkg = JSON.parse(import_node_fs.default.readFileSync(packageJsonIn(profileDir, packageName), "utf8"));
+    return typeof pkg.version === "string" ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
+function readProviderVersion(metaUrl) {
+  try {
+    const pkgPath = import_node_path.default.resolve(import_node_path.default.dirname((0, import_node_url.fileURLToPath)(metaUrl)), "../package.json");
+    const pkg = JSON.parse(import_node_fs.default.readFileSync(pkgPath, "utf8"));
+    return typeof pkg.version === "string" ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
+async function ensureDshPackage(profileDir, packageName, target, home, expectedVersion) {
   try {
     log.debug(`installing ${target} into dsh profile via dsh plugin add`);
     await (0, import_execa.execa)("dsh", ["plugin", "--profile", "web", "add", target], {
@@ -79,6 +98,16 @@ async function ensureDshPackage(profileDir, packageName, target, home) {
       });
       return false;
     }
+    const installed = readPackageVersion(profileDir, packageName);
+    if (expectedVersion && installed && installed !== expectedVersion) {
+      log.warn(
+        `${packageName} version ${installed} is out of sync with provider ${expectedVersion}`,
+        {
+          profileDir,
+          install: `dsh plugin --profile web add ${packageName}@${expectedVersion}`
+        }
+      );
+    }
     return true;
   } catch (e) {
     log.warn(`failed to install ${packageName} via dsh plugin add`, {
@@ -95,5 +124,7 @@ async function ensureDshPackage(profileDir, packageName, target, home) {
   dshProfileDir,
   ensureDshPackage,
   isDshPackageInstalled,
+  readPackageVersion,
+  readProviderVersion,
   resolveDevDshPackageSource
 });

package/lib/dsh-install.d.ts

@@ -12,10 +12,14 @@ export declare function resolveDevDshPackageSource(metaUrl: string, subdir: stri
 export declare function dshProfileDir(home?: string): string;
 /** 某 @aipanel/dsh-* 包在 profile 的 node_modules 中是否可解析 */
 export declare function isDshPackageInstalled(profileDir: string, packageName: string): boolean;
+/** 读取 profile 内已安装的某包版本（可解析不到时返回 null） */
+export declare function readPackageVersion(profileDir: string, packageName: string): string | null;
+/** 读取当前 provider 包版本（运行时源码 lib/es 的上一级即 package.json） */
+export declare function readProviderVersion(metaUrl: string): string | null;
 /**
  * 确保某 @aipanel/dsh-* 包已安装且为最新（官方命令 dsh plugin add）。
  * 每次启动都执行（不跳过已安装）：dev 本地目录每次重装保证改代码生效，
  * 生产 npm 包每次检查 registry 拉取最新版本。安装失败返回 false（不阻塞启动，
  * 仅对应 overlay 行停用，如失去 chip 高亮 / 审查工具）。
  */
-export declare function ensureDshPackage(profileDir: string, packageName: string, target: string, home?: string): Promise<boolean>;
+export declare function ensureDshPackage(profileDir: string, packageName: string, target: string, home?: string, expectedVersion?: string | null): Promise<boolean>;

package/lib/provider.cjs

@@ -71,6 +71,7 @@ or run without installing:
       };
     }
     const version = await (0, import_system.getDeepSeekVersion)();
+    log.debug("Detected dsh version", { version: version ?? "unknown" });
     const compatible = version === null ? true : (0, import_system.isDeepSeekVersionAtLeast)(version);
     if (compatible === false) {
       return {
@@ -96,11 +97,14 @@ Please upgrade:
     const launchToken = new import_deepseek_web.LaunchToken();
     this.api.setLaunchTokenSource(() => launchToken.wait());
     const devClientDir = (0, import_dsh_install.resolveDevDshPackageSource)(import_meta.url, "dsh-client", "lib/client.js");
+    const providerVersion = (0, import_dsh_install.readProviderVersion)(import_meta.url);
+    const clientTarget = devClientDir ?? (providerVersion ? `${import_dsh_install.DSH_CLIENT_PACKAGE}@${providerVersion}` : `${import_dsh_install.DSH_CLIENT_PACKAGE}@latest`);
     const clientAvailable = await (0, import_dsh_install.ensureDshPackage)(
       profileDir,
       import_dsh_install.DSH_CLIENT_PACKAGE,
-      devClientDir ?? import_dsh_install.DSH_CLIENT_PACKAGE,
-      this.opts.home
+      clientTarget,
+      this.opts.home,
+      providerVersion
     );
     if (!clientAvailable) {
       log.warn("@aipanel/dsh-client unavailable; @ menu chip highlight disabled", {
@@ -108,11 +112,13 @@ Please upgrade:
       });
     }
     const devPluginDir = (0, import_dsh_install.resolveDevDshPackageSource)(import_meta.url, "dsh-plugin", "dist/index.js");
+    const pluginTarget = devPluginDir ?? (providerVersion ? `${import_dsh_install.DSH_PLUGIN_PACKAGE}@${providerVersion}` : `${import_dsh_install.DSH_PLUGIN_PACKAGE}@latest`);
     const pluginAvailable = await (0, import_dsh_install.ensureDshPackage)(
       profileDir,
       import_dsh_install.DSH_PLUGIN_PACKAGE,
-      devPluginDir ?? import_dsh_install.DSH_PLUGIN_PACKAGE,
-      this.opts.home
+      pluginTarget,
+      this.opts.home,
+      providerVersion
     );
     if (!pluginAvailable) {
       log.warn("@aipanel/dsh-plugin unavailable; run_diagnostics & settings application disabled", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/provider-deepseek",
-  "version": "1.2.17",
+  "version": "1.2.19",
   "type": "module",
   "main": "lib/index.cjs",
   "module": "es/index.js",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "execa": "^9.6.1",
-    "@aipanel/core": "1.2.17"
+    "@aipanel/core": "1.2.19"
   },
   "devDependencies": {
     "esbuild": "^0.25.0"