dsh-plugin-prompt-tool 0.8.1 → 2.0.0

package/engine/branch.mjs

@@ -0,0 +1,44 @@
+/**
+ * 分支语法的唯一展开器：`if`/`then`/`else` 是当前名，`when`/`do` 是兼容输入。
+ *
+ * 规则（`rule-spec.mjs`）与触发器声明（`trigger-spec.mjs`）共用这一份实现——
+ * 两套入口必须是同一套语义，否则同一个模块换个入口就换行为。
+ */
+
+const record = value => value !== null && typeof value === 'object' && !Array.isArray(value)
+
+/** 分支节点：占动作位、没有 `kind`，但带 `if`/`then`/`else` 之一。 */
+export const isBranchNode = node => record(node) && node.kind === undefined
+  && (node.if !== undefined || node.then !== undefined || node.else !== undefined)
+
+/** 多个条件按声明序合取；空数组 = 无条件（`compileWhen(undefined)` 直接返回 undefined）。 */
+export function conjunction(conditions) {
+  if (conditions.length === 0) return undefined
+  return conditions.length === 1 ? conditions[0] : { all: [...conditions] }
+}
+
+/**
+ * 把一份动作声明展开为扁平的「动作 + 自身分支条件」列表。
+ *
+ * - 普通动作原样带出，分支条件 = `outer` 的合取（空 = 无条件）；
+ * - 分支节点的 `then` 追加本层 `if`、`else` 追加 `not(if)`——互斥由结构保证，不由作者手写；
+ * - 返回顺序即声明序（then 在前、else 在后）；
+ * - `bypass` 标记该动作来自**声明级** `else`：它的条件已含 `not(if)`，不能再叠加声明级判定。
+ */
+export function expandActions(list, options = {}, label) {
+  if (!Array.isArray(list)) throw new TypeError(`${label} must be an array`)
+  const { outer = [], bypass = false } = options
+  const out = []
+  for (const [index, node] of list.entries()) {
+    const at = `${label}[${index}]`
+    if (isBranchNode(node)) {
+      if (node.if === undefined) throw new TypeError(`${at}: a branch needs if`)
+      if (node.then === undefined) throw new TypeError(`${at}: a branch needs then`)
+      out.push(...expandActions(node.then, { outer: [...outer, node.if], bypass }, `${at}.then`))
+      if (node.else !== undefined) out.push(...expandActions(node.else, { outer: [...outer, { not: node.if }], bypass }, `${at}.else`))
+      continue
+    }
+    out.push({ node, conditions: outer, bypass })
+  }
+  return out
+}

package/engine/character-tools.mjs

@@ -2,10 +2,7 @@
 export const name = "character-tools"
 
 export function apply(ctx) {
-  const service = ctx.get("pt-character-tools")
-  if (service === null || service === undefined || typeof service.mount !== "function") {
-    ctx.logger?.warn(name + ": service unavailable; character tools not mounted for this preset")
-    return
-  }
-  ctx.effect(() => service.mount(ctx), name + ": mount")
+  ctx.inject(["pt-character-tools"], (scopeCtx) => {
+    scopeCtx.effect(() => scopeCtx.get("pt-character-tools").mount(scopeCtx), name + ": mount")
+  })
 }

package/engine/compaction-epoch.mjs

@@ -23,7 +23,7 @@
  *
  * GATE MODE (strict two-phase stabilization extension, source: xiaobright/dsh-anchored-standard
  * MIT + phase-1 quarantine): `promoteGate: true` gates the promotion on the
- * first reasoning block classifying minimal-like (`we` present, no `let me`),
+ * first reasoning block matching the caller's positive and negative patterns,
  * with a `maxPromoteSteps` fallback supplied by the caller's config; `promoteAfterFirstResponse:
  * true` promotes a tool-less first response once it has responded, and also
  * releases an anchor-gated session when its first turn ends. Gate mode uses
@@ -34,24 +34,41 @@
 
 import { sessionEvents, sessionState } from './shared.mjs'
 
-/** 首段 reasoning 块分类（严格门控扩展）：we 且无 let me = minimal-like。 */
-export function classifyReasoning(text) {
-  const trimmed = String(text ?? '').trim()
-  const we = [...trimmed.matchAll(/\bwe\b/gi)].length
-  const letMe = [...trimmed.matchAll(/\blet me\b/gi)].length
-  const metrics = { we, letMe }
-  if (we > 0 && letMe === 0) return { label: 'minimal-like', score: 4, metrics }
-  if (letMe > 0) return { label: 'standard-like', score: -4, metrics }
-  return { label: 'ambiguous', score: 0, metrics }
+/** 匹配内容与大小写均由调用方显式声明；空 pattern 不承担任何业务识别。 */
+function reasoningClassifier(options = {}) {
+  const flags = options.reasoningFlags ?? ''
+  if (typeof flags !== 'string') throw new TypeError('reasoningFlags must be a string')
+  const compile = (key) => {
+    const pattern = options[key]
+    if (pattern == null || pattern === '') return undefined
+    if (typeof pattern !== 'string') throw new TypeError(`${key} must be a string`)
+    return new RegExp(pattern, flags.includes('g') ? flags : `${flags}g`)
+  }
+  const positive = compile('reasoningPattern')
+  const negative = compile('reasoningNegativePattern')
+  return text => {
+    const trimmed = String(text ?? '').trim()
+    // 旧诊断返回字段保留；两项现在分别计数调用方的正、负模式。分数不参与晋升。
+    const we = positive === undefined ? 0 : [...trimmed.matchAll(positive)].length
+    const letMe = negative === undefined ? 0 : [...trimmed.matchAll(negative)].length
+    const metrics = { we, letMe }
+    if (we > 0 && letMe === 0) return { label: 'minimal-like', score: 4, metrics }
+    if (letMe > 0) return { label: 'standard-like', score: -4, metrics }
+    return { label: 'ambiguous', score: 0, metrics }
+  }
 }
 
+export function classifyReasoning(text, options = {}) { return reasoningClassifier(options)(text) }
+
 /** 首段 reasoning 块是否为 minimal-like（后续块不覆盖首个标准样块）。 */
-export function hasAnchoredReasoning(content) {
+function firstReasoningMatches(content, classify) {
   if (!Array.isArray(content)) return false
   const first = content.find((block) => block?.type === 'reasoning')
-  return first !== undefined && classifyReasoning(first.text).label === 'minimal-like'
+  return first !== undefined && classify(first.text).label === 'minimal-like'
 }
 
+export function hasAnchoredReasoning(content, options = {}) { return firstReasoningMatches(content, reasoningClassifier(options)) }
+
 /** True only when compaction completed and changed the model-visible surface. */
 export function isSuccessfulCompactionEnd(event) {
   return event?.type === 'compaction/end' && event.data?.error === undefined
@@ -62,6 +79,7 @@ export function createEpochPromotion(promoteEvents, options = {}) {
   const includeSubagents = options.includeSubagents === true
   const promoteGate = options.promoteGate === true
   const promoteAfterFirstResponse = options.promoteAfterFirstResponse === true
+  const classify = reasoningClassifier(options)
   // 门控回退步数由调用方配置提供（tool-bootstrap 在开启门控时做必填校验）：
   // 引擎不内置默认；未提供时步数兜底不生效，只按 anchored 判定。
   const maxPromoteSteps = options.maxPromoteSteps
@@ -115,7 +133,7 @@ export function createEpochPromotion(promoteEvents, options = {}) {
       else if (event.type === 'turn/end') entry.turnEnded = true
       else if (event.type === 'assistant/message') {
         entry.responded = true
-        if (!entry.anchored) entry.anchored = hasAnchoredReasoning(event.data?.message?.content)
+        if (!entry.anchored) entry.anchored = firstReasoningMatches(event.data?.message?.content, classify)
       }
       if (decideGate(entry)) entry.promoted = true
       return entry

package/engine/compositions/library/agent-instructions.yml

@@ -1,6 +1,6 @@
 # module: agent-instructions
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: agent-instructions

package/engine/compositions/library/command-goal.yml

@@ -1,6 +1,6 @@
 # module: command-goal
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: command-goal

package/engine/compositions/library/compaction.yml

@@ -1,6 +1,6 @@
 # module: compaction
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: compaction

package/engine/compositions/library/delegation-ptc.yml

@@ -1,6 +1,6 @@
 # module: delegation-ptc
 # source: master/packages/bundle/web-app/presets/ptc.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: delegation

package/engine/compositions/library/delegation.yml

@@ -1,6 +1,6 @@
 # module: delegation
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: delegation

package/engine/compositions/library/persistent-shell.yml

@@ -1,6 +1,6 @@
 # module: persistent-shell
 # source: master/packages/bundle/web-app/presets/minimal.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: persistent-shell

package/engine/compositions/library/planning.yml

@@ -1,6 +1,6 @@
 # module: planning
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: planning

package/engine/compositions/library/skill-filesystem-cordis.yml

@@ -1,6 +1,6 @@
 # module: skill-filesystem-cordis
 # source: master/packages/bundle/web-app/presets/cordis.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: skill-filesystem

package/engine/compositions/library/skill-filesystem.yml

@@ -1,6 +1,6 @@
 # module: skill-filesystem
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: skill-filesystem

package/engine/compositions/library/tool-ask-user.yml

@@ -1,6 +1,6 @@
 # module: tool-ask-user
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-ask-user

package/engine/compositions/library/tool-bash.yml

@@ -1,6 +1,6 @@
 # module: tool-bash
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-bash

package/engine/compositions/library/tool-cordis.yml

@@ -1,6 +1,6 @@
 # module: tool-cordis
 # source: master/packages/bundle/web-app/presets/cordis.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-cordis

package/engine/compositions/library/tool-fs-search.yml

@@ -1,6 +1,6 @@
 # module: tool-fs-search
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-fs-search

package/engine/compositions/library/tool-fs.yml

@@ -1,6 +1,6 @@
 # module: tool-fs
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-fs

package/engine/compositions/library/tool-goal.yml

@@ -1,6 +1,6 @@
 # module: tool-goal
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-goal

package/engine/compositions/library/tool-jobs.yml

@@ -1,6 +1,6 @@
 # module: tool-jobs
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-jobs

package/engine/compositions/library/tool-plugin-manager-disabled.yml

@@ -1,6 +1,6 @@
 # module: tool-plugin-manager-disabled
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-plugin-manager

package/engine/compositions/library/tool-plugin-manager.yml

@@ -1,6 +1,6 @@
 # module: tool-plugin-manager
 # source: master/packages/bundle/web-app/presets/cordis.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-plugin-manager

package/engine/compositions/library/tool-present.yml

@@ -1,6 +1,6 @@
 # module: tool-present
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: present

package/engine/compositions/library/tool-presentation.yml

@@ -1,6 +1,6 @@
 # module: tool-presentation
 # source: master/packages/bundle/web-app/presets/ptc.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-presentation

package/engine/compositions/library/tool-pwsh.yml

@@ -1,6 +1,6 @@
 # module: tool-pwsh
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-pwsh

package/engine/compositions/library/tool-skill.yml

@@ -1,6 +1,6 @@
 # module: tool-skill
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-skill

package/engine/compositions/library/tool-todo.yml

@@ -1,6 +1,6 @@
 # module: tool-todo
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-todo

package/engine/compositions/library/tool-web.yml

@@ -1,6 +1,6 @@
 # module: tool-web
 # source: master/packages/bundle/web-app/presets/standard.patch.yml
-# commit: c36a83ff6bb95e3f82cf79f9be7c724270a8aa61
+# commit: 4878cdabd87d4041bdaff61d04c966883b9fd07a
 # local patches: 0
 
 - id: tool-web

package/engine/compositions/source/local/dev-tool-search.yml

@@ -0,0 +1,11 @@
+# module: dev-tool-search
+# source: engine/compositions/source/local/dev-tool-search.yml (本地附加,非官方模块)
+#
+# 工具面的按需发现与解锁。与 assembly 动作的 allowFrom 配对使用：
+#   本工具把解锁名写进持久 tool/call 参数 → allowFrom 读回 → 下次请求起生效。
+# 只挂本行而不配 allowFrom 的话，解锁是一次性的（当次请求用完即被裁掉）。
+#
+# 常驻集由模板声明（见 templates/ 的工具面收窄模板），本行只负责发现入口。
+
+- id: dev-tool-search
+  name: ./engine/dev-tool-search.mjs

package/engine/compositions/source/local/instruction-hint.yml

@@ -6,10 +6,31 @@
 # opt-in：enabled 默认 false（与原 instructionHint 默认 false 同值），由参数桥
 # params.instructionHint（→ 本行 enabled）或本行 config.enabled: true 打开；
 # 相位词汇与 tool-bootstrap / promoted-code-mode 同源（compaction-epoch.mjs）。
+#
+# 四个模板必须随行给全（2026-10-05 修）：`instruction-hint.mjs#apply` 的首行是
+#   `if (!enabled || templateOf(source, 'messageTemplate').trim().length === 0) return`
+# 而本行此前只配了 enabled/promoteOn/includeSubagents —— 于是把开关打开**不注册任何
+# 转换**：配置合法、零效果、零报错（与 count.delegated 的静默失效同类）。模板正文取自
+# templates/policies/legacy-defaults.yml#instructionHint，与 rules-migration.ts:102
+# 的迁移默认值同源；两处必须一致，否则「迁移进来的定义」与「新装的组合源」行为分叉。
+# legacy-defaults.yml 自身标注「引擎运行时不得读取」，所以这里必须是实体而非引用。
+#
+# includeSubagents: true —— 子代理首次请求即视为已晋升（官方相位语义），所以子代理
+# 从第 1 轮就拿提示而非全文。主会话则是首个工具调用/助手消息之后才降级（promoteOn）。
 
 - id: instruction-hint
   name: ./engine/instruction-hint.mjs
   config:
     enabled: false
     promoteOn: either
-    includeSubagents: false
+    includeSubagents: true
+    projectTemplate: "Reference documents exist: {{FILES}} (project root: {{ROOT}})."
+    globalTemplate: "A user reference document exists: {{FILES}}."
+    suffixTemplate: They are reference documents about the user's environment and
+      workspace conventions, not task instructions. Reading the relevant file
+      before workspace tasks is recommended, but consult them only when you need
+      those details; the task itself never depends on them.
+    messageTemplate: |-
+      <system-reminder>
+      Reference documents exist: {{FILES}}. {{SUFFIX}}
+      </system-reminder>

package/engine/compositions/source/local/rule-engine.yml

@@ -0,0 +1,6 @@
+# module: rule-engine
+# 单一规则分发入口；插件配装通道直接挂载同一编译器时跳过此行。
+- id: rule-engine
+  name: ./engine/rule-engine.mjs
+  config:
+    rulesFile: ../rules.yml

package/engine/condition.mjs

@@ -14,7 +14,7 @@
 import { extractText, sessionEvents } from './shared.mjs'
 
 /** subject → 载荷字段名。改这里等于改所有层的匹配对象。 */
-const SUBJECT_FIELDS = {
+export const SUBJECT_FIELDS = {
   toolArgs: 'argsText',
   toolResult: 'resultText',
   userMessage: 'userText',
@@ -54,11 +54,24 @@ export function toolArgsText(args) {
   }
 }
 
-/** pre-step 的缺省匹配对象：本批用户消息的文本。 */
+/**
+ * pre-step 的缺省匹配对象：本批**真实对话**的用户消息文本。
+ *
+ * 只收真人输入：引擎自己注入的消息同样是 user-role（`executor.mjs` 的
+ * `role: PRE_STEP_ROLE`、`pluginMessage` 的 `source` 是 `plugin:<name>` 生产者身份），
+ * 把它们算进来会让 `text.match` 匹配到自己注入过的正文——规则正文里出现「重构」
+ * 「实现」这类词就会自我命中，且命中判定在去重之前，`dedupe` 挡不住。
+ * 过滤判据与 `st-world-book.mjs#stChatMessages` 的同名约定一致（那是最早做对的一处），
+ * 两处必须保持同语义。
+ */
 export function userMessagesText(messages) {
   if (!Array.isArray(messages)) return ''
   return messages
-    .filter((message) => message?.role === 'user')
+    .filter((message) => message?.role === 'user'
+      && message.source?.plugin === undefined
+      && message.source?.kind !== 'plugin'
+      && !(typeof message.source?.kind === 'string' && message.source.kind.startsWith('plugin:'))
+      && (message.source?.kind === undefined || message.source.kind === 'user'))
     .map((message) => extractText(message))
     .filter((text) => text.length > 0)
     .join('\n')

package/engine/conditions/anchor.mjs

@@ -0,0 +1,32 @@
+import { createAnchorMatcher } from '../anchor-match.mjs'
+import { sessionEvents, sessionState } from '../shared.mjs'
+import { sessionOf } from './subject.mjs'
+import { boundOf, keyList } from './values.mjs'
+
+/** 首条 assistant reasoning 的确认事实；未到达时不缓存，无 id 会话不共享状态。 */
+export function createAnchorState(options = {}) {
+  const matcher = createAnchorMatcher({ keys: keyList(options.keys, 'anchor.keys'), mode: 'prefix' })
+  const confirmedBySession = sessionState(undefined, () => false)
+  return session => {
+    const assistants = sessionEvents(session).filter(event => event.type === 'assistant/message')
+    let confirmed = confirmedBySession.peek(session)
+    if (confirmed === undefined && assistants.length > 0) {
+      const reasoning = (assistants[0].data?.message?.content ?? []).find(block => block.type === 'reasoning')
+      confirmed = reasoning !== undefined && matcher.scan(String(reasoning.text ?? '')).active
+      confirmedBySession.set(session, confirmed)
+    }
+    return { confirmed: confirmed === true, assistantRounds: assistants.length }
+  }
+}
+
+/** 确认即命中；可选 fallbackAfter 表示超过指定 assistant 消息数后也允许。 */
+export function createAnchorPredicate(options = {}) {
+  const inspect = createAnchorState(options)
+  const fallbackAfter = boundOf(options.fallbackAfter, 'anchor.fallbackAfter')
+  const predicate = payload => {
+    const status = inspect(sessionOf(payload))
+    return status.confirmed || (fallbackAfter !== undefined && status.assistantRounds > fallbackAfter)
+  }
+  predicate.kind = 'anchor'
+  return predicate
+}

package/engine/conditions/availability.mjs

@@ -0,0 +1,47 @@
+import { agentOf, sessionOf } from './subject.mjs'
+import { SUBJECT_FIELDS } from '../condition.mjs'
+
+/** 缺少真实事件事实不是 false；尤其不能经 not 反转成允许。 */
+export const UNAVAILABLE = Symbol('condition-input-unavailable')
+
+export function conditionInputAvailable(kind, options, payload) {
+  const agent = agentOf(payload)
+  const session = sessionOf(payload)
+  if (['phase', 'count', 'session', 'anchor'].includes(kind)) {
+    return session != null && typeof session.snapshotEvents === 'function' && (kind !== 'phase' || agent?.session != null)
+  }
+  if (kind === 'preset') return agent?.ctx != null
+  if (kind === 'names') {
+    const name = typeof payload === 'string' ? payload : payload?.name
+    return typeof name === 'string' && name.length > 0
+  }
+  if (kind === 'source') return payload?.source !== null && typeof payload?.source === 'object' && !Array.isArray(payload.source)
+  if (kind === 'text') {
+    if (typeof payload === 'string') return true
+    const field = Object.hasOwn(SUBJECT_FIELDS, options.subject) ? SUBJECT_FIELDS[options.subject] : undefined
+    if (field === undefined || typeof payload?.[field] !== 'string') return false
+    // 归一化器可把缺载荷投影为空文本；保留原参数表时必须区分缺事实与确实为空。
+    if (Array.isArray(payload.args)) {
+      if (options.subject === 'toolArgs') return payload.args[0] != null && Object.hasOwn(payload.args[0], 'arguments')
+      if (options.subject === 'toolResult') return payload.args.length > 1 && payload.args[1] !== undefined
+      if (options.subject === 'userMessage' && payload.channel === 'agent/pre-step') return Array.isArray(payload.args[0]?.messages)
+      if (options.subject === 'userMessage' && payload.channel === 'agent/inbox/inserted') return payload.args[0]?.message != null
+      if (options.subject === 'assistantText') return typeof session?.snapshotEvents === 'function'
+      if (options.subject === 'subagentInfo') return payload.args[0] != null
+    }
+    return true
+  }
+  if (kind === 'scope') {
+    if (options.audience !== undefined && session == null) return false
+    const model = payload?.model ?? agent?.options?.model
+    if (options.modelScope !== undefined && options.modelScope !== 'all' && (typeof model !== 'string' || model.length === 0)) return false
+  }
+  return true
+}
+
+export function withAvailableInput(kind, options, predicate) {
+  const wrapped = payload => conditionInputAvailable(kind, options, payload) ? predicate(payload) : UNAVAILABLE
+  wrapped.kind = predicate.kind
+  if (typeof predicate.observe === 'function') wrapped.observe = (session, event) => predicate.observe(session, event)
+  return wrapped
+}

package/engine/conditions/composite.mjs

@@ -0,0 +1,83 @@
+import { MATCH_LOGIC } from '../anchor-match.mjs'
+import { UNAVAILABLE } from './availability.mjs'
+const COMPOSITE_OPERATORS = Object.values(MATCH_LOGIC)
+
+export function composite(node) {
+  if (typeof node === 'function') return node
+  if (node === null || typeof node !== 'object' || Array.isArray(node)) {
+    throw new TypeError(`predicates: a composite must be a predicate or { ${COMPOSITE_OPERATORS.join(' | ')} }`)
+  }
+  const unknown = Object.keys(node).filter((key) => !COMPOSITE_OPERATORS.includes(key))
+  if (unknown.length > 0) {
+    throw new TypeError(`predicates: unknown composite key(s) ${unknown.join(', ')} — allowed: ${COMPOSITE_OPERATORS.join(', ')}`)
+  }
+  const declared = COMPOSITE_OPERATORS.filter((key) => node[key] !== undefined)
+  if (declared.length !== 1) {
+    throw new TypeError(`predicates: a composite node must declare exactly one of ${COMPOSITE_OPERATORS.join(', ')}`)
+  }
+  const operator = declared[0]
+  if (operator === MATCH_LOGIC.NOT) {
+    const child = composite(node[operator])
+    const predicate = (payload) => {
+      const result = child(payload)
+      return result === UNAVAILABLE ? UNAVAILABLE : !result
+    }
+    predicate.kind = 'composite'
+    if (typeof child.observe === 'function') {
+      predicate.observe = (session, event) => child.observe(session, event)
+    }
+    return predicate
+  }
+  const list = node[operator]
+  if (!Array.isArray(list) || list.length === 0) {
+    throw new TypeError(`predicates: composite ${operator} needs a non-empty array of predicates`)
+  }
+  const children = list.map(composite)
+  const predicates = {
+    [MATCH_LOGIC.ANY]: (payload) => {
+      let unknown = false
+      for (const child of children) {
+        const result = child(payload)
+        if (result === UNAVAILABLE) unknown = true
+        else if (result) return true
+      }
+      return unknown ? UNAVAILABLE : false
+    },
+    [MATCH_LOGIC.ALL]: (payload) => {
+      let unknown = false
+      for (const child of children) {
+        const result = child(payload)
+        if (result === UNAVAILABLE) unknown = true
+        else if (!result) return false
+      }
+      return unknown ? UNAVAILABLE : true
+    },
+    [MATCH_LOGIC.NOT_ANY]: (payload) => {
+      let unknown = false
+      for (const child of children) {
+        const result = child(payload)
+        if (result === UNAVAILABLE) unknown = true
+        else if (result) return false
+      }
+      return unknown ? UNAVAILABLE : true
+    },
+  }
+  const predicate = predicates[operator]
+  if (predicate === undefined) {
+    throw new TypeError(`predicates: composite ${operator} is not a supported operator`)
+  }
+  predicate.kind = 'composite'
+  // 组合层必须**转发子谓词的 observe**（B7 T1 的跨能力缺口修复）：两条挂载路径的观察器
+  // 接线都按 `when.observe` 过滤（`trigger.mjs` 的 `wireTriggerObservers`），被组合包住的
+  // phase / count / session 谓词否则永远收不到活的 `session/event`——状态按 `session.id`
+  // 缓存后不再重扫（`shared.mjs` 的 `sessionMapGet`），判定会停在冷扫那一刻（计数恒旧值、
+  // 相位永不晋升）。`phase` 有 `subscribe: false` 可绕（代价是每次判定冷扫），
+  // `count` / `session` 没有该档，所以这条转发是它们唯一的活路。
+  const observers = children.filter((child) => typeof child.observe === 'function')
+  if (observers.length > 0) {
+    predicate.observe = (session, event) => {
+      for (const child of observers) child.observe(session, event)
+    }
+  }
+  return predicate
+}