@restregular/dsh-memory 0.37.0 → 0.38.0
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 +7 -0
- package/lib/client.js +132 -52
- package/lib/panel.js +9 -0
- package/lib/provider/apply.js +4 -0
- package/lib/provider/hooks.js +43 -15
- package/lib/provider/index.js +6 -0
- package/lib/tools/index.js +44 -20
- package/lib/tools/render.js +19 -3
- package/package.json +1 -1
- package/skills/memory-hook-scripts/SKILL.md +4 -0
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
本项目的版本记录。安装 id 与 npm 版本一一对应。
|
|
4
4
|
|
|
5
|
+
## 0.38.0 — 规则代码卡片重做:批准即开关、折叠、筛选、真实试跑输出
|
|
6
|
+
|
|
7
|
+
- **批准成为唯一开关,移除启用/停用**:provider 新增 `revokeHookApproval()`(清 `approvedHash`,代码保留、变回待批准),面板 API 加 `action:'revoke-approval'`,`memory_hooks` 加同名 action(`enable`/`disable` 降级为旧别名)。`HookStore.forRun` 不再看 `enabled`;老数据里 `enabled:false` 一次性迁成"未批准"(清指纹),不会突然开始运行。未批准不运行、批准后运行。
|
|
8
|
+
- **试跑结果按运行时机分开展示**:保存前校验显示"允许保存 / 拒绝保存"、保存后观察显示"观察 / 附注"、注入前解析显示"改写后正文 / 整条丢弃";并新增 `HookOutcome.raw` 回显脚本**真实返回值**(连同 `log()` 输出),不再只给规范化结论。
|
|
9
|
+
- **面板规则代码卡片**:批准 / 撤销批准按钮替代启用停用;卡片**默认折叠**(点标题或箭头展开);顶部按**时机 / 生效作用域 / 是否批准**筛选;试跑输出可点「×」手动关闭。试验新输出再次点试跑会重新打开。
|
|
10
|
+
- 回归守卫:`hooks.test.ts` 加撤销批准与 raw 两例,`hooks-tool.test.ts` 加 revoke 用例,`tools.test.ts` 加分时机渲染用例,`bundled-skills.test.ts` 静态守卫面板卡片四项交互。全套 62 个测试文件 0 失败,`client.js` 通过 node --check。
|
|
11
|
+
|
|
5
12
|
## 0.37.0 — 钩子可读设置数据 + memory_list 完整时间戳 + 去掉冗余 key
|
|
6
13
|
|
|
7
14
|
- **钩子沙箱可读设置(ctx.settings)**:`HookRunInput` 新增可选 `settings`(只读快照:`digestChars` / `impressionChars` / `recallChars`),经 `runHookCode` 序列化进沙箱 `ctx.settings`;`parseForInject` 从实时 `injectSettings()` 取值(摘要 160 字、印象字数面板可改、召回 300 字)传入,`memory_hooks run` 试跑也带默认快照。before-inject 规则代码从此能按"当前摘要字数限制"截断,不写死数字。
|
package/lib/client.js
CHANGED
|
@@ -730,7 +730,13 @@ window.__ModuleLoader__.load({
|
|
|
730
730
|
'.memp .hooks-settings{display:flex;align-items:center;gap:14px;flex-wrap:wrap;padding:9px 11px;border:1px solid var(--dsw-alias-border-l1);border-radius:10px;background:var(--dsw-alias-bg-layer-1);font-size:12px}',
|
|
731
731
|
'.memp .hook-list{display:flex;flex-direction:column;gap:10px}',
|
|
732
732
|
'.memp .hook-card{border:1px solid var(--dsw-alias-border-l1);border-radius:12px;background:var(--dsw-alias-bg-layer-1);overflow:hidden}',
|
|
733
|
-
'.memp .hook-card.
|
|
733
|
+
'.memp .hook-card.folded .hook-card-head{border-bottom:none}',
|
|
734
|
+
'.memp .hook-caret{cursor:pointer;user-select:none;color:var(--dsw-alias-label-secondary);font-size:12px;width:14px;flex:none}',
|
|
735
|
+
'.memp .hook-pill.ok{color:var(--dsw-alias-state-success-primary,#2a8);border-color:color-mix(in srgb,var(--dsw-alias-state-success-primary,#2a8) 45%,transparent);background:color-mix(in srgb,var(--dsw-alias-state-success-primary,#2a8) 8%,transparent)}',
|
|
736
|
+
'.memp .hook-filters{display:flex;align-items:center;gap:10px;flex-wrap:wrap;padding:8px 11px;border:1px solid var(--dsw-alias-border-l1);border-radius:10px;font-size:12px}',
|
|
737
|
+
'.memp .hook-filters label{display:flex;align-items:center;gap:5px;color:var(--dsw-alias-label-secondary)}',
|
|
738
|
+
'.memp .hook-trial-raw{margin:5px 0 0;padding:6px 8px;border-radius:6px;background:var(--dsw-alias-bg-layer-2);font-family:var(--ds-font-family-code,ui-monospace,monospace);font-size:11px;white-space:pre-wrap;word-break:break-all}',
|
|
739
|
+
'.memp .hook-trial-close{margin-left:auto}',
|
|
734
740
|
'.memp .hook-card-head{display:flex;align-items:center;gap:10px;padding:10px 12px;border-bottom:1px solid var(--dsw-alias-border-l1);flex-wrap:wrap}',
|
|
735
741
|
'.memp .hook-card-title{display:flex;align-items:center;gap:7px;flex:1;min-width:0;flex-wrap:wrap}',
|
|
736
742
|
'.memp .hook-name{font-size:12.5px;font-weight:600}',
|
|
@@ -2874,6 +2880,13 @@ window.__ModuleLoader__.load({
|
|
|
2874
2880
|
const [busy, setBusy] = React.useState(false)
|
|
2875
2881
|
const [trial, setTrial] = React.useState(null)
|
|
2876
2882
|
const [trialText, setTrialText] = React.useState('记忆内容规范:这段是合规样例')
|
|
2883
|
+
// 0.38.0:卡片默认折叠;筛选维度 = 时机 / 生效作用域 / 是否批准。
|
|
2884
|
+
const [expanded, setExpanded] = React.useState(new Set())
|
|
2885
|
+
const [filterPhase, setFilterPhase] = React.useState('')
|
|
2886
|
+
const [filterScope, setFilterScope] = React.useState('')
|
|
2887
|
+
const [filterApproval, setFilterApproval] = React.useState('')
|
|
2888
|
+
// 试跑输出可手动关闭:记录哪些卡片的试跑结果被用户关掉。
|
|
2889
|
+
const [trialClosed, setTrialClosed] = React.useState(new Set())
|
|
2877
2890
|
|
|
2878
2891
|
const load = async () => {
|
|
2879
2892
|
setError('')
|
|
@@ -2969,7 +2982,7 @@ window.__ModuleLoader__.load({
|
|
|
2969
2982
|
const remove = async (hook) => {
|
|
2970
2983
|
// 0.36.1:删除钩子不可逆(hooks.json 直接覆盖、无回收站),面板也加一道二次确认,
|
|
2971
2984
|
// 与工具层的 confirm 参数对齐 —— 用户误点不再瞬间丢掉写好的规则代码。
|
|
2972
|
-
if (!window.confirm(`确定删除钩子「${hook.name || hook.id}」吗?\n\n这一步不可逆:规则代码会从 hooks.json
|
|
2985
|
+
if (!window.confirm(`确定删除钩子「${hook.name || hook.id}」吗?\n\n这一步不可逆:规则代码会从 hooks.json 直接移除,没有回收站。若只是想让它停下,请点「撤销批准」(代码保留、不再运行)。`)) return
|
|
2973
2986
|
setBusy(true)
|
|
2974
2987
|
setError('')
|
|
2975
2988
|
try {
|
|
@@ -2983,21 +2996,25 @@ window.__ModuleLoader__.load({
|
|
|
2983
2996
|
setBusy(false)
|
|
2984
2997
|
}
|
|
2985
2998
|
|
|
2986
|
-
|
|
2999
|
+
// 0.38.0:启用/停用语义移除 —— 批准 = 代码会运行;撤销批准 = 代码保留但不再运行。
|
|
3000
|
+
const approve = async (hook) => {
|
|
2987
3001
|
setBusy(true)
|
|
2988
3002
|
try {
|
|
2989
|
-
await api('hooks', {
|
|
2990
|
-
action: 'save',
|
|
2991
|
-
id: hook.id,
|
|
2992
|
-
name: hook.name,
|
|
2993
|
-
phase: hook.phase,
|
|
2994
|
-
code: hook.code,
|
|
2995
|
-
scopes: hook.scopes,
|
|
2996
|
-
kinds: hook.kinds,
|
|
2997
|
-
enabled: !(hook.enabled !== false),
|
|
2998
|
-
by: 'user',
|
|
2999
|
-
})
|
|
3003
|
+
await api('hooks', { action: 'approve', id: hook.id })
|
|
3000
3004
|
await load()
|
|
3005
|
+
flash('已批准,这段代码从现在起会运行')
|
|
3006
|
+
} catch (e) {
|
|
3007
|
+
setError(String(e.message || e))
|
|
3008
|
+
}
|
|
3009
|
+
setBusy(false)
|
|
3010
|
+
}
|
|
3011
|
+
|
|
3012
|
+
const revokeApproval = async (hook) => {
|
|
3013
|
+
setBusy(true)
|
|
3014
|
+
try {
|
|
3015
|
+
await api('hooks', { action: 'revoke-approval', id: hook.id })
|
|
3016
|
+
await load()
|
|
3017
|
+
flash('已撤销批准,代码保留但不会运行')
|
|
3001
3018
|
} catch (e) {
|
|
3002
3019
|
setError(String(e.message || e))
|
|
3003
3020
|
}
|
|
@@ -3008,6 +3025,7 @@ window.__ModuleLoader__.load({
|
|
|
3008
3025
|
const run = async (hook) => {
|
|
3009
3026
|
setBusy(true)
|
|
3010
3027
|
setTrial(null)
|
|
3028
|
+
setTrialClosed((prev) => { const next = new Set(prev); next.delete(hook.id); return next })
|
|
3011
3029
|
try {
|
|
3012
3030
|
const value = await api('hooks', { action: 'run', id: hook.id, content: trialText })
|
|
3013
3031
|
const outcome = Array.isArray(value.outcomes) ? value.outcomes[0] : undefined
|
|
@@ -3035,6 +3053,18 @@ window.__ModuleLoader__.load({
|
|
|
3035
3053
|
const settings = data.settings || {}
|
|
3036
3054
|
const pendingCount = hooks.filter((hook) => hook.pendingApproval).length
|
|
3037
3055
|
|
|
3056
|
+
// 0.38.0:筛选维度取值(从数据里收集,保证下拉里不会出现空选项)。
|
|
3057
|
+
const allScopes = [...new Set(hooks.flatMap((hook) => (Array.isArray(hook.scopes) ? hook.scopes : [])))]
|
|
3058
|
+
const shownHooks = hooks.filter((hook) => {
|
|
3059
|
+
if (filterPhase && hook.phase !== filterPhase) return false
|
|
3060
|
+
if (filterScope && !(Array.isArray(hook.scopes) && hook.scopes.includes(filterScope))) return false
|
|
3061
|
+
if (filterApproval === 'approved' && hook.pendingApproval) return false
|
|
3062
|
+
if (filterApproval === 'pending' && !hook.pendingApproval) return false
|
|
3063
|
+
return true
|
|
3064
|
+
})
|
|
3065
|
+
|
|
3066
|
+
const phaseTrialLabel = (phase) => phase === 'before-save' ? '保存前校验' : phase === 'after-save' ? '保存后观察' : phase === 'before-inject' ? '注入前解析' : '脚本'
|
|
3067
|
+
|
|
3038
3068
|
const renderEditor = () => h('div', { className: 'hook-edit' },
|
|
3039
3069
|
h('div', { className: 'hook-edit-head' },
|
|
3040
3070
|
h('span', { className: 'hook-edit-title' }, draft.id === '' ? '新建规则代码' : `编辑 ${draft.name || draft.id}`),
|
|
@@ -3089,52 +3119,84 @@ window.__ModuleLoader__.load({
|
|
|
3089
3119
|
)
|
|
3090
3120
|
|
|
3091
3121
|
const renderCard = (hook) => {
|
|
3092
|
-
const
|
|
3122
|
+
const editing = draft !== null && draft.id === hook.id
|
|
3123
|
+
const folded = !editing && !expanded.has(hook.id)
|
|
3124
|
+
const toggleFold = () => setExpanded((prev) => {
|
|
3125
|
+
const next = new Set(prev)
|
|
3126
|
+
if (next.has(hook.id)) next.delete(hook.id); else next.add(hook.id)
|
|
3127
|
+
return next
|
|
3128
|
+
})
|
|
3093
3129
|
const trialOutcome = trial !== null && trial.hookId === hook.id ? trial.outcome : undefined
|
|
3094
|
-
|
|
3130
|
+
const showTrial = trialOutcome !== undefined && trialOutcome !== null && !trialClosed.has(hook.id)
|
|
3131
|
+
const approved = !hook.pendingApproval
|
|
3132
|
+
let rawText = ''
|
|
3133
|
+
if (trialOutcome && trialOutcome.raw !== undefined) {
|
|
3134
|
+
try { rawText = JSON.stringify(trialOutcome.raw) } catch { rawText = String(trialOutcome.raw) }
|
|
3135
|
+
}
|
|
3136
|
+
return h('div', { className: 'hook-card' + (folded ? ' folded' : ''), key: hook.id },
|
|
3095
3137
|
h('div', { className: 'hook-card-head' },
|
|
3096
|
-
h('
|
|
3138
|
+
h('span', { className: 'hook-caret', role: 'button', tabIndex: 0, 'aria-expanded': !folded,
|
|
3139
|
+
title: folded ? '展开代码' : '折叠代码', onClick: toggleFold,
|
|
3140
|
+
onKeyDown: (e) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); toggleFold() } } }, folded ? '▸' : '▾'),
|
|
3141
|
+
h('div', { className: 'hook-card-title', onClick: toggleFold, style: { cursor: 'pointer' } },
|
|
3097
3142
|
h('span', { className: 'hook-name' }, hook.name),
|
|
3098
3143
|
h('span', { className: 'hook-pill' }, phaseText[hook.phase] || hook.phase),
|
|
3099
|
-
|
|
3100
|
-
|
|
3144
|
+
approved
|
|
3145
|
+
? h('span', { className: 'hook-pill ok' }, '已批准 · 会运行')
|
|
3146
|
+
: h('span', { className: 'hook-pill warn' }, '未批准 · 不会运行'),
|
|
3101
3147
|
hook.ruleId ? h('span', { className: 'hook-pill' }, `规则 ${String(hook.ruleId).slice(0, 8)}`) : null,
|
|
3102
3148
|
),
|
|
3103
3149
|
h('div', { className: 'hook-card-actions' },
|
|
3104
|
-
h('button', { className: 'linkbtn', onClick: () => (
|
|
3150
|
+
h('button', { className: 'linkbtn', onClick: () => (editing ? setDraft(null) : edit(hook)), disabled: busy }, editing ? '收起' : '编辑代码'),
|
|
3105
3151
|
h('button', { className: 'linkbtn', onClick: () => run(hook), disabled: busy }, '试跑'),
|
|
3106
|
-
|
|
3152
|
+
approved
|
|
3153
|
+
? h('button', { className: 'linkbtn', onClick: () => revokeApproval(hook), disabled: busy }, '撤销批准')
|
|
3154
|
+
: h('button', { className: 'linkbtn', onClick: () => approve(hook), disabled: busy }, '批准'),
|
|
3107
3155
|
h('button', { className: 'linkbtn danger', onClick: () => remove(hook), disabled: busy }, '删除'),
|
|
3108
3156
|
),
|
|
3109
3157
|
),
|
|
3110
|
-
h('div',
|
|
3111
|
-
(
|
|
3112
|
-
|
|
3113
|
-
|
|
3114
|
-
|
|
3115
|
-
|
|
3116
|
-
|
|
3117
|
-
|
|
3118
|
-
|
|
3119
|
-
|
|
3120
|
-
|
|
3121
|
-
? renderEditor()
|
|
3122
|
-
|
|
3123
|
-
|
|
3124
|
-
|
|
3125
|
-
|
|
3126
|
-
|
|
3127
|
-
|
|
3128
|
-
|
|
3129
|
-
|
|
3130
|
-
|
|
3131
|
-
|
|
3132
|
-
|
|
3133
|
-
|
|
3134
|
-
|
|
3135
|
-
|
|
3136
|
-
|
|
3137
|
-
|
|
3158
|
+
folded ? null : h('div', null,
|
|
3159
|
+
h('div', { className: 'hook-card-meta' },
|
|
3160
|
+
(hook.scopes && hook.scopes.length > 0 ? `作用域 ${hook.scopes.join(' / ')}` : '作用域:全部'),
|
|
3161
|
+
' · ',
|
|
3162
|
+
(hook.kinds && hook.kinds.length > 0 ? `类型 ${hook.kinds.join(' / ')}` : '类型:全部'),
|
|
3163
|
+
hook.runCount > 0 ? ` · 运行 ${hook.runCount} 次` : ' · 还没运行过',
|
|
3164
|
+
hook.rejectCount > 0 ? ` / 拒绝 ${hook.rejectCount}` : '',
|
|
3165
|
+
hook.errorCount > 0 ? ` / 出错 ${hook.errorCount}` : '',
|
|
3166
|
+
hook.lastOutcome === 'error' ? ` · 最近出错:${hook.lastMessage || '(无说明)'}` : '',
|
|
3167
|
+
hook.lastOutcome === 'rejected' ? ` · 最近拒绝:${hook.lastMessage || '(无说明)'}` : '',
|
|
3168
|
+
),
|
|
3169
|
+
editing ? renderEditor() : h('pre', { className: 'hook-code-preview' }, hook.code),
|
|
3170
|
+
h('div', { className: 'hook-trial' },
|
|
3171
|
+
h('input', {
|
|
3172
|
+
type: 'text',
|
|
3173
|
+
placeholder: '拿一段样例正文试跑(不写记忆)',
|
|
3174
|
+
value: trialText,
|
|
3175
|
+
onChange: (e) => setTrialText(e.target.value),
|
|
3176
|
+
}),
|
|
3177
|
+
showTrial
|
|
3178
|
+
? h('div', { className: 'hook-trial-result ' + (trialOutcome.error ? 'err' : trialOutcome.ok ? 'ok' : 'rej') },
|
|
3179
|
+
h('div', { style: { display: 'flex', alignItems: 'center' } },
|
|
3180
|
+
h('span', null,
|
|
3181
|
+
`${phaseTrialLabel(hook.phase)} · `,
|
|
3182
|
+
trialOutcome.error
|
|
3183
|
+
? `运行失败:${trialOutcome.error}`
|
|
3184
|
+
: hook.phase === 'before-save'
|
|
3185
|
+
? (trialOutcome.ok ? '允许保存(通过)' : `拒绝保存 · ${trialOutcome.message || '(无理由)'}`)
|
|
3186
|
+
: hook.phase === 'after-save'
|
|
3187
|
+
? (trialOutcome.ok ? '观察通过(不阻断)' : `附注 · ${trialOutcome.message || '(无说明)'}`)
|
|
3188
|
+
: (trialOutcome.ok ? '保留并记录(通过)' : `不通过 · ${trialOutcome.message || '(无理由)'}`),
|
|
3189
|
+
` (${trialOutcome.durationMs}ms)`,
|
|
3190
|
+
trialOutcome.drop === true ? ' · 整条丢弃' : '',
|
|
3191
|
+
),
|
|
3192
|
+
h('button', { className: 'linkbtn hook-trial-close', onClick: () => setTrialClosed((prev) => new Set(prev).add(hook.id)), title: '关闭试跑输出' }, '×'),
|
|
3193
|
+
),
|
|
3194
|
+
trialOutcome.content !== undefined ? h('div', null, `改写后正文:${trialOutcome.content}`) : null,
|
|
3195
|
+
trialOutcome.logs && trialOutcome.logs.length > 0 ? h('div', null, `日志:${trialOutcome.logs.join(' / ')}`) : null,
|
|
3196
|
+
rawText !== '' ? h('pre', { className: 'hook-trial-raw' }, `脚本真实输出:${rawText}`) : null,
|
|
3197
|
+
)
|
|
3198
|
+
: null,
|
|
3199
|
+
),
|
|
3138
3200
|
),
|
|
3139
3201
|
)
|
|
3140
3202
|
}
|
|
@@ -3176,12 +3238,30 @@ window.__ModuleLoader__.load({
|
|
|
3176
3238
|
? h('span', { className: 'warn' }, `${pendingCount} 条代码还在等批准,未批准不会运行`)
|
|
3177
3239
|
: null,
|
|
3178
3240
|
),
|
|
3241
|
+
h('div', { className: 'hook-filters' },
|
|
3242
|
+
h('span', null, '筛选:'),
|
|
3243
|
+
h('label', null, '时机 ', h(Dropdown, {
|
|
3244
|
+
items: [{ value: '', label: '全部' }, { value: 'before-save', label: '保存前校验' }, { value: 'after-save', label: '保存后观察' }, { value: 'before-inject', label: '注入前解析' }],
|
|
3245
|
+
value: filterPhase, onChange: setFilterPhase,
|
|
3246
|
+
})),
|
|
3247
|
+
h('label', null, '作用域 ', h(Dropdown, {
|
|
3248
|
+
items: [{ value: '', label: '全部' }, ...allScopes.map((scope) => ({ value: scope, label: scope }))],
|
|
3249
|
+
value: filterScope, onChange: setFilterScope,
|
|
3250
|
+
})),
|
|
3251
|
+
h('label', null, '批准状态 ', h(Dropdown, {
|
|
3252
|
+
items: [{ value: '', label: '全部' }, { value: 'approved', label: '已批准' }, { value: 'pending', label: '未批准' }],
|
|
3253
|
+
value: filterApproval, onChange: setFilterApproval,
|
|
3254
|
+
})),
|
|
3255
|
+
h('span', { className: 'muted' }, `${shownHooks.length} / ${hooks.length} 条`),
|
|
3256
|
+
),
|
|
3179
3257
|
draft !== null && draft.id === '' ? renderEditor() : null,
|
|
3180
3258
|
error && draft === null ? h('div', { className: 'err' }, error) : null,
|
|
3181
|
-
|
|
3259
|
+
shownHooks.length === 0
|
|
3182
3260
|
? h('div', { className: 'empty' },
|
|
3183
|
-
|
|
3184
|
-
|
|
3261
|
+
hooks.length === 0
|
|
3262
|
+
? '还没有规则代码。可以让 Agent 在 memory_save 时带 hookCode,或点右上角「新建代码」。'
|
|
3263
|
+
: '没有符合筛选条件的规则代码。')
|
|
3264
|
+
: h('div', { className: 'hook-list' }, shownHooks.map(renderCard)),
|
|
3185
3265
|
)
|
|
3186
3266
|
}
|
|
3187
3267
|
|
package/lib/panel.js
CHANGED
|
@@ -1288,6 +1288,15 @@ async function handle(ctx, routePath, req, res) {
|
|
|
1288
1288
|
return
|
|
1289
1289
|
}
|
|
1290
1290
|
|
|
1291
|
+
if (action === 'revoke-approval') {
|
|
1292
|
+
// 0.38.0:撤销批准 ≠ 停用 —— 代码保留、变回待批准;未批准不会运行。
|
|
1293
|
+
if (typeof memory.revokeHookApproval !== 'function') throw new ApiError(501, 'NOT_SUPPORTED', 'provider 未提供撤销批准接口(请升级 @restregular/dsh-memory)')
|
|
1294
|
+
const id = typeof body.id === 'string' ? body.id : ''
|
|
1295
|
+
if (id === '') throw new ApiError(400, 'HOOK_ID_REQUIRED', 'id 不能为空')
|
|
1296
|
+
writeJson(res, { ok: true, value: { revoked: memory.revokeHookApproval(id) } })
|
|
1297
|
+
return
|
|
1298
|
+
}
|
|
1299
|
+
|
|
1291
1300
|
if (action === 'delete') {
|
|
1292
1301
|
if (typeof memory.deleteHook !== 'function') throw new ApiError(501, 'NOT_SUPPORTED', 'provider 未提供记忆钩子接口')
|
|
1293
1302
|
const id = typeof body.id === 'string' ? body.id : ''
|
package/lib/provider/apply.js
CHANGED
|
@@ -414,6 +414,10 @@ export class CordisMemoryService extends Service {
|
|
|
414
414
|
return this.impl.approveHook(id)
|
|
415
415
|
}
|
|
416
416
|
|
|
417
|
+
revokeHookApproval(id ) {
|
|
418
|
+
return this.impl.revokeHookApproval(id)
|
|
419
|
+
}
|
|
420
|
+
|
|
417
421
|
hookPendingApproval(id ) {
|
|
418
422
|
return this.impl.hookPendingApproval(id)
|
|
419
423
|
}
|
package/lib/provider/hooks.js
CHANGED
|
@@ -150,6 +150,8 @@ const PHASE_ENTRY = {
|
|
|
150
150
|
|
|
151
151
|
|
|
152
152
|
|
|
153
|
+
|
|
154
|
+
|
|
153
155
|
|
|
154
156
|
|
|
155
157
|
|
|
@@ -294,7 +296,7 @@ export function runHookCode(
|
|
|
294
296
|
phase ,
|
|
295
297
|
input ,
|
|
296
298
|
settings ,
|
|
297
|
-
)
|
|
299
|
+
) {
|
|
298
300
|
const timeout = Math.max(20, Math.min(5000, settings.timeoutMs))
|
|
299
301
|
const key = `${phase}:${hashHookCode(code)}`
|
|
300
302
|
let compiled = compileCache.get(key)
|
|
@@ -333,7 +335,10 @@ export function runHookCode(
|
|
|
333
335
|
if (raw !== null && typeof raw === 'object' && typeof (raw ).then === 'function') {
|
|
334
336
|
return { ok: true, error: '脚本返回了 Promise:钩子必须是同步函数(不允许 await)', logs }
|
|
335
337
|
}
|
|
336
|
-
|
|
338
|
+
// 0.38.0:raw 只保留可 JSON 序列化的部分,避免宿主对象/循环引用流到外面。
|
|
339
|
+
let safeRaw
|
|
340
|
+
try { safeRaw = JSON.parse(JSON.stringify(raw ?? null)) } catch { safeRaw = String(raw) }
|
|
341
|
+
return { ...normalizeHookResult(raw), logs, raw: safeRaw }
|
|
337
342
|
} catch (error) {
|
|
338
343
|
const message = error instanceof Error ? error.message : String(error)
|
|
339
344
|
const timedOut = /timed out|Script execution timed out/i.test(message)
|
|
@@ -392,15 +397,21 @@ export class HookStore {
|
|
|
392
397
|
this.hooks = list.filter((hook) =>
|
|
393
398
|
hook !== null && typeof hook === 'object' && typeof hook.id === 'string' && typeof hook.code === 'string')
|
|
394
399
|
// 老文件可能缺统计字段:补齐,避免调用方到处判空。
|
|
395
|
-
.map((hook) =>
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
400
|
+
.map((hook) => {
|
|
401
|
+
// 0.38.0:移除启用/停用语义,审批成为唯一闸门。老数据里 enabled:false
|
|
402
|
+
// 的钩子等同于"用户不想让它跑" → 迁成"未批准"(清掉指纹),避免它突然生效。
|
|
403
|
+
const migrated = {
|
|
404
|
+
...hook,
|
|
405
|
+
enabled: true,
|
|
406
|
+
scopes: Array.isArray(hook.scopes) ? hook.scopes : [],
|
|
407
|
+
kinds: Array.isArray(hook.kinds) ? hook.kinds : [],
|
|
408
|
+
runCount: Number(hook.runCount) || 0,
|
|
409
|
+
errorCount: Number(hook.errorCount) || 0,
|
|
410
|
+
rejectCount: Number(hook.rejectCount) || 0,
|
|
411
|
+
}
|
|
412
|
+
if (hook.enabled === false) delete migrated.approvedHash
|
|
413
|
+
return migrated
|
|
414
|
+
})
|
|
404
415
|
} catch (error) {
|
|
405
416
|
// 坏文件不能让记忆整体不可用:退化成"没有钩子",并在日志里说清楚。
|
|
406
417
|
this.onWarn(`hooks.json 读取失败(按无钩子继续):${error instanceof Error ? error.message : String(error)}`)
|
|
@@ -439,9 +450,9 @@ export class HookStore {
|
|
|
439
450
|
*/
|
|
440
451
|
forRun(phase , target , settings , ignoreApproval = false) {
|
|
441
452
|
this.load()
|
|
453
|
+
// 0.38.0:不再看 enabled(启用/停用语义已移除)—— 唯一闸门是"是否被批准"。
|
|
442
454
|
return this.hooks.filter((hook) =>
|
|
443
|
-
hook.
|
|
444
|
-
&& hook.phase === phase
|
|
455
|
+
hook.phase === phase
|
|
445
456
|
&& hookApplies(hook, target)
|
|
446
457
|
&& (ignoreApproval || !hookNeedsApproval(hook, settings)))
|
|
447
458
|
}
|
|
@@ -462,7 +473,8 @@ export class HookStore {
|
|
|
462
473
|
existing.name = (input.name ?? existing.name).trim() || existing.name
|
|
463
474
|
existing.phase = input.phase
|
|
464
475
|
existing.code = code
|
|
465
|
-
|
|
476
|
+
// 0.38.0:enabled 不再是开关,统一保持 true;"不让跑"请用撤销批准。
|
|
477
|
+
existing.enabled = true
|
|
466
478
|
if (Array.isArray(input.scopes)) existing.scopes = input.scopes.map(String)
|
|
467
479
|
if (Array.isArray(input.kinds)) existing.kinds = input.kinds.map(String)
|
|
468
480
|
if (input.description !== undefined) existing.description = input.description
|
|
@@ -489,7 +501,7 @@ export class HookStore {
|
|
|
489
501
|
name: (input.name ?? '').trim() || `${input.phase} 规则`,
|
|
490
502
|
phase: input.phase,
|
|
491
503
|
code,
|
|
492
|
-
enabled:
|
|
504
|
+
enabled: true, // 0.38.0:审批是唯一闸门,enabled 恒 true(保留字段只为兼容旧数据)。
|
|
493
505
|
scopes: Array.isArray(input.scopes) ? input.scopes.map(String) : [],
|
|
494
506
|
kinds: Array.isArray(input.kinds) ? input.kinds.map(String) : [],
|
|
495
507
|
...(input.description !== undefined ? { description: input.description } : {}),
|
|
@@ -548,6 +560,21 @@ export class HookStore {
|
|
|
548
560
|
return true
|
|
549
561
|
}
|
|
550
562
|
|
|
563
|
+
/**
|
|
564
|
+
* 撤销批准(0.38.0):清掉已批准的指纹 → 代码变回"待批准、不会运行"。
|
|
565
|
+
* 代码本身保留,用户可随时再批准回来;不改变 enabled(批准语义与启用彻底分开)。
|
|
566
|
+
*/
|
|
567
|
+
revoke(id ) {
|
|
568
|
+
this.load()
|
|
569
|
+
const hook = this.hooks.find((item) => item.id === id)
|
|
570
|
+
if (hook === undefined) return false
|
|
571
|
+
if (hook.approvedHash === undefined) return false
|
|
572
|
+
delete hook.approvedHash
|
|
573
|
+
hook.updatedAt = Date.now()
|
|
574
|
+
this.persist()
|
|
575
|
+
return true
|
|
576
|
+
}
|
|
577
|
+
|
|
551
578
|
/** 测试用:绕过缓存重新读盘。 */
|
|
552
579
|
reload() {
|
|
553
580
|
this.loaded = false
|
|
@@ -596,6 +623,7 @@ export function runHooks(
|
|
|
596
623
|
...(result.drop === true ? { drop: true } : {}),
|
|
597
624
|
...(crashed ? { error: result.error } : {}),
|
|
598
625
|
...(result.logs.length > 0 ? { logs: result.logs.slice(0, 20) } : {}),
|
|
626
|
+
...(result.raw !== undefined ? { raw: result.raw } : {}),
|
|
599
627
|
}
|
|
600
628
|
try {
|
|
601
629
|
store.recordRun(hook.id, {
|
package/lib/provider/index.js
CHANGED
|
@@ -992,6 +992,11 @@ export class LocalMemoryService {
|
|
|
992
992
|
return this.hooks.approve(id, hashHookCode(hook.code))
|
|
993
993
|
}
|
|
994
994
|
|
|
995
|
+
/** 撤销审批(0.38.0):代码保留、变回待批准;未批准不会运行。 */
|
|
996
|
+
revokeHookApproval(id ) {
|
|
997
|
+
return this.hooks.revoke(id)
|
|
998
|
+
}
|
|
999
|
+
|
|
995
1000
|
/** 这条钩子是否还需要用户批准(代码变过也算需要)。 */
|
|
996
1001
|
hookPendingApproval(id ) {
|
|
997
1002
|
const hook = this.hooks.get(id)
|
|
@@ -1084,6 +1089,7 @@ export class LocalMemoryService {
|
|
|
1084
1089
|
...(result.drop === true ? { drop: true } : {}),
|
|
1085
1090
|
...(crashed ? { error: result.error } : {}),
|
|
1086
1091
|
...(result.logs.length > 0 ? { logs: result.logs.slice(0, 20) } : {}),
|
|
1092
|
+
...(result.raw !== undefined ? { raw: result.raw } : {}),
|
|
1087
1093
|
}]
|
|
1088
1094
|
}
|
|
1089
1095
|
|
package/lib/tools/index.js
CHANGED
|
@@ -325,6 +325,8 @@ import { canonicalWorkspacePath, defaultScopeDescription, normalizeScopeInput, r
|
|
|
325
325
|
|
|
326
326
|
|
|
327
327
|
|
|
328
|
+
|
|
329
|
+
|
|
328
330
|
|
|
329
331
|
|
|
330
332
|
|
|
@@ -378,6 +380,8 @@ import { canonicalWorkspacePath, defaultScopeDescription, normalizeScopeInput, r
|
|
|
378
380
|
|
|
379
381
|
|
|
380
382
|
|
|
383
|
+
|
|
384
|
+
|
|
381
385
|
|
|
382
386
|
|
|
383
387
|
|
|
@@ -2379,7 +2383,7 @@ export function memoryBlockTool(opts )
|
|
|
2379
2383
|
}
|
|
2380
2384
|
|
|
2381
2385
|
/** `memory_hooks` 支持的 action。 */
|
|
2382
|
-
|
|
2386
|
+
|
|
2383
2387
|
|
|
2384
2388
|
|
|
2385
2389
|
|
|
@@ -2455,12 +2459,11 @@ export function memoryHooksTool(opts )
|
|
|
2455
2459
|
parameters: {
|
|
2456
2460
|
action: {
|
|
2457
2461
|
type: 'string',
|
|
2458
|
-
enum: ['list', 'get', 'save', 'delete', 'approve', 'enable', 'disable', 'run'],
|
|
2462
|
+
enum: ['list', 'get', 'save', 'delete', 'approve', 'revoke-approval', 'enable', 'disable', 'run'],
|
|
2459
2463
|
required: true,
|
|
2460
|
-
description: 'list=列全部(不含代码);get=读代码;save=新建/更新;delete=删除(不可逆,**必须二次确认**:先不带 confirm 调用拿预览,再带 confirm="<钩子的 name 或 id>" 重复调用才真删);approve
|
|
2461
|
-
+ 'enable/disable=开关;run=拿一段正文试跑(不写记忆)。',
|
|
2464
|
+
description: 'list=列全部(不含代码);get=读代码;save=新建/更新;delete=删除(不可逆,**必须二次确认**:先不带 confirm 调用拿预览,再带 confirm="<钩子的 name 或 id>" 重复调用才真删);approve=批准代码使其运行;revoke-approval=撤销批准(代码保留、变回待批准、不再运行);enable/disable=旧别名(等同 approve/revoke-approval);run=拿一段正文试跑(不写记忆)。',
|
|
2462
2465
|
},
|
|
2463
|
-
id: { type: 'string', description: '钩子 id(或唯一前缀 / 名字);get/delete/approve/enable/disable/run 必填' },
|
|
2466
|
+
id: { type: 'string', description: '钩子 id(或唯一前缀 / 名字);get/delete/approve/revoke-approval/enable/disable/run 必填' },
|
|
2464
2467
|
confirm: { type: 'string', description: 'delete 专用二次确认:值必须等于目标钩子的 name 或完整 id。删除不可逆(hooks.json 直接覆盖、无回收站),不带或写错只返回待删预览、不会删除。' },
|
|
2465
2468
|
code: { type: 'string', description: '脚本源码(save 必填)。入口函数名与返回约定见技能 memory-hook-scripts。' },
|
|
2466
2469
|
phase: {
|
|
@@ -2608,26 +2611,47 @@ export function memoryHooksTool(opts )
|
|
|
2608
2611
|
}
|
|
2609
2612
|
}
|
|
2610
2613
|
|
|
2614
|
+
if (action === 'revoke-approval') {
|
|
2615
|
+
// 0.38.0:撤销批准 = 代码保留、变回待批准;未批准不会运行。与"停用"彻底分开。
|
|
2616
|
+
const hook = findHook(service, args.id ?? '')
|
|
2617
|
+
if (typeof service.revokeHookApproval !== 'function') {
|
|
2618
|
+
throw new MemoryToolError('HOOKS_UNSUPPORTED', '当前 memory provider 不支持撤销批准(请升级 @restregular/dsh-memory)')
|
|
2619
|
+
}
|
|
2620
|
+
const revoked = service.revokeHookApproval(hook.id)
|
|
2621
|
+
const fresh = typeof service.getHook === 'function' ? service.getHook(hook.id) : undefined
|
|
2622
|
+
return {
|
|
2623
|
+
action,
|
|
2624
|
+
hooks: fresh !== undefined ? [withApproval(fresh)] : [],
|
|
2625
|
+
note: revoked
|
|
2626
|
+
? `已撤销「${hook.name}」的批准:代码保留,但变回待批准,**不会运行**。`
|
|
2627
|
+
: `「${hook.name}」本来就没有批准过。`,
|
|
2628
|
+
}
|
|
2629
|
+
}
|
|
2630
|
+
|
|
2611
2631
|
if (action === 'enable' || action === 'disable') {
|
|
2632
|
+
// 0.38.0:保留 action 仅为向后兼容 —— 启用/停用语义已移除,统一映射到批准/撤销批准。
|
|
2612
2633
|
const hook = findHook(service, args.id ?? '')
|
|
2613
|
-
if (
|
|
2614
|
-
|
|
2634
|
+
if (action === 'disable') {
|
|
2635
|
+
if (typeof service.revokeHookApproval !== 'function') {
|
|
2636
|
+
throw new MemoryToolError('HOOKS_UNSUPPORTED', '当前 memory provider 不支持撤销批准(请升级 @restregular/dsh-memory)')
|
|
2637
|
+
}
|
|
2638
|
+
const revoked = service.revokeHookApproval(hook.id)
|
|
2639
|
+
const fresh = typeof service.getHook === 'function' ? service.getHook(hook.id) : undefined
|
|
2640
|
+
return {
|
|
2641
|
+
action,
|
|
2642
|
+
hooks: fresh !== undefined ? [withApproval(fresh)] : [],
|
|
2643
|
+
note: `「停用」已更名为「撤销批准」:${revoked ? '已撤销批准,代码保留但**不会运行**。' : '本来就未批准。'}`,
|
|
2644
|
+
}
|
|
2615
2645
|
}
|
|
2616
|
-
|
|
2617
|
-
|
|
2618
|
-
|
|
2619
|
-
|
|
2620
|
-
|
|
2621
|
-
enabled: action === 'enable',
|
|
2622
|
-
scopes: hook.scopes,
|
|
2623
|
-
kinds: hook.kinds,
|
|
2624
|
-
...(hook.description !== undefined ? { description: hook.description } : {}),
|
|
2625
|
-
...(hook.ruleId !== undefined ? { ruleId: hook.ruleId } : {}),
|
|
2626
|
-
})
|
|
2646
|
+
if (typeof service.approveHook !== 'function') {
|
|
2647
|
+
throw new MemoryToolError('HOOKS_UNSUPPORTED', '当前 memory provider 不支持批准')
|
|
2648
|
+
}
|
|
2649
|
+
service.approveHook(hook.id)
|
|
2650
|
+
const fresh = typeof service.getHook === 'function' ? service.getHook(hook.id) : undefined
|
|
2627
2651
|
return {
|
|
2628
2652
|
action,
|
|
2629
|
-
hooks: [withApproval(
|
|
2630
|
-
note:
|
|
2653
|
+
hooks: fresh !== undefined ? [withApproval(fresh)] : [],
|
|
2654
|
+
note: '「启用」已更名为「批准」:已批准这段代码,从现在起会运行。',
|
|
2631
2655
|
}
|
|
2632
2656
|
}
|
|
2633
2657
|
|
package/lib/tools/render.js
CHANGED
|
@@ -389,15 +389,31 @@ export function renderHooksResult(value , label )
|
|
|
389
389
|
|
|
390
390
|
if (value.action === 'run') {
|
|
391
391
|
const hook = value.hooks[0]
|
|
392
|
-
const
|
|
392
|
+
const phase = hook?.phase
|
|
393
|
+
// 0.38.0:不同时机试跑结果侧重不同 —— 校验看通过/拒绝,观察看附注,解析看改写/丢弃。
|
|
394
|
+
const phaseLabel = phase === 'before-save' ? '保存前校验' : phase === 'after-save' ? '保存后观察' : phase === 'before-inject' ? '注入前解析' : '脚本'
|
|
395
|
+
const head = hook !== undefined ? `${describe(hook)} · 试跑(${phaseLabel})` : `试跑(${phaseLabel})`
|
|
393
396
|
const outcomes = value.outcomes ?? []
|
|
394
397
|
const detail = outcomes.length === 0
|
|
395
398
|
? '(脚本没有命中这次输入)'
|
|
396
399
|
: outcomes.map((outcome) => {
|
|
397
400
|
const lines = []
|
|
398
401
|
if (outcome.error !== undefined) lines.push(`运行失败:${outcome.error}`)
|
|
399
|
-
else
|
|
400
|
-
|
|
402
|
+
else {
|
|
403
|
+
// 判定文案按时机区分。
|
|
404
|
+
if (phase === 'before-save') lines.push(outcome.ok ? '判定:允许保存(通过)' : `判定:拒绝保存 —— ${outcome.message ?? '(脚本没给理由)'}`)
|
|
405
|
+
else if (phase === 'after-save') lines.push(outcome.ok ? '判定:观察通过(不阻断)' : `判定:附注 —— ${outcome.message ?? '(无说明)'}`)
|
|
406
|
+
else lines.push(outcome.ok ? '判定:保留并记录(通过)' : `判定:不通过 —— ${outcome.message ?? '(脚本没给理由)'}`)
|
|
407
|
+
if (outcome.content !== undefined) lines.push(`改写后正文:${outcome.content.slice(0, 400)}`)
|
|
408
|
+
if (outcome.drop === true) lines.push('整条丢弃(drop:true)')
|
|
409
|
+
if (outcome.message !== undefined && phase !== 'before-save') lines.push(`脚本说明:${outcome.message}`)
|
|
410
|
+
// 真实输出:把脚本原始返回值原样回显,而不是只给规范化结论。
|
|
411
|
+
if (outcome.raw !== undefined) {
|
|
412
|
+
let rawText
|
|
413
|
+
try { rawText = JSON.stringify(outcome.raw) } catch { rawText = String(outcome.raw) }
|
|
414
|
+
lines.push(`脚本真实输出:${rawText}`)
|
|
415
|
+
}
|
|
416
|
+
}
|
|
401
417
|
if (outcome.logs !== undefined && outcome.logs.length > 0) lines.push(`日志:${outcome.logs.join(' / ')}`)
|
|
402
418
|
lines.push(`耗时 ${outcome.durationMs}ms`)
|
|
403
419
|
return lines.join('\n')
|
package/package.json
CHANGED
|
@@ -147,6 +147,10 @@ function verify(memory, ctx) {
|
|
|
147
147
|
|
|
148
148
|
改代码之后要重新批准:审批记的是**代码指纹**,改一个字符就会重新变回待批准。
|
|
149
149
|
|
|
150
|
+
**批准是唯一的开关(0.38.0)**:没有"启用 / 停用"了 —— 一段代码要么**已批准(会运行)**,要么**未批准(不会运行)**。面板卡片有「批准」和「撤销批准」两个按钮;`memory_hooks` 的 `approve` 批准、`revoke-approval` 撤销(`enable`/`disable` 只是这两个的旧别名)。撤销批准不会删代码,只是让它停下,随时能再批准回来。老数据里"已停用"的钩子会自动迁成"未批准",不会突然开始运行。
|
|
151
|
+
|
|
152
|
+
试跑结果按运行时机分开呈现(0.38.0):保存前校验显示"允许保存 / 拒绝保存",保存后观察显示"观察 / 附注",注入前解析显示"改写后正文 / 整条丢弃";并会回显脚本的**真实返回值**和 `log()` 输出,不只给规范化结论。
|
|
153
|
+
|
|
150
154
|
## 删除钩子要二次确认(不可逆)
|
|
151
155
|
|
|
152
156
|
`memory_hooks({ action: 'delete', id })` **不会一次删掉**——删除是从 `hooks.json` 直接移除、没有回收站,写好的代码找不回来(只能从会话日志里翻)。所以它分两步:
|