dsh-model-health 0.2.9 → 0.2.10

package/README.md

@@ -42,7 +42,7 @@ dsh --profile web --dump-config | grep dsh-model-health   # 配置层含本行
 
 ## 功能 / Features
 
-读取 `$DSH_HOME/settings.yaml`（默认 `~/.dsh/settings.yaml`），提供三种使用方式：
+读取 DSH 设置配置（兼容新旧版本：旧版 `$DSH_HOME/settings.yaml`；新版 `0.1.7-alpha.2+` 迁移至 profile 的 `cordis.patch.yml`，插件自动按优先级合并 `settings.yaml` / `settings.yaml.imported` / profile patch），提供三种使用方式：
 
 | # | 形式 | 入口 | 说明 |
 |---|------|------|------|
@@ -67,7 +67,8 @@ dsh --profile web --dump-config | grep dsh-model-health   # 配置层含本行
 ┌─ host 侧  src/index.ts → dist/index.js ─────────────────────────┐
 │  - ctx.tools.register：注册 list_models 工具（Markdown 表格输出） │
 │  - ctx.webServer.register：                                        │
-│      GET  /api/model-health/json  读取并解析 settings.yaml → JSON  │
+│      GET  /api/model-health/json  读取并解析 DSH 设置（settings.yaml  │
+│      与 profile patch 多来源合并，兼容新旧 DSH 版本）→ JSON          │
 │      POST /api/model-health/test  对单模型发最小请求测可用性/延迟  │
 │      （Origin 限本机；200 响应校验 body 为成功应答）               │
 │  - 解析 DSH credential service 获取 API Key                        │

package/dist/index.js

@@ -1,42 +1,101 @@
 import { defineTool } from "@deepseek-ai/dsh-tools";
-import { join } from "node:path";
-import { readFileSync, statSync } from "node:fs";
+import { existsSync, readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
-import { load } from "js-yaml";
+import { join } from "node:path";
+import { DEFAULT_SCHEMA, Schema, Type, load } from "js-yaml";
 //#region src/host/config.ts
+/** 插件只关心的模型配置 section / entry id。 */
+const MODEL_SECTIONS = /* @__PURE__ */ new Set(["llm-pi-ai", "llm-deepseek"]);
 /** 解析 DSH 配置目录：优先 $DSH_HOME，回退到 ~/.dsh。 */
 function dshHome() {
 	return process.env.DSH_HOME || join(homedir(), ".dsh");
 }
-/** 读取并解析 settings.yaml。 */
-function readSettings() {
-	const settingsPath = join(dshHome(), "settings.yaml");
-	let raw;
-	try {
-		raw = readFileSync(settingsPath, "utf8");
-	} catch (e) {
-		throw new Error(`无法读取 settings.yaml (${settingsPath})：${e.message}。请在 设置 → 模型 中配置后重试。`);
+const BaseSchemaTypes = DEFAULT_SCHEMA;
+const LooseSchema = new Schema({
+	implicit: BaseSchemaTypes.implicit,
+	explicit: [...BaseSchemaTypes.explicit, new Type("tag:yaml.org,2002:js", {
+		kind: "scalar",
+		resolve: () => true,
+		construct: (value) => value
+	})]
+});
+/**
+* 解析一份设置文件的内容为「模型 section → 配置」映射。
+* 兼容两种文件形态：
+* - 旧版 settings.yaml：顶层 map（llm-pi-ai: {...}）
+* - 新版 profile patch：YAML 序列（- id: llm-pi-ai / config: {...}）
+*/
+function parseSettingsContent(raw) {
+	const doc = load(raw, { schema: LooseSchema });
+	if (Array.isArray(doc)) {
+		const cfg = {};
+		for (const entry of doc) {
+			if (!entry || typeof entry !== "object" || Array.isArray(entry)) continue;
+			if (typeof entry.id !== "string" || !MODEL_SECTIONS.has(entry.id)) continue;
+			if (entry.config === void 0 || entry.config === null) continue;
+			cfg[entry.id] = entry.config;
+		}
+		return cfg;
 	}
-	const cfg = load(raw);
-	return cfg && typeof cfg === "object" ? cfg : {};
+	if (!doc || typeof doc !== "object" || Array.isArray(doc)) return {};
+	const cfg = {};
+	const record = doc;
+	for (const key of MODEL_SECTIONS) if (Object.hasOwn(record, key)) cfg[key] = record[key];
+	return cfg;
 }
-/** 按 mtime 缓存解析结果：并发测试时同一份 settings 只解析一次，文件变了自动失效。 */
-let settingsCache = null;
-function readSettingsCached() {
-	const settingsPath = join(dshHome(), "settings.yaml");
-	try {
-		const mtimeMs = statSync(settingsPath).mtimeMs;
-		if (settingsCache && settingsCache.mtimeMs === mtimeMs) return settingsCache.cfg;
-		const cfg = readSettings();
-		settingsCache = {
-			mtimeMs,
-			cfg
-		};
-		return cfg;
-	} catch {
-		settingsCache = null;
-		return readSettings();
+/** 返回当前存在的候选设置文件路径（按优先级排列）。 */
+function settingsPaths(profile) {
+	const home = dshHome();
+	const out = [];
+	for (const name of ["settings.yaml", "settings.yaml.imported"]) {
+		const p = join(home, name);
+		if (existsSync(p)) out.push(p);
+	}
+	if (profile) {
+		for (const p of [
+			join(home, "cordis.patch.yml"),
+			join(profile.dir, "cordis.yml"),
+			profile.patchPath
+		]) if (existsSync(p)) out.push(p);
 	}
+	return out;
+}
+/** 按文件 mtime 缓存解析结果：同一份文件只解析一次，内容变了自动失效。 */
+const fileCache = /* @__PURE__ */ new Map();
+/** 按给定候选路径列表读取并合并设置（后出现的来源覆盖前面的同名 section）。 */
+function readSettingsFrom(paths) {
+	if (paths.length === 0) throw new Error("未找到 DSH 配置文件（已查找：$DSH_HOME/settings.yaml、settings.yaml.imported、profile patch）。请在 设置 → 模型 中配置后重试。");
+	const merged = {};
+	let lastError = null;
+	for (const path of paths) {
+		let mtimeMs;
+		try {
+			mtimeMs = statSync(path).mtimeMs;
+		} catch {
+			continue;
+		}
+		let cached = fileCache.get(path);
+		if (!cached || cached.mtimeMs !== mtimeMs) try {
+			cached = {
+				mtimeMs,
+				cfg: parseSettingsContent(readFileSync(path, "utf8"))
+			};
+			fileCache.set(path, cached);
+		} catch (e) {
+			lastError = /* @__PURE__ */ new Error(`解析配置失败 (${path})：${e.message}`);
+			continue;
+		}
+		for (const [key, value] of Object.entries(cached.cfg)) merged[key] = value;
+	}
+	if (lastError && Object.keys(merged).length === 0) throw lastError;
+	return merged;
+}
+/**
+* 读取当前生效的 DSH 模型配置。
+* @param profile 新版 DSH 的 profileContext（可空，空时按旧版逻辑只读 settings.yaml）
+*/
+function readSettingsCached(profile) {
+	return readSettingsFrom(settingsPaths(profile));
 }
 //#endregion
 //#region src/host/models.ts
@@ -96,14 +155,14 @@ function collectModels(cfg) {
 }
 //#endregion
 //#region src/host/markdown.ts
-function renderMarkdownTable(rows) {
-	const settingsPath = join(dshHome(), "settings.yaml");
+function renderMarkdownTable(rows, source) {
+	const configLabel = source || join(dshHome(), "settings.yaml");
 	if (rows.length === 0) return [
-		"当前 settings.yaml 中未配置任何模型。/ No models are configured in settings.yaml.",
+		"当前 DSH 配置中未配置任何模型。/ No models are configured in the DSH config.",
 		"",
 		"请在 Web UI 的 设置 → 模型 中添加 DeepSeek API Key 或自定义提供商。",
 		"Please add a DeepSeek API key or a custom provider in Web UI → Settings → Models.",
-		`配置文件位置 / Config file: ${settingsPath}`
+		`配置文件位置 / Config file(s): ${configLabel}`
 	].join("\n");
 	const header = "| # | Provider | Model ID | Name | Context Window | Max Output | Input | API | BaseURL |";
 	const sep = "|---|----------|----------|------|----------------|------------|-------|-----|---------|";
@@ -117,7 +176,7 @@ function renderMarkdownTable(rows) {
 		sep,
 		...lines,
 		"",
-		`_来源 / Source: ${settingsPath}_`
+		`_来源 / Source: ${configLabel}_`
 	].join("\n");
 }
 //#endregion
@@ -325,9 +384,10 @@ const inject = [
 	"credentials"
 ];
 function apply(ctx) {
+	const profile = ctx.get("profileContext");
 	ctx.tools.register(defineTool({
 		name: "list_models",
-		description: "列出当前 DSH 配置（$DSH_HOME/settings.yaml）中已配置的所有模型，以 Markdown 表格展示。用于在对话中查看当前可用模型清单。",
+		description: "列出当前 DSH 配置（settings.yaml 或 profile patch）中已配置的所有模型，以 Markdown 表格展示。用于在对话中查看当前可用模型清单。",
 		parameters: {},
 		output: {
 			schema: { type: "string" },
@@ -337,7 +397,8 @@ function apply(ctx) {
 			}]
 		},
 		async execute() {
-			return renderMarkdownTable(collectModels(readSettingsCached()));
+			const source = settingsPaths(profile).join(" + ");
+			return renderMarkdownTable(collectModels(readSettingsCached(profile)), source);
 		}
 	}));
 	ctx.webServer.register({
@@ -345,11 +406,11 @@ function apply(ctx) {
 		path: "/api/model-health/json",
 		handler: (_req, res) => {
 			try {
-				const rows = collectModels(readSettingsCached());
+				const rows = collectModels(readSettingsCached(profile));
 				sendJson(res, 200, {
 					ok: true,
 					count: rows.length,
-					source: join(dshHome(), "settings.yaml"),
+					source: settingsPaths(profile).join(" + "),
 					updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
 					models: rows.map(toPublicRow)
 				});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model-health",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "DSH plugin that lists all configured models with availability/latency testing, by reading $DSH_HOME/settings.yaml.",
   "license": "MIT",
   "repository": {