@modusensus/dsh-mneme 0.9.0 → 0.9.2
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/README.md +82 -19
- package/bin/cli.mjs +69 -9
- package/docs/CONFIGURATION.md +48 -0
- package/docs/SEMANTIC.md +3 -3
- package/lib/api-standalone.js +78 -12
- package/lib/api.js +339 -59
- package/lib/candidates.js +454 -454
- package/lib/client.js +669 -256
- package/lib/config.js +50 -2
- package/lib/dream/sleep.js +35 -12
- package/lib/dream.js +86 -14
- package/lib/embedding.js +153 -22
- package/lib/index.js +32 -0
- package/lib/inject.js +34 -3
- package/lib/lang.js +124 -0
- package/lib/pipeline-activities.js +178 -0
- package/lib/pipeline-attribution.js +165 -0
- package/lib/pipeline-command.js +279 -0
- package/lib/pipeline-confirm.js +142 -0
- package/lib/pipeline-exec.js +174 -0
- package/lib/pipeline-nudge.js +1281 -0
- package/lib/pipeline-observations.js +181 -0
- package/lib/pipeline-observe.js +133 -0
- package/lib/pipeline-runner.js +346 -0
- package/lib/pipeline-runs.js +442 -0
- package/lib/pipeline.js +128 -7
- package/lib/scope-state.js +277 -0
- package/lib/semantic.js +66 -10
- package/lib/service.js +80 -3
- package/lib/settings.js +139 -1
- package/lib/store.js +216 -3
- package/lib/summarize.js +2 -3
- package/lib/tools.js +71 -0
- package/package.json +3 -3
- package/scripts/changelog-prep.mjs +62 -7
- package/scripts/check-sync.js +8 -6
- package/scripts/release-docs.mjs +204 -0
- package/scripts/release-notes.mjs +162 -0
- package/src/api-standalone.js +78 -12
- package/src/api.js +339 -59
- package/src/candidates.js +454 -454
- package/src/config.js +50 -2
- package/src/dream/sleep.js +35 -12
- package/src/dream.js +86 -14
- package/src/embedding.js +153 -22
- package/src/index.js +32 -0
- package/src/inject.js +34 -3
- package/src/lang.js +124 -0
- package/src/pipeline-activities.js +178 -0
- package/src/pipeline-attribution.js +165 -0
- package/src/pipeline-command.js +279 -0
- package/src/pipeline-confirm.js +142 -0
- package/src/pipeline-exec.js +174 -0
- package/src/pipeline-nudge.js +1281 -0
- package/src/pipeline-observations.js +181 -0
- package/src/pipeline-observe.js +133 -0
- package/src/pipeline-runner.js +346 -0
- package/src/pipeline-runs.js +442 -0
- package/src/pipeline.js +128 -7
- package/src/scope-state.js +277 -0
- package/src/semantic.js +66 -10
- package/src/service.js +80 -3
- package/src/settings.js +139 -1
- package/src/store.js +216 -3
- package/src/summarize.js +2 -3
- package/src/tools.js +71 -0
- package/test/api-hardening.test.js +173 -0
- package/test/api.test.js +210 -1
- package/test/changelog-prep.test.js +74 -8
- package/test/cli-enums.test.js +37 -0
- package/test/cli-flag-value.test.js +86 -0
- package/test/client.test.js +216 -6
- package/test/distill-tx-embed-gap.test.js +110 -0
- package/test/docs-config-keys.test.js +65 -0
- package/test/dream-maxtokens-fallback.test.js +132 -0
- package/test/embed-text-reasons.test.js +112 -0
- package/test/helpers/write-admission-samples.js +6 -2
- package/test/lib-smoke.test.js +20 -0
- package/test/persona-api.test.js +172 -0
- package/test/persona-flag.test.js +36 -0
- package/test/persona-inject.test.js +145 -0
- package/test/persona-settings.test.js +145 -0
- package/test/pipeline-activities.test.js +155 -0
- package/test/pipeline-attribution.test.js +175 -0
- package/test/pipeline-command.test.js +243 -0
- package/test/pipeline-confirm.test.js +148 -0
- package/test/pipeline-exec.test.js +172 -0
- package/test/pipeline-nudge.test.js +1036 -0
- package/test/pipeline-observations.test.js +157 -0
- package/test/pipeline-observe.test.js +127 -0
- package/test/pipeline-r1r2.test.js +149 -0
- package/test/pipeline-runner.test.js +442 -0
- package/test/pipeline-runs.test.js +767 -0
- package/test/pipeline.test.js +137 -6
- package/test/readme-claims.test.js +68 -0
- package/test/reindex-backfill.test.js +83 -4
- package/test/release-docs.test.js +130 -0
- package/test/release-notes.test.js +240 -0
- package/test/release-workflow.test.js +16 -0
- package/test/route-policy.test.js +113 -0
- package/test/scope-state.test.js +481 -0
- package/test/security-doc.test.js +139 -0
- package/test/sensitive-scan.test.js +44 -0
- package/test/tools-dto-schema-matrix.test.js +12 -3
- package/test/tools.test.js +6 -6
- package/test/workflow-guards.test.js +156 -0
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* P3 的两个产出:观察旁挂(丙方案)与 tool 不符检出。
|
|
3
|
+
*
|
|
4
|
+
* ## 背景(一句话)
|
|
5
|
+
*
|
|
6
|
+
* 自动归属被实测否决(14.2%,第三方复核 74% 变体唯一),所以写账由人确认;
|
|
7
|
+
* 而人确认时说「这一步做了」,可与本次**实际观察到的业务动作**对不上——
|
|
8
|
+
* 「声明是 npm test,这次一次 npm test 都没看到」。这个矛盾是步骤表过时的信号,
|
|
9
|
+
* 就是 P3 要捕的东西(设计见 mneme-research/mo-foundations/10 号)。
|
|
10
|
+
*
|
|
11
|
+
* ## 丙方案:观察为什么不进账本、要旁挂
|
|
12
|
+
*
|
|
13
|
+
* 账本 `.runs.jsonl` 是**已发布的数据契约**(v0.9.0 发出去的形状),为 P3 加字段
|
|
14
|
+
* 是「动已发布契约」,代价与风险都不必要。所以观察走旁挂文件:
|
|
15
|
+
*
|
|
16
|
+
* <memoryDir>/observations/<项目键>/<工作流id>.jsonl
|
|
17
|
+
*
|
|
18
|
+
* 这在这个仓库有**三次同构先例**:candidates / proposals / 本目录。
|
|
19
|
+
* 共同纪律:**项目键分桶、只增不改(append-only)、不进仓库、坏行跳过但计数**。
|
|
20
|
+
*
|
|
21
|
+
* ## 🔴 隐私
|
|
22
|
+
*
|
|
23
|
+
* 观察清单的每一项都来自 `pipeline-activities` 的产物——那一层已经**剥掉了位置参数**
|
|
24
|
+
* (完整命令行含绝对路径,路径含本机用户名)。本模块**只存 `{key, count, flags}`**,
|
|
25
|
+
* 拒收任何带命令原文的形状。这是第二道闸:即使上游改了,这里也不放行。
|
|
26
|
+
*/
|
|
27
|
+
|
|
28
|
+
import { existsSync, mkdirSync, readFileSync, appendFileSync, writeFileSync } from "node:fs";
|
|
29
|
+
import { dirname, join } from "node:path";
|
|
30
|
+
import { homedir } from "node:os";
|
|
31
|
+
|
|
32
|
+
/** 展开 `~`;观察旁挂跟 candidates/proposals 一样是本地状态(candidates.js 的 expandHome 同构)。
|
|
33
|
+
* config.memoryDir 的默认值是 "~/.dsh/memory",不展开的话 readdir 在带 "~" 的字面路径上
|
|
34
|
+
* 永远落空——旁挂静默读不到,fix-step-tool 提议少一类(CodeRabbit #458 F2)。 */
|
|
35
|
+
function expandHome(p) {
|
|
36
|
+
const s = String(p || "");
|
|
37
|
+
if (s === "~") return homedir();
|
|
38
|
+
if (s.startsWith("~/") || s.startsWith("~\\")) return join(homedir(), s.slice(2));
|
|
39
|
+
return s;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/** 观察旁挂的目录:`<memoryDir>/observations/<项目键>/`。与 candidates/proposals 同构。 */
|
|
43
|
+
export function observationDir({ memoryDir, projectKey } = {}) {
|
|
44
|
+
if (!projectKey || String(projectKey).trim() === "") return null;
|
|
45
|
+
const base = expandHome(memoryDir && String(memoryDir).trim() ? memoryDir : "~/.dsh/memory");
|
|
46
|
+
return join(base, "observations", projectKey);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/** 观察行的形状闸:只认 {key, count}(flags 可选且必须是旗标数组)。多一个字段都拒。 */
|
|
50
|
+
export function validateObservationLine(raw) {
|
|
51
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw)) return { ok: false, reason: "not-object" };
|
|
52
|
+
if (typeof raw.key !== "string" || raw.key.trim() === "") return { ok: false, reason: "bad-key" };
|
|
53
|
+
if (!Number.isInteger(raw.count) || raw.count < 1) return { ok: false, reason: "bad-count" };
|
|
54
|
+
if (raw.flags !== undefined && !Array.isArray(raw.flags)) return { ok: false, reason: "bad-flags" };
|
|
55
|
+
if (raw.command !== undefined || raw.args !== undefined || raw.segments !== undefined) {
|
|
56
|
+
// 🔴 命令原文(或其片段)不许出现在观察行里——那是位置参数泄露的口子
|
|
57
|
+
return { ok: false, reason: "forbidden-field" };
|
|
58
|
+
}
|
|
59
|
+
return { ok: true };
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* 落盘一次确认时的观察清单(append-only,幂等键 = confirmAt)。
|
|
64
|
+
*
|
|
65
|
+
* 返回 `{ok, file, lines}`;传 `dryRun: true` 时只校验不写(测试与预览用)。
|
|
66
|
+
*/
|
|
67
|
+
export function saveObservations({ dir, pipelineId, confirmAt, activities, dryRun = false } = {}) {
|
|
68
|
+
if (!dir) return { ok: false, reason: "no-dir" };
|
|
69
|
+
if (!pipelineId || typeof pipelineId !== "string") return { ok: false, reason: "no-pipeline-id" };
|
|
70
|
+
if (typeof confirmAt !== "string" || confirmAt.trim() === "") return { ok: false, reason: "no-confirm-at" };
|
|
71
|
+
if (!Array.isArray(activities)) return { ok: false, reason: "bad-activities" };
|
|
72
|
+
|
|
73
|
+
const valid = [];
|
|
74
|
+
for (const a of activities) {
|
|
75
|
+
// 🔴 先验**原始输入**再构造:多带 command/args/segments 的行要**大声拒**,
|
|
76
|
+
// 不是悄悄剥掉——静默剥离会把上游的形状 bug 藏进一次"成功"的写入里。
|
|
77
|
+
const v0 = validateObservationLine(a);
|
|
78
|
+
if (!v0.ok) return { ok: false, reason: "invalid-line:" + v0.reason, file: null, lines: 0 };
|
|
79
|
+
const line = { key: a.key, count: a.count, ...(Array.isArray(a.flags) && a.flags.length ? { flags: a.flags } : {}) };
|
|
80
|
+
valid.push(line);
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
const record = { contract: "mneme.observations/v1", pipelineId, confirmAt, activities: valid };
|
|
84
|
+
const file = join(dir, `${pipelineId}.jsonl`);
|
|
85
|
+
|
|
86
|
+
// 幂等:同一 confirmAt 已写过就不重复(confirm 保留待确认状态重答的场景会重放)
|
|
87
|
+
if (existsSync(file)) {
|
|
88
|
+
const seen = readFileSync(file, "utf8").split("\n").filter((l) => l.trim());
|
|
89
|
+
for (const l of seen) {
|
|
90
|
+
try { if (JSON.parse(l).confirmAt === confirmAt) return { ok: true, file, lines: 0, duplicate: true }; }
|
|
91
|
+
catch { /* 坏行:与读侧同一纪律,跳过但不出声 */ }
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
if (dryRun) return { ok: true, file, lines: valid.length, dryRun: true };
|
|
96
|
+
mkdirSync(dir, { recursive: true });
|
|
97
|
+
appendFileSync(file, JSON.stringify(record) + "\n", "utf8");
|
|
98
|
+
return { ok: true, file, lines: valid.length };
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/** 读一个工作流攒下的全部观察(按 confirmAt 升序,坏行跳过并计数)。 */
|
|
102
|
+
export function loadObservations(dir, pipelineId) {
|
|
103
|
+
if (!dir || !pipelineId) return { records: [], unreadable: 0 };
|
|
104
|
+
const file = join(dir, `${pipelineId}.jsonl`);
|
|
105
|
+
if (!existsSync(file)) return { records: [], unreadable: 0 };
|
|
106
|
+
const records = [];
|
|
107
|
+
let unreadable = 0;
|
|
108
|
+
for (const l of readFileSync(file, "utf8").split("\n")) {
|
|
109
|
+
if (!l.trim()) continue;
|
|
110
|
+
try {
|
|
111
|
+
const r = JSON.parse(l);
|
|
112
|
+
if (r?.contract === "mneme.observations/v1" && Array.isArray(r.activities)) records.push(r);
|
|
113
|
+
else unreadable += 1;
|
|
114
|
+
} catch { unreadable += 1; }
|
|
115
|
+
}
|
|
116
|
+
return { records, unreadable };
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
/**
|
|
120
|
+
* 批量读多个工作流的观察,压成 readPipelineDoc 要的形状:
|
|
121
|
+
* { [pipelineId]: { latest: { activities } } }
|
|
122
|
+
*
|
|
123
|
+
* `latest` 取最后一条记录(confirmAt 升序写入,末条即最近一次确认)。
|
|
124
|
+
* 没有观察的 id 不出现在结果里——读侧用 `?? null` 降级,不制造空壳。
|
|
125
|
+
*/
|
|
126
|
+
export function loadObservationsById(dir, pipelineIds) {
|
|
127
|
+
const out = {};
|
|
128
|
+
for (const id of pipelineIds || []) {
|
|
129
|
+
if (typeof id !== "string" || id.trim() === "") continue;
|
|
130
|
+
const { records, unreadable } = loadObservations(dir, id);
|
|
131
|
+
if (records.length === 0) {
|
|
132
|
+
// 有文件但全坏也如实记一条空 latest?——不。空 = 没有观察,与坏文件同形处理,
|
|
133
|
+
// unreadable 的计数只在单工作流读取时暴露,批量视图里降级为「没有」。
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
136
|
+
const last = records[records.length - 1];
|
|
137
|
+
out[id] = { latest: { activities: last.activities }, unreadable };
|
|
138
|
+
}
|
|
139
|
+
return out;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/**
|
|
143
|
+
* 🔴 核心判据:从「人确认的执行集」与「本次观察到的动作」里算出 tool 不符。
|
|
144
|
+
*
|
|
145
|
+
* - `pipeline.steps[].tool`:人手写的声明(可能是 `git push`,或 `a / b` 多锚点)
|
|
146
|
+
* - `confirmedDone`:人说了 done 的 stepId 集合
|
|
147
|
+
* - `activities`:本次观察到的业务动作(`{key, count}`)——**只认 key,不认命令原文**
|
|
148
|
+
*
|
|
149
|
+
* 返回不符清单。**unsure 与没答不进判据**(那不是「做了但没看到」,是「没确认」)。
|
|
150
|
+
* `declared` 原样带出,不含路径(tool 是作者手写的,且没有经过本模块之外的清洗——
|
|
151
|
+
* 若作者把路径写进 tool,那是步骤表自己的内容,应由步骤表校验层管,不在这里扩大职责)。
|
|
152
|
+
*/
|
|
153
|
+
export function toolMismatches({ pipeline, confirmedDone, activities } = {}) {
|
|
154
|
+
if (!pipeline || !Array.isArray(pipeline.steps)) return { ok: false, reason: "no-pipeline", items: [] };
|
|
155
|
+
if (!(confirmedDone instanceof Set)) return { ok: false, reason: "bad-confirmed", items: [] };
|
|
156
|
+
if (!Array.isArray(activities)) return { ok: false, reason: "bad-activities", items: [] };
|
|
157
|
+
|
|
158
|
+
const seen = new Set(activities.map((a) => String(a?.key ?? "").toLowerCase()).filter(Boolean));
|
|
159
|
+
const items = [];
|
|
160
|
+
for (const step of pipeline.steps) {
|
|
161
|
+
if (!confirmedDone.has(step.id)) continue;
|
|
162
|
+
const declared = typeof step.tool === "string" ? step.tool.trim() : "";
|
|
163
|
+
if (declared === "") continue; // 纯人判步骤(无 tool 声明)无从矛盾
|
|
164
|
+
const anchors = declared.split("/").map((t) => t.trim().toLowerCase()).filter(Boolean);
|
|
165
|
+
// 多锚点(`a / b`)任一出现即算对上——它们是作者声明的同义做法
|
|
166
|
+
const hit = anchors.some((a) => seen.has(a));
|
|
167
|
+
if (!hit) {
|
|
168
|
+
items.push({
|
|
169
|
+
stepId: step.id,
|
|
170
|
+
title: step.title,
|
|
171
|
+
declared,
|
|
172
|
+
observedTop: activities
|
|
173
|
+
.slice()
|
|
174
|
+
.sort((a, b) => (b.count ?? 0) - (a.count ?? 0))
|
|
175
|
+
.slice(0, 3)
|
|
176
|
+
.map((a) => `${a.key} ×${a.count}`)
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
return { ok: true, items };
|
|
181
|
+
}
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 把宿主的会话事件,翻成归属规则认得的**观察**。
|
|
3
|
+
*
|
|
4
|
+
* ## 为什么需要这一层(接线前实测出来的事实)
|
|
5
|
+
*
|
|
6
|
+
* 会话日志里的工具调用长这样:`name:"pwsh"`,`arguments:'{"command":"npm test"}'`。
|
|
7
|
+
* 而工作流里人写的 `tool` 是**命令行**:`"npm test"`、`"git push <tag>"`。
|
|
8
|
+
* **两者不重叠**——直接拿 `name` 去比,一条都对不上(实测 400 个会话里
|
|
9
|
+
* `pwsh` 1399 次、`read` 1709 次、`glob` 183 次,而工作流写的是 npm/git/gh 命令)。
|
|
10
|
+
*
|
|
11
|
+
* 唯一能对上的是:**命令跑在哪个工具里**。所以这一层的职责就是把它抽出来——
|
|
12
|
+
* `{name:"pwsh", arguments:{command:"npm test"}}` → `{command:"npm test"}`。
|
|
13
|
+
*
|
|
14
|
+
* ## 为什么只抽「命令执行器」,其余一律不给观察
|
|
15
|
+
*
|
|
16
|
+
* 真实工作流 19 步的 `tool` 全是 shell 命令(git / gh / npm / node)。而 `read`、`write`、
|
|
17
|
+
* `glob`、`grep` 这些是**代理的日常动作**,不是任何工作流的一步。硬把
|
|
18
|
+
* `read C:\…\file.js` 拼成一个「命令行」去参与匹配,只会制造噪声——而噪声的代价是
|
|
19
|
+
* 把某一步凭空染色。所以认不出来命令执行器,就**不产观察**(返回 null),
|
|
20
|
+
* 由上游记进 skipped 桶:**「不是工作流的动作」与「认不出是哪一步」是两件事。**
|
|
21
|
+
*
|
|
22
|
+
* ## 成败的三态
|
|
23
|
+
*
|
|
24
|
+
* `tool/result` 带 `message.isError`。只认 true/false 两个值,取不到时留 `null`
|
|
25
|
+
* ——把「不知道」折叠成「失败」会给这一步打上不该有的 refuted 标记。
|
|
26
|
+
*/
|
|
27
|
+
|
|
28
|
+
/** 命令执行器:只有跑在这些工具里的调用,才可能是工作流写成的那种命令行。 */
|
|
29
|
+
const COMMAND_TOOLS = new Set(["pwsh", "bash", "sh", "shell", "cmd", "run_command", "terminal"]);
|
|
30
|
+
|
|
31
|
+
/** 参数里哪个字段是命令行。按工具名给,取不到就退回常见字段名。 */
|
|
32
|
+
const COMMAND_KEYS = ["command", "cmd", "script", "commandLine"];
|
|
33
|
+
|
|
34
|
+
function parseArgs(raw) {
|
|
35
|
+
if (raw === null || raw === undefined) return null;
|
|
36
|
+
if (typeof raw === "object" && !Array.isArray(raw)) return raw;
|
|
37
|
+
if (typeof raw !== "string") return null;
|
|
38
|
+
try {
|
|
39
|
+
const parsed = JSON.parse(raw);
|
|
40
|
+
return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
|
|
41
|
+
} catch {
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* 这次工具调用是不是一条工作流命令。是就给出命令行,不是给 `null`。
|
|
48
|
+
*
|
|
49
|
+
* 返回 `{tool, command}`;`command` 已去掉首尾空白(比较由归属规则负责)。
|
|
50
|
+
*/
|
|
51
|
+
export function commandFromToolCall(name, args) {
|
|
52
|
+
const tool = typeof name === "string" ? name.trim() : "";
|
|
53
|
+
if (tool === "" || !COMMAND_TOOLS.has(tool.toLowerCase())) return null;
|
|
54
|
+
const parsed = parseArgs(args);
|
|
55
|
+
if (!parsed) return null;
|
|
56
|
+
for (const key of COMMAND_KEYS) {
|
|
57
|
+
const value = parsed[key];
|
|
58
|
+
if (typeof value === "string" && value.trim() !== "") {
|
|
59
|
+
return { tool, command: value.trim() };
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
// 是命令执行器但参数里没有命令行(形状变了):不猜,给 null。
|
|
63
|
+
return null;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/** `tool/result` 的成败:只认布尔,拿不到留 null(「不知道」不许折叠成「失败」)。 */
|
|
67
|
+
export function outcomeOfToolResult(event) {
|
|
68
|
+
const message = event?.data?.message;
|
|
69
|
+
if (!message || typeof message !== "object") return null;
|
|
70
|
+
if (message.isError === true) return false;
|
|
71
|
+
if (message.isError === false) return true;
|
|
72
|
+
// 旧形状把 isError 挂在 content 的 tool-result 块上;两种都不认时留 null。
|
|
73
|
+
const blocks = Array.isArray(message.content) ? message.content : [];
|
|
74
|
+
const legacy = blocks.find((b) => b && b.type === "tool-result");
|
|
75
|
+
if (legacy && typeof legacy.isError === "boolean") return legacy.isError !== true;
|
|
76
|
+
return null;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* 把一串会话事件配对成观察列表(纯函数,便于测试与批处理)。
|
|
81
|
+
*
|
|
82
|
+
* 配对靠 `callId`:`tool/call` 先到、`tool/result` 后到。**只有拿到结果的调用才产观察**
|
|
83
|
+
* ——结果决定了成败,而「调了但没结果」既不是成功也不是失败(可能被中断),
|
|
84
|
+
* 拿它当一次成功使用是编造。
|
|
85
|
+
*
|
|
86
|
+
* 另外两条纪律:
|
|
87
|
+
* - 认不出命令执行器的调用**直接丢**(进 `notCommands` 计数),不产观察
|
|
88
|
+
* - 有调用没结果的,如实进 `dangling`,不产观察也不假装失败
|
|
89
|
+
*/
|
|
90
|
+
export function pairObservations(events) {
|
|
91
|
+
const pending = new Map(); // callId -> {tool, command, at}
|
|
92
|
+
const observations = [];
|
|
93
|
+
const dangling = [];
|
|
94
|
+
let notCommands = 0;
|
|
95
|
+
|
|
96
|
+
for (const event of events || []) {
|
|
97
|
+
const type = event?.type;
|
|
98
|
+
if (type === "tool/call") {
|
|
99
|
+
const data = event.data ?? {};
|
|
100
|
+
const extracted = commandFromToolCall(data.name, data.arguments);
|
|
101
|
+
if (!extracted) {
|
|
102
|
+
notCommands += 1;
|
|
103
|
+
continue;
|
|
104
|
+
}
|
|
105
|
+
const callId = data.callId ?? null;
|
|
106
|
+
const entry = { ...extracted, at: event.at ?? null };
|
|
107
|
+
if (callId === null) {
|
|
108
|
+
// 没有 callId 就无法配对結果;不硬凑,如实记下。
|
|
109
|
+
dangling.push({ ...entry, why: "调用没有 callId,无法与结果配对" });
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
pending.set(callId, entry);
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
if (type === "tool/result") {
|
|
117
|
+
const callId = event?.data?.callId ?? event?.callId ?? null;
|
|
118
|
+
if (callId === null || !pending.has(callId)) continue;
|
|
119
|
+
const entry = pending.get(callId);
|
|
120
|
+
pending.delete(callId);
|
|
121
|
+
observations.push({
|
|
122
|
+
tool: entry.tool,
|
|
123
|
+
command: entry.command,
|
|
124
|
+
ok: outcomeOfToolResult(event),
|
|
125
|
+
at: entry.at
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
for (const entry of pending.values()) dangling.push({ ...entry, why: "调用没有等到结果" });
|
|
131
|
+
|
|
132
|
+
return { observations, dangling, notCommands };
|
|
133
|
+
}
|
|
@@ -0,0 +1,346 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* M.O. 的**执行记录器**:把「谁在什么时候按哪条工作流走了一遍」记成一条账。
|
|
3
|
+
*
|
|
4
|
+
* ## 它在整条链里的位置
|
|
5
|
+
*
|
|
6
|
+
* session/event → pairObservations → attributionCandidates → openRun → appendRun
|
|
7
|
+
* (宿主事件) (事件→观察) (观察→哪一步) (窗口) (落盘)
|
|
8
|
+
*
|
|
9
|
+
* 前四段都已各自成模块并被测过。本模块是**把它们串起来的那一层**,也是唯一持有
|
|
10
|
+
* 「当前有哪些窗口开着」这个状态的地方。
|
|
11
|
+
*
|
|
12
|
+
* ## 四个刻意的取舍
|
|
13
|
+
*
|
|
14
|
+
* 1. **窗口按会话开,一个会话同时只允许一个**。一次执行是「这条流程走一遍」,不是
|
|
15
|
+
* 「同时走两条」。再开一个会被**拒**(`already-open`)而不是顶掉前一个——顶掉会让
|
|
16
|
+
* 前一次的执行悄无声息地消失,那比拒绝难查得多。
|
|
17
|
+
*
|
|
18
|
+
* 2. **事件先缓冲、到 stop 才配对**。`tool/call` 与 `tool/result` 靠 callId 配对,结果
|
|
19
|
+
* 可能比调用晚很久;边到边配会把「还没等到结果」误判成「没有这个调用」。
|
|
20
|
+
*
|
|
21
|
+
* 3. **v1 只在显式 stop 时结账**,不在回合结束时自动关。一条流程常常跨多个回合
|
|
22
|
+
* (跑测试 → 等人点头 → 再继续),按回合关会把一次执行切成好几条半截账。
|
|
23
|
+
* 代价是忘了 stop 会一直开着——所以缓冲有上限,超了标 `truncated` 并如实写出。
|
|
24
|
+
*
|
|
25
|
+
* 4. **热路径上永不抛**。挂的是宿主每个会话事件的通道,本仓对此有明文不变量
|
|
26
|
+
* (`continuity.js` 的「可选插件的可选能力把 agent 的一步带崩,比丢一次抢救严重
|
|
27
|
+
* 得多」)。所有异常只 `warn`,绝不让宿主的一步失败。
|
|
28
|
+
*
|
|
29
|
+
* ## 一个尚未实测的前提
|
|
30
|
+
*
|
|
31
|
+
* `session/event` 的实时通道是否**逐条**投递 `tool/call` 与 `tool/result`,我没有在
|
|
32
|
+
* 活宿主上验过(本仓现有消费者只用 `turn/end` 与压缩边缘;工具事件是从**日志文件**
|
|
33
|
+
* 读的)。事件类型联合与落盘日志都包含它们,所以同一通道应当也带——但这是**推断**,
|
|
34
|
+
* 接线后要用一次真实执行验证(开窗走一遍,看账里有没有步骤)。本模块把这件事做成
|
|
35
|
+
* 可观测的:`stop()` 的返回里给出缓冲到多少条事件,一条都没缓冲到时会有
|
|
36
|
+
* `reason:"no-observations"`,而不是写一条空账假装成功。
|
|
37
|
+
*/
|
|
38
|
+
|
|
39
|
+
import { loadPipelines, pipelineSources } from "./pipeline.js";
|
|
40
|
+
import { appendRun } from "./pipeline-runs.js";
|
|
41
|
+
import { openRun } from "./pipeline-exec.js";
|
|
42
|
+
import { pairObservations } from "./pipeline-observe.js";
|
|
43
|
+
import { tallyActivities } from "./pipeline-activities.js";
|
|
44
|
+
import { buildProposal, runFromAnswers } from "./pipeline-confirm.js";
|
|
45
|
+
import { observationDir, saveObservations, toolMismatches } from "./pipeline-observations.js";
|
|
46
|
+
import { projectKey } from "./candidates.js";
|
|
47
|
+
|
|
48
|
+
/** 一个窗口最多缓冲多少条会话事件。忘了 stop 时,这是内存的兜底。 */
|
|
49
|
+
export const MAX_BUFFERED_EVENTS = 4000;
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* 会话的工作目录。与 `scope.js` 同一口径:`session.header` 是创建时冻结的那份
|
|
53
|
+
* (含 `cwd`),**不能先读 `requestHeader()`** —— 那返回请求级模型路由头,会把
|
|
54
|
+
* `cwd` 遮蔽掉(scope.js 里记着本地 web 实测踩中过)。
|
|
55
|
+
*/
|
|
56
|
+
export function projectRootOf(session) {
|
|
57
|
+
const header = session?.header ?? session?.requestHeader?.()?.config ?? null;
|
|
58
|
+
const cwd = header?.cwd;
|
|
59
|
+
return typeof cwd === "string" && cwd.trim() !== "" ? cwd : null;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* 默认的工作流解析:项目层优先、全局层兜底(与 `readPipelineDoc` 同一优先级)。
|
|
64
|
+
*
|
|
65
|
+
* 坏文件按 `loadPipelines` 的纪律**照抛**,由调用方兜住并如实回报——静默跳过会让
|
|
66
|
+
* 「这条流程读不出来」与「没有这条流程」长得一样。
|
|
67
|
+
*/
|
|
68
|
+
export function defaultResolvePipeline(projectRoot, pipelineId) {
|
|
69
|
+
for (const source of pipelineSources({ projectRoot })) {
|
|
70
|
+
const list = loadPipelines(source.dir, { scope: source.scope, label: source.label });
|
|
71
|
+
const hit = list.find((p) => p.id === pipelineId);
|
|
72
|
+
if (hit) return hit;
|
|
73
|
+
}
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/** 所有工作流的 id 清单(给命令的用法提示与「你指的是哪条」用)。 */
|
|
78
|
+
export function listPipelineIds(projectRoot) {
|
|
79
|
+
const ids = [];
|
|
80
|
+
try {
|
|
81
|
+
for (const source of pipelineSources({ projectRoot })) {
|
|
82
|
+
for (const p of loadPipelines(source.dir, { scope: source.scope, label: source.label })) {
|
|
83
|
+
if (!ids.includes(p.id)) ids.push(p.id);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
} catch {
|
|
87
|
+
// 清单只是提示信息,读不出来不该让命令本身失败。
|
|
88
|
+
}
|
|
89
|
+
return ids;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* 造一个记录器。
|
|
94
|
+
*
|
|
95
|
+
* 除了 `ctx` 之外的所有依赖都可注入(`resolvePipeline` / `persistRun` / `now`),
|
|
96
|
+
* 这样测试不必碰真文件系统,也能精确控制时间。
|
|
97
|
+
*/
|
|
98
|
+
export function createExecutionRecorder({
|
|
99
|
+
ctx,
|
|
100
|
+
logger = null,
|
|
101
|
+
resolvePipeline = defaultResolvePipeline,
|
|
102
|
+
persistRun = appendRun,
|
|
103
|
+
now = () => new Date(),
|
|
104
|
+
maxBufferedEvents = MAX_BUFFERED_EVENTS,
|
|
105
|
+
// P3(丙):观察旁挂的根目录。null = 不落旁挂(P3 静默关闭)。
|
|
106
|
+
// 与 resolvePipeline/persistRun 同款依赖注入——runner 不读 config,测试不碰真文件系统。
|
|
107
|
+
memoryDir = null
|
|
108
|
+
} = {}) {
|
|
109
|
+
const windows = new Map(); // sessionId → { pipeline, projectRoot, run, events, truncated }
|
|
110
|
+
// 已结账、等人确认的会话:sessionId → { pipeline, projectRoot, proposal, stats }
|
|
111
|
+
const pending = new Map();
|
|
112
|
+
|
|
113
|
+
const unsubscribe = ctx?.on?.("session/event", (session, event) => {
|
|
114
|
+
try {
|
|
115
|
+
const id = session?.id;
|
|
116
|
+
if (!id) return;
|
|
117
|
+
const w = windows.get(id);
|
|
118
|
+
// 没有开窗 = 一个字都不记。这是整个设计的地基:漏记可接受,编造不可。
|
|
119
|
+
if (!w) return;
|
|
120
|
+
const type = event?.type;
|
|
121
|
+
if (type !== "tool/call" && type !== "tool/result") return;
|
|
122
|
+
if (w.events.length >= maxBufferedEvents) {
|
|
123
|
+
w.truncated = true;
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
w.events.push(event);
|
|
127
|
+
} catch (error) {
|
|
128
|
+
logger?.warn?.(`dsh-mneme: 执行记录器读事件失败:${String(error)}`);
|
|
129
|
+
}
|
|
130
|
+
});
|
|
131
|
+
|
|
132
|
+
return {
|
|
133
|
+
/**
|
|
134
|
+
* 开窗。`pipelineId` 由调用方点名——**本模块不猜**「用户刚才那句话是不是意味着
|
|
135
|
+
* 开始走某条流程」。猜错会把一条从没跑过的流程记成跑过。
|
|
136
|
+
*/
|
|
137
|
+
start({ session, pipelineId } = {}) {
|
|
138
|
+
const id = session?.id;
|
|
139
|
+
if (!id) return { ok: false, reason: "no-session" };
|
|
140
|
+
const open = windows.get(id);
|
|
141
|
+
if (open) return { ok: false, reason: "already-open", pipelineId: open.pipeline.id };
|
|
142
|
+
|
|
143
|
+
const projectRoot = projectRootOf(session);
|
|
144
|
+
if (!projectRoot) return { ok: false, reason: "no-project-root" };
|
|
145
|
+
|
|
146
|
+
let pipeline;
|
|
147
|
+
try {
|
|
148
|
+
pipeline = resolvePipeline(projectRoot, pipelineId);
|
|
149
|
+
} catch (error) {
|
|
150
|
+
return { ok: false, reason: "pipeline-unreadable", detail: String(error?.message ?? error) };
|
|
151
|
+
}
|
|
152
|
+
if (!pipeline) {
|
|
153
|
+
return { ok: false, reason: "pipeline-not-found", available: listPipelineIds(projectRoot) };
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
const run = openRun({ pipeline, by: "main", triggeredBy: String(pipelineId ?? ""), now });
|
|
157
|
+
windows.set(id, { pipeline, projectRoot, run, events: [], truncated: false });
|
|
158
|
+
return { ok: true, pipelineId: pipeline.id, steps: pipeline.steps.length };
|
|
159
|
+
},
|
|
160
|
+
|
|
161
|
+
/**
|
|
162
|
+
* 结账:**不再自动写账**,改成产出一份「请你确认哪几步走了」的提案。
|
|
163
|
+
*
|
|
164
|
+
* 这是 P2 的契约变更,理由是被实测否决的自动归属(详见 pipeline-confirm 的文件头):
|
|
165
|
+
* 机器唯一归属只有 14.2%,而**猜错的代价是把没走过的步骤记成走过**
|
|
166
|
+
* (`deriveState` 会据此把它染成 trusted)。所以写账这一步必须有人确认。
|
|
167
|
+
*
|
|
168
|
+
* 自动归属的结果**降级成 hint**:仍然算出来,但只作提示、不预选、不落盘。
|
|
169
|
+
* 同时给出 P1 那份「观察到的业务动作清单」,让人对照着勾。
|
|
170
|
+
*/
|
|
171
|
+
stop({ session } = {}) {
|
|
172
|
+
const id = session?.id;
|
|
173
|
+
if (!id) return { ok: false, reason: "no-session" };
|
|
174
|
+
const w = windows.get(id);
|
|
175
|
+
if (!w) return { ok: false, reason: "no-open-window" };
|
|
176
|
+
windows.delete(id);
|
|
177
|
+
|
|
178
|
+
const { observations, dangling, notCommands } = pairObservations(w.events);
|
|
179
|
+
|
|
180
|
+
// 自动归属只用来产 hint:唯一 exact 的那一步给出来,其余不给。
|
|
181
|
+
// 它不进账——这一版的账只有人能写。
|
|
182
|
+
const hints = {};
|
|
183
|
+
for (const observation of observations) {
|
|
184
|
+
const r = w.run.observe(observation);
|
|
185
|
+
if (r.result === "observed" && r.stepId) {
|
|
186
|
+
// hint 只记「这次见到过相近的命令」这个事实,**不存命令行原文**:
|
|
187
|
+
// 完整命令行含绝对路径(路径含本机用户名),而这条 hint 会流到命令回执里。
|
|
188
|
+
hints[r.stepId] = (hints[r.stepId] || 0) + 1;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
const activityTally = tallyActivities(observations);
|
|
193
|
+
const proposal = buildProposal({
|
|
194
|
+
pipeline: w.pipeline,
|
|
195
|
+
activities: activityTally.activities,
|
|
196
|
+
hints
|
|
197
|
+
});
|
|
198
|
+
|
|
199
|
+
// 待确认状态挂在会话上:人在下一次调用里回答。
|
|
200
|
+
// stats 只留**确认阶段真的会渲染**的三个字段(ponytail 复核:另外三个零读取)。
|
|
201
|
+
pending.set(id, {
|
|
202
|
+
pipeline: w.pipeline,
|
|
203
|
+
projectRoot: w.projectRoot,
|
|
204
|
+
proposal,
|
|
205
|
+
// P3(丙):把本次观察清单带进待确认状态。confirm 时它有三个用途:
|
|
206
|
+
// 旁挂落盘 / tool 不符检出 / 回执展示。memoryDir 为空时不带(P3 关)。
|
|
207
|
+
activities: activityTally.activities,
|
|
208
|
+
stats: {
|
|
209
|
+
truncated: w.truncated,
|
|
210
|
+
notCommands,
|
|
211
|
+
shellNoise: activityTally.shellNoise
|
|
212
|
+
}
|
|
213
|
+
});
|
|
214
|
+
|
|
215
|
+
return {
|
|
216
|
+
ok: true,
|
|
217
|
+
state: "awaiting-confirmation",
|
|
218
|
+
proposal,
|
|
219
|
+
activities: activityTally.activities,
|
|
220
|
+
shellNoise: activityTally.shellNoise,
|
|
221
|
+
bufferedEvents: w.events.length,
|
|
222
|
+
truncated: w.truncated,
|
|
223
|
+
observations: observations.length,
|
|
224
|
+
notCommands,
|
|
225
|
+
dangling: dangling.length
|
|
226
|
+
};
|
|
227
|
+
},
|
|
228
|
+
|
|
229
|
+
/**
|
|
230
|
+
* 人确认后落盘。**这是唯一会写账的入口。**
|
|
231
|
+
*
|
|
232
|
+
* `answers` 形如 `{ "P6": "done", "V2": "notDone" }`;未提到的步骤什么都不写
|
|
233
|
+
* ("没确认"不等于"没发生",见 pipeline-confirm 的注释)。
|
|
234
|
+
*/
|
|
235
|
+
confirm({ session, answers } = {}) {
|
|
236
|
+
const id = session?.id;
|
|
237
|
+
if (!id) return { ok: false, reason: "no-session" };
|
|
238
|
+
const p = pending.get(id);
|
|
239
|
+
if (!p) return { ok: false, reason: "nothing-to-confirm" };
|
|
240
|
+
|
|
241
|
+
const result = runFromAnswers({
|
|
242
|
+
pipeline: p.pipeline,
|
|
243
|
+
answers,
|
|
244
|
+
by: "human",
|
|
245
|
+
triggeredBy: String(p.pipeline.id ?? ""),
|
|
246
|
+
now
|
|
247
|
+
});
|
|
248
|
+
|
|
249
|
+
if (result.kind === "error") {
|
|
250
|
+
// 回答非法:**保留待确认状态**,让人重答,而不是把它丢掉。
|
|
251
|
+
return { ok: false, reason: result.reason, stepId: result.stepId, value: result.value, ...p.stats };
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
if (result.kind === "nothing") {
|
|
255
|
+
// 什么都没确认:没有信息可记,如实说,且不留一个悬着的待确认状态。
|
|
256
|
+
pending.delete(id);
|
|
257
|
+
return {
|
|
258
|
+
ok: false,
|
|
259
|
+
reason: "no-answers",
|
|
260
|
+
notDone: result.notDone,
|
|
261
|
+
unanswered: result.unanswered,
|
|
262
|
+
unsure: result.unsure,
|
|
263
|
+
...p.stats
|
|
264
|
+
};
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
pending.delete(id);
|
|
268
|
+
try {
|
|
269
|
+
persistRun(p.projectRoot, p.pipeline.id, result.run);
|
|
270
|
+
} catch (error) {
|
|
271
|
+
return { ok: false, reason: "write-failed", detail: String(error?.message ?? error), ...p.stats };
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
// ── P3:人确认过的事实,与本次观察到的动作对一遍 ──────────────────
|
|
275
|
+
// ① tool 不符检出:人说了 done、但声明的 tool 在本次动作里没出现。
|
|
276
|
+
// 这是「步骤表可能与实际行为脱节」的信号(实测:gh pr merge --rebase 在
|
|
277
|
+
// 21723 次调用里出现 0 次)。**只报告,不改步骤表**——改表是人的动作。
|
|
278
|
+
const doneIds = new Set(result.run.steps.filter((s) => !s.skipped).map((s) => s.id));
|
|
279
|
+
let toolMismatchesResult = { ok: true, items: [] };
|
|
280
|
+
if (Array.isArray(p.activities)) {
|
|
281
|
+
toolMismatchesResult = toolMismatches({
|
|
282
|
+
pipeline: p.pipeline,
|
|
283
|
+
confirmedDone: doneIds,
|
|
284
|
+
activities: p.activities
|
|
285
|
+
});
|
|
286
|
+
}
|
|
287
|
+
// ② 观察旁挂(丙):memoryDir 给了才落。写失败**不连累记账**——旁挂是
|
|
288
|
+
// 可再生的辅助数据(同一 run 重走一遍就有),账本才是唯一事实。
|
|
289
|
+
let observationsSaved = null;
|
|
290
|
+
if (memoryDir && Array.isArray(p.activities)) {
|
|
291
|
+
const key = projectKey(p.projectRoot);
|
|
292
|
+
const odir = observationDir({ memoryDir, projectKey: key });
|
|
293
|
+
if (odir) {
|
|
294
|
+
try {
|
|
295
|
+
observationsSaved = saveObservations({
|
|
296
|
+
dir: odir,
|
|
297
|
+
pipelineId: p.pipeline.id,
|
|
298
|
+
confirmAt: result.run.at,
|
|
299
|
+
activities: p.activities
|
|
300
|
+
});
|
|
301
|
+
} catch (error) {
|
|
302
|
+
logger?.warn?.(`dsh-mneme: 观察旁挂写入失败(不影响记账):${String(error)}`);
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
|
|
307
|
+
return {
|
|
308
|
+
ok: true,
|
|
309
|
+
pipelineId: p.pipeline.id,
|
|
310
|
+
steps: result.run.steps.length,
|
|
311
|
+
// 三类如实分开:「确认没做」「说不知道」「压根没答」是三种不同的信息
|
|
312
|
+
notDone: result.notDone,
|
|
313
|
+
unsure: result.unsure,
|
|
314
|
+
unanswered: result.unanswered,
|
|
315
|
+
// P3 的两个产出:不符清单(人判「声明该改还是本来不必敲」)与旁挂回执
|
|
316
|
+
toolMismatches: toolMismatchesResult.ok ? toolMismatchesResult.items : [],
|
|
317
|
+
observationsSaved: observationsSaved
|
|
318
|
+
? { ok: true, file: observationsSaved.file, lines: observationsSaved.lines, duplicate: observationsSaved.duplicate === true }
|
|
319
|
+
: { ok: false, skipped: true },
|
|
320
|
+
...p.stats
|
|
321
|
+
};
|
|
322
|
+
},
|
|
323
|
+
|
|
324
|
+
/** 只看状态,不结账。要能分辨「窗口开着」与「等你确认」两种状态。 */
|
|
325
|
+
status({ session } = {}) {
|
|
326
|
+
const id = session?.id;
|
|
327
|
+
if (pending.has(id)) {
|
|
328
|
+
const p = pending.get(id);
|
|
329
|
+
return { open: false, awaitingConfirmation: true, pipelineId: p.pipeline.id, steps: p.proposal.steps.length, ...p.stats };
|
|
330
|
+
}
|
|
331
|
+
const w = windows.get(id);
|
|
332
|
+
if (!w) return { open: false };
|
|
333
|
+
return { ...w.run.state(), bufferedEvents: w.events.length, truncated: w.truncated };
|
|
334
|
+
},
|
|
335
|
+
|
|
336
|
+
dispose() {
|
|
337
|
+
try {
|
|
338
|
+
unsubscribe?.();
|
|
339
|
+
} catch {
|
|
340
|
+
/* 重复 dispose 不报错 */
|
|
341
|
+
}
|
|
342
|
+
windows.clear();
|
|
343
|
+
pending.clear();
|
|
344
|
+
}
|
|
345
|
+
};
|
|
346
|
+
}
|