@aipanel/provider-deepseek 1.3.11 → 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

@@ -59,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

@@ -106,9 +106,12 @@ ${context}
   }
 }
 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/provider.js

@@ -4,11 +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,
@@ -146,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
@@ -246,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

@@ -25,6 +25,17 @@ export type DeepSeekProviderOptions = {
      * 于是启动只会表现为"等 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） */
@@ -42,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

@@ -128,9 +128,12 @@ ${context}
   }
 }
 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

@@ -59,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/provider.cjs

@@ -31,6 +31,7 @@ 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");
@@ -155,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
@@ -255,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

@@ -25,6 +25,17 @@ export type DeepSeekProviderOptions = {
      * 于是启动只会表现为"等 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） */
@@ -42,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.11",
+  "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.11",
+    "@aipanel/core": "1.3.12",
     "execa": "^9.6.1"
   },
   "devDependencies": {