dsh-workplan 1.8.18 → 1.9.1
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 +159 -0
- package/README.en.md +1 -1
- package/README.md +1 -1
- package/client.js +1 -0
- package/docs/postmortem-1.8.7-20261031.md +113 -0
- package/docs/release-notes-1.9.1.md +67 -0
- package/lib/host.js +105 -5
- package/lib/plan.js +151 -1
- package/lib/runtime.js +390 -37
- package/lib/supersede-digest.js +115 -0
- package/lib/supersede.js +378 -0
- package/package.json +2 -2
- package/src/client.ts +1 -0
- package/src/host.ts +113 -4
- package/src/plan.ts +166 -1
- package/src/runtime.ts +416 -35
- package/src/supersede-digest.ts +116 -0
- package/src/supersede.ts +429 -0
package/lib/plan.js
CHANGED
|
@@ -7,7 +7,55 @@
|
|
|
7
7
|
* runtime and by unit tests.
|
|
8
8
|
*/
|
|
9
9
|
import { randomUUID } from 'node:crypto';
|
|
10
|
+
import { isMappingDigest, verifyMappingDigest } from './supersede-digest.js';
|
|
10
11
|
export const PLAN_VERSION = 1;
|
|
12
|
+
/**
|
|
13
|
+
* [1.9.0] 处置终态:cancelled(用户撤销)与 superseded(责任已转移)。
|
|
14
|
+
*
|
|
15
|
+
* 两者都是终态:记录与计数原样保留,永不算完成,也永不被自动选为
|
|
16
|
+
* `present` 的判定对象;只有「本回合结构化点名」时才判定(cancelled 仍硬拦)。
|
|
17
|
+
* 规则依据:_rerun_20261101/GATE_rule_design.md §3.1。
|
|
18
|
+
*/
|
|
19
|
+
export const TERMINAL_PHASES = new Set(['cancelled', 'superseded']);
|
|
20
|
+
export function isTerminalPhase(phase) {
|
|
21
|
+
return typeof phase === 'string' && TERMINAL_PHASES.has(phase);
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* [1.9.2] `present` 拒绝码(P1 统一)。
|
|
25
|
+
*
|
|
26
|
+
* 规则出处:`_rerun_20261101/GATE_rule_design.md` §4.3(P1/P2 与
|
|
27
|
+
* `judgeEffective`)及 §4.4 真值表;最小修法出处:
|
|
28
|
+
* `_rerun_20261101/GATE_case_matrix.md` §3.2(T9 的唯一不一致格
|
|
29
|
+
* `C05.denyCode`)。
|
|
30
|
+
*
|
|
31
|
+
* T8 原文的 P1 把「全部 done 但证据缺口」和「还有子任务没做完」合并成
|
|
32
|
+
* 一个码值 `ACTIVE_NOT_READY`,于是 R2/G02 的 `EVIDENCE_GAP` 在未点名时
|
|
33
|
+
* 永远走不到。修法只拆一个维度:`remaining` 为空且 `blockers` 非空
|
|
34
|
+
* ⇒ `EVIDENCE_GAP`,其余仍是 `ACTIVE_NOT_READY`。这本来就是 1.8.19 的
|
|
35
|
+
* 既有语义(`remaining.length === 0` 有独立文案),不是新增语义。
|
|
36
|
+
*
|
|
37
|
+
* 码值是对外契约:测试、日志与后续 UI 按字面值断言。所有拒绝点只能引用
|
|
38
|
+
* 这里的常量或 `activeDenyCode()`,不得再手写字符串。
|
|
39
|
+
*/
|
|
40
|
+
export const PRESENT_DENY_CODES = {
|
|
41
|
+
ACTIVE_NOT_READY: 'ACTIVE_NOT_READY',
|
|
42
|
+
EVIDENCE_GAP: 'EVIDENCE_GAP',
|
|
43
|
+
CANCELLED_NAMED: 'CANCELLED_NAMED',
|
|
44
|
+
SUPERSEDED_STALE: 'SUPERSEDED_STALE',
|
|
45
|
+
};
|
|
46
|
+
/**
|
|
47
|
+
* P1 的单一映射:active 计划未就绪时,只由交付就绪结果决定拒绝码。
|
|
48
|
+
*
|
|
49
|
+
* 调用点(`present` 的未完成分支、点名 active 计划的判定)必须走这个函数,
|
|
50
|
+
* 不要在分支里各写一份判断——T9 的 C05 不一致正是「规则一个码、实现另一个
|
|
51
|
+
* 码」造成的。终态计划不走这里:cancelled 是 `CANCELLED_NAMED`,superseded
|
|
52
|
+
* 按覆盖链给 `SUPERSEDED_STALE` / `ACTIVE_NOT_READY`。
|
|
53
|
+
*/
|
|
54
|
+
export function activeDenyCode(readiness) {
|
|
55
|
+
return readiness.remaining.length === 0 && readiness.blockers.length > 0
|
|
56
|
+
? PRESENT_DENY_CODES.EVIDENCE_GAP
|
|
57
|
+
: PRESENT_DENY_CODES.ACTIVE_NOT_READY;
|
|
58
|
+
}
|
|
11
59
|
export const MAX_STAGES = 6;
|
|
12
60
|
export const MAX_SUBTASKS = 15;
|
|
13
61
|
export const MAX_CONCURRENT = 5;
|
|
@@ -1233,7 +1281,27 @@ export function parseResultMessage(message) {
|
|
|
1233
1281
|
return null;
|
|
1234
1282
|
}
|
|
1235
1283
|
}
|
|
1236
|
-
|
|
1284
|
+
/*
|
|
1285
|
+
* [1.9.2] `workplan-cancel` 信封是 cancelled / superseded 的**唯一写入出口**。
|
|
1286
|
+
*
|
|
1287
|
+
* 规则出处:`_rerun_20261101/GATE_rule_design.md` §6.1(字段 schema)、§7.2
|
|
1288
|
+
* 第 7 条(写入 durable 记录后 replay 仍为 superseded)。写侧任何地方都不得
|
|
1289
|
+
* 自己拼这段 JSON:一旦有第二条拼装路径,`disposition`/`supersededBy` 的字段
|
|
1290
|
+
* 形状就会分叉,replay 与 present 的读侧判定随之失效(正是本子任务要杜绝的
|
|
1291
|
+
* 「绕过」)。
|
|
1292
|
+
*
|
|
1293
|
+
* 语义边界:本函数只负责把**运行时已经核验过**的处置结果写成信封;V1–V8
|
|
1294
|
+
* 核验与 digest 复算在 `src/supersede.ts`(唯一写入者)。因此这里对 superseded
|
|
1295
|
+
* 再做一次防线:`supersededBy.mapping` 与 `digest` 必须能逐字复算,否则抛错、
|
|
1296
|
+
* 不写日志、不改状态(fail-closed)。
|
|
1297
|
+
*/
|
|
1298
|
+
export function buildCancelMessage(planId, reason = '用户取消', terminal = null) {
|
|
1299
|
+
const disposition = terminal?.disposition ?? 'cancelled';
|
|
1300
|
+
if (disposition === 'superseded')
|
|
1301
|
+
return buildSupersededMessage(planId, reason, terminal);
|
|
1302
|
+
if (disposition !== 'cancelled') {
|
|
1303
|
+
throw new Error(`buildCancelMessage: 非法处置 disposition=${String(disposition)}`);
|
|
1304
|
+
}
|
|
1237
1305
|
const summary = `【任务已取消】${truncate(String(reason || '用户取消'), 120)}`;
|
|
1238
1306
|
const payload = {
|
|
1239
1307
|
kind: 'workplan-cancel',
|
|
@@ -1266,6 +1334,59 @@ export function buildCancelMessage(planId, reason = '用户取消') {
|
|
|
1266
1334
|
summary,
|
|
1267
1335
|
});
|
|
1268
1336
|
}
|
|
1337
|
+
/**
|
|
1338
|
+
* [1.9.2] `disposition:'superseded'` 的信封正文(由 `buildCancelMessage` 独占调用)。
|
|
1339
|
+
*
|
|
1340
|
+
* 与 cancelled 共用同一个 `kind:'workplan-cancel'`:旧版本解析器只校验 `kind`
|
|
1341
|
+
* (`parseCancelMessage`),新增字段被忽略后按 cancelled 读——不可派发、不可
|
|
1342
|
+
* 交付,属安全降级(规则文档 §10.3)。这也是「不得新增第二种信封 kind」的原因:
|
|
1343
|
+
* 换 kind 会让旧回放彻底读不到这条处置记录。
|
|
1344
|
+
*/
|
|
1345
|
+
function buildSupersededMessage(planId, reason, terminal) {
|
|
1346
|
+
const by = terminal?.supersededBy;
|
|
1347
|
+
const verifiable = isRecord(by)
|
|
1348
|
+
&& typeof by.planId === 'string'
|
|
1349
|
+
&& by.planId !== ''
|
|
1350
|
+
&& Array.isArray(by.mapping)
|
|
1351
|
+
&& by.mapping.length > 0
|
|
1352
|
+
&& isMappingDigest(by.digest)
|
|
1353
|
+
&& verifyMappingDigest(by.mapping, by.digest);
|
|
1354
|
+
if (!verifiable) {
|
|
1355
|
+
throw new Error('buildCancelMessage: superseded 信封必须带可复算的 supersededBy.planId/mapping/digest');
|
|
1356
|
+
}
|
|
1357
|
+
const text = String(reason || '责任已转移');
|
|
1358
|
+
const supersededAt = Number.isFinite(Number(terminal?.supersededAt)) ? Number(terminal.supersededAt) : Date.now();
|
|
1359
|
+
const requiredCount = Number(by.requiredCount ?? 0);
|
|
1360
|
+
const coveredCount = Number(by.coveredCount ?? 0);
|
|
1361
|
+
const summary = `【计划已被取代】${truncate(text, 120)}|承接:${by.planId}`
|
|
1362
|
+
+ `(映射 ${coveredCount}/${requiredCount})`;
|
|
1363
|
+
const payload = {
|
|
1364
|
+
kind: 'workplan-cancel',
|
|
1365
|
+
version: PLAN_VERSION,
|
|
1366
|
+
planId,
|
|
1367
|
+
reason: text,
|
|
1368
|
+
cancelledAt: supersededAt,
|
|
1369
|
+
disposition: 'superseded',
|
|
1370
|
+
supersededAt,
|
|
1371
|
+
supersededBy: by,
|
|
1372
|
+
};
|
|
1373
|
+
const lines = [
|
|
1374
|
+
summary,
|
|
1375
|
+
'',
|
|
1376
|
+
'这次任务分解的责任已转移给一个可验证的承接计划。被取代不等于完成:',
|
|
1377
|
+
'原计划的记录与计数原样保留,未完成项永远不会因为这次转移而变成完成。',
|
|
1378
|
+
'交付时只能使用承接计划通过交付就绪检查的产物;原计划不作为完成证据。',
|
|
1379
|
+
'',
|
|
1380
|
+
CANCEL_MARKER_BEGIN,
|
|
1381
|
+
JSON.stringify(payload),
|
|
1382
|
+
CANCEL_MARKER_END,
|
|
1383
|
+
];
|
|
1384
|
+
return makeUserMessage(lines.join('\n'), {
|
|
1385
|
+
kind: 'workplan-cancel',
|
|
1386
|
+
form: 'notice',
|
|
1387
|
+
summary,
|
|
1388
|
+
});
|
|
1389
|
+
}
|
|
1269
1390
|
export function parseCancelMessage(message) {
|
|
1270
1391
|
const body = extractBetween(messageText(message), CANCEL_MARKER_BEGIN, CANCEL_MARKER_END);
|
|
1271
1392
|
if (!body)
|
|
@@ -2052,6 +2173,12 @@ export function planPhase(statuses, _resultSeen = false) {
|
|
|
2052
2173
|
* 它们携带状态列表里没有的信息(预算暂停、用户取消)。
|
|
2053
2174
|
*/
|
|
2054
2175
|
export function reconcilePhase(phase, statuses) {
|
|
2176
|
+
/*
|
|
2177
|
+
* [1.9.0] 终态优先:superseded 的记录即使状态全部 done,也不得被对账成
|
|
2178
|
+
* done(T8 §5.5 C6)。cancelled 保持 1.8.19 的既有对账语义不变。
|
|
2179
|
+
*/
|
|
2180
|
+
if (phase === 'superseded')
|
|
2181
|
+
return phase;
|
|
2055
2182
|
const derived = planPhase(statuses);
|
|
2056
2183
|
if (derived === 'done')
|
|
2057
2184
|
return 'done';
|
|
@@ -2345,6 +2472,28 @@ export function buildChildPrompt({ plan, subtask, stage, dependencyResults, cwd,
|
|
|
2345
2472
|
'请针对上面这个原因调整做法,不要重复相同的失败路径;如果仍然无法完成,第一行输出 `BLOCKED: 原因` 并说明缺少什么。',
|
|
2346
2473
|
].join('\n')
|
|
2347
2474
|
: '';
|
|
2475
|
+
/*
|
|
2476
|
+
* [1.8.19] A retried subtask must not pretend the prior attempt never existed.
|
|
2477
|
+
*
|
|
2478
|
+
* The timeout/budget paths record the declared outputs that already landed on
|
|
2479
|
+
* disk (`artifacts[].exists === true`). Feeding them back into the next
|
|
2480
|
+
* attempt turns a 15-minute restart into "check what is there and finish",
|
|
2481
|
+
* which is the difference between a recoverable ceiling and silent rework.
|
|
2482
|
+
*/
|
|
2483
|
+
const previousStatus = Array.isArray(statuses)
|
|
2484
|
+
? statuses.find((item) => item && item.subtaskId === subtask?.id)
|
|
2485
|
+
: null;
|
|
2486
|
+
const landedArtifacts = (Array.isArray(previousStatus?.artifacts) ? previousStatus.artifacts : [])
|
|
2487
|
+
.filter((item) => item && item.exists === true && typeof item.ref === 'string')
|
|
2488
|
+
.map((item) => String(item.ref));
|
|
2489
|
+
const resumeHint = landedArtifacts.length > 0
|
|
2490
|
+
? [
|
|
2491
|
+
'',
|
|
2492
|
+
'上一次这一子任务被中止,但以下声明产物已经在盘上(先用 read/grep 核对,不要重写):',
|
|
2493
|
+
...landedArtifacts.slice(0, 8).map((ref) => `- ${ref}`),
|
|
2494
|
+
'已经覆盖验收标准的部分保持原样,只补缺失部分;结尾按契约给出证据块。',
|
|
2495
|
+
].join('\n')
|
|
2496
|
+
: '';
|
|
2348
2497
|
/*
|
|
2349
2498
|
* [1.8.12] 提示词整体过一遍 session-reference 消毒。
|
|
2350
2499
|
*
|
|
@@ -2377,6 +2526,7 @@ export function buildChildPrompt({ plan, subtask, stage, dependencyResults, cwd,
|
|
|
2377
2526
|
dependencies,
|
|
2378
2527
|
...(team ? ['', '兄弟部门进展(同一计划内的其他子任务;不要直接联系它们,需要协作请写进 needs 由主 Agent 转达):', team] : []),
|
|
2379
2528
|
...(failure ? [failure] : []),
|
|
2529
|
+
...(resumeHint ? [resumeHint] : []),
|
|
2380
2530
|
'',
|
|
2381
2531
|
'执行要求:',
|
|
2382
2532
|
'- 只完成本子任务,不擅自扩大范围;不要派生新的 Agent。',
|