@restregular/dsh-memory 0.35.2 → 0.35.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/lib/provider/hooks.js +8 -2
- package/lib/provider/index.js +14 -2
- package/lib/tools/index.js +7 -3
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
本项目的版本记录。安装 id 与 npm 版本一一对应。
|
|
4
4
|
|
|
5
|
+
## 0.35.3 — 钩子否决保存时自动带上关联规则 ID
|
|
6
|
+
|
|
7
|
+
- **问题**:钩子拒绝一条记忆写入时,报错只说「钩子『记忆内容规范(概括句:正文)』判定不符合要求」,模型看不到这条校验代码挂在**哪条规则记忆**上 —— 脚本的 `message` 往往只讲"缺什么",模型想按规则全文改对却无从取起。
|
|
8
|
+
- **修法**:`HookOutcome.hook` 带上 `ruleId`(钩子创建时由 `memory_save.hookCode` 关联的规则记忆 id);`before-save` 否决时报错自动追加一行「关联规则记忆:<完整 id>(用 memory_get("<8位短 id>") 取全文,按规则改好后重试)」。`memory_hooks run` 的判定说明、试跑 outcome 也带上同一个 ruleId。没有关联规则的手动钩子不会凭空造出这一行。
|
|
9
|
+
- 回归守卫:`hooks.test.ts` 加两条(报错带 ruleId + memory_get 提示 / 裸钩子不伪造 ruleId,试跑 outcome 带 ruleId),`bundled-skills.test.ts` 加一条静态守卫。全套 641 tests / 640 pass / 1 skipped。
|
|
10
|
+
|
|
5
11
|
## 0.35.2 — 修复「未批准的新脚本无法试跑」:试跑改按 id 精确执行
|
|
6
12
|
|
|
7
13
|
- **问题(再次实机验证发现)**:技能 `memory-hook-scripts` 的上手流程第一步就是「先 `memory_hooks run` 试跑样例,再上线」。但 0.35.0/0.35.1 的 `run` 走的是 `runHooks(phase, ...)`,而 `runHooks` 会在 `HookStore.forRun()` 里过滤掉**未批准**的钩子(审批门禁放在存储层是对的),于是刚保存、还没批准的新脚本试跑时永远报「脚本没有命中这次输入(作用域/类型过滤把它排除了)」—— 实际上是审批门禁挡的,报错还说错了原因。流程直接走不通。
|
package/lib/provider/hooks.js
CHANGED
|
@@ -118,7 +118,8 @@ const PHASE_ENTRY = {
|
|
|
118
118
|
|
|
119
119
|
/** 单个钩子的运行结果。 */
|
|
120
120
|
|
|
121
|
-
|
|
121
|
+
|
|
122
|
+
|
|
122
123
|
|
|
123
124
|
|
|
124
125
|
|
|
@@ -561,7 +562,12 @@ export function runHooks(
|
|
|
561
562
|
const result = runHookCode(hook.code, phase, input, settings)
|
|
562
563
|
const crashed = result.error !== undefined
|
|
563
564
|
const outcome = {
|
|
564
|
-
hook: {
|
|
565
|
+
hook: {
|
|
566
|
+
id: hook.id,
|
|
567
|
+
name: hook.name,
|
|
568
|
+
phase,
|
|
569
|
+
...(hook.ruleId !== undefined ? { ruleId: hook.ruleId } : {}),
|
|
570
|
+
},
|
|
565
571
|
// 崩溃时 ok 恒 true —— 调用方据此"不阻断"。
|
|
566
572
|
ok: crashed ? true : result.ok,
|
|
567
573
|
durationMs: Date.now() - started,
|
package/lib/provider/index.js
CHANGED
|
@@ -1071,7 +1071,12 @@ export class LocalMemoryService {
|
|
|
1071
1071
|
const result = runHookCode(hook.code, hook.phase, input, this.hookSettings())
|
|
1072
1072
|
const crashed = result.error !== undefined
|
|
1073
1073
|
return [{
|
|
1074
|
-
hook: {
|
|
1074
|
+
hook: {
|
|
1075
|
+
id: hook.id,
|
|
1076
|
+
name: hook.name,
|
|
1077
|
+
phase: hook.phase,
|
|
1078
|
+
...(hook.ruleId !== undefined ? { ruleId: hook.ruleId } : {}),
|
|
1079
|
+
},
|
|
1075
1080
|
ok: crashed ? true : result.ok,
|
|
1076
1081
|
durationMs: Date.now() - started,
|
|
1077
1082
|
...(result.message !== undefined ? { message: result.message } : {}),
|
|
@@ -3379,9 +3384,16 @@ export class LocalMemoryService {
|
|
|
3379
3384
|
const veto = outcomes.find((outcome) => outcome.error === undefined && !outcome.ok)
|
|
3380
3385
|
if (veto !== undefined) {
|
|
3381
3386
|
const why = veto.message !== undefined && veto.message !== '' ? veto.message : '内容不符合规则记忆的要求'
|
|
3387
|
+
// 0.35.3:把关联的规则记忆 id 自动带进报错。钩子只是规则的执行体,
|
|
3388
|
+
// 模型看到"哪个校验器拒了"还不够 —— 它要能立刻取规则全文才能改对,
|
|
3389
|
+
// 否则只能靠脚本 message 里那几句话猜。
|
|
3390
|
+
const ruleId = veto.hook.ruleId
|
|
3391
|
+
const ruleLine = ruleId !== undefined && ruleId !== ''
|
|
3392
|
+
? `\n关联规则记忆:${ruleId}(用 memory_get("${ruleId.slice(0, 8)}") 取全文,按规则改好后重试)。`
|
|
3393
|
+
: ''
|
|
3382
3394
|
throw memoryError(
|
|
3383
3395
|
'HOOK_REJECTED',
|
|
3384
|
-
`记忆未保存:钩子「${veto.hook.name}」判定不符合要求 —— ${why}\n`
|
|
3396
|
+
`记忆未保存:钩子「${veto.hook.name}」判定不符合要求 —— ${why}${ruleLine}\n`
|
|
3385
3397
|
+ '按提示改好 content 后重新调用 memory_save(这不是权限问题,不需要审批)。',
|
|
3386
3398
|
)
|
|
3387
3399
|
}
|
package/lib/tools/index.js
CHANGED
|
@@ -370,7 +370,8 @@ import { canonicalWorkspacePath, defaultScopeDescription, normalizeScopeInput, r
|
|
|
370
370
|
|
|
371
371
|
/** 一次钩子运行的结果(试跑与真实运行同形)。 */
|
|
372
372
|
|
|
373
|
-
|
|
373
|
+
|
|
374
|
+
|
|
374
375
|
|
|
375
376
|
|
|
376
377
|
|
|
@@ -2536,13 +2537,16 @@ export function memoryHooksTool(opts )
|
|
|
2536
2537
|
}
|
|
2537
2538
|
const mine = service.runHookTrial(hook.id, input)
|
|
2538
2539
|
const verdict = mine[0]
|
|
2540
|
+
const ruleRef = verdict?.hook.ruleId !== undefined && verdict.hook.ruleId !== ''
|
|
2541
|
+
? `(关联规则记忆 ${verdict.hook.ruleId},可用 memory_get 取全文)`
|
|
2542
|
+
: ''
|
|
2539
2543
|
const note = verdict === undefined
|
|
2540
2544
|
? '脚本没有命中这次输入(作用域/类型过滤把它排除了)。'
|
|
2541
2545
|
: verdict.error !== undefined
|
|
2542
2546
|
? `脚本运行失败:${verdict.error}`
|
|
2543
2547
|
: verdict.ok
|
|
2544
|
-
?
|
|
2545
|
-
: `脚本判定:不通过 —— ${verdict.message ?? '(脚本没给 message)'}`
|
|
2548
|
+
? `脚本判定:通过。${ruleRef}`
|
|
2549
|
+
: `脚本判定:不通过 —— ${verdict.message ?? '(脚本没给 message)'}${ruleRef}`
|
|
2546
2550
|
return { action, hooks: [withApproval(hook)], outcomes: mine, note }
|
|
2547
2551
|
},
|
|
2548
2552
|
}
|