dsh-plugin-prompt-tool 2.0.1 → 3.0.0

package/engine/layers.mjs

@@ -1,25 +1,25 @@
 /**
- * layers — 非 pre-step 的五个官方层级接线。
+ * layers — 非 pre-step 的官方层级接线。
  * 所有注册都只作用于本插件提示词配置;单条失败 warnOnce 后继续。
  */
 
 import {
   MAX_TRACKED_SESSIONS,
-  extractText,
   getService,
   isDelegated,
   keepDisposer,
+  matchesAudience,
   matchesModel,
   newMessageId,
-  parseToolNames,
   sessionState,
 } from './shared.mjs'
-import { KNOWN_STRATEGIES } from './schema.mjs'
-import { interpolateVariables, stripUnresolvedRefs, RUNTIME_FACTS, runtimeFactValue } from './interpolate.mjs'
-import { getSessionVar, sessionVarsSnapshot } from './session-vars.mjs'
-import { conditionHit, lastAssistantText, subagentTextOf, toolArgsText } from './condition.mjs'
+import { pluginKind } from './source-kind.mjs'
+import { INJECTION_LAYERS, KNOWN_STRATEGIES, SESSION_VARIABLES_DISABLED } from './schema.mjs'
+import { interpolateVariables, stripUnresolvedRefs, RUNTIME_FACTS, runtimeFactValue, isReservedInterpolationName } from './interpolate.mjs'
+import { renderTemplate } from './template-frame.mjs'
 import { compareConfigSequence, compareTextPlacement } from './order.mjs'
-import { ruleFrame, ruleMatches } from './conditions/evaluation.mjs'
+import { ruleFrame, actionMatches } from './conditions/evaluation.mjs'
+import { textRegistrationName, identityStampOf, actionStamp, injectedMessage, findActionDelivery } from './delivery.mjs'
 
 const name = 'prompt-config-engine'
 // 同一宿主会话共享投递账本，避免预设作用域重挂后重投同一次结束通知。
@@ -33,11 +33,14 @@ const subagentEndDeliveries = new WeakMap()
  *  keep=官方变量通道按 assembly 求值的名字，静态 pass 命中即原样保留引用。 */
 function configText(config, registries, warnOnce, context) {
   const registry = registries.get(config)
-  if (typeof config.renderSt === 'function') {
-    return officialChannelText(config.renderSt(context?.agent, [], warnOnce, context), `${config.layer} ${config.id}`, registry, warnOnce)
+  if (config.params?.templateEvaluation === true) {
+    try { return officialChannelText(renderTemplate(config, context, { enabled: config[SESSION_VARIABLES_DISABLED] !== true, warn: warnOnce }), `${config.layer} ${config.id}`, registry, warnOnce) }
+    catch (error) { warnOnce(`${name}: template ${config.id} failed: ${String(error?.message ?? error)}`); return '' }
   }
+  const variables = config[SESSION_VARIABLES_DISABLED] === true ? {} : config.texts.some(text => text.includes('{{'))
+    ? config.variableStore?.read(config.sourceModuleId).effective ?? config.variables : config.variables
   const text = config.texts
-    .map((item) => interpolateVariables(item, config.variables, context?.agent?.session, registry?.protect))
+    .map((item, index) => interpolateVariables(item, variables, context?.agent?.session, registry?.protect, `${config.id}#${index}`))
     .filter((item) => item.length > 0)
     .join('\n\n')
   return officialChannelText(text, `${config.layer} ${config.id}`, registry, warnOnce)
@@ -76,7 +79,8 @@ function registerOfficialVariables(ctx, configs, warnOnce, keep) {
   const reserved = new Set()
   const facts = new Set()
   for (const config of configs) {
-    if (config.params?.stMacros === true) continue
+    // 持久值在各正文 provider 被调用时读取，使后卡看到前卡刚提交的变量。
+    if (config.params?.templateEvaluation === true || config.variableStore !== undefined) continue
     const referenced = new Set()
     for (const text of config.texts) {
       for (const match of String(text).matchAll(NAME_REFERENCE_RE)) referenced.add(match[1])
@@ -93,14 +97,14 @@ function registerOfficialVariables(ctx, configs, warnOnce, keep) {
   for (const [config, referenced] of references) {
     const registry = registries.get(config)
     for (const name of referenced) {
-      const declared = Object.hasOwn(config.variables, name)
+      const declared = Object.hasOwn(config.variables, name) || config.variableStore !== undefined && !isReservedInterpolationName(name)
       const isFact = !declared && RUNTIME_FACTS.has(name.toLowerCase())
       if (!declared && !isFact) continue
       let official = isFact ? name.toLowerCase() : OFFICIAL_NAME_RE.test(name) ? name : officialAliasOf(name)
       try {
         // 内容绑定包含局部命名空间：会话覆盖也可以再引用其中的变量。
         // 纯事实不属于任何配置的内容命名空间，所有大小写变体复用规范名。
-        const signature = isFact ? `fact:${official}` : JSON.stringify([name, Object.entries(config.variables).sort(([a], [b]) => a.localeCompare(b))])
+        const signature = isFact ? `fact:${official}` : JSON.stringify([config.sourceModuleId, name, config.variableStore === undefined ? Object.entries(config.variables).sort(([a], [b]) => a.localeCompare(b)) : null])
         let binding = bindings.get(signature)
         if (binding === undefined) {
           if (usedNames.has(official) || (!isFact && facts.has(official)) || (official !== name && !isFact && reserved.has(official))) {
@@ -110,12 +114,13 @@ function registerOfficialVariables(ctx, configs, warnOnce, keep) {
           }
           usedNames.add(official)
           const source = isFact ? name.toLowerCase() : name
-          const declaredValue = declared ? String(config.variables[name] ?? '') : undefined
+          const variablesDisabled = config[SESSION_VARIABLES_DISABLED] === true
           keep(systemPrompt.variable(official, (context) => {
             const session = context?.agent?.session
-            const override = getSessionVar(session, source)
-            const value = override !== undefined ? String(override) : declaredValue ?? runtimeFactValue(source, session) ?? ''
-            const expanded = interpolateVariables(value, { ...config.variables, ...sessionVarsSnapshot(session) }, session)
+            const variables = variablesDisabled ? {} : config.variableStore?.read(config.sourceModuleId).effective ?? config.variables
+            const value = Object.hasOwn(variables, source) ? String(variables[source]) : runtimeFactValue(source, session) ?? ''
+            // 变量值内的 {{pick}} 同样要有位置身份（配置 id + 声明名），否则同会话下多个变量的首个 pick 撞值。
+            const expanded = interpolateVariables(value, variables, session, undefined, `variable:${config.sourceModuleId}:${config.id}:${name}`)
             return officialChannelText(expanded, `variable ${official}`, { alias: new Map(), registered: new Set() }, warnOnce)
           }), `${name}: official prompt variable ${official}`)
           binding = official
@@ -141,16 +146,14 @@ function rewriteOfficialAliases(text, alias) {
 /** agent/request 与 tools/* 层的作用域过滤。 */
 export function matchesAgentScope(config, agent) {
   if (agent === undefined) return true
-  const delegated = isDelegated(agent.session)
-  if (config.audience === 'main' && delegated) return false
-  if (config.audience === 'subagent' && !delegated) return false
+  if (!matchesAudience(config.audience, isDelegated(agent.session) ? 'subagent' : 'main')) return false
   return matchesModel(config.modelScope, agent.options?.model)
 }
 
 /**
  * 官方插值通道（system-section / runtime-context）出口清洗：本项目解析后仍残留的
  * 引用一律剥离，官方严格插值因此看不到未注册引用（既不抛错也不留字面）。
- * 只在本项目的宽容解析之后调用；其他层（pre-step / agent-request / tool-pipeline）
+ * 只在本项目的宽容解析之后调用；其他层（pre-step / agent-request）
  * 不经官方插值，保持原有宽容语义。
  */
 function officialChannelText(text, label, registry, warnOnce) {
@@ -171,36 +174,27 @@ function textLayerGroups(configs) {
     const base = previous?.[0]
     if (config.mergeMode === 'merged' && base?.mergeMode === 'merged'
       && config.sourceModuleId === base.sourceModuleId
+      && (config.params?.complete === true) === (base.params?.complete === true)
+      && (config.params?.suppressRuntimeContext === true) === (base.params?.suppressRuntimeContext === true)
       && config.position === base.position && config.order === base.order) previous.push(config)
     else groups.push([config])
   }
   return groups
 }
 
-/** 官方同 order 按 name 排序：默认名编码安全整数序号，显式名仍由作者拥有。 */
-function textRegistrationName(config, field) {
-  const explicit = config.params?.[field]
-  if (typeof explicit === 'string' && explicit.length > 0) return explicit
-  if (config.sourceModuleId === undefined) return config.id
-  // 非负安全整数最多 16 位，跨过四位文件前缀后仍保持数值顺序。
-  const sequence = String(config.sequence).padStart(16, '0')
-  return `prompt-tool:${sequence}:${config.sourceModuleId}:${config.id}`
-}
-
 /** system-section:注册静态 system prompt 段(支持官方 {{variable}} 渲染与 merged 拼接)。 */
-function wireSystemSections(ctx, configs, registry, warnOnce, keep) {
-  const disposers = []
+function wireSystemSections(ctx, configs, registry, warnOnce, keep, ordered) {
   const systemPrompt = getService(ctx, 'systemPrompt')
   if (systemPrompt === undefined || typeof systemPrompt.section !== 'function') {
     if (configs.length > 0) warnOnce(`${name}: systemPrompt service unavailable — system-section configs skipped`)
-    return disposers
+    return
   }
   // 人设段（deployment:persona-prefix/suffix）由官方 @deepseek-ai/dsh-persona 行注册
   // （preset.yml 顶层 persona 段驱动）；本层只处理其余 system-section 配置。
   for (const group of textLayerGroups(configs)) {
     const base = group[0]
     try {
-      const dynamic = group.some((config) => config.audience != null || typeof config.renderSt === 'function'
+      const dynamic = group.some((config) => config.audience != null || config.params?.templateEvaluation === true || config.variableStore !== undefined
         || config.texts.some(text => /\{\{\s*(?:random|pick|roll|chance)(?=\s|:|\})/i.test(text)))
       const groupText = dynamic ? '' : group.map((config) => configText(config, registry, warnOnce)).filter((item) => item.length > 0).join('\n\n')
       if (!dynamic && groupText.length === 0) continue
@@ -211,12 +205,14 @@ function wireSystemSections(ctx, configs, registry, warnOnce, keep) {
               .filter((item) => item.length > 0)
               .join('\n\n')
         : groupText
+      const entryName = textRegistrationName(base, 'sectionName')
       keep(systemPrompt.section({
-        name: textRegistrationName(base, 'sectionName'),
+        name: entryName,
         order: base.order,
         text,
         ...(base.params?.complete === true ? { complete: true } : {}),
       }), `${name}: section ${base.id}`)
+      ordered.sections.push(orderedEntry(entryName, base))
       // suppressRuntimeContext 抑制该 scope 的动态 runtime-context 快照（多段重复调用幂等）。
       if (base.params?.suppressRuntimeContext === true) {
         keep(systemPrompt.suppressRuntimeContext(), `${name}: suppressRuntimeContext ${base.id}`)
@@ -225,7 +221,6 @@ function wireSystemSections(ctx, configs, registry, warnOnce, keep) {
       warnOnce(`${name}: system-section config ${base.id} failed: ${String(error?.message ?? error)}`)
     }
   }
-  return disposers
 }
 
 async function resolvedContextText(ctx, config, context, registry, warnOnce) {
@@ -233,14 +228,19 @@ async function resolvedContextText(ctx, config, context, registry, warnOnce) {
   const session = agent?.session
   const resolved = await config.resolve({ ctx, agent, session, signal: context.signal, decision: { kind: 'ok', messages: [] }, messages: [] })
   if (context.signal?.aborted || resolved == null) return ''
-  const variables = { ...config.variables, ...(resolved.variables !== null && typeof resolved.variables === 'object' ? resolved.variables : {}) }
-  const rendered = config.texts.length > 0 ? interpolateVariables(config.texts.join('\n\n'), variables, session)
-    : typeof resolved.text === 'string' ? interpolateVariables(resolved.text, variables, session) : ''
+  const variables = { ...(config[SESSION_VARIABLES_DISABLED] === true ? {} : config.variableStore?.read(config.sourceModuleId).effective ?? config.variables), ...(resolved.variables !== null && typeof resolved.variables === 'object' ? resolved.variables : {}) }
+  if (config.params?.templateEvaluation === true) {
+    const texts = config.texts.length ? config.texts : [resolved.text ?? '']
+    return officialChannelText(renderTemplate({ ...config, texts }, context, { enabled: config[SESSION_VARIABLES_DISABLED] !== true, warn: warnOnce }), `runtime-context ${config.id}`, registry, warnOnce)
+  }
+  // 模板位置身份 = 配置 id（texts 合并与 resolved.text 是同一位置的两个互斥分支）；缺省会退化成 [会话, 出现序号]。
+  const rendered = config.texts.length > 0 ? interpolateVariables(config.texts.join('\n\n'), variables, session, undefined, config.id)
+    : typeof resolved.text === 'string' ? interpolateVariables(resolved.text, variables, session, undefined, config.id) : ''
   return officialChannelText(rendered, `runtime-context ${config.id}`, registry, warnOnce)
 }
 
 /** 条件化文本保留官方排序占位；仅在本次真实 assembly 填充，不缓存 context 身份。 */
-function wireRuleTextContributions(ctx, configs, registry, warnOnce, keep, on) {
+function wireRuleTextContributions(ctx, configs, registry, warnOnce, keep, on, ordered) {
   if (!configs.length) return []
   const systemPrompt = getService(ctx, 'systemPrompt')
   if (systemPrompt === undefined) { warnOnce(`${name}: systemPrompt unavailable`); return [] }
@@ -254,6 +254,7 @@ function wireRuleTextContributions(ctx, configs, registry, warnOnce, keep, on) {
     const entryName = textRegistrationName(base, section ? 'sectionName' : 'contextName')
     keep(systemPrompt[section ? 'section' : 'context']({ name: entryName, order: base.order, text: marker }), `${name}: conditional ${entryName}`)
     bindings.push({ group, name: entryName, collection: section ? 'sections' : 'contexts' })
+    ordered[section ? 'sections' : 'contexts'].push(orderedEntry(entryName, base))
   }
   let active = true
   keep(() => { active = false }, `${name}: conditional text lifecycle`)
@@ -265,7 +266,7 @@ function wireRuleTextContributions(ctx, configs, registry, warnOnce, keep, on) {
       entry.text = ''
       const blocks = []
       for (const config of binding.group) {
-        if (!active || context.signal?.aborted || !ruleMatches(config.rule, frame) || !matchesAgentScope(config, context.agent)) continue
+        if (!active || context.signal?.aborted || !actionMatches(config, frame) || !matchesAgentScope(config, context.agent)) continue
         try {
           const text = config.layer === 'runtime-context' && (config.strategy === 'placeholder' || !KNOWN_STRATEGIES.has(config.strategy))
             ? await resolvedContextText(ctx, config, context, registry.get(config), warnOnce)
@@ -281,7 +282,7 @@ function wireRuleTextContributions(ctx, configs, registry, warnOnce, keep, on) {
 }
 
 /** runtime-context:注册运行时上下文；静态文本支持 merged，动态策略在官方 assembly waterfall 中填充。 */
-function wireRuntimeContexts(ctx, configs, registry, warnOnce, keep, on) {
+function wireRuntimeContexts(ctx, configs, registry, warnOnce, keep, on, ordered) {
   const disposers = []
   const systemPrompt = getService(ctx, 'systemPrompt')
   if (systemPrompt === undefined || typeof systemPrompt.context !== 'function') {
@@ -295,17 +296,20 @@ function wireRuntimeContexts(ctx, configs, registry, warnOnce, keep, on) {
   for (const group of textLayerGroups(staticConfigs)) {
     const base = group[0]
     try {
-      const dynamic = group.some(config => typeof config.renderSt === 'function'
+      const dynamic = group.some(config => config.params?.templateEvaluation === true || config.variableStore !== undefined
         || config.texts.some(text => /\{\{\s*(?:random|pick|roll|chance)(?=\s|:|\})/i.test(text)))
       const render = context => group.map(config => configText(config, registry, warnOnce, context)).filter(item => item.length > 0).join('\n\n')
       const text = dynamic ? render : render()
       if (!dynamic && text.length === 0) continue
+      const entryName = textRegistrationName(base, 'contextName')
       keep(systemPrompt.context({
-        name: textRegistrationName(base, 'contextName'),
+        name: entryName,
         order: base.order,
         text,
       }), `${name}: context ${base.id}`)
+      ordered.contexts.push(orderedEntry(entryName, base))
     } catch (error) {
+      if (base.linkedDelivery) throw error
       warnOnce(`${name}: runtime-context config ${base.id} failed: ${String(error?.message ?? error)}`)
     }
   }
@@ -329,6 +333,7 @@ function wireRuntimeContexts(ctx, configs, registry, warnOnce, keep, on) {
         text: slotText,
       }), `${name}: context ${config.id}`)
       registered.set(contextName, config)
+      ordered.contexts.push(orderedEntry(contextName, config))
     } catch (error) {
       warnOnce(`${name}: runtime-context placeholder ${config.id} failed: ${String(error?.message ?? error)}`)
     }
@@ -352,91 +357,6 @@ function wireRuntimeContexts(ctx, configs, registry, warnOnce, keep, on) {
   return disposers
 }
 
-/**
- * agent/request 载荷的唯一改写实现（B3 T2 第 (7) 类动作与既有 `agent-request`
- * 层**共用这一份**，不另写一套请求改写）。三种语义：
- *   - `patch`：对下游已解析的 LlmCallConfig 做浅合并；
- *   - `replace: true`：整体替换为 `patch`（不叠加 base，故 `unset` 无比较对象）；
- *   - `unset`：**按值条件删键** —— 仅当合并结果里的值**恰好等于**声明值时删除该键
- *     （`Object.is` 比较）。这来自原 `tool-bootstrap` 剥离 `bootstrapMaxTokens` 的语义
- *     （「仅当解析后的 maxTokens 恰好等于本声明注入的那个值时才删」；声明侧见
- *     `test/engine/declarations/tool-bootstrap.yml` 声明 4 的 `do.unset`），不是"存在即删"
- *     ——模型或其它插件设置的同名参数不会被删。
- *     浅合并做不到删键，故删键必须走显式通道。
- * @param params 提示词配置的 `params`（或动作的等价声明）。
- * @param base 下游 `next()` 已解析的请求配置。
- * @returns 改写后的请求配置；无 unset 命中时零额外分配。
- */
-export function applyAgentRequestParams(params, base) {
-  const patch = params?.patch !== null && typeof params?.patch === 'object' && !Array.isArray(params.patch)
-    ? params.patch
-    : {}
-  if (params?.replace === true) return { ...patch }
-  const merged = { ...base, ...patch }
-  const unset = params?.unset
-  if (unset === null || typeof unset !== 'object' || Array.isArray(unset)) return merged
-  let result
-  for (const [key, expected] of Object.entries(unset)) {
-    // 每个键都对着**合并结果**判定：一旦分配过副本，后续键不得跳过比较。
-    if (!Object.is(merged[key], expected)) continue
-    if (result === undefined) result = { ...merged }
-    delete result[key]
-  }
-  return result ?? merged
-}
-
-/** agent-request:对冻结的 LlmCallConfig 做浅合并 / 整体替换 / 按值条件删键。 */
-function wireAgentRequests(ctx, configs, warnOnce, on) {
-  if (configs.length === 0) return []
-  const ordered = configs.some(config => config.sequence !== undefined) ? configs : [...configs].reverse()
-  return [on('agent/request', async (payload, next, invocation) => {
-    let result = await next()
-    const frame = invocation ?? ruleFrame('agent/request', [payload], warnOnce)
-    // 模块请求在 next 返回后按序合并；无文件来源的独立调用保持原回栈顺序。
-    for (const config of ordered) {
-      try {
-        if (ruleMatches(config.rule, frame) && matchesAgentScope(config, payload?.agent)) result = applyAgentRequestParams(config.params, result)
-      } catch (error) {
-        warnOnce(`${name}: agent-request config ${config.id} failed: ${String(error?.message ?? error)}`)
-      }
-    }
-    return result
-  })]
-}
-
-/** 把流替换为提示词配置文本的最小合法 chunk 序列。 */
-async function* replacedStream(text) {
-  yield { type: 'block-start', index: 0, blockType: 'text' }
-  yield { type: 'text-delta', index: 0, text }
-  yield { type: 'block-end', index: 0, block: { type: 'text', text } }
-}
-
-/** llm-stream:pass 透传;replace 用提示词配置文本替代整个模型流。 */
-function wireLlmStreams(ctx, configs, warnOnce, on) {
-  const disposers = []
-  for (const config of configs) {
-    disposers.push(on('llm/stream', (options, next, invocation) => {
-      try {
-        const frame = invocation ?? ruleFrame('llm/stream', [options], warnOnce)
-        const agent = options?.sessionId === undefined ? undefined : getService(ctx, 'agents')?.get?.(options.sessionId)
-        frame.subject.agent = agent
-        if (!ruleMatches(config.rule, frame)) return next()
-        const mode = config.params?.mode ?? 'pass'
-        if (mode === 'replace' && config.texts.length > 0 && matchesModel(config.modelScope, options?.model)) {
-          return replacedStream(config.texts.join('\n\n'))
-        }
-        return next()
-      } catch (error) {
-        warnOnce(`${name}: llm-stream config ${config.id} failed: ${String(error?.message ?? error)}`)
-        return next()
-      }
-    }))
-  }
-  return disposers
-}
-
-/** 条件判定的匹配器与取文本逻辑由 condition.mjs 承载（pre-step 与其他层共用）。 */
-
 /**
  * 插件来源的 user 消息：与 anchor-turn / progress-reminder 同一形状。
  *
@@ -451,15 +371,17 @@ export function pluginMessage(prefix, text, summary) {
     id: newMessageId(prefix),
     role: 'user',
     content: [{ type: 'text', text }],
-    source: { kind: `plugin:${name}`, plugin: name, form: 'notice', summary },
+    source: { kind: pluginKind(name), plugin: name, form: 'notice', summary },
   }
 }
 
 /** 层级文本：按声明变量插值后按空行拼接；不走官方插值通道（非 system-section）。 */
 function layerText(config, agent, warnOnce) {
   try {
+    if (config.params?.templateEvaluation === true) return renderTemplate(config, { agent }, { enabled: config[SESSION_VARIABLES_DISABLED] !== true, warn: warnOnce })
+    const variables = config[SESSION_VARIABLES_DISABLED] === true ? {} : config.variableStore?.read(config.sourceModuleId).effective ?? config.variables
     return config.texts
-      .map((item) => interpolateVariables(item, config.variables, agent?.session))
+      .map((item, index) => interpolateVariables(item, variables, agent?.session, undefined, `${config.sourceModuleId}:${config.id}#${index}`))
       .filter((item) => item.length > 0)
       .join('\n\n')
   } catch (error) {
@@ -468,56 +390,10 @@ function layerText(config, agent, warnOnce) {
   }
 }
 
-/** tool-pipeline:pre-execute 判定、execute 包装、post-execute 结果替换/阻断。 */
-function wireToolPipelines(ctx, configs, warnOnce, on) {
-  const disposers = []
-  for (const config of configs) {
-    const names = parseToolNames(config.params?.toolNames)
-    const matchesTool = (exec) => names.length === 0 || names.includes(exec?.name)
-    disposers.push(on('tools/pre-execute', async (exec, next, invocation) => {
-      try {
-        if (!ruleMatches(config.rule, invocation ?? ruleFrame('tools/pre-execute', [exec], warnOnce))) return next()
-        if (!matchesTool(exec) || !matchesAgentScope(config, exec?.agent)) return next()
-        if (!conditionHit(config, { argsText: toolArgsText(exec?.arguments) })) return next()
-        const decision = config.params?.preDecision ?? 'allow'
-        if (decision === 'allow') return next()
-        if (decision === 'deny') {
-          return { kind: 'deny', reason: String(config.params?.denyReason ?? `${config.name}: denied by prompt config`) }
-        }
-        if (decision === 'ask') return { kind: 'ask' }
-        return next()
-      } catch (error) {
-        warnOnce(`${name}: tool-pipeline(pre) config ${config.id} failed: ${String(error?.message ?? error)}`)
-        return next()
-      }
-    }))
-    disposers.push(on('tools/post-execute', async (exec, result, next, invocation) => {
-      try {
-        if (!ruleMatches(config.rule, invocation ?? ruleFrame('tools/post-execute', [exec, result], warnOnce))) return next()
-        if (!matchesTool(exec) || !matchesAgentScope(config, exec?.agent)) return next()
-        if (!conditionHit(config, { argsText: toolArgsText(exec?.arguments), resultText: extractText(result) })) return next()
-        const action = config.params?.postAction ?? 'accept'
-        if (action === 'accept') return next()
-        if (action === 'replace' && config.texts.length > 0) {
-          return { kind: 'accept', content: [{ type: 'text', text: config.texts.join('\n\n') }] }
-        }
-        if (action === 'block') {
-          return { kind: 'block', feedback: [{ type: 'text', text: config.texts.length > 0 ? config.texts.join('\n\n') : `${config.name}: blocked by prompt config` }] }
-        }
-        return next()
-      } catch (error) {
-        warnOnce(`${name}: tool-pipeline(post) config ${config.id} failed: ${String(error?.message ?? error)}`)
-        return next()
-      }
-    }))
-  }
-  return disposers
-}
-
 /**
- * 轮次停止层的续跑上限：每轮 1 次、每会话 3 次，均为引擎常量。
- * 不暴露为配置——强制续跑失控会把会话卡在停不下来的循环里；官方桥在同一位置
- * 也只留了 TODO(stop-loop-guard) 而未实现上限。
+ * 轮次停止层（`turn-stop` 与续跑动作）的续跑上限：**每个来源（模块）**每轮 1 次、
+ * 每会话 3 次，均为引擎常量。不暴露为配置——强制续跑失控会把会话卡在停不下来的
+ * 循环里；官方桥在同一位置也只留了 TODO(stop-loop-guard) 而未实现上限。
  */
 export const TURN_STOP_MAX_PER_TURN = 1
 export const TURN_STOP_MAX_PER_SESSION = 3
@@ -526,8 +402,10 @@ export const TURN_STOP_MAX_PER_SESSION = 3
 export const TURN_STOP_MAX_TRACKED_TURNS = 8
 
 /**
- * 续跑预算（唯一实现）：B3 T2 第 (4) 类动作的「续跑」与既有 turn-stop 层共用它，
+ * 续跑预算（唯一实现）：所有 turn-stop 注入共用它，
  * 上限是引擎常量而不是配置——强制续跑失控会把会话卡在停不下来的循环里。
+ * **一份预算覆盖一个来源模块**（规则运行时按模块传入同一份），因此同模块的多条
+ * turn-stop 动作合计每轮 1 次、每会话 3 次。
  * 三步语义刻意与迁移前逐行一致：
  *   entry(...)    取条目（含创建与超限轮次淘汰的副作用），在条件判定**之前**调用；
  *   available(...) 只读判定，不落账；
@@ -537,24 +415,22 @@ export function createTurnStopBudget() {
   /**
    * 会话预算条目（`sessionState`：统一访问接口，策略逐条声明）。
    *
-   * 键类型 `session.id`；淘汰策略超限 `clear()` 全清（与迁移前的 `sessionMapGet` 同档：
+   * 键类型 `session.id`；淘汰策略超限 `clear()` 全清（与迁移前的会话态记账同档：
    * 第 `MAX_TRACKED_SESSIONS` 个会话仍会清空整个容器）；**不声明复位**——预算是纯增量、
    * 不可从事件流重建的计数（与 `progress-reminder` 同档），丢失时机必须与迁移前逐字一致，
    * compaction 也不重置它。
    *
-   * 本函数**没有 ctx**：`createTurnStopBudget()` 是 B3 交付物的一部分，对外签名与
-   * `entry/available/claim` 三个方法逐字不变（调用方见 actions.mjs 的 append-context 与
-   * 本文件的 turn-stop 层）。`sessionState` 只在声明了 `reset` 时才读 ctx，因此这里传
+   * 本函数没有 ctx，只有 turn-stop 注入消费预算。
+   * `sessionState` 只在声明了 `reset` 时才读 ctx，因此这里传
    * `undefined` 合法且零开销（详见 shared.mjs 的 JSDoc 与 test/engine/session-state.test.mjs）。
    */
   const state = sessionState(undefined, () => ({ turns: new Map(), total: 0 }))
 
   const stateOf = (sessionId, turn) => {
     // 对外仍是 `(sessionId, turn)`：按 id 造一次性键宿主，`keyOf` 取的就是 `.id`，与旧的
-    // `sessionMapGet(state, sessionId, …)` 写进同一个槽位、同一个 clear 时机。
+    // 记账写法写进同一个槽位、同一个 clear 时机。
     // 唯一差异在**无 id 的会话**（`sessionId === undefined`）：`sessionState` 刻意不记账
-    // （见 shared.mjs），旧写法把 `undefined` 当一个共享槽位。两个调用点（actions.mjs 的
-    // append-context 与下方 turn-stop 层）都在 `entry()` 之前守卫 `session?.id === undefined`，
+    // （见 shared.mjs），下方 turn-stop 层在 `entry()` 前守卫 `session?.id === undefined`，
     // 故该路径不可达；这里兜底一个新条目，避免将来误用时抛 TypeError。
     const entry = state.get({ id: sessionId }) ?? { turns: new Map(), total: 0 }
     if (!Number.isFinite(turn)) return entry
@@ -579,11 +455,15 @@ export function createTurnStopBudget() {
   }
 }
 
-/** turn-stop：命中条件时阻止本轮停止并强制续跑一步，上限在引擎内。 */
-function wireTurnStops(ctx, configs, warnOnce, on) {
+/**
+ * turn-stop：命中条件时阻止本轮停止并强制续跑一步，上限在引擎内。
+ * options.turnStopBudgets 由调用方传入时按同一份预算记账（规则运行时按模块一份），
+ * 缺省仍按 sourceModuleId 各建一份。
+ */
+function wireTurnStops(ctx, configs, warnOnce, on, turnStopBudgets) {
   const disposers = []
   if (configs.length === 0) return disposers
-  const budgets = new Map()
+  const budgets = turnStopBudgets ?? new Map()
 
   for (const config of configs) {
     const source = config.sourceModuleId ?? ''
@@ -592,18 +472,20 @@ function wireTurnStops(ctx, configs, warnOnce, on) {
     disposers.push(on('agent/turn-stopping', (payload = {}, _next, invocation) => {
       const { agent, turn } = payload
       try {
-        if (!ruleMatches(config.rule, invocation ?? ruleFrame('agent/turn-stopping', [payload], warnOnce))) return
+        if (payload.signal?.aborted) return
+        if (!actionMatches(config, invocation ?? ruleFrame('agent/turn-stopping', [payload], warnOnce))) return
         const session = agent?.session
         if (session?.id === undefined || typeof agent.steer !== 'function') return
         if (!matchesAgentScope(config, agent)) return
+        if (config.dedupe === 'session' && (config.linkedDelivery ? findActionDelivery(session, config) : injectedMessage(config, session))) return
         const entry = budget.entry(session.id, turn)
         if (!budget.available(entry, turn)) return
-        if (!conditionHit(config, { assistantText: lastAssistantText(session) })) return
         const text = layerText(config, agent, warnOnce)
         if (text.length === 0) return
         // 计数在 steer 之前落账：steer 抛错也不允许下一步重试越过预算。
         budget.claim(entry, turn)
-        agent.steer(pluginMessage(`turn-stop-${config.id}`, text, `turn-stop ${config.id}`))
+        const message = pluginMessage(`turn-stop-${config.id}`, text, `turn-stop ${config.id}`)
+        agent.steer({ ...message, source: { ...message.source, ...identityStampOf(config), ...actionStamp(config, session) } })
       } catch (error) {
         warnOnce(`${name}: turn-stop config ${config.id} failed: ${String(error?.message ?? error)}`)
       }
@@ -645,7 +527,7 @@ function wireSubagentEvents(ctx, configs, warnOnce, on) {
       const session = child?.session ?? getService(ctx, 'sessions')?.get?.(info.id)
       if (session === undefined) return
       const mainId = mainSessionForChild(ctx, info.id)
-      // ponytail: 有界运行记录；极端并发超过上限时，结束事件仍可通过存活会话血缘定位。
+      // shortcut: 有界运行记录；极端并发超过上限时，结束事件仍可通过存活会话血缘定位。
       if (runs.size >= MAX_TRACKED_SESSIONS) runs.delete(runs.keys().next().value)
       runs.set(info.runId, { id: info.id, mainId, agent: child, session, model: child?.options?.model })
     }))
@@ -660,11 +542,9 @@ function wireSubagentEvents(ctx, configs, warnOnce, on) {
         if (child === undefined) return
         const frame = invocation ?? ruleFrame('subagent/start', [info], warnOnce)
         frame.subject.agent = child
-        const subagentText = subagentTextOf(info)
         for (const config of startConfigs) {
-          if (!ruleMatches(config.rule, frame)) continue
+          if (!actionMatches(config, frame)) continue
           if (!matchesAgentScope(config, child)) continue
-          if (!conditionHit(config, { subagentText })) continue
           if (typeof child.inject !== 'function') continue
           const text = layerText(config, child, warnOnce)
           if (text.length === 0) continue
@@ -682,17 +562,16 @@ function wireSubagentEvents(ctx, configs, warnOnce, on) {
         const recorded = runs.get(info?.runId)
         runs.delete(info?.runId)
         if (recorded !== undefined && recorded.id !== info?.id) return
-        const subagentText = subagentTextOf(info)
         const frame = invocation ?? ruleFrame('subagent/end', [info], warnOnce)
         frame.subject.agent = child ?? recorded?.agent
         frame.subject.session = child?.session ?? recorded?.session ?? getService(ctx, 'sessions')?.get?.(info?.id)
         frame.subject.model = child?.options?.model ?? recorded?.model
         for (const config of endConfigs) {
-          if (!ruleMatches(config.rule, frame)) continue
+          if (!actionMatches(config, frame)) continue
           if (!matchesModel(config.modelScope, child?.options?.model ?? recorded?.model)) continue
-          if (!conditionHit(config, { subagentText })) continue
           if (config.params?.action !== 'inject-main') {
-            warnOnce(`${name}: subagent-end ${config.id} matched (observe only)`)
+            // 模板本意是逐次记录；命中本身已由装配实例的判定账本记 hit，这里不占告警名额。
+            ctx.logger?.info?.(`${name}: subagent-end ${config.id} matched (observe only)`)
             continue
           }
           if (typeof info?.runId !== 'string' || info.runId.length === 0) continue
@@ -708,7 +587,7 @@ function wireSubagentEvents(ctx, configs, warnOnce, on) {
           if (delivered === undefined) { delivered = new Map(); subagentEndDeliveries.set(main.session, delivered) }
           const key = `${info.runId}:${config.id}`
           if (delivered.has(key)) continue
-          // ponytail: 会话内保留最近的投递记录；超大历史改用持久事件索引时可取消此上限。
+          // shortcut: 会话内保留最近的投递记录；超大历史改用持久事件索引时可取消此上限。
           if (delivered.size >= MAX_TRACKED_SESSIONS) delivered.delete(delivered.keys().next().value)
           delivered.set(key, true)
           main.inject(pluginMessage(`subagent-end-${config.id}`, text, `subagent-end ${config.id}`))
@@ -721,43 +600,99 @@ function wireSubagentEvents(ctx, configs, warnOnce, on) {
   return disposers
 }
 
+/** 注册名与序号：字段只在注册点算一次，重排器只消费这里的结果。 */
+function orderedEntry(name, config) {
+  return { name, sequence: config.sequence ?? config.order ?? 0, order: config.order ?? 0 }
+}
+
+/**
+ * 实际注册名按 configOrder（sequence）排序；同序号保持注册序，同名只留一次。
+ * 名字来自注册点而不是事后从 configs 推导，避免 regular/conditional/placeholder 三条路径漂移。
+ */
+function orderedNamesOf(entries) {
+  // configOrder 优先；同序号回到官方 order（而不是接线顺序），最后 stable 保留注册顺序。
+  return [...new Set([...entries]
+    .sort((left, right) => left.sequence - right.sequence || (left.order ?? 0) - (right.order ?? 0))
+    .map((entry) => entry.name))]
+}
+
+/**
+ * 官方先按 order/段名排好投递顺序；这里按 configOrder 把本插件注册的段/上下文
+ * 回填到它们原来的槽位。只换本插件段之间的位置：平台段与其他插件段占住的槽位不动。
+ */
+function registerDeliveryOrder(ctx, keep, collection, names) {
+  if (names.length < 2) return
+  const rank = new Map(names.map((entryName, index) => [entryName, index]))
+  keep(ctx.on('system-prompt/assemble', async (assembly, context, next) => {
+    const result = await next()
+    const list = result?.[collection]
+    if (!Array.isArray(list)) return result
+    const slots = []
+    for (let index = 0; index < list.length; index++) {
+      if (rank.has(list[index]?.name)) slots.push(index)
+    }
+    if (slots.length < 2) return result
+    const ordered = slots.map((index) => list[index]).sort((left, right) => rank.get(left.name) - rank.get(right.name))
+    if (slots.every((slot, index) => list[slot] === ordered[index])) return result
+    const nextList = [...list]
+    slots.forEach((slot, index) => { nextList[slot] = ordered[index] })
+    return { ...result, [collection]: nextList }
+  }, { prepend: true }), `${name}: ${collection} order`)
+}
+
 /**
  * 把非 pre-step 提示词配置接入其声明的官方层级通道。
- * @returns 聚合 disposer：回收本次接线显式创建的 waterfall 监听器；段/上下文/
- *   变量注册走 keepDisposer（随 ctx fiber 释放），不在本函数的回收面内。
+ * @param options.agent 当前 ctx 所属的真实 Agent；固定效果的受众在注册前匹配。
+ * @param options.turnStopBudgets 可选的续跑预算映射（键 = 模块 id，来源缺失用空串兜底）；
+ *   规则运行时按模块传入同一份，使同模块的 turn-stop 动作共享上限。
+ * @returns 聚合 disposer：回收监听器及段/上下文/变量注册；后者也绑定 ctx fiber，重复释放幂等。
  */
 export function wireLayers(ctx, configs, warnOnce, options = {}) {
+  // 固定效果必须在目标 Agent 注册前筛选；空正文不能撤销官方 complete/suppress 声明。
+  configs = configs.filter(config => {
+    if (config.layer !== 'system-section' || config.audience == null
+      || config.params?.complete !== true && config.params?.suppressRuntimeContext !== true) return true
+    if (options.agent?.session === undefined) throw new TypeError(`${name}: fixed system-section ${config.id} with audience requires an explicit Agent in options.agent`)
+    return matchesAudience(config.audience, isDelegated(options.agent.session) ? 'subagent' : 'main')
+  })
   configs = [...configs].sort(compareConfigSequence)
+  // 没有注入通道的层（`tool-pipeline`）在这里没有分派：显式告警一次，别让 config 级入口静默丢弃。
+  for (const config of configs) {
+    if (!INJECTION_LAYERS.includes(config.layer)) warnOnce(`${name}: ${config.id}: layer ${String(config.layer)} 没有注入通道，已跳过（工具链的裁决请用 decision / append-context）`)
+  }
   const owned = []
   const keep = (dispose, label) => {
     if (typeof dispose !== 'function') return
     let active = true
     const release = () => { if (active) { active = false; dispose() } }
     owned.push(release); keepDisposer(ctx, release, label)
+    return release
   }
-  const on = options.on ?? ((...args) => ctx.on(...args))
-  // 官方插值两层共享一份变量注册：运行时事实按 assembly 求值，非法名走别名改写。
-  const registry = registerOfficialVariables(ctx, configs.filter((config) => config.layer === 'system-section' || config.layer === 'runtime-context'), warnOnce, keep)
-  const conditional = configs.filter(config => typeof config.rule?.when === 'function' && ['system-section', 'runtime-context'].includes(config.layer))
-  const regular = configs.filter(config => !conditional.includes(config))
-  const registered = [
-    wireSystemSections(ctx, regular.filter((config) => config.layer === 'system-section'), registry, warnOnce, keep),
-    wireRuntimeContexts(ctx, regular.filter((config) => config.layer === 'runtime-context'), registry, warnOnce, keep, on),
-    wireRuleTextContributions(ctx, conditional, registry, warnOnce, keep, on),
-    wireAgentRequests(ctx, configs.filter((config) => config.layer === 'agent-request'), warnOnce, on),
-    wireLlmStreams(ctx, configs.filter((config) => config.layer === 'llm-stream'), warnOnce, on),
-    wireToolPipelines(ctx, configs.filter((config) => config.layer === 'tool-pipeline'), warnOnce, on),
-    wireTurnStops(ctx, configs.filter((config) => config.layer === 'turn-stop'), warnOnce, on),
-    wireSubagentEvents(ctx, configs.filter((config) => config.layer === 'subagent-start' || config.layer === 'subagent-end'), warnOnce, on),
-    owned,
-  ].flat().filter((disposer) => typeof disposer === 'function')
-  return () => {
-    for (const dispose of registered.splice(0)) {
-      try {
-        dispose()
-      } catch {
-        // 释放失败不得反过来打断卸载流程。
-      }
+  const on = (...args) => keep((options.on ?? ((...values) => ctx.on(...values)))(...args), `${name}: ${args[0]}`)
+  const dispose = () => {
+    for (const release of owned.splice(0).reverse()) { try { release() } catch {} }
+  }
+  try {
+    // 注册即纳入 owned，后续注册失败也能释放已取得的变量和监听器。
+    /** 实际注册名与序号：重排器只认这里，不从 configs 反推。 */
+    const ordered = { sections: [], contexts: [] }
+    const registry = registerOfficialVariables(ctx, configs.filter((config) => config.layer === 'system-section' || config.layer === 'runtime-context'), warnOnce, keep)
+    const conditional = configs.filter(config => ['system-section', 'runtime-context'].includes(config.layer)
+      && (typeof config.rule?.when === 'function' || typeof config.actionWhen === 'function'
+        || (config.rule !== undefined || config.params?.templateEvaluation === true) && config.params?.complete !== true && config.params?.suppressRuntimeContext !== true))
+    const regular = configs.filter(config => !conditional.includes(config))
+    wireSystemSections(ctx, regular.filter((config) => config.layer === 'system-section'), registry, warnOnce, keep, ordered)
+    wireRuntimeContexts(ctx, regular.filter((config) => config.layer === 'runtime-context'), registry, warnOnce, keep, on, ordered)
+    wireRuleTextContributions(ctx, conditional, registry, warnOnce, keep, on, ordered)
+    wireTurnStops(ctx, configs.filter((config) => config.layer === 'turn-stop'), warnOnce, on, options.turnStopBudgets)
+    wireSubagentEvents(ctx, configs.filter((config) => config.layer === 'subagent-start' || config.layer === 'subagent-end'), warnOnce, on)
+    // 官方 order 只提供初始槽位；configOrder 覆盖段/上下文的先后（平台段与其他插件段不动）。
+    for (const collection of ['sections', 'contexts']) {
+      registerDeliveryOrder(ctx, keep, collection, orderedNamesOf(ordered[collection]))
     }
+    return dispose
+  } catch (error) {
+    dispose()
+    throw error
   }
 }