@aipanel/provider-deepseek 1.3.10 → 1.3.12

package/es/constants.js

@@ -4,7 +4,8 @@ const DSH_LOOPBACK_HOST = "127.0.0.1";
 const DSH_DEFAULT_PORT = 3080;
 const DSH_DEFAULT_PROFILE = "web";
 const DEFAULT_DEEPSEEK_PROVIDER_OPTIONS = {
-  profile: DSH_DEFAULT_PROFILE
+  profile: DSH_DEFAULT_PROFILE,
+  settingsFrom: DSH_DEFAULT_PROFILE
 };
 export {
   DEFAULT_DEEPSEEK_PROVIDER_OPTIONS,

package/es/deepseek-web.d.ts

@@ -33,6 +33,13 @@ export declare class LaunchToken {
     fail(err: Error): void;
     /** 窗口到点：输出 dsh web 启动原始日志辅助诊断，再按未捕获 token 判定本次启动失败 */
     private expire;
+    /**
+     * 附上"这次起的是哪个 profile"的上下文（provider 起进程前调用）。
+     * 只加在这里、不进 printStartupOutput：超时的那条错误要能自己说清 profile 与它的 bundle 列表，
+     * 否则症状永远只是"启动超时"（见 profile-check 的注释）。
+     */
+    attachContext(provider: () => string): void;
+    private context?;
     /** 报错时把 dsh web 启动的原始日志作为一条日志整体输出（幂等：每实例只打一次） */
     private printed;
     private printStartupOutput;
@@ -52,6 +59,11 @@ export interface DeepSeekWebOptions {
     profile?: string;
     /** cordis overlay 文件路径（--patch 注入 MCP client / aipanel 插件） */
     patchPath?: string;
+    /**
+     * 继承层路径（--patch 叠来源 profile 的配置，见 settings-layer.ts）。
+     * 必须排在 `patchPath` **之前**：`--patch` 越靠后越赢，AIPanel 自己插的插件行要压过来源 profile。
+     */
+    settingsPatchPath?: string;
     /** dsh 数据目录（透传 DSH_HOME；缺省跟随 $DSH_HOME / ~/.dsh） */
     home?: string;
     /** 启用 verbose 模式 */

package/es/deepseek-web.js

@@ -19,6 +19,7 @@ class LaunchToken {
     /** dsh 进程是否已 spawn：token 只可能在 spawn 后打印，超时窗口自 arm 起算 */
     __publicField(this, "spawned", false);
     __publicField(this, "windowTimer");
+    __publicField(this, "context");
     /** 报错时把 dsh web 启动的原始日志作为一条日志整体输出（幂等：每实例只打一次） */
     __publicField(this, "printed", false);
   }
@@ -63,12 +64,24 @@ class LaunchToken {
   /** 窗口到点：输出 dsh web 启动原始日志辅助诊断，再按未捕获 token 判定本次启动失败 */
   expire() {
     this.printStartupOutput();
+    const context = this.context?.();
+    const base = `dsh launch token was not captured from stdout within ${this.timeoutMs}ms (dsh >= 0.1.2 should print the "dsh web: http://127.0.0.1:<port>/?token=..." URL)`;
     this.fail(
       new Error(
-        `dsh launch token was not captured from stdout within ${this.timeoutMs}ms (dsh >= 0.1.2 should print the "dsh web: http://127.0.0.1:<port>/?token=..." URL)`
+        context === void 0 || context.trim() === "" ? base : `${base}
+${context}
+\uFF08\u8FD9\u4E2A profile \u8D77\u4E0D\u4E86 Web UI \u65F6\u5C31\u662F\u8FD9\u4E2A\u75C7\u72B6\uFF1A\u5148\u786E\u8BA4\u5B83\u5EFA\u597D\u4E86\uFF09`
       )
     );
   }
+  /**
+   * 附上"这次起的是哪个 profile"的上下文（provider 起进程前调用）。
+   * 只加在这里、不进 printStartupOutput：超时的那条错误要能自己说清 profile 与它的 bundle 列表，
+   * 否则症状永远只是"启动超时"（见 profile-check 的注释）。
+   */
+  attachContext(provider) {
+    this.context = provider;
+  }
   printStartupOutput() {
     if (this.printed) return;
     this.printed = true;
@@ -93,9 +106,12 @@ class LaunchToken {
   }
 }
 function startDeepSeekWeb(options) {
-  const { port, hostname, cwd, patchPath, home, verbose, launchToken } = options;
+  const { port, hostname, cwd, patchPath, settingsPatchPath, home, verbose, launchToken } = options;
   const profile = options.profile ?? DSH_DEFAULT_PROFILE;
   const args = ["--profile", profile];
+  if (settingsPatchPath) {
+    args.push("--patch", settingsPatchPath);
+  }
   if (patchPath) {
     args.push("--patch", patchPath);
   }

package/es/profile-check.d.ts

@@ -0,0 +1,19 @@
+/** dsh 的 Web 应用 bundle（`dsh web` 的 profile 必有；纯终端类 profile 没有） */
+export declare const DSH_WEB_APP_BUNDLE = "@deepseek-ai/dsh-web-app";
+export type DshProfileProblem = "missing" | "no-web-app";
+export interface DshProfileInspection {
+    /** 这个 profile 现在能不能起 Web UI */
+    readonly ok: boolean;
+    /** 不能时是哪一类问题；能时为 null */
+    readonly problem: DshProfileProblem | null;
+    /** profile 声明的 bundle 列表（读不到时为空数组） */
+    readonly bundles: readonly string[];
+    /** profile 清单文件路径（报错信息里给绝对路径，方便直接去看） */
+    readonly manifest: string;
+}
+/** 读 profile 清单并判断它是否具备启动 Web UI 的条件 */
+export declare function inspectDshProfile(profileDir: string): DshProfileInspection;
+/** 预检没过时给用户的说明（通用措辞：说清是什么、去哪看、怎么修） */
+export declare function profileProblemText(inspection: DshProfileInspection, profileDir: string, profile: string): string;
+/** 启动超时诊断用的一行上下文：profile 在哪、声明了哪些 bundle */
+export declare function describeDshProfile(profileDir: string, profile: string): string;

package/es/profile-check.js

@@ -0,0 +1,41 @@
+import fs from "node:fs";
+import path from "node:path";
+const DSH_WEB_APP_BUNDLE = "@deepseek-ai/dsh-web-app";
+function inspectDshProfile(profileDir) {
+  const manifest = path.join(profileDir, "package.json");
+  let parsed;
+  try {
+    parsed = JSON.parse(fs.readFileSync(manifest, "utf8"));
+  } catch {
+    return { ok: false, problem: "missing", bundles: [], manifest };
+  }
+  const declared = parsed?.dsh?.profile?.bundles;
+  const bundles = Array.isArray(declared) ? declared.filter((one) => typeof one === "string") : [];
+  if (!bundles.includes(DSH_WEB_APP_BUNDLE)) {
+    return { ok: false, problem: "no-web-app", bundles, manifest };
+  }
+  return { ok: true, problem: null, bundles, manifest };
+}
+function profileProblemText(inspection, profileDir, profile) {
+  const head = inspection.problem === "missing" ? `dsh profile "${profile}" \u8FD8\u4E0D\u5B58\u5728\uFF08\u627E\u4E0D\u5230 ${inspection.manifest}\uFF09` : `dsh profile "${profile}" \u91CC\u6CA1\u6709 Web \u5E94\u7528 bundle\uFF08${DSH_WEB_APP_BUNDLE}\uFF09`;
+  const bundles = inspection.bundles.length === 0 ? "\uFF08\u8BFB\u4E0D\u5230 bundle \u5217\u8868\uFF09" : `\u73B0\u6709 bundles\uFF1A${inspection.bundles.join("\u3001")}`;
+  return [
+    `${head}\uFF1A${profileDir}`,
+    `  ${bundles}`,
+    "  dsh \u5728 profile \u7F3A\u5931\u65F6\u4F1A\u81EA\u5DF1\u5EFA\u4E00\u4E2A\u53EA\u6709 @deepseek-ai/dsh-base \u7684\u7A7A\u58F3\uFF0C\u8D77\u6765\u4E0D\u4F1A\u6709\u754C\u9762\uFF1B",
+    "  \u800C provider \u7684\u7F16\u6392\u662F\u300C\u5148\u88C5\u63D2\u4EF6\u3001\u518D\u8D77\u8FDB\u7A0B\u300D\uFF0C\u90A3\u4E00\u6B65\u4F1A\u628A\u7A7A\u58F3\u5EFA\u51FA\u6765\uFF0C\u75C7\u72B6\u53EA\u662F\u542F\u52A8\u8D85\u65F6\u3002",
+    "  \u5148\u628A\u8FD9\u4E2A profile \u5EFA\u597D\uFF08\u5B83\u81EA\u5DF1\u7684\u5B89\u88C5\u6D41\u7A0B\uFF0C\u6216 `dsh <\u540D> --from-default-profile web`\uFF09\u518D\u91CD\u5F00\u3002"
+  ].join("\n");
+}
+function describeDshProfile(profileDir, profile) {
+  const inspection = inspectDshProfile(profileDir);
+  const bundles = inspection.bundles.length === 0 ? "\uFF08\u8BFB\u4E0D\u5230\uFF09" : inspection.bundles.join("\u3001");
+  return `profile: ${profile} (${profileDir})
+bundles: ${bundles}`;
+}
+export {
+  DSH_WEB_APP_BUNDLE,
+  describeDshProfile,
+  inspectDshProfile,
+  profileProblemText
+};

package/es/provider.js

@@ -4,10 +4,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 import { sleep } from "@aipanel/core";
 import { DEFAULT_DIAGNOSTICS_POLICY, resolveDiagnosticsPolicy } from "@aipanel/core";
 import { createLogger } from "@aipanel/core/node";
-import { DEFAULT_DEEPSEEK_PROVIDER_OPTIONS, DSH_DEFAULT_PROFILE, DSH_LOOPBACK_HOST } from "./constants.js";
+import {
+  DEFAULT_DEEPSEEK_PROVIDER_OPTIONS,
+  DSH_DEFAULT_PROFILE,
+  DSH_LOOPBACK_HOST
+} from "./constants.js";
 import { DeepSeekAPI } from "./api.js";
 import { LaunchToken, startDeepSeekWeb } from "./deepseek-web.js";
 import { buildDshOverlay, writeDshOverlay } from "./profile.js";
+import { describeDshProfile, inspectDshProfile, profileProblemText } from "./profile-check.js";
+import { inheritSourceOf, writeInheritLayer } from "./settings-layer.js";
 import {
   checkDeepSeekInstalled,
   getDeepSeekVersion,
@@ -91,6 +97,14 @@ Please upgrade:
     const launchToken = new LaunchToken();
     this.launchToken = launchToken;
     this.api.setLaunchTokenSource(() => launchToken.wait());
+    launchToken.attachContext(() => describeDshProfile(profileDir, this.opts.profile));
+    const profileCheck = inspectDshProfile(profileDir);
+    if (!profileCheck.ok) {
+      const reason = profileProblemText(profileCheck, profileDir, this.opts.profile);
+      log.error(reason);
+      launchToken.fail(new Error(reason));
+      throw new Error(reason);
+    }
     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`);
@@ -137,12 +151,15 @@ Please upgrade:
       theme: this.uiTheme
     });
     const patchPath = writeDshOverlay(options.cwd, overlay);
+    const inheritSource = inheritSourceOf(this.opts.profile, this.opts.settingsFrom);
+    const settingsPatchPath = inheritSource === null ? null : writeInheritLayer({ cwd: options.cwd, home: this.opts.home, source: inheritSource });
     const proc = startDeepSeekWeb({
       port: options.port,
       hostname: DSH_LOOPBACK_HOST,
       cwd: options.cwd,
       profile: this.opts.profile,
       patchPath,
+      ...settingsPatchPath === null ? {} : { settingsPatchPath },
       home: this.opts.home,
       verbose: options.verbose,
       launchToken
@@ -237,6 +254,8 @@ function resolveDeepSeekOptions(options) {
     ...DEFAULT_DEEPSEEK_PROVIDER_OPTIONS,
     home: po.home ?? options?.home,
     profile: po.profile ?? options?.profile ?? DSH_DEFAULT_PROFILE,
+    // 默认就叠（见 settings-layer.ts）：用户不会去改配置，机器级设置只配一次是默认预期。
+    settingsFrom: po.settingsFrom === false ? false : typeof po.settingsFrom === "string" ? po.settingsFrom : DSH_DEFAULT_PROFILE,
     agentPreset: po.agentPreset ?? options?.agentPreset,
     permissionPreset: po.permissionPreset ?? options?.permissionPreset,
     busyEnter: po.busyEnter ?? options?.busyEnter,

package/es/settings-layer.d.ts

@@ -0,0 +1,24 @@
+/** 不跟着来源走的那几行（每个界面自己的偏好）；理由见文件头 */
+export declare const INHERIT_SKIP_IDS: readonly string[];
+/** 生成层落在项目缓存目录，与 AIPanel 自己的 overlay 同处 */
+export declare const INHERIT_LAYER_FILENAME = "dsh-inherit.cordis.yml";
+/**
+ * 该从哪个 profile 继承。
+ * @param settingsFrom 解析后的选项：profile 名 / `false`（不叠）
+ * @returns 源 profile 名；`null` = 不叠（关掉了，或目标就是它自己）
+ */
+export declare function inheritSourceOf(profile: string, settingsFrom: string | false): string | null;
+/**
+ * 按**顶层条目**剥掉若干 `- id:` 块（与 dsh-workbench 启动器里那段 awk 同口径：从命中的 `- ` 行
+ * 一路丢到下一个顶层 `- ` 为止）。手写而不是上 YAML 库：这一层只是转交一份文本，没必要为它引入依赖，
+ * 也不能因为来源文件里有 `!!js` 之类的 dsh 扩展标签就解析失败。
+ */
+export declare function stripEntries(text: string, skipIds: readonly string[]): string;
+/**
+ * 写出继承层并返回它的路径；来源不存在/读不动时返回 `null`（**不阻断启动**：少了它只是回到老行为）。
+ */
+export declare function writeInheritLayer(input: {
+    cwd: string;
+    home?: string | undefined;
+    source: string;
+}): string | null;

package/es/settings-layer.js

@@ -0,0 +1,47 @@
+import fs from "node:fs";
+import path from "node:path";
+import { AIPANEL_CACHE_DIR, createLogger } from "@aipanel/core/node";
+import { dshProfileDir } from "./dsh-install.js";
+const log = createLogger("DeepSeekSettings");
+const INHERIT_SKIP_IDS = ["ui-theme"];
+const INHERIT_LAYER_FILENAME = "dsh-inherit.cordis.yml";
+function inheritSourceOf(profile, settingsFrom) {
+  if (settingsFrom === false) return null;
+  return settingsFrom === profile ? null : settingsFrom;
+}
+function stripEntries(text, skipIds) {
+  const skip = new Set(skipIds);
+  const kept = [];
+  let dropping = false;
+  for (const line of text.split("\n")) {
+    if (line.startsWith("- ")) {
+      const id = /^- id:\s*"?([^"\s]+)"?\s*$/.exec(line)?.[1];
+      dropping = id !== void 0 && skip.has(id);
+    }
+    if (!dropping) kept.push(line);
+  }
+  return kept.join("\n");
+}
+function writeInheritLayer(input) {
+  const source = path.join(dshProfileDir(input.source, input.home), "cordis.patch.yml");
+  let text;
+  try {
+    text = fs.readFileSync(source, "utf8");
+  } catch {
+    log.debug("\u6765\u6E90 profile \u6CA1\u6709\u53EF\u53E0\u7684\u914D\u7F6E\uFF0C\u8DF3\u8FC7", { source });
+    return null;
+  }
+  const dir = path.join(input.cwd, AIPANEL_CACHE_DIR, "dsh");
+  fs.mkdirSync(dir, { recursive: true });
+  const file = path.join(dir, INHERIT_LAYER_FILENAME);
+  fs.writeFileSync(file, stripEntries(text, INHERIT_SKIP_IDS), "utf8");
+  log.debug("\u5DF2\u53E0\u4E0A\u6765\u6E90 profile \u7684\u914D\u7F6E", { source, file, skipIds: INHERIT_SKIP_IDS });
+  return file;
+}
+export {
+  INHERIT_LAYER_FILENAME,
+  INHERIT_SKIP_IDS,
+  inheritSourceOf,
+  stripEntries,
+  writeInheritLayer
+};

package/es/types.d.ts

@@ -17,8 +17,25 @@ export type DeepSeekBusyEnter = BusyEnterBehavior;
 export type DeepSeekProviderOptions = {
     /** dsh 数据目录（$DSH_HOME），默认跟随系统（~/.dsh） */
     home?: string;
-    /** dsh profile 名（$DSH_HOME/profiles/<name>），默认 "web"；AIPanel 侧插件与 web 进程都指向该 profile */
+    /**
+     * dsh profile 名（$DSH_HOME/profiles/<name>），默认 "web"；AIPanel 侧插件与 web 进程都指向该 profile。
+     *
+     * ⚠️ 该 profile 必须**先建好**：其 `dsh.profile.bundles` 里要有 `@deepseek-ai/dsh-web-app`。
+     * 缺失时 dsh 的 `plugin` 子命令会自己建出一个只有 `@deepseek-ai/dsh-base` 的空壳，
+     * 于是启动只会表现为"等 launch token 超时"（见 profile-check.ts 的预检与说明）。
+     */
     profile?: string;
+    /**
+     * 机器级设置（模型供应商 / 搜索源 / MCP）从哪个 profile 继承，作为一层 `--patch` 叠在目标 profile 之上。
+     *
+     * 默认 `web`（即 `providerOptions.profile` 的默认值）：**默认就叠，用户不需要配**。dsh 没有
+     * "profile 继承 profile"，不叠的话自建 profile 只会用建 profile 那一刻的快照，于是"我在 web 里
+     * 配过的东西这里看不到"。目标 profile 就是来源时自动跳过（等于不叠）。
+     *
+     * `false` = 不叠（只保留目标 profile 自己的配置）。每个界面自己的偏好（主题等）**永远不继承** ——
+     * 那类行跟着来源走会把界面锁死（见 settings-layer.ts）。
+     */
+    settingsFrom?: string | false;
     /** 默认 Agent 预设（dsh settings agent-presets.default，如 code/standard；新建会话的默认模式） */
     agentPreset?: string;
     /** 默认权限预设（dsh settings permission.defaultPreset） */
@@ -36,8 +53,9 @@ export type DeepSeekProviderOptions = {
      */
     [key: string]: unknown;
 };
-/** 归一化后的 Provider 选项：诊断策略一定是完整的（Partial 已在 provider 内解析），profile 一定落到默认值 */
+/** 归一化后的 Provider 选项：诊断策略一定是完整的（Partial 已在 provider 内解析），profile / settingsFrom 一定落到默认值 */
 export type DeepSeekResolvedOptions = DeepSeekProviderOptions & {
     profile: string;
+    settingsFrom: string | false;
     diagnostics: DiagnosticsPolicy;
 };

package/lib/constants.cjs

@@ -31,7 +31,8 @@ const DSH_LOOPBACK_HOST = "127.0.0.1";
 const DSH_DEFAULT_PORT = 3080;
 const DSH_DEFAULT_PROFILE = "web";
 const DEFAULT_DEEPSEEK_PROVIDER_OPTIONS = {
-  profile: DSH_DEFAULT_PROFILE
+  profile: DSH_DEFAULT_PROFILE,
+  settingsFrom: DSH_DEFAULT_PROFILE
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/deepseek-web.cjs

@@ -41,6 +41,7 @@ class LaunchToken {
     /** dsh 进程是否已 spawn：token 只可能在 spawn 后打印，超时窗口自 arm 起算 */
     __publicField(this, "spawned", false);
     __publicField(this, "windowTimer");
+    __publicField(this, "context");
     /** 报错时把 dsh web 启动的原始日志作为一条日志整体输出（幂等：每实例只打一次） */
     __publicField(this, "printed", false);
   }
@@ -85,12 +86,24 @@ class LaunchToken {
   /** 窗口到点：输出 dsh web 启动原始日志辅助诊断，再按未捕获 token 判定本次启动失败 */
   expire() {
     this.printStartupOutput();
+    const context = this.context?.();
+    const base = `dsh launch token was not captured from stdout within ${this.timeoutMs}ms (dsh >= 0.1.2 should print the "dsh web: http://127.0.0.1:<port>/?token=..." URL)`;
     this.fail(
       new Error(
-        `dsh launch token was not captured from stdout within ${this.timeoutMs}ms (dsh >= 0.1.2 should print the "dsh web: http://127.0.0.1:<port>/?token=..." URL)`
+        context === void 0 || context.trim() === "" ? base : `${base}
+${context}
+\uFF08\u8FD9\u4E2A profile \u8D77\u4E0D\u4E86 Web UI \u65F6\u5C31\u662F\u8FD9\u4E2A\u75C7\u72B6\uFF1A\u5148\u786E\u8BA4\u5B83\u5EFA\u597D\u4E86\uFF09`
       )
     );
   }
+  /**
+   * 附上"这次起的是哪个 profile"的上下文（provider 起进程前调用）。
+   * 只加在这里、不进 printStartupOutput：超时的那条错误要能自己说清 profile 与它的 bundle 列表，
+   * 否则症状永远只是"启动超时"（见 profile-check 的注释）。
+   */
+  attachContext(provider) {
+    this.context = provider;
+  }
   printStartupOutput() {
     if (this.printed) return;
     this.printed = true;
@@ -115,9 +128,12 @@ class LaunchToken {
   }
 }
 function startDeepSeekWeb(options) {
-  const { port, hostname, cwd, patchPath, home, verbose, launchToken } = options;
+  const { port, hostname, cwd, patchPath, settingsPatchPath, home, verbose, launchToken } = options;
   const profile = options.profile ?? import_constants.DSH_DEFAULT_PROFILE;
   const args = ["--profile", profile];
+  if (settingsPatchPath) {
+    args.push("--patch", settingsPatchPath);
+  }
   if (patchPath) {
     args.push("--patch", patchPath);
   }

package/lib/deepseek-web.d.ts

@@ -33,6 +33,13 @@ export declare class LaunchToken {
     fail(err: Error): void;
     /** 窗口到点：输出 dsh web 启动原始日志辅助诊断，再按未捕获 token 判定本次启动失败 */
     private expire;
+    /**
+     * 附上"这次起的是哪个 profile"的上下文（provider 起进程前调用）。
+     * 只加在这里、不进 printStartupOutput：超时的那条错误要能自己说清 profile 与它的 bundle 列表，
+     * 否则症状永远只是"启动超时"（见 profile-check 的注释）。
+     */
+    attachContext(provider: () => string): void;
+    private context?;
     /** 报错时把 dsh web 启动的原始日志作为一条日志整体输出（幂等：每实例只打一次） */
     private printed;
     private printStartupOutput;
@@ -52,6 +59,11 @@ export interface DeepSeekWebOptions {
     profile?: string;
     /** cordis overlay 文件路径（--patch 注入 MCP client / aipanel 插件） */
     patchPath?: string;
+    /**
+     * 继承层路径（--patch 叠来源 profile 的配置，见 settings-layer.ts）。
+     * 必须排在 `patchPath` **之前**：`--patch` 越靠后越赢，AIPanel 自己插的插件行要压过来源 profile。
+     */
+    settingsPatchPath?: string;
     /** dsh 数据目录（透传 DSH_HOME；缺省跟随 $DSH_HOME / ~/.dsh） */
     home?: string;
     /** 启用 verbose 模式 */

package/lib/profile-check.cjs

@@ -0,0 +1,77 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var profile_check_exports = {};
+__export(profile_check_exports, {
+  DSH_WEB_APP_BUNDLE: () => DSH_WEB_APP_BUNDLE,
+  describeDshProfile: () => describeDshProfile,
+  inspectDshProfile: () => inspectDshProfile,
+  profileProblemText: () => profileProblemText
+});
+module.exports = __toCommonJS(profile_check_exports);
+var import_node_fs = __toESM(require("node:fs"));
+var import_node_path = __toESM(require("node:path"));
+const DSH_WEB_APP_BUNDLE = "@deepseek-ai/dsh-web-app";
+function inspectDshProfile(profileDir) {
+  const manifest = import_node_path.default.join(profileDir, "package.json");
+  let parsed;
+  try {
+    parsed = JSON.parse(import_node_fs.default.readFileSync(manifest, "utf8"));
+  } catch {
+    return { ok: false, problem: "missing", bundles: [], manifest };
+  }
+  const declared = parsed?.dsh?.profile?.bundles;
+  const bundles = Array.isArray(declared) ? declared.filter((one) => typeof one === "string") : [];
+  if (!bundles.includes(DSH_WEB_APP_BUNDLE)) {
+    return { ok: false, problem: "no-web-app", bundles, manifest };
+  }
+  return { ok: true, problem: null, bundles, manifest };
+}
+function profileProblemText(inspection, profileDir, profile) {
+  const head = inspection.problem === "missing" ? `dsh profile "${profile}" \u8FD8\u4E0D\u5B58\u5728\uFF08\u627E\u4E0D\u5230 ${inspection.manifest}\uFF09` : `dsh profile "${profile}" \u91CC\u6CA1\u6709 Web \u5E94\u7528 bundle\uFF08${DSH_WEB_APP_BUNDLE}\uFF09`;
+  const bundles = inspection.bundles.length === 0 ? "\uFF08\u8BFB\u4E0D\u5230 bundle \u5217\u8868\uFF09" : `\u73B0\u6709 bundles\uFF1A${inspection.bundles.join("\u3001")}`;
+  return [
+    `${head}\uFF1A${profileDir}`,
+    `  ${bundles}`,
+    "  dsh \u5728 profile \u7F3A\u5931\u65F6\u4F1A\u81EA\u5DF1\u5EFA\u4E00\u4E2A\u53EA\u6709 @deepseek-ai/dsh-base \u7684\u7A7A\u58F3\uFF0C\u8D77\u6765\u4E0D\u4F1A\u6709\u754C\u9762\uFF1B",
+    "  \u800C provider \u7684\u7F16\u6392\u662F\u300C\u5148\u88C5\u63D2\u4EF6\u3001\u518D\u8D77\u8FDB\u7A0B\u300D\uFF0C\u90A3\u4E00\u6B65\u4F1A\u628A\u7A7A\u58F3\u5EFA\u51FA\u6765\uFF0C\u75C7\u72B6\u53EA\u662F\u542F\u52A8\u8D85\u65F6\u3002",
+    "  \u5148\u628A\u8FD9\u4E2A profile \u5EFA\u597D\uFF08\u5B83\u81EA\u5DF1\u7684\u5B89\u88C5\u6D41\u7A0B\uFF0C\u6216 `dsh <\u540D> --from-default-profile web`\uFF09\u518D\u91CD\u5F00\u3002"
+  ].join("\n");
+}
+function describeDshProfile(profileDir, profile) {
+  const inspection = inspectDshProfile(profileDir);
+  const bundles = inspection.bundles.length === 0 ? "\uFF08\u8BFB\u4E0D\u5230\uFF09" : inspection.bundles.join("\u3001");
+  return `profile: ${profile} (${profileDir})
+bundles: ${bundles}`;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DSH_WEB_APP_BUNDLE,
+  describeDshProfile,
+  inspectDshProfile,
+  profileProblemText
+});

package/lib/profile-check.d.ts

@@ -0,0 +1,19 @@
+/** dsh 的 Web 应用 bundle（`dsh web` 的 profile 必有；纯终端类 profile 没有） */
+export declare const DSH_WEB_APP_BUNDLE = "@deepseek-ai/dsh-web-app";
+export type DshProfileProblem = "missing" | "no-web-app";
+export interface DshProfileInspection {
+    /** 这个 profile 现在能不能起 Web UI */
+    readonly ok: boolean;
+    /** 不能时是哪一类问题；能时为 null */
+    readonly problem: DshProfileProblem | null;
+    /** profile 声明的 bundle 列表（读不到时为空数组） */
+    readonly bundles: readonly string[];
+    /** profile 清单文件路径（报错信息里给绝对路径，方便直接去看） */
+    readonly manifest: string;
+}
+/** 读 profile 清单并判断它是否具备启动 Web UI 的条件 */
+export declare function inspectDshProfile(profileDir: string): DshProfileInspection;
+/** 预检没过时给用户的说明（通用措辞：说清是什么、去哪看、怎么修） */
+export declare function profileProblemText(inspection: DshProfileInspection, profileDir: string, profile: string): string;
+/** 启动超时诊断用的一行上下文：profile 在哪、声明了哪些 bundle */
+export declare function describeDshProfile(profileDir: string, profile: string): string;

package/lib/provider.cjs

@@ -30,6 +30,8 @@ var import_constants = require("./constants.cjs");
 var import_api = require("./api.cjs");
 var import_deepseek_web = require("./deepseek-web.cjs");
 var import_profile = require("./profile.cjs");
+var import_profile_check = require("./profile-check.cjs");
+var import_settings_layer = require("./settings-layer.cjs");
 var import_system = require("./system.cjs");
 var import_dsh_install = require("./dsh-install.cjs");
 const log = (0, import_node.createLogger)("DeepSeekWebProvider");
@@ -100,6 +102,14 @@ Please upgrade:
     const launchToken = new import_deepseek_web.LaunchToken();
     this.launchToken = launchToken;
     this.api.setLaunchTokenSource(() => launchToken.wait());
+    launchToken.attachContext(() => (0, import_profile_check.describeDshProfile)(profileDir, this.opts.profile));
+    const profileCheck = (0, import_profile_check.inspectDshProfile)(profileDir);
+    if (!profileCheck.ok) {
+      const reason = (0, import_profile_check.profileProblemText)(profileCheck, profileDir, this.opts.profile);
+      log.error(reason);
+      launchToken.fail(new Error(reason));
+      throw new Error(reason);
+    }
     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`);
@@ -146,12 +156,15 @@ Please upgrade:
       theme: this.uiTheme
     });
     const patchPath = (0, import_profile.writeDshOverlay)(options.cwd, overlay);
+    const inheritSource = (0, import_settings_layer.inheritSourceOf)(this.opts.profile, this.opts.settingsFrom);
+    const settingsPatchPath = inheritSource === null ? null : (0, import_settings_layer.writeInheritLayer)({ cwd: options.cwd, home: this.opts.home, source: inheritSource });
     const proc = (0, import_deepseek_web.startDeepSeekWeb)({
       port: options.port,
       hostname: import_constants.DSH_LOOPBACK_HOST,
       cwd: options.cwd,
       profile: this.opts.profile,
       patchPath,
+      ...settingsPatchPath === null ? {} : { settingsPatchPath },
       home: this.opts.home,
       verbose: options.verbose,
       launchToken
@@ -246,6 +259,8 @@ function resolveDeepSeekOptions(options) {
     ...import_constants.DEFAULT_DEEPSEEK_PROVIDER_OPTIONS,
     home: po.home ?? options?.home,
     profile: po.profile ?? options?.profile ?? import_constants.DSH_DEFAULT_PROFILE,
+    // 默认就叠（见 settings-layer.ts）：用户不会去改配置，机器级设置只配一次是默认预期。
+    settingsFrom: po.settingsFrom === false ? false : typeof po.settingsFrom === "string" ? po.settingsFrom : import_constants.DSH_DEFAULT_PROFILE,
     agentPreset: po.agentPreset ?? options?.agentPreset,
     permissionPreset: po.permissionPreset ?? options?.permissionPreset,
     busyEnter: po.busyEnter ?? options?.busyEnter,

package/lib/settings-layer.cjs

@@ -0,0 +1,84 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var settings_layer_exports = {};
+__export(settings_layer_exports, {
+  INHERIT_LAYER_FILENAME: () => INHERIT_LAYER_FILENAME,
+  INHERIT_SKIP_IDS: () => INHERIT_SKIP_IDS,
+  inheritSourceOf: () => inheritSourceOf,
+  stripEntries: () => stripEntries,
+  writeInheritLayer: () => writeInheritLayer
+});
+module.exports = __toCommonJS(settings_layer_exports);
+var import_node_fs = __toESM(require("node:fs"));
+var import_node_path = __toESM(require("node:path"));
+var import_node = require("@aipanel/core/node");
+var import_dsh_install = require("./dsh-install.cjs");
+const log = (0, import_node.createLogger)("DeepSeekSettings");
+const INHERIT_SKIP_IDS = ["ui-theme"];
+const INHERIT_LAYER_FILENAME = "dsh-inherit.cordis.yml";
+function inheritSourceOf(profile, settingsFrom) {
+  if (settingsFrom === false) return null;
+  return settingsFrom === profile ? null : settingsFrom;
+}
+function stripEntries(text, skipIds) {
+  const skip = new Set(skipIds);
+  const kept = [];
+  let dropping = false;
+  for (const line of text.split("\n")) {
+    if (line.startsWith("- ")) {
+      const id = /^- id:\s*"?([^"\s]+)"?\s*$/.exec(line)?.[1];
+      dropping = id !== void 0 && skip.has(id);
+    }
+    if (!dropping) kept.push(line);
+  }
+  return kept.join("\n");
+}
+function writeInheritLayer(input) {
+  const source = import_node_path.default.join((0, import_dsh_install.dshProfileDir)(input.source, input.home), "cordis.patch.yml");
+  let text;
+  try {
+    text = import_node_fs.default.readFileSync(source, "utf8");
+  } catch {
+    log.debug("\u6765\u6E90 profile \u6CA1\u6709\u53EF\u53E0\u7684\u914D\u7F6E\uFF0C\u8DF3\u8FC7", { source });
+    return null;
+  }
+  const dir = import_node_path.default.join(input.cwd, import_node.AIPANEL_CACHE_DIR, "dsh");
+  import_node_fs.default.mkdirSync(dir, { recursive: true });
+  const file = import_node_path.default.join(dir, INHERIT_LAYER_FILENAME);
+  import_node_fs.default.writeFileSync(file, stripEntries(text, INHERIT_SKIP_IDS), "utf8");
+  log.debug("\u5DF2\u53E0\u4E0A\u6765\u6E90 profile \u7684\u914D\u7F6E", { source, file, skipIds: INHERIT_SKIP_IDS });
+  return file;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  INHERIT_LAYER_FILENAME,
+  INHERIT_SKIP_IDS,
+  inheritSourceOf,
+  stripEntries,
+  writeInheritLayer
+});

package/lib/settings-layer.d.ts

@@ -0,0 +1,24 @@
+/** 不跟着来源走的那几行（每个界面自己的偏好）；理由见文件头 */
+export declare const INHERIT_SKIP_IDS: readonly string[];
+/** 生成层落在项目缓存目录，与 AIPanel 自己的 overlay 同处 */
+export declare const INHERIT_LAYER_FILENAME = "dsh-inherit.cordis.yml";
+/**
+ * 该从哪个 profile 继承。
+ * @param settingsFrom 解析后的选项：profile 名 / `false`（不叠）
+ * @returns 源 profile 名；`null` = 不叠（关掉了，或目标就是它自己）
+ */
+export declare function inheritSourceOf(profile: string, settingsFrom: string | false): string | null;
+/**
+ * 按**顶层条目**剥掉若干 `- id:` 块（与 dsh-workbench 启动器里那段 awk 同口径：从命中的 `- ` 行
+ * 一路丢到下一个顶层 `- ` 为止）。手写而不是上 YAML 库：这一层只是转交一份文本，没必要为它引入依赖，
+ * 也不能因为来源文件里有 `!!js` 之类的 dsh 扩展标签就解析失败。
+ */
+export declare function stripEntries(text: string, skipIds: readonly string[]): string;
+/**
+ * 写出继承层并返回它的路径；来源不存在/读不动时返回 `null`（**不阻断启动**：少了它只是回到老行为）。
+ */
+export declare function writeInheritLayer(input: {
+    cwd: string;
+    home?: string | undefined;
+    source: string;
+}): string | null;

package/lib/types.d.ts

@@ -17,8 +17,25 @@ export type DeepSeekBusyEnter = BusyEnterBehavior;
 export type DeepSeekProviderOptions = {
     /** dsh 数据目录（$DSH_HOME），默认跟随系统（~/.dsh） */
     home?: string;
-    /** dsh profile 名（$DSH_HOME/profiles/<name>），默认 "web"；AIPanel 侧插件与 web 进程都指向该 profile */
+    /**
+     * dsh profile 名（$DSH_HOME/profiles/<name>），默认 "web"；AIPanel 侧插件与 web 进程都指向该 profile。
+     *
+     * ⚠️ 该 profile 必须**先建好**：其 `dsh.profile.bundles` 里要有 `@deepseek-ai/dsh-web-app`。
+     * 缺失时 dsh 的 `plugin` 子命令会自己建出一个只有 `@deepseek-ai/dsh-base` 的空壳，
+     * 于是启动只会表现为"等 launch token 超时"（见 profile-check.ts 的预检与说明）。
+     */
     profile?: string;
+    /**
+     * 机器级设置（模型供应商 / 搜索源 / MCP）从哪个 profile 继承，作为一层 `--patch` 叠在目标 profile 之上。
+     *
+     * 默认 `web`（即 `providerOptions.profile` 的默认值）：**默认就叠，用户不需要配**。dsh 没有
+     * "profile 继承 profile"，不叠的话自建 profile 只会用建 profile 那一刻的快照，于是"我在 web 里
+     * 配过的东西这里看不到"。目标 profile 就是来源时自动跳过（等于不叠）。
+     *
+     * `false` = 不叠（只保留目标 profile 自己的配置）。每个界面自己的偏好（主题等）**永远不继承** ——
+     * 那类行跟着来源走会把界面锁死（见 settings-layer.ts）。
+     */
+    settingsFrom?: string | false;
     /** 默认 Agent 预设（dsh settings agent-presets.default，如 code/standard；新建会话的默认模式） */
     agentPreset?: string;
     /** 默认权限预设（dsh settings permission.defaultPreset） */
@@ -36,8 +53,9 @@ export type DeepSeekProviderOptions = {
      */
     [key: string]: unknown;
 };
-/** 归一化后的 Provider 选项：诊断策略一定是完整的（Partial 已在 provider 内解析），profile 一定落到默认值 */
+/** 归一化后的 Provider 选项：诊断策略一定是完整的（Partial 已在 provider 内解析），profile / settingsFrom 一定落到默认值 */
 export type DeepSeekResolvedOptions = DeepSeekProviderOptions & {
     profile: string;
+    settingsFrom: string | false;
     diagnostics: DiagnosticsPolicy;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/provider-deepseek",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "type": "module",
   "main": "lib/index.cjs",
   "module": "es/index.js",
@@ -21,7 +21,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@aipanel/core": "1.3.10",
+    "@aipanel/core": "1.3.12",
     "execa": "^9.6.1"
   },
   "devDependencies": {