dsh-plugin-prompt-tool 0.6.1 → 0.6.2

package/README.md

@@ -50,12 +50,19 @@ dsh --profile prompt-tool                                          # 首次启
 | 锚定 | `firstTurnAnchor` `firstTurnCustom` `firstTurnText` `firstTurnWord` `firstTurnBuild` `firstTurnInspect` `firstTurnDeep` |
 | 引导 | `guideCustom` `guideText` `guideComplexPattern` `guideWeak` `guideDeep` `buildPattern` `complexPattern` |
 | PTC/门控 | `usePtcMode` `bootstrapMaxTokens` `injectPrompt` `allowKinds` |
-| 主对话模型 | `modelProvider` `modelName` `modelReasoningEffort` `modelTemperature` `modelMaxTokens` |
-| 子代理模型 | `subagentModelProvider` `subagentModelName` `subagentReasoningEffort` `subagentTemperature` `subagentMaxTokens` |
 | 人设 | 模块列表的 `persona-main`（system-section + `deployment:persona`，complete 互斥 + suppressRuntimeContext）；`subagentPersona`（子代理显式，缺省经 scope 链继承主会话） |
 | 工具集 | `toolFilterAllow` `toolFilterDeny`（子代理 toolFilter；主对话 tool-filter 模块共用） |
 | 深度 | `maxDepth`（0 禁止委派 / `provider-managed` / 正整数） |
 
+模型参数在 **preset.yml 顶层 `model` / `subagentModel` 段**（官方 `agent-default-model` 同构）：
+
+| 段 | 键 |
+|---|---|
+| `model`（主对话） | `provider` `name` `reasoningEffort` `temperature` `maxTokens` |
+| `subagentModel`（子代理固定路由） | `provider` `name` `reasoningEffort` `temperature` `maxTokens` |
+
+读取时顶层段展平进 params 扁平键（`modelProvider` 等），旧扁平键双读兼容；保存时写顶层段并清理旧键（保存即迁移）。
+
 > 根目录 **`preset.yml`** 是配置参数齐全、逐项注释的完整模板，复制即得自定义预设起点。
 
 ## 提示词配置（六层全家桶）

package/lib/index.d.mts

@@ -198,6 +198,10 @@ interface PresetSpec {
   composition?: string;
   /** 扁平参数:全部直读(true/false、数字、字符串),on/off 作为兼容写法。 */
   params?: Record<string, unknown>;
+  /** 顶层模型段（主对话，官方 agent-default-model 同构）：provider/name/reasoningEffort/temperature/maxTokens。 */
+  model?: Record<string, unknown>;
+  /** 顶层子代理模型段：provider/name/reasoningEffort/temperature/maxTokens。 */
+  subagentModel?: Record<string, unknown>;
   /** 预设级模板变量（{{key}} 插值源；与引擎行为参数 params 分离，顶层 variables 段）。 */
   variables?: Record<string, string>;
   /** 模板变量插值开关（缺省 true = 启用；false = 停用，writePreset 不生成变量文件）。 */

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { C as userPresetsDir, D as DEFAULT_SKILLS_DIR, E as DEFAULT_RESIDENT_AGENTS_PATH, O as LEGACY_CONTAINER_DIR, S as savePresetParams, T as DEFAULT_PRESET_DIR, _ as readPluginState, a as asString, b as resolvePresetDir, c as duplicateUserPreset, d as listPresets, f as loadPresetContent, g as parseImportedPresetId, h as packageEngineDir, i as applyModuleConfigs, k as LEGACY_USER_PRESETS_DIR, l as ensurePresetSeed, m as openPresetLocation, n as mergePromptConfigs, o as assertCompositionArray, p as loadPresetSpec, r as renderPromptConfigYaml, s as cloneBuiltinPreset, t as loadPromptConfigFiles, u as listBuiltinTemplates, v as removeUserPreset, w as writePluginState, x as resolvePresetParams, y as renderComposition } from "./prompt-configs-ThS4iXPg.mjs";
+import { C as userPresetsDir, D as DEFAULT_SKILLS_DIR, E as DEFAULT_RESIDENT_AGENTS_PATH, O as LEGACY_CONTAINER_DIR, S as savePresetParams, T as DEFAULT_PRESET_DIR, _ as readPluginState, a as asString, b as resolvePresetDir, c as duplicateUserPreset, d as listPresets, f as loadPresetContent, g as parseImportedPresetId, h as packageEngineDir, i as applyModuleConfigs, k as LEGACY_USER_PRESETS_DIR, l as ensurePresetSeed, m as openPresetLocation, n as mergePromptConfigs, o as assertCompositionArray, p as loadPresetSpec, r as renderPromptConfigYaml, s as cloneBuiltinPreset, t as loadPromptConfigFiles, u as listBuiltinTemplates, v as removeUserPreset, w as writePluginState, x as resolvePresetParams, y as renderComposition } from "./prompt-configs-BgFw_bFf.mjs";
 import { settingsNamespace } from "@deepseek-ai/dsh-settings";
 import { appendFileSync, cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, rmSync, statSync, watch, writeFileSync } from "node:fs";
 import { parse, parseDocument, stringify } from "yaml";

package/lib/preset-core.mjs

@@ -1,4 +1,4 @@
-import { n as mergePromptConfigs, o as assertCompositionArray, p as loadPresetSpec, r as renderPromptConfigYaml, t as loadPromptConfigFiles, y as renderComposition } from "./prompt-configs-ThS4iXPg.mjs";
+import { n as mergePromptConfigs, o as assertCompositionArray, p as loadPresetSpec, r as renderPromptConfigYaml, t as loadPromptConfigFiles, y as renderComposition } from "./prompt-configs-BgFw_bFf.mjs";
 import { fileURLToPath } from "node:url";
 //#region src/preset-core.ts
 /**

package/lib/{prompt-configs-ThS4iXPg.mjs → prompt-configs-BgFw_bFf.mjs}

@@ -84,6 +84,28 @@ function loadPresetSpec(dir) {
 	const parsed = parse(raw, { logLevel: "silent" });
 	if (parsed === null || typeof parsed !== "object") throw new Error(`preset ${join(dir, "preset.yml")} is not a YAML map`);
 	if (typeof parsed.id !== "string" || parsed.id.length === 0) parsed.id = basename(dir);
+	const flattenModelGroup = (source, mapping) => {
+		if (source === null || typeof source !== "object" || Array.isArray(source)) return;
+		if (parsed.params === null || typeof parsed.params !== "object" || Array.isArray(parsed.params)) parsed.params = {};
+		for (const [segmentKey, flatKey] of Object.entries(mapping)) {
+			const value = source[segmentKey];
+			if (value !== void 0) parsed.params[flatKey] = value;
+		}
+	};
+	flattenModelGroup(parsed.model, {
+		provider: "modelProvider",
+		name: "modelName",
+		reasoningEffort: "modelReasoningEffort",
+		temperature: "modelTemperature",
+		maxTokens: "modelMaxTokens"
+	});
+	flattenModelGroup(parsed.subagentModel, {
+		provider: "subagentModelProvider",
+		name: "subagentModelName",
+		reasoningEffort: "subagentReasoningEffort",
+		temperature: "subagentTemperature",
+		maxTokens: "subagentMaxTokens"
+	});
 	return parsed;
 }
 /** 读取预设模板内容资产(presetText / agentsText);模板缺失时静默降级。
@@ -363,12 +385,28 @@ function openPresetLocation(id, presetRoot = userPresetsDir()) {
 * 通道残留——参数已并入 preset.yml，避免旧值覆盖新值）。
 */
 function savePresetParams(presetRoot, templateName, params, promptConfigs, variables, variablesEnabled) {
+	const MODEL_KEY_MAP = {
+		modelProvider: ["model", "provider"],
+		modelName: ["model", "name"],
+		modelReasoningEffort: ["model", "reasoningEffort"],
+		modelTemperature: ["model", "temperature"],
+		modelMaxTokens: ["model", "maxTokens"],
+		subagentModelProvider: ["subagentModel", "provider"],
+		subagentModelName: ["subagentModel", "name"],
+		subagentReasoningEffort: ["subagentModel", "reasoningEffort"],
+		subagentTemperature: ["subagentModel", "temperature"],
+		subagentMaxTokens: ["subagentModel", "maxTokens"]
+	};
 	const file = join(presetRoot, templateName, "preset.yml");
 	if (!existsSync(file)) throw new Error(`preset ${templateName} 无 preset.yml`);
 	const doc = parseDocument(readFileSync(file, "utf8"), { logLevel: "silent" });
 	if (params !== void 0) for (const [key, value] of Object.entries(params)) {
 		if (value === void 0 || value === null || key.trim().length === 0) continue;
-		doc.setIn(["params", key], value);
+		const segment = MODEL_KEY_MAP[key];
+		if (segment !== void 0) {
+			doc.setIn([segment[0], segment[1]], value);
+			doc.deleteIn(["params", key]);
+		} else doc.setIn(["params", key], value);
 	}
 	if (promptConfigs !== void 0) {
 		const cleaned = promptConfigs.map((config) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-prompt-tool",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "DSH 插件：提示词工具，规范模型的思维链与回答内容，提供 Web UI 编辑 preset.md 与 AGENTS.md，并按 skills 目录注册可开关技能。",
   "license": "MIT",
   "repository": {