dsh-plugin-prompt-tool 0.6.0 → 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/engine/interpolate.mjs

@@ -7,8 +7,9 @@
  *
  * 插值规则：
  *   - {{key}}：配置 variables 有值 → 替换；否则 ST 运行时宏（lastusermessage /
- *     lastcharmessage 等，大小写不敏感）→ 会话事件提取；否则内置变量（DSH_HOME /
- *     WORKSPACE / CWD）→ 替换；否则保留字面（宽容，未注册变量不抛错）。
+ *     lastcharmessage 等，大小写不敏感）→ 会话事件提取；否则动态宏（roll/random/
+ *     pick/chance/time/date 等，支持 {{name::arg}} 参数）→ 运行时计算；否则内置
+ *     变量（DSH_HOME / WORKSPACE / CWD）→ 替换；否则保留字面（宽容）。
  *   - 键字符集：字母数字、下划线、点、中文、连字符（与 ST setvar/getvar 一致）。
  */
 
@@ -30,13 +31,62 @@ function lastMessageOf(session, type) {
   return ''
 }
 
-/** ST 运行时宏（会话上下文，大小写不敏感；无会话上下文时为空串——不残留字面）。 */
+/** 逗号分隔随机选一个（{{random::a,b,c}} / {{pick::a,b,c}}）。 */
+function pickRandom(arg) {
+  const items = String(arg ?? '').split(',').map((item) => item.trim()).filter((item) => item.length > 0)
+  if (items.length === 0) return ''
+  return items[Math.floor(Math.random() * items.length)]
+}
+
+/** 骰子表达式（{{roll::2d6+3}} / {{roll::1d20}}；非法表达式原样返回）。 */
+function rollDice(arg) {
+  const text = String(arg ?? '').replace(/\s+/g, '').toLowerCase()
+  const match = text.match(/^(\d*)d(\d+)([+-]\d+)?$/)
+  if (match === null) return text
+  const count = match[1] === '' ? 1 : Number.parseInt(match[1], 10)
+  const sides = Number.parseInt(match[2], 10)
+  const modifier = match[3] === undefined ? 0 : Number.parseInt(match[3], 10)
+  if (!Number.isSafeInteger(count) || count <= 0 || count > 100 || !Number.isSafeInteger(sides) || sides <= 0) return text
+  let sum = 0
+  for (let index = 0; index < count; index++) sum += 1 + Math.floor(Math.random() * sides)
+  return String(sum + modifier)
+}
+
+/** 百分比概率（{{chance::50}} → true/false）。 */
+function chancePercent(arg) {
+  const value = Number(String(arg ?? '').replace('%', '').trim())
+  if (!Number.isFinite(value)) return ''
+  return Math.random() * 100 < value ? 'true' : 'false'
+}
+
+/** 本地 HH:MM（{{time}}）。 */
+function formatTime(now) {
+  return `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`
+}
+
+/** UTC YYYY-MM-DD（{{date}}）。 */
+function formatDate(now) {
+  return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`
+}
+
+/** ST 动态宏（大小写不敏感；函数签名 (arg) => string；无会话上下文时同样可用）。 */
 const DYNAMIC_MACROS = {
-  lastusermessage: (session) => lastMessageOf(session, 'user/message'),
-  lastcharmessage: (session) => lastMessageOf(session, 'assistant/message'),
+  lastusermessage: (_arg, session) => lastMessageOf(session, 'user/message'),
+  lastcharmessage: (_arg, session) => lastMessageOf(session, 'assistant/message'),
   // charIfNotGroup：ST 群聊时空、单聊为角色名；dsh 会话 header 无角色名
   //（单角色会话），统一返回空串（不残留字面，也不注入错误内容）。
   charifnotgroup: () => '',
+  random: (arg) => pickRandom(arg),
+  pick: (arg) => pickRandom(arg),
+  roll: (arg) => rollDice(arg),
+  chance: (arg) => chancePercent(arg),
+  time: () => formatTime(new Date()),
+  date: () => formatDate(new Date()),
+  weekday: () => '星期' + '日一二三四五六'[new Date().getDay()],
+  isotime: () => new Date().toISOString().slice(11, 19),
+  isodate: () => new Date().toISOString().slice(0, 10),
+  newline: () => '\n',
+  pipe: () => '|',
 }
 
 /** 模板变量插值：配置 variables 优先，ST 运行时宏次之，内置 {{DSH_HOME}} / {{WORKSPACE}} / {{CWD}} 兜底。 */
@@ -46,21 +96,21 @@ export function interpolateVariables(text, variables, session) {
     WORKSPACE: process.env.DSH_WORKSPACE ?? session?.header?.cwd ?? process.cwd(),
     CWD: session?.header?.cwd ?? process.cwd(),
   }
-  return text.replace(/\{\{([A-Za-z0-9_.\u4e00-\u9fff-]+)\}\}/g, (whole, key) => {
+  return text.replace(/\{\{([A-Za-z0-9_.\u4e00-\u9fff-]+)(?:::(.*?))?\}\}/g, (whole, key, arg) => {
     if (Object.prototype.hasOwnProperty.call(variables, key)) return String(variables[key])
     const dynamic = DYNAMIC_MACROS[key.toLowerCase()]
-    if (dynamic !== undefined) return dynamic(session)
+    if (dynamic !== undefined) return dynamic(arg, session)
     return Object.prototype.hasOwnProperty.call(builtins, key) ? builtins[key] : whole
   })
 }
 
 /** 仅做配置级静态变量替换（无 session 上下文的层）。 */
 export function interpolateStatic(text, variables) {
-  return text.replace(/\{\{([A-Za-z0-9_.\u4e00-\u9fff-]+)\}\}/g, (whole, key) => {
+  return text.replace(/\{\{([A-Za-z0-9_.\u4e00-\u9fff-]+)(?:::(.*?))?\}\}/g, (whole, key, arg) => {
     if (Object.prototype.hasOwnProperty.call(variables, key)) return String(variables[key])
     // ST 运行时宏在无会话上下文（system-section 注册期）时替换为空串——
     // 不残留字面，也不触发官方 unknown variable 渲染报错。
     const dynamic = DYNAMIC_MACROS[key.toLowerCase()]
-    return dynamic !== undefined ? dynamic(undefined) : whole
+    return dynamic !== undefined ? dynamic(arg, undefined) : whole
   })
 }

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.0",
+  "version": "0.6.2",
   "description": "DSH 插件：提示词工具，规范模型的思维链与回答内容，提供 Web UI 编辑 preset.md 与 AGENTS.md，并按 skills 目录注册可开关技能。",
   "license": "MIT",
   "repository": {

package/templates/70-subagent-maintenance.yml

@@ -0,0 +1,38 @@
+# 模板：子代理状态 / 记忆维护（audience=subagent 专用注入）
+# 用途：把 ST 的「角色状态跟踪 + 关系记忆」委派给子代理完成——引擎保持确定性
+#       （插值/匹配/注入），智能判断（何时更新、更新成什么）交给委派子代理，
+#       写入经确定性工具边界（session_var 会话状态 / world_book note 持久记忆）。
+# 接入：模板选择器「消息批层」插入；默认关闭，插入后启用并按需改 stateKeys。
+id: subagent-maintenance
+name: 子代理状态/记忆维护
+enabled: false
+layer: pre-step
+strategy: static
+position: after-user
+dedupe: none
+promotion: none
+audience: subagent
+modelScope: all
+configKind: ordered
+order: 2000
+role: user
+mergeMode: merged
+sourceKind: ''
+form: hint
+summary: ''
+identity:
+  field: plugin
+  value: subagent-maintenance
+text: |-
+  你是本会话的「状态与记忆维护者」，与创作类子代理职责互补：
+  - 状态（本会话临时，模板变量注入用）：观察互动中明确的角色状态变化
+    （心情、态度、接受度等），用 session_var 工具 set 更新——变量名见下方
+    「状态变量」清单；状态未变化时不要重复写入。
+  - 记忆（跨会话持久）：有人际关系进展或重要事实时，用 world_book_upsert
+    的 note 参数写入来源角色卡记忆（条目 id 带 chara- 前缀 → 角色卡
+    memory.md，跨会话跟随角色卡）；无归属条目写入预设记忆。
+  - 克制：仅在状态确实变化时更新；不确定时保留原值；不编造未发生的内容。
+  状态变量清单：{{stateKeys}}
+variables:
+  stateKeys: 心情, 接受值, 关系进度
+params: {}