@aipanel/provider-deepseek 1.3.12 → 1.3.14

package/es/provider.js

@@ -152,7 +152,12 @@ Please upgrade:
     });
     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 settingsPatchPath = inheritSource === null ? null : writeInheritLayer({
+      cwd: options.cwd,
+      home: this.opts.home,
+      source: inheritSource,
+      target: this.opts.profile
+    });
     const proc = startDeepSeekWeb({
       port: options.port,
       hostname: DSH_LOOPBACK_HOST,

package/es/settings-layer.d.ts

@@ -1,19 +1,34 @@
-/** 不跟着来源走的那几行（每个界面自己的偏好）；理由见文件头 */
+/** 不跟着来源走的那几行（每个界面自己的偏好，目标没写也不继承）；理由见文件头 */
 export declare const INHERIT_SKIP_IDS: readonly string[];
 /** 生成层落在项目缓存目录，与 AIPanel 自己的 overlay 同处 */
 export declare const INHERIT_LAYER_FILENAME = "dsh-inherit.cordis.yml";
+/** 目标 profile 自己已经定义/插入的行 id：来源层里同 id 的条目不再继承 */
+export interface TargetEntries {
+    /** 顶层 `- id:` 条目 */
+    ids: ReadonlySet<string>;
+    /** 顶层 `- insert:` 里插入的条目 id */
+    insertIds: ReadonlySet<string>;
+}
 /**
  * 该从哪个 profile 继承。
  * @param settingsFrom 解析后的选项：profile 名 / `false`（不叠）
  * @returns 源 profile 名；`null` = 不叠（关掉了，或目标就是它自己）
  */
 export declare function inheritSourceOf(profile: string, settingsFrom: string | false): string | null;
+/**
+ * 读目标 profile 自己的 patch，收集它已经写过 / 插入过的行 id。
+ * 这些行由目标作主：来源层里同 id 的条目不能再叠上去（`--patch` 会整段覆盖目标的 config）。
+ */
+export declare function collectTargetEntries(text: string): TargetEntries;
 /**
  * 按**顶层条目**剥掉若干 `- id:` 块（与 dsh-workbench 启动器里那段 awk 同口径：从命中的 `- ` 行
- * 一路丢到下一个顶层 `- ` 为止）。手写而不是上 YAML 库：这一层只是转交一份文本，没必要为它引入依赖，
+ * 一路丢到下一个顶层 `- ` 为止）；给了 `skipInsertIds` 时，再把 `- insert:` 里命中 id 的嵌套条目
+ * 连同它的续行一起剥掉（整块剥空则连 `- insert:` 头一起丢，避免留下空的 insert 条目）。
+ * insert 的嵌套条目按 dsh 示例的 4 空格缩进识别；缩进不认识时整块原样保留，不误删。
+ * 手写而不是上 YAML 库：这一层只是转交一份文本，没必要为它引入依赖，
  * 也不能因为来源文件里有 `!!js` 之类的 dsh 扩展标签就解析失败。
  */
-export declare function stripEntries(text: string, skipIds: readonly string[]): string;
+export declare function stripEntries(text: string, skipIds: readonly string[], skipInsertIds?: readonly string[]): string;
 /**
  * 写出继承层并返回它的路径；来源不存在/读不动时返回 `null`（**不阻断启动**：少了它只是回到老行为）。
  */
@@ -21,4 +36,5 @@ export declare function writeInheritLayer(input: {
     cwd: string;
     home?: string | undefined;
     source: string;
+    target: string;
 }): string | null;

package/es/settings-layer.js

@@ -9,19 +9,71 @@ function inheritSourceOf(profile, settingsFrom) {
   if (settingsFrom === false) return null;
   return settingsFrom === profile ? null : settingsFrom;
 }
-function stripEntries(text, skipIds) {
+function collectTargetEntries(text) {
+  const ids = /* @__PURE__ */ new Set();
+  const insertIds = /* @__PURE__ */ new Set();
+  let inInsert = false;
+  for (const line of text.split("\n")) {
+    if (line.startsWith("- ")) {
+      inInsert = /^- insert:\s*$/.test(line);
+      const id2 = /^- id:\s*"?([^"\s]+)"?\s*$/.exec(line)?.[1];
+      if (id2 !== void 0) ids.add(id2);
+      continue;
+    }
+    if (!inInsert) continue;
+    const id = /^ {4}- id:\s*"?([^"\s]+)"?\s*$/.exec(line)?.[1];
+    if (id !== void 0) insertIds.add(id);
+  }
+  return { ids, insertIds };
+}
+function stripEntries(text, skipIds, skipInsertIds = []) {
   const skip = new Set(skipIds);
+  const skipInserts = new Set(skipInsertIds);
   const kept = [];
+  let block = null;
   let dropping = false;
+  const flush = () => {
+    if (block !== null) {
+      if (!dropping) kept.push(...filterInserted(block, skipInserts));
+      block = null;
+      dropping = false;
+    }
+  };
   for (const line of text.split("\n")) {
     if (line.startsWith("- ")) {
+      flush();
       const id = /^- id:\s*"?([^"\s]+)"?\s*$/.exec(line)?.[1];
       dropping = id !== void 0 && skip.has(id);
+      block = [line];
+      continue;
     }
-    if (!dropping) kept.push(line);
+    if (block === null) kept.push(line);
+    else block.push(line);
   }
+  flush();
   return kept.join("\n");
 }
+function filterInserted(block, skipInserts) {
+  if (skipInserts.size === 0 || !/^- insert:\s*$/.test(block[0])) return [...block];
+  if (!block.some((line) => /^ {4}- /.test(line))) return [...block];
+  const out = [block[0]];
+  let keeping = true;
+  for (const line of block.slice(1)) {
+    const id = /^ {4}- id:\s*"?([^"\s]+)"?\s*$/.exec(line)?.[1];
+    if (id !== void 0) {
+      keeping = !skipInserts.has(id);
+      if (keeping) out.push(line);
+      continue;
+    }
+    if (/^ {4}- /.test(line)) {
+      keeping = true;
+      out.push(line);
+      continue;
+    }
+    if (keeping) out.push(line);
+  }
+  return out.slice(1).some((line) => /^ {4}- /.test(line)) ? out : [];
+}
 function writeInheritLayer(input) {
   const source = path.join(dshProfileDir(input.source, input.home), "cordis.patch.yml");
   let text;
@@ -31,16 +83,43 @@ function writeInheritLayer(input) {
     log.debug("\u6765\u6E90 profile \u6CA1\u6709\u53EF\u53E0\u7684\u914D\u7F6E\uFF0C\u8DF3\u8FC7", { source });
     return null;
   }
+  const owned = readTargetEntries(input.target, input.home);
+  const skipIds = inheritSkipIds(owned);
+  const skipInsertIds = [...owned.insertIds];
   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 });
+  fs.writeFileSync(file, asPatchList(stripEntries(text, skipIds, skipInsertIds)), "utf8");
+  log.debug("\u5DF2\u53E0\u4E0A\u6765\u6E90 profile \u7684\u914D\u7F6E", {
+    source,
+    file,
+    skipIds,
+    skipInsertIds
+  });
   return file;
 }
+function inheritSkipIds(owned) {
+  const skip = /* @__PURE__ */ new Set([...INHERIT_SKIP_IDS, ...owned.ids]);
+  if (owned.ids.has("llm-pi-ai")) skip.add("agent-default-model");
+  return [...skip];
+}
+function asPatchList(text) {
+  return text.split("\n").some((line) => line.startsWith("- ")) ? text : `${text.trimEnd()}
+[]
+`;
+}
+function readTargetEntries(target, home) {
+  try {
+    const file = path.join(dshProfileDir(target, home), "cordis.patch.yml");
+    return collectTargetEntries(fs.readFileSync(file, "utf8"));
+  } catch {
+    return { ids: /* @__PURE__ */ new Set(), insertIds: /* @__PURE__ */ new Set() };
+  }
+}
 export {
   INHERIT_LAYER_FILENAME,
   INHERIT_SKIP_IDS,
+  collectTargetEntries,
   inheritSourceOf,
   stripEntries,
   writeInheritLayer

package/lib/provider.cjs

@@ -157,7 +157,12 @@ Please upgrade:
     });
     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 settingsPatchPath = inheritSource === null ? null : (0, import_settings_layer.writeInheritLayer)({
+      cwd: options.cwd,
+      home: this.opts.home,
+      source: inheritSource,
+      target: this.opts.profile
+    });
     const proc = (0, import_deepseek_web.startDeepSeekWeb)({
       port: options.port,
       hostname: import_constants.DSH_LOOPBACK_HOST,

package/lib/settings-layer.cjs

@@ -29,6 +29,7 @@ var settings_layer_exports = {};
 __export(settings_layer_exports, {
   INHERIT_LAYER_FILENAME: () => INHERIT_LAYER_FILENAME,
   INHERIT_SKIP_IDS: () => INHERIT_SKIP_IDS,
+  collectTargetEntries: () => collectTargetEntries,
   inheritSourceOf: () => inheritSourceOf,
   stripEntries: () => stripEntries,
   writeInheritLayer: () => writeInheritLayer
@@ -45,19 +46,71 @@ function inheritSourceOf(profile, settingsFrom) {
   if (settingsFrom === false) return null;
   return settingsFrom === profile ? null : settingsFrom;
 }
-function stripEntries(text, skipIds) {
+function collectTargetEntries(text) {
+  const ids = /* @__PURE__ */ new Set();
+  const insertIds = /* @__PURE__ */ new Set();
+  let inInsert = false;
+  for (const line of text.split("\n")) {
+    if (line.startsWith("- ")) {
+      inInsert = /^- insert:\s*$/.test(line);
+      const id2 = /^- id:\s*"?([^"\s]+)"?\s*$/.exec(line)?.[1];
+      if (id2 !== void 0) ids.add(id2);
+      continue;
+    }
+    if (!inInsert) continue;
+    const id = /^ {4}- id:\s*"?([^"\s]+)"?\s*$/.exec(line)?.[1];
+    if (id !== void 0) insertIds.add(id);
+  }
+  return { ids, insertIds };
+}
+function stripEntries(text, skipIds, skipInsertIds = []) {
   const skip = new Set(skipIds);
+  const skipInserts = new Set(skipInsertIds);
   const kept = [];
+  let block = null;
   let dropping = false;
+  const flush = () => {
+    if (block !== null) {
+      if (!dropping) kept.push(...filterInserted(block, skipInserts));
+      block = null;
+      dropping = false;
+    }
+  };
   for (const line of text.split("\n")) {
     if (line.startsWith("- ")) {
+      flush();
       const id = /^- id:\s*"?([^"\s]+)"?\s*$/.exec(line)?.[1];
       dropping = id !== void 0 && skip.has(id);
+      block = [line];
+      continue;
     }
-    if (!dropping) kept.push(line);
+    if (block === null) kept.push(line);
+    else block.push(line);
   }
+  flush();
   return kept.join("\n");
 }
+function filterInserted(block, skipInserts) {
+  if (skipInserts.size === 0 || !/^- insert:\s*$/.test(block[0])) return [...block];
+  if (!block.some((line) => /^ {4}- /.test(line))) return [...block];
+  const out = [block[0]];
+  let keeping = true;
+  for (const line of block.slice(1)) {
+    const id = /^ {4}- id:\s*"?([^"\s]+)"?\s*$/.exec(line)?.[1];
+    if (id !== void 0) {
+      keeping = !skipInserts.has(id);
+      if (keeping) out.push(line);
+      continue;
+    }
+    if (/^ {4}- /.test(line)) {
+      keeping = true;
+      out.push(line);
+      continue;
+    }
+    if (keeping) out.push(line);
+  }
+  return out.slice(1).some((line) => /^ {4}- /.test(line)) ? out : [];
+}
 function writeInheritLayer(input) {
   const source = import_node_path.default.join((0, import_dsh_install.dshProfileDir)(input.source, input.home), "cordis.patch.yml");
   let text;
@@ -67,17 +120,44 @@ function writeInheritLayer(input) {
     log.debug("\u6765\u6E90 profile \u6CA1\u6709\u53EF\u53E0\u7684\u914D\u7F6E\uFF0C\u8DF3\u8FC7", { source });
     return null;
   }
+  const owned = readTargetEntries(input.target, input.home);
+  const skipIds = inheritSkipIds(owned);
+  const skipInsertIds = [...owned.insertIds];
   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 });
+  import_node_fs.default.writeFileSync(file, asPatchList(stripEntries(text, skipIds, skipInsertIds)), "utf8");
+  log.debug("\u5DF2\u53E0\u4E0A\u6765\u6E90 profile \u7684\u914D\u7F6E", {
+    source,
+    file,
+    skipIds,
+    skipInsertIds
+  });
   return file;
 }
+function inheritSkipIds(owned) {
+  const skip = /* @__PURE__ */ new Set([...INHERIT_SKIP_IDS, ...owned.ids]);
+  if (owned.ids.has("llm-pi-ai")) skip.add("agent-default-model");
+  return [...skip];
+}
+function asPatchList(text) {
+  return text.split("\n").some((line) => line.startsWith("- ")) ? text : `${text.trimEnd()}
+[]
+`;
+}
+function readTargetEntries(target, home) {
+  try {
+    const file = import_node_path.default.join((0, import_dsh_install.dshProfileDir)(target, home), "cordis.patch.yml");
+    return collectTargetEntries(import_node_fs.default.readFileSync(file, "utf8"));
+  } catch {
+    return { ids: /* @__PURE__ */ new Set(), insertIds: /* @__PURE__ */ new Set() };
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   INHERIT_LAYER_FILENAME,
   INHERIT_SKIP_IDS,
+  collectTargetEntries,
   inheritSourceOf,
   stripEntries,
   writeInheritLayer

package/lib/settings-layer.d.ts

@@ -1,19 +1,34 @@
-/** 不跟着来源走的那几行（每个界面自己的偏好）；理由见文件头 */
+/** 不跟着来源走的那几行（每个界面自己的偏好，目标没写也不继承）；理由见文件头 */
 export declare const INHERIT_SKIP_IDS: readonly string[];
 /** 生成层落在项目缓存目录，与 AIPanel 自己的 overlay 同处 */
 export declare const INHERIT_LAYER_FILENAME = "dsh-inherit.cordis.yml";
+/** 目标 profile 自己已经定义/插入的行 id：来源层里同 id 的条目不再继承 */
+export interface TargetEntries {
+    /** 顶层 `- id:` 条目 */
+    ids: ReadonlySet<string>;
+    /** 顶层 `- insert:` 里插入的条目 id */
+    insertIds: ReadonlySet<string>;
+}
 /**
  * 该从哪个 profile 继承。
  * @param settingsFrom 解析后的选项：profile 名 / `false`（不叠）
  * @returns 源 profile 名；`null` = 不叠（关掉了，或目标就是它自己）
  */
 export declare function inheritSourceOf(profile: string, settingsFrom: string | false): string | null;
+/**
+ * 读目标 profile 自己的 patch，收集它已经写过 / 插入过的行 id。
+ * 这些行由目标作主：来源层里同 id 的条目不能再叠上去（`--patch` 会整段覆盖目标的 config）。
+ */
+export declare function collectTargetEntries(text: string): TargetEntries;
 /**
  * 按**顶层条目**剥掉若干 `- id:` 块（与 dsh-workbench 启动器里那段 awk 同口径：从命中的 `- ` 行
- * 一路丢到下一个顶层 `- ` 为止）。手写而不是上 YAML 库：这一层只是转交一份文本，没必要为它引入依赖，
+ * 一路丢到下一个顶层 `- ` 为止）；给了 `skipInsertIds` 时，再把 `- insert:` 里命中 id 的嵌套条目
+ * 连同它的续行一起剥掉（整块剥空则连 `- insert:` 头一起丢，避免留下空的 insert 条目）。
+ * insert 的嵌套条目按 dsh 示例的 4 空格缩进识别；缩进不认识时整块原样保留，不误删。
+ * 手写而不是上 YAML 库：这一层只是转交一份文本，没必要为它引入依赖，
  * 也不能因为来源文件里有 `!!js` 之类的 dsh 扩展标签就解析失败。
  */
-export declare function stripEntries(text: string, skipIds: readonly string[]): string;
+export declare function stripEntries(text: string, skipIds: readonly string[], skipInsertIds?: readonly string[]): string;
 /**
  * 写出继承层并返回它的路径；来源不存在/读不动时返回 `null`（**不阻断启动**：少了它只是回到老行为）。
  */
@@ -21,4 +36,5 @@ export declare function writeInheritLayer(input: {
     cwd: string;
     home?: string | undefined;
     source: string;
+    target: string;
 }): string | null;

package/package.json

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