@aipanel/provider-deepseek 1.2.0-beta.2 → 1.2.0-beta.3

package/es/dsh-install.d.ts

@@ -1,16 +1,21 @@
 export declare const DSH_CLIENT_PACKAGE = "@aipanel/dsh-client";
+export declare const DSH_PLUGIN_PACKAGE = "@aipanel/dsh-plugin";
 /**
- * 是否为 dev workspace 且 dsh-client 产物就绪（存在 package.json 与 lib/client.js）。
- * 生产安装的 provider 在 node_modules/@aipanel/provider-deepseek/ 下，上一级不是 dsh-client，返回 null。
+ * 是否为 dev workspace 且某 dsh 包产物就绪（存在 package.json 与产物文件）。
+ * 生产安装的 provider 在 node_modules/@aipanel/provider-deepseek/ 下，上一级不是 dsh-*，返回 null。
+ * @param metaUrl 调用方 import.meta.url（provider 源码 es/lib 的上一级是 packages/providers/deepseek）
+ * @param subdir  dev 子目录名（"dsh-client" | "dsh-plugin"）
+ * @param distRel 产物相对路径（client 为 "lib/client.js"，plugin 为 "dist/index.js"）
  */
-export declare function resolveDevDshClientSource(metaUrl: string): string | null;
+export declare function resolveDevDshPackageSource(metaUrl: string, subdir: string, distRel: string): string | null;
 /** dsh web profile 目录（固定 --profile web）；home 未指定时回退 $DSH_HOME / ~/.dsh */
 export declare function dshProfileDir(home?: string): string;
-/** @aipanel/dsh-client 在 profile 的 node_modules 中是否可解析 */
-export declare function isDshClientInstalled(profileDir: string): boolean;
+/** 某 @aipanel/dsh-* 包在 profile 的 node_modules 中是否可解析 */
+export declare function isDshPackageInstalled(profileDir: string, packageName: string): boolean;
 /**
- * 确保 @aipanel/dsh-client 已安装且为最新（官方命令 dsh plugin add）。
+ * 确保某 @aipanel/dsh-* 包已安装且为最新（官方命令 dsh plugin add）。
  * 每次启动都执行（不跳过已安装）：dev 本地目录每次重装保证改代码生效，
- * 生产 npm 包每次检查 registry 拉取最新版本。安装失败返回 false（不阻塞启动，仅 chip 高亮不可用）。
+ * 生产 npm 包每次检查 registry 拉取最新版本。安装失败返回 false（不阻塞启动，
+ * 仅对应 overlay 行停用，如失去 chip 高亮 / 审查工具）。
  */
-export declare function ensureDshClient(profileDir: string, target: string, home?: string): Promise<boolean>;
+export declare function ensureDshPackage(profileDir: string, packageName: string, target: string, home?: string): Promise<boolean>;

package/es/dsh-install.js

@@ -6,10 +6,14 @@ import { fileURLToPath } from "node:url";
 import { createLogger } from "@aipanel/core/node";
 const log = createLogger("DshInstall");
 const DSH_CLIENT_PACKAGE = "@aipanel/dsh-client";
-function resolveDevDshClientSource(metaUrl) {
+const DSH_PLUGIN_PACKAGE = "@aipanel/dsh-plugin";
+function packageJsonIn(profileDir, packageName) {
+  return path.join(profileDir, "node_modules", ...packageName.split("/"), "package.json");
+}
+function resolveDevDshPackageSource(metaUrl, subdir, distRel) {
   const here = path.dirname(fileURLToPath(metaUrl));
-  const devDir = path.resolve(here, "../dsh-client");
-  if (fs.existsSync(path.join(devDir, "package.json")) && fs.existsSync(path.join(devDir, "lib/client.js"))) {
+  const devDir = path.resolve(here, `../${subdir}`);
+  if (fs.existsSync(path.join(devDir, "package.json")) && fs.existsSync(path.join(devDir, distRel))) {
     return devDir;
   }
   return null;
@@ -18,12 +22,10 @@ function dshProfileDir(home) {
   const resolved = home || process.env.DSH_HOME || path.join(os.homedir(), ".dsh");
   return path.join(resolved, "profiles", "web");
 }
-function isDshClientInstalled(profileDir) {
-  return fs.existsSync(
-    path.join(profileDir, "node_modules", "@aipanel", "dsh-client", "package.json")
-  );
+function isDshPackageInstalled(profileDir, packageName) {
+  return fs.existsSync(packageJsonIn(profileDir, packageName));
 }
-async function ensureDshClient(profileDir, target, home) {
+async function ensureDshPackage(profileDir, packageName, target, home) {
   try {
     log.debug(`installing ${target} into dsh profile via dsh plugin add`);
     await execa("dsh", ["plugin", "--profile", "web", "add", target], {
@@ -34,15 +36,15 @@ async function ensureDshClient(profileDir, target, home) {
         ...home ? { DSH_HOME: home } : {}
       }
     });
-    if (!isDshClientInstalled(profileDir)) {
-      log.warn(`dsh plugin add finished but ${DSH_CLIENT_PACKAGE} is not resolvable`, {
+    if (!isDshPackageInstalled(profileDir, packageName)) {
+      log.warn(`dsh plugin add finished but ${packageName} is not resolvable`, {
         profileDir
       });
       return false;
     }
     return true;
   } catch (e) {
-    log.warn(`failed to install ${DSH_CLIENT_PACKAGE} via dsh plugin add`, {
+    log.warn(`failed to install ${packageName} via dsh plugin add`, {
       target,
       error: e instanceof Error ? e.message : String(e)
     });
@@ -51,8 +53,9 @@ async function ensureDshClient(profileDir, target, home) {
 }
 export {
   DSH_CLIENT_PACKAGE,
+  DSH_PLUGIN_PACKAGE,
   dshProfileDir,
-  ensureDshClient,
-  isDshClientInstalled,
-  resolveDevDshClientSource
+  ensureDshPackage,
+  isDshPackageInstalled,
+  resolveDevDshPackageSource
 };

package/es/profile.d.ts

@@ -2,10 +2,10 @@
 export declare function buildDshOverlay(options: {
     vitePort: number;
     cwd: string;
-    pluginDistPath?: string;
-    /** client 插件是否可被 dsh 解析（provider 已同步到 dsh profile）；false 时停用该行，避免 fail-loud */
+    /** host 插件（@aipanel/dsh-plugin）是否已被同步到 dsh profile；false 时停用该行，避免 fail-loud */
+    pluginAvailable?: boolean;
+    /** client 插件（@aipanel/dsh-client）是否可被 dsh 解析（provider 已同步到 dsh profile）；false 时停用该行，避免 fail-loud */
     clientAvailable?: boolean;
 }): string;
-/** 将 overlay 写入项目缓存目录（node_modules/.cache/aipanel，参照 opencode 的
- * node_modules/.cache/opencode 惯例），不污染用户项目根目录。 */
+/** 将 overlay 写入项目缓存目录（AIPANEL_CACHE_DIR 下按 provider 分二级目录），不污染用户项目根目录。 */
 export declare function writeDshOverlay(workspaceCwd: string, overlay: string): string;

package/es/profile.js

@@ -1,10 +1,9 @@
 import fs from "fs";
 import path from "path";
-import { pathToFileURL } from "url";
-import { MCP_API_PATH, createLogger } from "@aipanel/core/node";
+import { AIPANEL_CACHE_DIR, MCP_API_PATH, createLogger } from "@aipanel/core/node";
 const log = createLogger("DeepSeekProfile");
 function buildDshOverlay(options) {
-  const { vitePort, cwd, pluginDistPath, clientAvailable = true } = options;
+  const { vitePort, cwd, pluginAvailable = true, clientAvailable = true } = options;
   const mcpUrl = `http://127.0.0.1:${vitePort}${MCP_API_PATH}`;
   const rows = [];
   rows.push(
@@ -18,22 +17,17 @@ function buildDshOverlay(options) {
       "        headers: {}"
     ].join("\n")
   );
-  if (pluginDistPath && fs.existsSync(pluginDistPath)) {
-    const pluginSpec = pathToFileURL(pluginDistPath).href;
-    log.debug("injecting aipanel host plugin row", { pluginDistPath, pluginSpec });
-    rows.push(
-      [
-        "    - id: aipanel",
-        `      name: '${pluginSpec}'`,
-        "      inject: [tools, subprocess]",
-        "      config:",
-        `        cwd: ${JSON.stringify(cwd)}`,
-        "        autoDiagnose: true"
-      ].join("\n")
-    );
-  } else {
-    log.debug("aipanel dsh-plugin dist not found, skipping host plugin row", { pluginDistPath });
-  }
+  rows.push(
+    [
+      "    - id: aipanel",
+      "      name: '@aipanel/dsh-plugin'",
+      ...pluginAvailable ? [] : ["      disabled: true"],
+      "      inject: [tools, subprocess]",
+      "      config:",
+      `        cwd: ${JSON.stringify(cwd)}`,
+      "        autoDiagnose: true"
+    ].join("\n")
+  );
   rows.push(
     [
       "    - id: aipanel-client",
@@ -44,7 +38,7 @@ function buildDshOverlay(options) {
   return ["- insert:", rows.join("\n"), ""].join("\n");
 }
 function writeDshOverlay(workspaceCwd, overlay) {
-  const dir = path.join(workspaceCwd, "node_modules", ".cache", "aipanel");
+  const dir = path.join(workspaceCwd, AIPANEL_CACHE_DIR, "dsh");
   fs.mkdirSync(dir, { recursive: true });
   const file = path.join(dir, "dsh-overlay.cordis.yml");
   fs.writeFileSync(file, overlay, "utf-8");

package/es/provider.d.ts

@@ -36,9 +36,6 @@ export declare class DeepSeekWebProvider implements WebProvider {
     start(options: ProviderStartOptions): Promise<ProviderStartResult>;
     /** 把 providerOptions 配置映射为 dsh settings 命名空间 patch（仅含用户显式配置项） */
     private buildSettingsToApply;
-    /** 解析 aipanel dsh-plugin 的构建产物路径（存在才在 overlay 里注入插件行）。
-     * 注意用 fileURLToPath：URL.pathname 是 percent-encoded，中文路径下 existsSync 会误判不存在。 */
-    private resolvePluginDist;
     stop(): Promise<void>;
     killOrphans(): Promise<number>;
     listSessions(projectDir: string): Promise<ChatSession[]>;

package/es/provider.js

@@ -1,7 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { fileURLToPath } from "node:url";
 import { createLogger } from "@aipanel/core/node";
 import { DEFAULT_DEEPSEEK_PROVIDER_OPTIONS } from "./constants.js";
 import { DSH_LOOPBACK_HOST, DSH_MUX_EVENTS_PATH, DSH_HOST_EVENTS_PATH } from "./constants.js";
@@ -11,10 +10,11 @@ import { startDeepSeekWeb } from "./deepseek-web.js";
 import { buildDshOverlay, writeDshOverlay } from "./profile.js";
 import { checkDeepSeekInstalled, getDeepSeekVersion, killOrphanDeepSeekProcesses } from "./system.js";
 import {
+  DSH_CLIENT_PACKAGE,
+  DSH_PLUGIN_PACKAGE,
   dshProfileDir,
-  ensureDshClient,
-  resolveDevDshClientSource,
-  DSH_CLIENT_PACKAGE
+  ensureDshPackage,
+  resolveDevDshPackageSource
 } from "./dsh-install.js";
 const log = createLogger("DeepSeekWebProvider");
 class DeepSeekWebProvider {
@@ -66,9 +66,11 @@ or run without installing:
       cwd: options.cwd,
       vitePort: options.vitePort
     });
-    const devClientDir = resolveDevDshClientSource(import.meta.url);
-    const clientAvailable = await ensureDshClient(
-      dshProfileDir(this.opts.home),
+    const profileDir = dshProfileDir(this.opts.home);
+    const devClientDir = resolveDevDshPackageSource(import.meta.url, "dsh-client", "lib/client.js");
+    const clientAvailable = await ensureDshPackage(
+      profileDir,
+      DSH_CLIENT_PACKAGE,
       devClientDir ?? DSH_CLIENT_PACKAGE,
       this.opts.home
     );
@@ -77,10 +79,22 @@ or run without installing:
         metaUrl: import.meta.url
       });
     }
+    const devPluginDir = resolveDevDshPackageSource(import.meta.url, "dsh-plugin", "dist/index.js");
+    const pluginAvailable = await ensureDshPackage(
+      profileDir,
+      DSH_PLUGIN_PACKAGE,
+      devPluginDir ?? DSH_PLUGIN_PACKAGE,
+      this.opts.home
+    );
+    if (!pluginAvailable) {
+      log.warn("@aipanel/dsh-plugin unavailable; run_diagnostics & auto-diagnose disabled", {
+        metaUrl: import.meta.url
+      });
+    }
     const overlay = buildDshOverlay({
       vitePort: options.vitePort,
       cwd: options.cwd,
-      pluginDistPath: this.resolvePluginDist(),
+      pluginAvailable,
       clientAvailable
     });
     const patchPath = writeDshOverlay(options.cwd, overlay);
@@ -124,12 +138,6 @@ or run without installing:
     }
     return sections;
   }
-  /** 解析 aipanel dsh-plugin 的构建产物路径（存在才在 overlay 里注入插件行）。
-   * 注意用 fileURLToPath：URL.pathname 是 percent-encoded，中文路径下 existsSync 会误判不存在。 */
-  resolvePluginDist() {
-    const fromHere = new URL("../dsh-plugin/dist/index.js", import.meta.url);
-    return fileURLToPath(fromHere);
-  }
   async stop() {
     if (this.process) {
       log.debug("Killing dsh web process", { pid: this.process.pid });

package/lib/dsh-install.cjs

@@ -28,10 +28,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var dsh_install_exports = {};
 __export(dsh_install_exports, {
   DSH_CLIENT_PACKAGE: () => DSH_CLIENT_PACKAGE,
+  DSH_PLUGIN_PACKAGE: () => DSH_PLUGIN_PACKAGE,
   dshProfileDir: () => dshProfileDir,
-  ensureDshClient: () => ensureDshClient,
-  isDshClientInstalled: () => isDshClientInstalled,
-  resolveDevDshClientSource: () => resolveDevDshClientSource
+  ensureDshPackage: () => ensureDshPackage,
+  isDshPackageInstalled: () => isDshPackageInstalled,
+  resolveDevDshPackageSource: () => resolveDevDshPackageSource
 });
 module.exports = __toCommonJS(dsh_install_exports);
 var import_node_fs = __toESM(require("node:fs"));
@@ -42,10 +43,14 @@ var import_node_url = require("node:url");
 var import_node = require("@aipanel/core/node");
 const log = (0, import_node.createLogger)("DshInstall");
 const DSH_CLIENT_PACKAGE = "@aipanel/dsh-client";
-function resolveDevDshClientSource(metaUrl) {
+const DSH_PLUGIN_PACKAGE = "@aipanel/dsh-plugin";
+function packageJsonIn(profileDir, packageName) {
+  return import_node_path.default.join(profileDir, "node_modules", ...packageName.split("/"), "package.json");
+}
+function resolveDevDshPackageSource(metaUrl, subdir, distRel) {
   const here = import_node_path.default.dirname((0, import_node_url.fileURLToPath)(metaUrl));
-  const devDir = import_node_path.default.resolve(here, "../dsh-client");
-  if (import_node_fs.default.existsSync(import_node_path.default.join(devDir, "package.json")) && import_node_fs.default.existsSync(import_node_path.default.join(devDir, "lib/client.js"))) {
+  const devDir = import_node_path.default.resolve(here, `../${subdir}`);
+  if (import_node_fs.default.existsSync(import_node_path.default.join(devDir, "package.json")) && import_node_fs.default.existsSync(import_node_path.default.join(devDir, distRel))) {
     return devDir;
   }
   return null;
@@ -54,12 +59,10 @@ function dshProfileDir(home) {
   const resolved = home || process.env.DSH_HOME || import_node_path.default.join(import_node_os.default.homedir(), ".dsh");
   return import_node_path.default.join(resolved, "profiles", "web");
 }
-function isDshClientInstalled(profileDir) {
-  return import_node_fs.default.existsSync(
-    import_node_path.default.join(profileDir, "node_modules", "@aipanel", "dsh-client", "package.json")
-  );
+function isDshPackageInstalled(profileDir, packageName) {
+  return import_node_fs.default.existsSync(packageJsonIn(profileDir, packageName));
 }
-async function ensureDshClient(profileDir, target, home) {
+async function ensureDshPackage(profileDir, packageName, target, home) {
   try {
     log.debug(`installing ${target} into dsh profile via dsh plugin add`);
     await (0, import_execa.execa)("dsh", ["plugin", "--profile", "web", "add", target], {
@@ -70,15 +73,15 @@ async function ensureDshClient(profileDir, target, home) {
         ...home ? { DSH_HOME: home } : {}
       }
     });
-    if (!isDshClientInstalled(profileDir)) {
-      log.warn(`dsh plugin add finished but ${DSH_CLIENT_PACKAGE} is not resolvable`, {
+    if (!isDshPackageInstalled(profileDir, packageName)) {
+      log.warn(`dsh plugin add finished but ${packageName} is not resolvable`, {
         profileDir
       });
       return false;
     }
     return true;
   } catch (e) {
-    log.warn(`failed to install ${DSH_CLIENT_PACKAGE} via dsh plugin add`, {
+    log.warn(`failed to install ${packageName} via dsh plugin add`, {
       target,
       error: e instanceof Error ? e.message : String(e)
     });
@@ -88,8 +91,9 @@ async function ensureDshClient(profileDir, target, home) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DSH_CLIENT_PACKAGE,
+  DSH_PLUGIN_PACKAGE,
   dshProfileDir,
-  ensureDshClient,
-  isDshClientInstalled,
-  resolveDevDshClientSource
+  ensureDshPackage,
+  isDshPackageInstalled,
+  resolveDevDshPackageSource
 });

package/lib/dsh-install.d.ts

@@ -1,16 +1,21 @@
 export declare const DSH_CLIENT_PACKAGE = "@aipanel/dsh-client";
+export declare const DSH_PLUGIN_PACKAGE = "@aipanel/dsh-plugin";
 /**
- * 是否为 dev workspace 且 dsh-client 产物就绪（存在 package.json 与 lib/client.js）。
- * 生产安装的 provider 在 node_modules/@aipanel/provider-deepseek/ 下，上一级不是 dsh-client，返回 null。
+ * 是否为 dev workspace 且某 dsh 包产物就绪（存在 package.json 与产物文件）。
+ * 生产安装的 provider 在 node_modules/@aipanel/provider-deepseek/ 下，上一级不是 dsh-*，返回 null。
+ * @param metaUrl 调用方 import.meta.url（provider 源码 es/lib 的上一级是 packages/providers/deepseek）
+ * @param subdir  dev 子目录名（"dsh-client" | "dsh-plugin"）
+ * @param distRel 产物相对路径（client 为 "lib/client.js"，plugin 为 "dist/index.js"）
  */
-export declare function resolveDevDshClientSource(metaUrl: string): string | null;
+export declare function resolveDevDshPackageSource(metaUrl: string, subdir: string, distRel: string): string | null;
 /** dsh web profile 目录（固定 --profile web）；home 未指定时回退 $DSH_HOME / ~/.dsh */
 export declare function dshProfileDir(home?: string): string;
-/** @aipanel/dsh-client 在 profile 的 node_modules 中是否可解析 */
-export declare function isDshClientInstalled(profileDir: string): boolean;
+/** 某 @aipanel/dsh-* 包在 profile 的 node_modules 中是否可解析 */
+export declare function isDshPackageInstalled(profileDir: string, packageName: string): boolean;
 /**
- * 确保 @aipanel/dsh-client 已安装且为最新（官方命令 dsh plugin add）。
+ * 确保某 @aipanel/dsh-* 包已安装且为最新（官方命令 dsh plugin add）。
  * 每次启动都执行（不跳过已安装）：dev 本地目录每次重装保证改代码生效，
- * 生产 npm 包每次检查 registry 拉取最新版本。安装失败返回 false（不阻塞启动，仅 chip 高亮不可用）。
+ * 生产 npm 包每次检查 registry 拉取最新版本。安装失败返回 false（不阻塞启动，
+ * 仅对应 overlay 行停用，如失去 chip 高亮 / 审查工具）。
  */
-export declare function ensureDshClient(profileDir: string, target: string, home?: string): Promise<boolean>;
+export declare function ensureDshPackage(profileDir: string, packageName: string, target: string, home?: string): Promise<boolean>;

package/lib/profile.cjs

@@ -33,11 +33,10 @@ __export(profile_exports, {
 module.exports = __toCommonJS(profile_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
-var import_url = require("url");
 var import_node = require("@aipanel/core/node");
 const log = (0, import_node.createLogger)("DeepSeekProfile");
 function buildDshOverlay(options) {
-  const { vitePort, cwd, pluginDistPath, clientAvailable = true } = options;
+  const { vitePort, cwd, pluginAvailable = true, clientAvailable = true } = options;
   const mcpUrl = `http://127.0.0.1:${vitePort}${import_node.MCP_API_PATH}`;
   const rows = [];
   rows.push(
@@ -51,22 +50,17 @@ function buildDshOverlay(options) {
       "        headers: {}"
     ].join("\n")
   );
-  if (pluginDistPath && import_fs.default.existsSync(pluginDistPath)) {
-    const pluginSpec = (0, import_url.pathToFileURL)(pluginDistPath).href;
-    log.debug("injecting aipanel host plugin row", { pluginDistPath, pluginSpec });
-    rows.push(
-      [
-        "    - id: aipanel",
-        `      name: '${pluginSpec}'`,
-        "      inject: [tools, subprocess]",
-        "      config:",
-        `        cwd: ${JSON.stringify(cwd)}`,
-        "        autoDiagnose: true"
-      ].join("\n")
-    );
-  } else {
-    log.debug("aipanel dsh-plugin dist not found, skipping host plugin row", { pluginDistPath });
-  }
+  rows.push(
+    [
+      "    - id: aipanel",
+      "      name: '@aipanel/dsh-plugin'",
+      ...pluginAvailable ? [] : ["      disabled: true"],
+      "      inject: [tools, subprocess]",
+      "      config:",
+      `        cwd: ${JSON.stringify(cwd)}`,
+      "        autoDiagnose: true"
+    ].join("\n")
+  );
   rows.push(
     [
       "    - id: aipanel-client",
@@ -77,7 +71,7 @@ function buildDshOverlay(options) {
   return ["- insert:", rows.join("\n"), ""].join("\n");
 }
 function writeDshOverlay(workspaceCwd, overlay) {
-  const dir = import_path.default.join(workspaceCwd, "node_modules", ".cache", "aipanel");
+  const dir = import_path.default.join(workspaceCwd, import_node.AIPANEL_CACHE_DIR, "dsh");
   import_fs.default.mkdirSync(dir, { recursive: true });
   const file = import_path.default.join(dir, "dsh-overlay.cordis.yml");
   import_fs.default.writeFileSync(file, overlay, "utf-8");

package/lib/profile.d.ts

@@ -2,10 +2,10 @@
 export declare function buildDshOverlay(options: {
     vitePort: number;
     cwd: string;
-    pluginDistPath?: string;
-    /** client 插件是否可被 dsh 解析（provider 已同步到 dsh profile）；false 时停用该行，避免 fail-loud */
+    /** host 插件（@aipanel/dsh-plugin）是否已被同步到 dsh profile；false 时停用该行，避免 fail-loud */
+    pluginAvailable?: boolean;
+    /** client 插件（@aipanel/dsh-client）是否可被 dsh 解析（provider 已同步到 dsh profile）；false 时停用该行，避免 fail-loud */
     clientAvailable?: boolean;
 }): string;
-/** 将 overlay 写入项目缓存目录（node_modules/.cache/aipanel，参照 opencode 的
- * node_modules/.cache/opencode 惯例），不污染用户项目根目录。 */
+/** 将 overlay 写入项目缓存目录（AIPANEL_CACHE_DIR 下按 provider 分二级目录），不污染用户项目根目录。 */
 export declare function writeDshOverlay(workspaceCwd: string, overlay: string): string;

package/lib/provider.cjs

@@ -23,7 +23,6 @@ __export(provider_exports, {
 });
 module.exports = __toCommonJS(provider_exports);
 const import_meta = {};
-var import_node_url = require("node:url");
 var import_node = require("@aipanel/core/node");
 var import_constants = require("./constants.cjs");
 var import_constants2 = require("./constants.cjs");
@@ -83,9 +82,11 @@ or run without installing:
       cwd: options.cwd,
       vitePort: options.vitePort
     });
-    const devClientDir = (0, import_dsh_install.resolveDevDshClientSource)(import_meta.url);
-    const clientAvailable = await (0, import_dsh_install.ensureDshClient)(
-      (0, import_dsh_install.dshProfileDir)(this.opts.home),
+    const profileDir = (0, import_dsh_install.dshProfileDir)(this.opts.home);
+    const devClientDir = (0, import_dsh_install.resolveDevDshPackageSource)(import_meta.url, "dsh-client", "lib/client.js");
+    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
     );
@@ -94,10 +95,22 @@ or run without installing:
         metaUrl: import_meta.url
       });
     }
+    const devPluginDir = (0, import_dsh_install.resolveDevDshPackageSource)(import_meta.url, "dsh-plugin", "dist/index.js");
+    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
+    );
+    if (!pluginAvailable) {
+      log.warn("@aipanel/dsh-plugin unavailable; run_diagnostics & auto-diagnose disabled", {
+        metaUrl: import_meta.url
+      });
+    }
     const overlay = (0, import_profile.buildDshOverlay)({
       vitePort: options.vitePort,
       cwd: options.cwd,
-      pluginDistPath: this.resolvePluginDist(),
+      pluginAvailable,
       clientAvailable
     });
     const patchPath = (0, import_profile.writeDshOverlay)(options.cwd, overlay);
@@ -141,12 +154,6 @@ or run without installing:
     }
     return sections;
   }
-  /** 解析 aipanel dsh-plugin 的构建产物路径（存在才在 overlay 里注入插件行）。
-   * 注意用 fileURLToPath：URL.pathname 是 percent-encoded，中文路径下 existsSync 会误判不存在。 */
-  resolvePluginDist() {
-    const fromHere = new URL("../dsh-plugin/dist/index.js", import_meta.url);
-    return (0, import_node_url.fileURLToPath)(fromHere);
-  }
   async stop() {
     if (this.process) {
       log.debug("Killing dsh web process", { pid: this.process.pid });

package/lib/provider.d.ts

@@ -36,9 +36,6 @@ export declare class DeepSeekWebProvider implements WebProvider {
     start(options: ProviderStartOptions): Promise<ProviderStartResult>;
     /** 把 providerOptions 配置映射为 dsh settings 命名空间 patch（仅含用户显式配置项） */
     private buildSettingsToApply;
-    /** 解析 aipanel dsh-plugin 的构建产物路径（存在才在 overlay 里注入插件行）。
-     * 注意用 fileURLToPath：URL.pathname 是 percent-encoded，中文路径下 existsSync 会误判不存在。 */
-    private resolvePluginDist;
     stop(): Promise<void>;
     killOrphans(): Promise<number>;
     listSessions(projectDir: string): Promise<ChatSession[]>;

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@aipanel/provider-deepseek",
-  "version": "1.2.0-beta.2",
+  "version": "1.2.0-beta.3",
   "type": "module",
   "main": "lib/index.cjs",
   "module": "es/index.js",
   "types": "es/index.d.ts",
   "files": [
     "es",
-    "lib",
-    "dsh-plugin/dist"
+    "lib"
   ],
   "exports": {
     ".": {
@@ -22,10 +21,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2",
     "execa": "^9.6.1",
-    "@aipanel/core": "1.2.0-beta.2"
+    "@aipanel/core": "1.2.0-beta.3"
   },
   "devDependencies": {
     "esbuild": "^0.25.0"

package/dsh-plugin/dist/index.js

@@ -1,110 +0,0 @@
-// dsh-plugin/src/index.ts
-import path from "node:path";
-import {
-  defineTool
-} from "@deepseek-ai/dsh-tools";
-import { createUserMessage } from "@deepseek-ai/dsh-llm";
-var name = "aipanel";
-var inject = ["tools", "subprocess"];
-var JS_EXTENSIONS = /* @__PURE__ */ new Set([
-  ".js",
-  ".jsx",
-  ".ts",
-  ".tsx",
-  ".mjs",
-  ".cjs",
-  ".mts",
-  ".cts",
-  ".vue"
-]);
-var MUTATING_TOOLS = /* @__PURE__ */ new Set(["write", "edit", "apply_patch"]);
-var STDOUT_MAX_BYTES = 2e5;
-var STDOUT_SPILL_MAX_BYTES = 2e6;
-var STDERR_MAX_BYTES = 1e5;
-var GRACE_MS = 3e4;
-function apply(ctx, config = {}) {
-  const cwd = config.cwd ?? process.cwd();
-  const autoDiagnose = config.autoDiagnose ?? true;
-  const tools = ctx.tools;
-  const subprocess = ctx.subprocess;
-  async function collectOutput(argv, signal) {
-    try {
-      const exe = await subprocess.resolveExecutable("npx", void 0, signal);
-      const proc = subprocess.spawn({
-        argv: [exe, ...argv],
-        cwd,
-        stdio: {
-          stdin: "ignore",
-          stdout: { maxBytes: STDOUT_MAX_BYTES, spill: { maxBytes: STDOUT_SPILL_MAX_BYTES } },
-          stderr: { maxBytes: STDERR_MAX_BYTES }
-        },
-        graceMs: GRACE_MS,
-        signal
-      });
-      await proc.done;
-      return { text: proc.collected.stdout?.readFrom(0)?.text ?? "" };
-    } catch (e) {
-      return { text: "", error: String(e) };
-    }
-  }
-  async function runDiagnostics(filePath, signal) {
-    const parts = [];
-    const tsc = await collectOutput(["tsc", "--noEmit", "--pretty", "false"], signal);
-    if (tsc.error) parts.push("## tsc\n\n(diagnostics skipped: " + tsc.error + ")");
-    else if (tsc.text.trim()) parts.push("## tsc\n\n" + tsc.text.trim());
-    const eslint = await collectOutput(["eslint", filePath, "--format", "compact"], signal);
-    if (eslint.text.trim()) parts.push("## eslint\n\n" + eslint.text.trim());
-    return parts.join("\n\n");
-  }
-  tools.register(
-    defineTool({
-      name: "run_diagnostics",
-      description: "Run ESLint and TypeScript type checks on filePath and report problems. Use after editing code to verify no lint/type errors before proceeding.",
-      parameters: {
-        filePath: {
-          type: "string",
-          required: true,
-          description: "Absolute or cwd-relative file path to diagnose"
-        }
-      },
-      output: {
-        schema: { type: "string" },
-        render: (_args, value) => [{ type: "text", text: value }]
-      },
-      async execute(args, exec) {
-        return runDiagnostics(path.resolve(cwd, args.filePath), exec.signal).catch(
-          (e) => "diagnostics failed: " + String(e)
-        );
-      }
-    })
-  );
-  ctx.on(
-    "tools/post-execute",
-    async (exec, result, next) => {
-      const decision = await next();
-      if (!autoDiagnose) return decision;
-      if (!MUTATING_TOOLS.has(exec.name)) return decision;
-      if (result.isError) return decision;
-      if (decision.kind !== "accept") return decision;
-      const filePath = exec.arguments?.filePath;
-      if (typeof filePath !== "string" || !filePath) return decision;
-      if (!JS_EXTENSIONS.has(path.extname(filePath))) return decision;
-      const diag = await runDiagnostics(path.resolve(cwd, filePath), exec.signal).catch(
-        () => "diagnostics unavailable"
-      );
-      const message = createUserMessage({
-        content: [
-          { type: "text", text: `Auto diagnostics after ${exec.name} (${filePath}):
-${diag}` }
-        ],
-        source: { kind: "plugin", plugin: name }
-      });
-      return { kind: "accept", additionalContexts: [message] };
-    }
-  );
-}
-export {
-  apply,
-  inject,
-  name
-};