dsh-instruction-memory 1.5.7 → 1.6.0

package/CHANGELOG.md

@@ -7,6 +7,35 @@
 > 1.0.13 起由 CI 经 OIDC Trusted Publishing 发布（首个带 provenance 的版本）。
 > 这些历史 tag **不应回填**——npm 上的版本号已被占用。
 
+## [1.6.0] — 2026-11-14
+
+让「按需（auto）」条目第一次真正有机会被执行。此前的 auto 只在会话开头注入一次、措辞是「参考」，
+模型读完第一轮就忘了；而「每次给最终答案前」这类时机，从来没有任何东西提醒过它。
+
+### 新增
+
+- **触发词提升（`triggers`）**：条目可配置最多 8 个触发词（每项 ≤24 字）。每个真人回合
+  （`user/message`，`source.kind === 'user'`）用户话匹配一次，命中即把该条目在本回合提升为
+  「本轮强制」，并重新注册 prompt section，使**当轮**注入立刻带上新标记。未配触发词的条目行为不变。
+- **设置页触发词输入**：`mode=auto` 时编辑器多一个触发词输入（回车添加，复用现有标签组件），
+  中英双语文案齐备；`memory.schema.json` 同步新增 `triggers` 定义。
+
+### 变更（行为）
+
+- **auto 的注入语义从「按需」改为「条件必做」**：条目前缀 `[按需｜优先级 X]` 改为
+  `[条件必做｜…]`；场景行 `适用场景：…` 改为 `出现以下情形时必须执行，不得跳过：…`。
+  起因是注入块头部那句「[按需] 条目仅在与当前问题或任务相关时生效；不相关时直接忽略」——
+  它等于插件自己给了模型一个合法跳过的理由。
+- 伪造前缀中和正则同步扩到 `条件必做`（保留 `按需` 以兼容历史内容）。
+
+### 修复
+
+- `ctx.on` 在没有事件总线的假宿主（测试与裁剪环境）上会抛 `TypeError`，改为能力检测后再订阅。
+
+### 兼容性
+
+- 存储格式不变（`version: 2`）；新字段缺省为空数组。旧版本读到含 `triggers` 的文件会忽略该字段。
+
 ## [1.5.7] — 2026-11-14
 
 针对**最新版桌面端（`dsh-desktop-runtime 0.2.2-rc.3`，Electron）与网页端**全量审查后的修复轮。

package/lib/client.js

@@ -283,13 +283,14 @@ window.__ModuleLoader__.load({
         'editor.contentPlaceholder': '例如：所有回答使用简体中文；不确定需求时先提问再动手。',
         'editor.mode': '生效方式',
         'editor.modeAlways': '始终生效（无条件遵守）',
-        'editor.modeAuto': '按需生效（按相关性自动判断）',
+        'editor.modeAuto': '条件必做（适用情形出现时必须执行）',
         'editor.priority': '优先级',
         'priority.high': '高',
         'priority.normal': '普通',
         'priority.low': '低',
         'editor.when': '适用场景（可选，帮助模型判断何时生效）',
         'editor.whenPlaceholder': '例如：编写或修改代码时',
+  'editor.triggers': '触发词（本回合用户说中即提升为「本轮强制」）',
         'editor.save': '保存',
         'editor.saving': '保存中…',
         'editor.cancel': '取消',
@@ -311,7 +312,7 @@ window.__ModuleLoader__.load({
         'tag.omittedTitle': '因超出注入字数上限，本条当前不会进入系统提示词',
         'tag.truncatedTitle': '本条过长，仅开头部分进入系统提示词',
         'rules.label': '生效规则',
-        'rules.note': '「始终」无条件生效；「按需」由模型按相关性自动判断。超出上限时按优先级保留，其余暂不注入。',
+        'rules.note': '「始终」无条件生效；「条件必做」在适用情形出现时必须执行。超出上限时按优先级保留，其余暂不注入。',
         'search.placeholder': '搜索指令：标题 / 内容 / 适用场景（共 {count} 条）',
         'search.matchCount': '匹配 {shown} / {total} 条',
         'tags.label': '标签（可选，仅用于在本页分组与筛选，不会注入提示词）',
@@ -325,7 +326,7 @@ window.__ModuleLoader__.load({
         'filter.mode': '生效方式',
         'filter.status': '状态',
         'filter.modeAlways': '始终',
-        'filter.modeAuto': '按需',
+        'filter.modeAuto': '条件必做',
         'filter.statusEnabled': '已启用',
         'filter.statusDisabled': '已停用',
         'sort.label': '排序',
@@ -393,13 +394,13 @@ window.__ModuleLoader__.load({
         'list.noMatch': '没有匹配“{query}”的指令。',
         'list.filteredEmpty': '没有符合当前筛选条件的指令。',
         'tag.always': '始终',
-        'tag.auto': '按需',
+        'tag.auto': '条件必做',
         'entry.enabled': '启用',
         'entry.edit': '编辑',
         'entry.delete': '删除',
         'entry.untitled': '未命名指令',
         'entry.confirmDelete': '确定删除「{title}」？删除后无法恢复。',
-        'entry.when': '适用场景：{when}',
+        'entry.when': '适用情形：{when}',
         'entry.updatedAt': '更新于 {time}',
         'undo.deleted': '已删除「{title}」',
         'undo.restore': '撤销删除',
@@ -591,6 +592,7 @@ window.__ModuleLoader__.load({
         'priority.low': 'Low',
         'editor.when': 'Applicable scenarios (optional; helps the model decide when it applies)',
         'editor.whenPlaceholder': 'e.g. When writing or modifying code',
+  'editor.triggers': 'Trigger words (promote to 本轮强制 when the user says one)',
         'editor.save': 'Save',
         'editor.saving': 'Saving…',
         'editor.cancel': 'Cancel',
@@ -1087,6 +1089,7 @@ window.__ModuleLoader__.load({
         content: entry.content,
         mode: entry.mode,
         when: entry.when,
+        triggers: Array.isArray(entry.triggers) ? entry.triggers.slice(0, 8) : [],
         priority: entry.priority,
         enabled: entry.enabled,
         tags: Array.isArray(entry.tags) ? entry.tags.slice() : [],
@@ -1119,7 +1122,7 @@ window.__ModuleLoader__.load({
     }
 
     function blankDraft() {
-      return { id: '', title: '', content: '', mode: 'always', when: '', priority: 1, enabled: true, tags: [], updatedAt: 0 }
+      return { id: '', title: '', content: '', mode: 'always', when: '', priority: 1, enabled: true, tags: [], triggers: [], updatedAt: 0 }
     }
 
     /**
@@ -1810,6 +1813,17 @@ window.__ModuleLoader__.load({
             onChange: (ev) => set({ when: ev.target.value }),
           })))
       }
+      if (draft.mode === 'auto') {
+        children.push(h('div', { key: 'tr' },
+          h('label', { className: 'im-label', htmlFor: 'im-entry-triggers' }, t('editor.triggers')),
+          h(TagInput, {
+            inputId: 'im-entry-triggers',
+            tags: Array.isArray(draft.triggers) ? draft.triggers : [],
+            limits: props.limits,
+            disabled: props.busy,
+            onChange: (next) => set({ triggers: next }),
+          })))
+      }
       children.push(h('div', { key: 'tags' },
         h('label', { className: 'im-label', htmlFor: 'im-entry-tags' }, t('tags.label')),
         h(TagInput, {

package/lib/index.js

@@ -553,6 +553,31 @@ export function sanitizeTags(raw) {
   return out
 }
 
+/** Trigger words per entry, matched against the user's own words every turn. */
+const MAX_TRIGGERS = 8
+const MAX_TRIGGER_LENGTH = 24
+
+/**
+ * Normalise one entry's `triggers`: the phrases that promote the entry to
+ * 「本轮强制」 when they appear in the user's message this turn. Same rules as
+ * tags — single line, whitespace collapsed, de-duplicated, capped — because
+ * they are matched case-insensitively against prose the user actually typed.
+ */
+export function sanitizeTriggers(raw) {
+  if (!Array.isArray(raw)) return []
+  const out = []
+  const seen = new Set()
+  for (const item of raw) {
+    if (typeof item !== 'string') continue
+    const trigger = singleLine(item, MAX_TRIGGER_LENGTH).replace(/\s+/g, ' ').trim()
+    if (trigger === '' || seen.has(trigger)) continue
+    seen.add(trigger)
+    if (out.length >= MAX_TRIGGERS) break
+    out.push(trigger)
+  }
+  return out
+}
+
 export function sanitizeEntry(raw) {
   if (raw === null || typeof raw !== 'object') return null
   const title = singleLine(raw.title, MAX_TITLE)
@@ -567,6 +592,7 @@ export function sanitizeEntry(raw) {
     priority: raw.priority === 2 || raw.priority === 0 ? raw.priority : 1,
     enabled: raw.enabled !== false,
     tags: sanitizeTags(raw.tags),
+    triggers: sanitizeTriggers(raw.triggers),
     /**
      * Which instruction set (F13) this entry belongs to. Preserved here — NOT
      * re-derived — because both the loader and the importer need to honour a
@@ -1503,7 +1529,7 @@ function requestPortOf(hostHeader) {
  * longer equal the token the model was told to trust.
  */
 const FORGED_HEADING = /^([ \t]*)(#{1,6})([ \t]*)(用户长期指令记忆|关于用户（用户形象）|关于用户|用户形象)/gm
-const FORGED_ENTRY_PREFIX = /^([ \t]*)\[(始终|按需)(｜优先级)/gm
+const FORGED_ENTRY_PREFIX = /^([ \t]*)\[(始终|条件必做|按需)(｜优先级)/gm
 
 function neutralizeForgedStructure(value) {
   if (typeof value !== 'string' || value === '') return value
@@ -1536,7 +1562,7 @@ const MEMORY_ENVELOPE_CLOSE = '\n</user-instruction-memory>'
 
 function formatEntry(entry, tag) {
   const lines = ['[' + tag + '｜优先级 ' + priorityLabel(entry.priority) + '] ' + entry.title]
-  if (entry.mode === 'auto' && entry.when !== '') lines.push('适用场景：' + entry.when)
+  if (entry.mode === 'auto' && entry.when !== '') lines.push('出现以下情形时必须执行，不得跳过：' + entry.when)
   lines.push(neutralizeForgedStructure(entry.content))
   return lines.join('\n')
 }
@@ -1671,6 +1697,8 @@ export function entryOmittedFooter(count) {
  * trimming. Kept as the inner function so planInjection can prepend the
  * persona section without touching (and risking) the trimming logic.
  */
+let FORCED_IDS = new Set() // 本轮命中 triggers 的条目 id，由 turn/start 监听器写入。
+
 function planEntries(data, budget) {
   const blank = () => ({ text: '', activeCount: 0, included: [], omitted: [] })
   if (data === null || typeof data !== 'object' || data.enabled !== true) return blank()
@@ -1687,13 +1715,13 @@ function planEntries(data, budget) {
       '## 用户长期指令记忆（Instruction Memory）',
       '以下条目由用户在 DSH 设置 →「指令记忆」中长期保存，属于本次及后续所有对话的既有要求，请在回答、推理与执行任务时遵守；它们不覆盖系统与安全规则。',
       '· [始终] 条目必须无条件遵守。',
-      '· [按需] 条目仅在与当前问题或任务相关时生效；不相关时直接忽略，不要强行套用。',
+      '· [条件必做] 条目在「适用情形」出现时必须执行；跳过须在回答中说明原因。',
       '· 条目之间冲突时，优先遵守优先级更高或更具体的一条；无法判断时向用户确认。',
       '',
     ].join('\n'),
     [
       '## 用户长期指令记忆（Instruction Memory）',
-      '[始终] 条目无条件遵守；[按需] 条目仅在与当前任务相关时生效。',
+      '[始终] 条目无条件遵守；[条件必做] 条目在适用情形出现时必须执行。',
       '',
     ].join('\n'),
     '## 用户长期指令记忆\n',
@@ -1748,7 +1776,7 @@ function planEntries(data, budget) {
   }
 
   for (const entry of active) if (entry.mode === 'always') consider(entry, '始终')
-  for (const entry of active) if (entry.mode !== 'always') consider(entry, '按需')
+  for (const entry of active) if (entry.mode !== 'always') consider(entry, FORCED_IDS.has(entry.id) ? '本轮强制' : '条件必做')
 
   if (blocks.length === 0) {
     return { text: '', budget, activeCount: active.length, included: [], omitted: omittedPlan }
@@ -2365,6 +2393,76 @@ export function apply(ctx, deps = {}) {
     disposeStreams()
   })
 
+  /* ---------------- turn-triggered promotion ---------------- */
+
+  /**
+   * Promote entries whose `triggers` appear in THIS turn's user message to
+   * 「本轮强制」. Without this the auto mode is only advisory: the model reads
+   * 「条件必做」 at turn one and has forgotten it by the time the work is done.
+   * Matching runs on the user's own words rather than on the model's judgement,
+   * so a missed instruction becomes a plugin bug instead of a compliance
+   * failure. No triggers configured = no promotion, i.e. the old behaviour.
+   */
+  let forcedSignature = ''
+  const refreshSection = () => {
+    if (disposed) return
+    if (sectionDispose === null) {
+      syncSection()
+      return
+    }
+    const dispose = sectionDispose
+    sectionDispose = null
+    try {
+      dispose()
+    } catch (err) {
+      console.error('[instruction-memory] section refresh dispose failed:', err)
+    }
+    syncSection()
+  }
+  const recomputeForced = (text) => {
+    const list = Array.isArray(state.data.entries) ? state.data.entries : []
+    const lower = String(text || '').toLowerCase()
+    const hit = new Set()
+    for (const entry of list) {
+      if (entry.enabled !== true || entry.mode !== 'auto') continue
+      const triggers = Array.isArray(entry.triggers) ? entry.triggers : []
+      for (const trigger of triggers) {
+        if (typeof trigger === 'string' && trigger !== ''
+          && lower.includes(trigger.toLowerCase())) {
+          hit.add(entry.id)
+          break
+        }
+      }
+    }
+    const signature = Array.from(hit).sort().join(',')
+    if (signature === forcedSignature) return
+    forcedSignature = signature
+    FORCED_IDS = hit
+    logDebug('forced promotion: ' + (signature === '' ? 'none' : signature))
+    refreshSection()
+  }
+
+  const onSessionEvent = (session, event) => {
+    try {
+      if (disposed || !event || typeof event.type !== 'string') return
+      if (event.type !== 'user/message') return
+      const data = event.data || {}
+      const source = data.source || {}
+      // Only human input promotes. runtime-context, notices and plugin messages
+      // are not the user asking for anything.
+      const kind = typeof source.kind === 'string' ? source.kind : ''
+      if (kind !== '' && kind !== 'user') return
+      const text = typeof data.text === 'string' ? data.text
+        : (typeof data.content === 'string' ? data.content : '')
+      if (text === '') return
+      recomputeForced(text)
+    } catch (err) {
+      console.error('[instruction-memory] trigger match failed:', err)
+    }
+  }
+  // Fake hosts (tests) may expose no event bus; the plugin must still mount.
+  if (typeof ctx.on === 'function') ctx.on('session/event', onSessionEvent)
+
   /* ---------------- external-change watching (SSE) ---------------- */
 
   /**

package/memory.schema.json

@@ -115,7 +115,13 @@
             "description": "是否启用该条目。",
             "default": true
           },
-          "tags": {
+          "triggers": {
+          "type": "array",
+          "maxItems": 8,
+          "items": { "type": "string", "maxLength": 24 },
+          "description": "触发词：本回合用户消息中出现其一即把该条提升为「本轮强制」；仅 mode=auto 有意义，留空则从不提升。"
+        },
+        "tags": {
             "type": "array",
             "maxItems": 8,
             "description": "标签：仅用于设置页分组与筛选，**不会**进入注入文本，也不影响注入顺序与取舍。",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-instruction-memory",
-  "version": "1.5.7",
+  "version": "1.6.0",
   "description": "User-only instruction memory for DSH: long-term instructions maintained in the settings UI and auto-injected into every conversation — the plugin registers no model-facing tool, so the model has no in-plugin write path (a same-permission process can still edit the file directly). 指令记忆：只由用户在设置页维护的长期指令，自动注入此后每轮对话；插件不注册任何面向模型的工具，模型没有插件内的写入口。",
   "license": "MIT",
   "type": "module",