dsh-workplan 3.0.6 → 3.1.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 +27 -0
- package/README.en.md +2 -2
- package/README.md +16 -14
- package/README.zh.md +2 -2
- package/docs/release-notes-3.0.9.md +7 -0
- package/docs/release-notes-3.1.0.md +7 -0
- package/lib/caps.js +43 -0
- package/lib/comm-format.js +7 -7
- package/lib/{three-phase.js → five-step.js} +204 -132
- package/lib/host.js +124 -77
- package/lib/lessons.js +4 -4
- package/lib/llm-rules.js +71 -104
- package/lib/plan.js +186 -80
- package/lib/runtime.js +367 -139
- package/lib/v3-contract.js +10 -7
- package/package.json +2 -3
- package/src/caps.ts +49 -0
- package/src/comm-format.ts +7 -6
- package/src/{three-phase.ts → five-step.ts} +230 -167
- package/src/host.ts +124 -77
- package/src/lessons.ts +4 -4
- package/src/llm-rules.ts +83 -127
- package/src/plan.ts +181 -76
- package/src/runtime.ts +373 -137
- package/src/v3-contract.ts +10 -7
package/src/runtime.ts
CHANGED
|
@@ -74,6 +74,7 @@ import {
|
|
|
74
74
|
isSocialMessage,
|
|
75
75
|
isTerminalPhase,
|
|
76
76
|
isStatusQuestion,
|
|
77
|
+
isUserConfirmation,
|
|
77
78
|
isVagueContinuation,
|
|
78
79
|
makeUserMessage,
|
|
79
80
|
markDependentsBlocked,
|
|
@@ -147,7 +148,7 @@ import {
|
|
|
147
148
|
buildPhaseZeroDelegateePrompt,
|
|
148
149
|
resolveTaskEffort,
|
|
149
150
|
} from './llm-rules.js'
|
|
150
|
-
import { phaseGateFromErrors, phaseSummaryLine,
|
|
151
|
+
import { checkStartEvidenceCarryover, phaseGateFromErrors, phaseSummaryLine, sanitizeStartPhaseEvidence, START_EVIDENCE_MIN_CHARS_BRIEF, validateFiveStepEvidence, validateStartPhaseEvidence } from './five-step.js'
|
|
151
152
|
import {
|
|
152
153
|
lessonStats,
|
|
153
154
|
rankLessons,
|
|
@@ -158,6 +159,10 @@ import {
|
|
|
158
159
|
} from './lessons.js'
|
|
159
160
|
import { computeMappingDigest, verifyMappingDigest } from './supersede-digest.js'
|
|
160
161
|
import { supersedePlanRecord } from './supersede.js'
|
|
162
|
+
// [3.1.0] 人数上限单一真源(caps.ts):报错文案与门禁同源。
|
|
163
|
+
import { MAX_COMPLEX_DELEGATE_MEMBERS } from './caps.js'
|
|
164
|
+
// [3.1.0] 排队等待上限环境变量化(默认 10 分钟不变)+规划器并发预算环境变量化。
|
|
165
|
+
import { envPositiveInt } from './caps.js'
|
|
161
166
|
import { createProgressWatchdog, describeError } from './watchdog.js'
|
|
162
167
|
import { AUTO_RESUME_DEFAULTS, autoResumeAttemptCap, decideAutoResume, liveResumeCounts } from './auto-resume.js'
|
|
163
168
|
/*
|
|
@@ -370,8 +375,12 @@ export function describeSubagentActivationError(error: any, context: string): Er
|
|
|
370
375
|
* 多个等待者共享一个模块级冷却时间,避免同一毫秒一起撞门(惊群)。
|
|
371
376
|
* 这不是“精确信号量”(宿主没有暴露当前活跃数),而是“有界排队退避”:
|
|
372
377
|
* 空位一出现,等待者按退避节奏自然补位。
|
|
378
|
+
*
|
|
379
|
+
* [3.1.0] 等待上限可用 DSH_WORKPLAN_ACTIVATION_QUEUE_MAX_WAIT_MS 覆盖
|
|
380
|
+
* (默认 10 分钟不变);新增 onWait 回调:每次退避决策后通知调用方,
|
|
381
|
+
* 供派发循环向用户暴露「排队中」状态(排队可见化)。
|
|
373
382
|
*/
|
|
374
|
-
export const ACTIVATION_QUEUE_MAX_WAIT_MS = 10 * 60 * 1000
|
|
383
|
+
export const ACTIVATION_QUEUE_MAX_WAIT_MS = envPositiveInt('DSH_WORKPLAN_ACTIVATION_QUEUE_MAX_WAIT_MS', 10 * 60 * 1000)
|
|
375
384
|
const ACTIVATION_QUEUE_BASE_DELAY_MS = 1000
|
|
376
385
|
const ACTIVATION_QUEUE_MAX_DELAY_MS = 15000
|
|
377
386
|
let activationQueueCooldownUntil = 0
|
|
@@ -385,6 +394,7 @@ export async function startActivationQueued<T>(
|
|
|
385
394
|
start: () => Promise<T>,
|
|
386
395
|
signal: any,
|
|
387
396
|
context: string,
|
|
397
|
+
onWait?: (info: { waits: number; elapsedMs: number }) => void,
|
|
388
398
|
): Promise<T> {
|
|
389
399
|
const beganAt = Date.now()
|
|
390
400
|
let waits = 0
|
|
@@ -410,6 +420,10 @@ export async function startActivationQueued<T>(
|
|
|
410
420
|
// 全局冷却只增不减:所有等待者共用同一个“下一次可以再试”的时刻。
|
|
411
421
|
activationQueueCooldownUntil = Math.max(activationQueueCooldownUntil, now + backoff)
|
|
412
422
|
const delay = Math.max(250, activationQueueCooldownUntil - now)
|
|
423
|
+
// [3.1.0] 排队可见化:退避决策通知调用方(派发循环据此发用户可见通知)。
|
|
424
|
+
if (onWait) {
|
|
425
|
+
try { onWait({ waits, elapsedMs: Date.now() - beganAt }) } catch { /* 通知回调失败不影响排队 */ }
|
|
426
|
+
}
|
|
413
427
|
await sleepAbortable(signal, delay + Math.floor(Math.random() * 250))
|
|
414
428
|
if (signal?.aborted) throw new PlanError('排队等待子代理空位时被取消', 'ABORTED')
|
|
415
429
|
}
|
|
@@ -1491,16 +1505,33 @@ function resultText(result: any) {
|
|
|
1491
1505
|
* (keyResults/keyInfo/importantInfo/leadRequirements 四字段齐全、非空、
|
|
1492
1506
|
* 不重复);缺失或重复即退回(该成员记 failed 并附 F10 拒因),绝不记 done。
|
|
1493
1507
|
*
|
|
1494
|
-
* 最小侵入、只拦 done
|
|
1495
|
-
*
|
|
1496
|
-
*
|
|
1508
|
+
* 最小侵入、只拦 done 路径:F1–F9 与三阶段既有判定不在此重复;replay/读档
|
|
1509
|
+
* 路径不经这两个回调,行为零变化。
|
|
1510
|
+
*
|
|
1511
|
+
* [修复] 与主链路「非法 JSON 绝不计 done」同一口径(T4 契约):
|
|
1512
|
+
* - 结果块缺失 / JSON 无法解析:旧实现返回 ok:true,这类汇报被**记成成员
|
|
1513
|
+
* done**(看板虚报完成,与 executeSubtask 的 EVIDENCE_UNPARSABLE 闸矛盾);
|
|
1514
|
+
* 现在记 failed 并附拒因,负责人核实产物后可重派。
|
|
1515
|
+
* - 声明 blocked/partial:旧实现同样记 done;现在记 failed,受阻原因随拒因
|
|
1516
|
+
* 交负责人(escalate 工具已登记 escalation 的行不受本判定影响——结算回调
|
|
1517
|
+
* 里 escalation 优先于 done/failed)。
|
|
1497
1518
|
*/
|
|
1498
1519
|
function adjudicateExpertReport(outcome: any): { ok: true } | { ok: false; rejection: string } {
|
|
1499
1520
|
const text = resultText(outcome)
|
|
1500
1521
|
const parsed = parseEvidenceBlock(text)
|
|
1501
1522
|
const payload = parsed && typeof parsed === 'object' ? parsed.payload : null
|
|
1502
|
-
if (!payload || typeof payload !== 'object')
|
|
1503
|
-
|
|
1523
|
+
if (!payload || typeof payload !== 'object') {
|
|
1524
|
+
return {
|
|
1525
|
+
ok: false,
|
|
1526
|
+
rejection: '专家汇报无法结算:结果块缺失或 JSON 无法解析(完成必回报,非法 JSON 绝不计 done);请负责人核实其产物后重派,或按实改判',
|
|
1527
|
+
}
|
|
1528
|
+
}
|
|
1529
|
+
if (String(payload.status ?? '') !== 'done') {
|
|
1530
|
+
return {
|
|
1531
|
+
ok: false,
|
|
1532
|
+
rejection: `专家汇报声明 status=${String(payload.status ?? '(缺失)')}(非 done,不计完成):${truncate(String(payload.blockedReason ?? payload.question ?? '未附原因'), 200)}`,
|
|
1533
|
+
}
|
|
1534
|
+
}
|
|
1504
1535
|
const report = checkExpertReport((payload as any).report)
|
|
1505
1536
|
if (!Array.isArray(report.violations) || report.violations.length === 0) return { ok: true }
|
|
1506
1537
|
return {
|
|
@@ -1893,6 +1924,13 @@ function settleFromOutput(
|
|
|
1893
1924
|
?.map((item: any) => String(item?.member ?? ''))
|
|
1894
1925
|
.filter((name: string) => name !== '') ?? []
|
|
1895
1926
|
: [],
|
|
1927
|
+
/*
|
|
1928
|
+
* [3.0.8] 开工-结算一致性比对输入:行级 startPhases(review/direct 开工闸
|
|
1929
|
+
* 登记值);历史行无登记 ⇒ undefined,跳过比对(零迁移)。
|
|
1930
|
+
*/
|
|
1931
|
+
startPhases: Array.isArray(record?.statuses)
|
|
1932
|
+
? record.statuses.find((item: any) => item?.subtaskId === subtask?.id)?.startPhases ?? undefined
|
|
1933
|
+
: undefined,
|
|
1896
1934
|
})
|
|
1897
1935
|
const checked = checkArtifacts(verdict.artifacts, options.cwd, options.artifactExists)
|
|
1898
1936
|
const escalated = verdict.status === 'blocked'
|
|
@@ -2089,9 +2127,10 @@ function settleFromOutput(
|
|
|
2089
2127
|
* Retry policy for one child attempt.
|
|
2090
2128
|
*
|
|
2091
2129
|
* A wedged child (no event for the whole idle window) is worth one fresh
|
|
2092
|
-
* attempt. `CHILD_NOT_COMPLETED`
|
|
2093
|
-
*
|
|
2094
|
-
*
|
|
2130
|
+
* attempt. `CHILD_NOT_COMPLETED` 的预算比较在生产路径上恒真:当前实现没有
|
|
2131
|
+
* 「整轮剩余预算」概念,全部调用点传入 remainingMs=+∞(TOTAL_TIMEOUT_MS=0
|
|
2132
|
+
* 表示不设整轮硬预算),真正的重试上限只有函数开头的 attempt<2。预算比较
|
|
2133
|
+
* 保留给单元测试与将来接入真实整轮预算的场景,注释按此真实契约书写。
|
|
2095
2134
|
*
|
|
2096
2135
|
* [1.10.3] 单个子任务撞上 900 秒硬上限时,只要整轮预算还够再跑一轮,就自动重试
|
|
2097
2136
|
* 一次。用户 2026-11-01 的质疑是对的:此前这一支被无条件 `return false`,
|
|
@@ -2129,8 +2168,9 @@ export function shouldRetryAttempt(error: any, attempt: any, remainingMs: any, i
|
|
|
2129
2168
|
/*
|
|
2130
2169
|
* [2.2.8][T7] 结果块解析失败与 CHILD_NOT_COMPLETED 走同一道闸(用户 2026-11-09
|
|
2131
2170
|
* 报告 T4 事故:非法 JSON 一次即 blocked,并级联阻断下游;子会话其实已完成
|
|
2132
|
-
*
|
|
2133
|
-
*
|
|
2171
|
+
* 工作,只差一个合法回报)。生产路径 remainingMs=+∞(无整轮预算概念),
|
|
2172
|
+
* 该比较恒真、退化为 attempt<2 上限把关;预算比较保留给单测与将来接入
|
|
2173
|
+
* 真实整轮预算的场景。
|
|
2134
2174
|
*/
|
|
2135
2175
|
if (code === 'EVIDENCE_UNPARSABLE') {
|
|
2136
2176
|
return Number(remainingMs) > Number(idleTimeoutMs)
|
|
@@ -2139,12 +2179,21 @@ export function shouldRetryAttempt(error: any, attempt: any, remainingMs: any, i
|
|
|
2139
2179
|
* [2.2.9] 结果块缺失与 unparsable 同闸(用户 2026-11-10 红字复发族):
|
|
2140
2180
|
* 结算的唯一载体是收尾消息块,任何异常收尾(error/截断/超时)都会丢;
|
|
2141
2181
|
* 旧实现 missing 一次即 blocked 并级联冻结下游(看板红字「待裁决/需处理」
|
|
2142
|
-
*
|
|
2143
|
-
*
|
|
2182
|
+
* 反复出现的结构根因之一)。回喂补报(勿重做已完成工作)在生产路径上
|
|
2183
|
+
* remainingMs=+∞、预算比较恒真,由函数开头 attempt<2 上限把关;预算比较
|
|
2184
|
+
* 保留给单测与将来接入真实整轮预算的场景。
|
|
2144
2185
|
*/
|
|
2145
2186
|
if (code === 'EVIDENCE_MISSING') {
|
|
2146
2187
|
return Number(remainingMs) > Number(idleTimeoutMs)
|
|
2147
2188
|
}
|
|
2189
|
+
/*
|
|
2190
|
+
* [修复] 结算闸退回(EVIDENCE_INCOMPLETE:验收未逐条覆盖 / 五步证据不完整 /
|
|
2191
|
+
* 开工-结算证据不一致)与 unparsable/missing 同闸:结果块已解析,缺口清单
|
|
2192
|
+
* 经 previousFailure 回喂同一子会话补报。
|
|
2193
|
+
*/
|
|
2194
|
+
if (code === 'EVIDENCE_INCOMPLETE') {
|
|
2195
|
+
return Number(remainingMs) > Number(idleTimeoutMs)
|
|
2196
|
+
}
|
|
2148
2197
|
return true
|
|
2149
2198
|
}
|
|
2150
2199
|
|
|
@@ -2719,7 +2768,7 @@ async function executeSubtask(ctx: any, record: any, stage: any, subtask: any, o
|
|
|
2719
2768
|
continue
|
|
2720
2769
|
}
|
|
2721
2770
|
throw new PlanError(
|
|
2722
|
-
'phase-0 结束但未提交自配推理等级:先配置后开工是平台硬规则——请评估任务复杂度并经 dsh_workplan_delegate(action="review") 配置 consolidation.taskReasoningEffort,平台将以自配档接续;low(轻度)任务请改经 action="direct"
|
|
2771
|
+
'phase-0 结束但未提交自配推理等级:先配置后开工是平台硬规则——请评估任务复杂度并经 dsh_workplan_delegate(action="review") 配置 consolidation.taskReasoningEffort,平台将以自配档接续;low(轻度)任务请改经 action="direct" 登记开工证据 startPhases(负责人亲自执行,禁止下派)',
|
|
2723
2772
|
'SELF_EFFORT_MISSING',
|
|
2724
2773
|
{ subtaskId: subtask.id },
|
|
2725
2774
|
)
|
|
@@ -2771,12 +2820,25 @@ async function executeSubtask(ctx: any, record: any, stage: any, subtask: any, o
|
|
|
2771
2820
|
* 结算严格性不变:非法 JSON 依旧绝不计 done——只修恢复路径。
|
|
2772
2821
|
*/
|
|
2773
2822
|
const settleRow = record.statuses.find((item: any) => item?.subtaskId === subtask.id)
|
|
2823
|
+
/*
|
|
2824
|
+
* [修复] F11 接通:行上有已派发专家 ⇒ 本行是部门负责人 ⇒ 结算闸按
|
|
2825
|
+
* leader 层级核验 departmentSummary(F11)并按专家名单核 sources 覆盖度。
|
|
2826
|
+
* 口径与 settleFromOutput :1885-1896 逐字同源(此前预裁决路径不传这两项,
|
|
2827
|
+
* F11 在生产路径上从未执行,但提示词宣称存在——提示词与闸门双源矛盾)。
|
|
2828
|
+
*/
|
|
2829
|
+
const settleDelegates = Array.isArray(settleRow?.delegates)
|
|
2830
|
+
? settleRow.delegates.map((item: any) => String(item?.member ?? '')).filter((name: string) => name !== '')
|
|
2831
|
+
: []
|
|
2774
2832
|
const settleVerdict = settleRow?.closure === 'escalated'
|
|
2775
2833
|
? null
|
|
2776
2834
|
: adjudicateResult({
|
|
2777
2835
|
output,
|
|
2778
2836
|
strict: options.strictEvidence !== false,
|
|
2779
2837
|
expectedAcceptance: Array.isArray(subtask?.acceptance) ? subtask.acceptance : [],
|
|
2838
|
+
// [3.0.8] 开工-结算一致性比对输入(行级登记值,历史行跳过)。
|
|
2839
|
+
startPhases: settleRow?.startPhases ?? undefined,
|
|
2840
|
+
formatTier: settleDelegates.length > 0 ? 'leader' : undefined,
|
|
2841
|
+
expectedExperts: settleDelegates,
|
|
2780
2842
|
})
|
|
2781
2843
|
if (settleVerdict && settleVerdict.verification === 'unparsable') {
|
|
2782
2844
|
const unparsableLanded = probeInterruptedArtifacts(output, subtask, options.cwd, options.artifactExists)
|
|
@@ -2809,8 +2871,7 @@ async function executeSubtask(ctx: any, record: any, stage: any, subtask: any, o
|
|
|
2809
2871
|
* 附在盘产物清单与「只补交结果块、勿重做已完成工作」;重试耗尽才
|
|
2810
2872
|
* 按实 blocked(既有 settleFromOutput 路径,严格性不变:缺失永不计 done)。
|
|
2811
2873
|
*/
|
|
2812
|
-
if (settleVerdict && settleVerdict.
|
|
2813
|
-
&& /结果块缺失/.test(String(settleVerdict.error ?? ''))) {
|
|
2874
|
+
if (settleVerdict && settleVerdict.missingBlock === true) {
|
|
2814
2875
|
const settleBackup = join(options.cwd ?? process.cwd(), 'reports', `wp-settlement-${subtask.id}.json`)
|
|
2815
2876
|
let backupVerdict: any = null
|
|
2816
2877
|
let backupText = ''
|
|
@@ -2860,8 +2921,13 @@ async function executeSubtask(ctx: any, record: any, stage: any, subtask: any, o
|
|
|
2860
2921
|
output: backupText,
|
|
2861
2922
|
strict: true,
|
|
2862
2923
|
expectedAcceptance: Array.isArray(subtask?.acceptance) ? subtask.acceptance : [],
|
|
2924
|
+
// [3.0.8] 开工-结算一致性比对输入(行级登记值,历史行跳过)。
|
|
2925
|
+
startPhases: settleRow?.startPhases ?? undefined,
|
|
2926
|
+
// [修复] 备份采纳与消息路径同一 F11 口径(见 settleVerdict 处注释)。
|
|
2927
|
+
formatTier: settleDelegates.length > 0 ? 'leader' : undefined,
|
|
2928
|
+
expectedExperts: settleDelegates,
|
|
2863
2929
|
})
|
|
2864
|
-
if (!backupVerdict ||
|
|
2930
|
+
if (!backupVerdict || backupVerdict.missingBlock === true || backupVerdict.verification === 'unparsable') backupVerdict = null
|
|
2865
2931
|
}
|
|
2866
2932
|
}
|
|
2867
2933
|
} catch {
|
|
@@ -2896,6 +2962,27 @@ async function executeSubtask(ctx: any, record: any, stage: any, subtask: any, o
|
|
|
2896
2962
|
throw missingError
|
|
2897
2963
|
}
|
|
2898
2964
|
}
|
|
2965
|
+
/*
|
|
2966
|
+
* [修复] 结果块已解析、但结算闸退回(验收未逐条覆盖 / 五步证据不完整 /
|
|
2967
|
+
* 开工-结算证据不一致)= 与 unparsable/missing 同族的有界回喂重试。
|
|
2968
|
+
*
|
|
2969
|
+
* 结构性根因:旧实现里这类缺口一次即 blocked、无任何回喂,子 Agent 不知道
|
|
2970
|
+
* 差在哪,主 Agent 只能人工重派——「五步证据不完整」反复出现的直接原因。
|
|
2971
|
+
* 现在把校验器给出的具体缺口清单经 previousFailure 回喂同一子会话:
|
|
2972
|
+
* 勿重做已完成的工作,按缺口补全证据后重新回报完整结构化结果块;
|
|
2973
|
+
* 最多两次由 attempt 上限统一把关,重试耗尽仍按实 blocked(严格性不变)。
|
|
2974
|
+
*/
|
|
2975
|
+
if (settleVerdict && settleVerdict.verification === 'unverified' && settleVerdict.rereport === true) {
|
|
2976
|
+
const incompleteError = new PlanError(
|
|
2977
|
+
`结果块已解析,但结算闸退回(本次回报不能计完成):${truncate(String(settleVerdict.error ?? ''), 600)}`
|
|
2978
|
+
+ '——请勿重做已完成的工作,按上述缺口补全证据后重新回报完整结构化结果块',
|
|
2979
|
+
'EVIDENCE_INCOMPLETE',
|
|
2980
|
+
{ subtaskId: subtask.id },
|
|
2981
|
+
)
|
|
2982
|
+
if (shouldRetryAttempt(incompleteError, attempt, Number.POSITIVE_INFINITY, idleTimeoutMs)) {
|
|
2983
|
+
throw incompleteError
|
|
2984
|
+
}
|
|
2985
|
+
}
|
|
2899
2986
|
/*
|
|
2900
2987
|
* [1.7.0] Evidence decides the verdict.
|
|
2901
2988
|
*
|
|
@@ -4369,9 +4456,9 @@ export function reconstructFromSession(session: any, targetPlanId?: string) {
|
|
|
4369
4456
|
/* [1.11.0] 重规划修订号与未处理的变更请求,随 durable 消息回放。 */
|
|
4370
4457
|
planRevision: number
|
|
4371
4458
|
changeRequest: any
|
|
4372
|
-
/* [
|
|
4373
|
-
|
|
4374
|
-
|
|
4459
|
+
/* [3.0.8] 主 Agent 五步第 1/2/3 步开工证据(计划级),随 durable workplan-update 回放。 */
|
|
4460
|
+
mainStartPhases: any
|
|
4461
|
+
mainStartPhasesPlanId: string | null
|
|
4375
4462
|
/* [3.0.1] 认可闸门(计划级)随回放快照透传:刷新/重启后 dispatch 闸门读档生效。 */
|
|
4376
4463
|
dispatchHold?: any
|
|
4377
4464
|
gateHistory?: any[]
|
|
@@ -4405,8 +4492,8 @@ export function reconstructFromSession(session: any, targetPlanId?: string) {
|
|
|
4405
4492
|
errors: [],
|
|
4406
4493
|
planRevision: Number(plan?.planRevision ?? 0) || 0,
|
|
4407
4494
|
changeRequest: null,
|
|
4408
|
-
|
|
4409
|
-
|
|
4495
|
+
mainStartPhases: null,
|
|
4496
|
+
mainStartPhasesPlanId: null,
|
|
4410
4497
|
dispatchHold: undefined,
|
|
4411
4498
|
gateHistory: undefined,
|
|
4412
4499
|
}
|
|
@@ -4556,17 +4643,17 @@ export function reconstructFromSession(session: any, targetPlanId?: string) {
|
|
|
4556
4643
|
/* [2.5.5][T10] 合并汇总消息按序展开成多条 update,逐条应用(与逐条落盘等价)。 */
|
|
4557
4644
|
for (const update of parseUpdateMessages(event.data)) {
|
|
4558
4645
|
/*
|
|
4559
|
-
* [
|
|
4560
|
-
* (dispatchTool
|
|
4646
|
+
* [3.0.8] 主 Agent 开工证据回放(计划级字段):写入侧
|
|
4647
|
+
* (dispatchTool 开工闸登记)把 mainStartPhases/mainStartPhasesPlanId 随
|
|
4561
4648
|
* durable workplan-update 落盘(subtaskId=null,不挂任何子任务行);
|
|
4562
|
-
* 消费侧同一判据消毒(
|
|
4649
|
+
* 消费侧同一判据消毒(sanitizeStartPhaseEvidence)后抬进计划快照——刷新/
|
|
4563
4650
|
* 重启后续跑读档放行,不必重新提交;旧日志无该字段零迁移不报错。
|
|
4564
4651
|
*/
|
|
4565
|
-
if (update && typeof update.planId === 'string' && update.
|
|
4566
|
-
const
|
|
4567
|
-
if (
|
|
4568
|
-
|
|
4569
|
-
|
|
4652
|
+
if (update && typeof update.planId === 'string' && update.mainStartPhases !== undefined) {
|
|
4653
|
+
const startPhasesSnap = snapshots.get(update.planId)
|
|
4654
|
+
if (startPhasesSnap) {
|
|
4655
|
+
startPhasesSnap.mainStartPhases = sanitizeStartPhaseEvidence(update.mainStartPhases)
|
|
4656
|
+
startPhasesSnap.mainStartPhasesPlanId = typeof update.mainStartPhasesPlanId === 'string' ? update.mainStartPhasesPlanId : null
|
|
4570
4657
|
}
|
|
4571
4658
|
}
|
|
4572
4659
|
/*
|
|
@@ -4702,10 +4789,13 @@ export function reconstructFromSession(session: any, targetPlanId?: string) {
|
|
|
4702
4789
|
*/
|
|
4703
4790
|
effortOverride: update.effortOverride,
|
|
4704
4791
|
consolidation: update.consolidation,
|
|
4792
|
+
// [3.0.8] 行级开工证据(review/direct 登记)回放:applyStatus 同口径
|
|
4793
|
+
// 消毒,undefined 保留旧值——刷新/重启后结算一致性比对与重试蓝图不丢。
|
|
4794
|
+
startPhases: update.startPhases,
|
|
4705
4795
|
delegates: update.delegates,
|
|
4706
4796
|
delegateSelfEfforts: update.delegateSelfEfforts,
|
|
4707
|
-
// [
|
|
4708
|
-
|
|
4797
|
+
// [3.0.8] 叶子开工证据台账回放(applyStatus 同口径消毒)。
|
|
4798
|
+
delegateStartPhases: update.delegateStartPhases,
|
|
4709
4799
|
// [T6][契约v1 §3] 第三层开工预估台账回放(applyStatus 同口径消毒,
|
|
4710
4800
|
// undefined 保留旧值):刷新/重启后预估不丢,重派读档门禁据此判定。
|
|
4711
4801
|
delegateEstimates: update.delegateEstimates,
|
|
@@ -4978,9 +5068,9 @@ export function reconstructFromSession(session: any, targetPlanId?: string) {
|
|
|
4978
5068
|
updatedAt: Date.now(),
|
|
4979
5069
|
createdTurn: plan.createdTurn,
|
|
4980
5070
|
resumeCount,
|
|
4981
|
-
/* [
|
|
4982
|
-
|
|
4983
|
-
|
|
5071
|
+
/* [3.0.8] 主 Agent 开工证据随回放回到记录(续跑读档放行)。 */
|
|
5072
|
+
mainStartPhases: chosen.mainStartPhases ?? null,
|
|
5073
|
+
mainStartPhasesPlanId: chosen.mainStartPhasesPlanId ?? null,
|
|
4984
5074
|
/* [3.0.1] 认可闸门随重建记录还原:重启后 dispatch 闸门与审计留痕不失效。
|
|
4985
5075
|
* 直接属性而非条件展开——条件展开会破坏返回字面量的判别收窄
|
|
4986
5076
|
* (rebuilt.plan 的 null/对象判别失效,resumeLimit 访问报 union 错)。 */
|
|
@@ -7322,15 +7412,15 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
7322
7412
|
}
|
|
7323
7413
|
|
|
7324
7414
|
/**
|
|
7325
|
-
* [1.13.0]
|
|
7415
|
+
* [1.13.0→3.0.8] 第四步(验证阶段)的插件核验入口(用户 2026-11-05;五步口径)。
|
|
7326
7416
|
*
|
|
7327
7417
|
* 「按提交内容判阶段」:
|
|
7328
|
-
* - 只有 planning + execution
|
|
7329
|
-
* - 缺 planning/execution 的调用以 PHASE_GATE 拒绝并列出待补项 —— 这是一道
|
|
7330
|
-
*
|
|
7418
|
+
* - 只有 planning + preparation + execution 证据齐全,才会进入第四步核验;
|
|
7419
|
+
* - 缺 planning/preparation/execution 的调用以 PHASE_GATE 拒绝并列出待补项 —— 这是一道
|
|
7420
|
+
* 证据门禁,不是对插件的全局禁用(「前三步禁用插件」只是 2026-11-05
|
|
7331
7421
|
* 当次优化会话的过程约束,2.0.2 起不再作为所有会话的产品规则);
|
|
7332
|
-
* -
|
|
7333
|
-
*
|
|
7422
|
+
* - 第四步核验会逐条检查:任务梳理/资源/工具/方案是否有实质内容、准备就绪
|
|
7423
|
+
* 证据是否记录、执行步骤是否记录、验证是否全部通过、验证记录是否覆盖全部验收标准。
|
|
7334
7424
|
*
|
|
7335
7425
|
* 它不写状态、不替子 Agent 宣称完成:最终是否 done 仍由 `adjudicateResult`
|
|
7336
7426
|
* 对同一份 phases 再判一次,避免「核验工具说通过」与「结果块没写」两套真相。
|
|
@@ -7338,7 +7428,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
7338
7428
|
async function verifySubtask(agent: any, args: any) {
|
|
7339
7429
|
const childSession = agent?.session
|
|
7340
7430
|
if (!childSession?.id) {
|
|
7341
|
-
return { ok: false, code: 'NO_SESSION', passed: false, error: '
|
|
7431
|
+
return { ok: false, code: 'NO_SESSION', passed: false, error: '只能在部门子会话内做第四步核验' }
|
|
7342
7432
|
}
|
|
7343
7433
|
const parentId = childSession.header?.parentSession
|
|
7344
7434
|
if (!parentId) {
|
|
@@ -7346,7 +7436,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
7346
7436
|
ok: false,
|
|
7347
7437
|
code: 'NOT_CHILD_SESSION',
|
|
7348
7438
|
passed: false,
|
|
7349
|
-
error: '
|
|
7439
|
+
error: '当前不是子会话,无法反查父计划;第四步核验只对已派发的部门子任务开放',
|
|
7350
7440
|
}
|
|
7351
7441
|
}
|
|
7352
7442
|
let record = state.records.get(parentId)
|
|
@@ -7375,18 +7465,18 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
7375
7465
|
const rawPhases = isRecord(args?.phases)
|
|
7376
7466
|
? args.phases
|
|
7377
7467
|
: { planning: args?.planning, preparation: args?.preparation, execution: args?.execution, verification: args?.verification }
|
|
7378
|
-
const check =
|
|
7468
|
+
const check = validateFiveStepEvidence(rawPhases, expectedAcceptance)
|
|
7379
7469
|
if (!check.ok || !check.phases) {
|
|
7380
7470
|
const gate = phaseGateFromErrors(check.errors)
|
|
7381
7471
|
return {
|
|
7382
7472
|
ok: false,
|
|
7383
7473
|
passed: false,
|
|
7384
|
-
code: gate === '
|
|
7474
|
+
code: gate === 'steps-1-3' ? 'PHASE_GATE' : 'VERIFICATION_INCOMPLETE',
|
|
7385
7475
|
phase: gate,
|
|
7386
7476
|
planId: record.plan.planId,
|
|
7387
7477
|
subtaskId: row.subtaskId,
|
|
7388
7478
|
gaps: check.errors,
|
|
7389
|
-
error: gate === '
|
|
7479
|
+
error: gate === 'steps-1-3'
|
|
7390
7480
|
? `核验缺少前几步证据:先完成「梳理任务 → 研究资源工具方案 → 准备到位 → 执行」并按步写全证据,再提交验证核验。${check.errors.slice(0, 5).join(';')}`
|
|
7391
7481
|
: `验证核验未通过:${check.errors.slice(0, 5).join(';')}`,
|
|
7392
7482
|
}
|
|
@@ -7398,7 +7488,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
7398
7488
|
planId: record.plan.planId,
|
|
7399
7489
|
subtaskId: row.subtaskId,
|
|
7400
7490
|
summary: phaseSummaryLine(check.phases),
|
|
7401
|
-
message: '
|
|
7491
|
+
message: '插件核验通过:第四步证据齐全、验证全部通过。现在把同一份 phases 写进结果块,并按第五步以 JSON mode 交回本部门负责人。',
|
|
7402
7492
|
}
|
|
7403
7493
|
}
|
|
7404
7494
|
|
|
@@ -8502,33 +8592,31 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
8502
8592
|
const rationale = String(args?.complexityRationale ?? '').trim()
|
|
8503
8593
|
if (!rationale) return { ok: false, code: 'SELF_EFFORT_RATIONALE_MISSING', error: 'complexityRationale 必填:写清你分到的单项任务为何是该复杂度档(事实/依赖/验证难度)。' }
|
|
8504
8594
|
/*
|
|
8505
|
-
* [
|
|
8506
|
-
*
|
|
8595
|
+
* [3.0.8] 叶子执行前五步第 1/2/3 步开工证据硬门禁(五步工作法单框架;取代
|
|
8596
|
+
* 2.5.2 的两轮深度思考 deepThink 门禁——两轮内容本就是五步第 1、2 步的子集)。
|
|
8507
8597
|
*
|
|
8508
|
-
*
|
|
8509
|
-
*
|
|
8510
|
-
*
|
|
8511
|
-
*
|
|
8512
|
-
*
|
|
8513
|
-
*
|
|
8514
|
-
* 登记之后,且必须按第二轮理清的方法、流程、步骤执行(少走弯路)。
|
|
8598
|
+
* self_effort 必须同时携带合格 startPhases={ planning, preparation }
|
|
8599
|
+
* (与主 Agent/负责人同一 validateStartPhaseEvidence 判据、同一七项字数下限
|
|
8600
|
+
* 口径:problemAnalysis/approach ≥40、approachBasis/resources/prepared/evidence ≥20、
|
|
8601
|
+
* tools ≥10),缺交/不合格硬拒(START_EVIDENCE_MISSING / START_EVIDENCE_INCOMPLETE),
|
|
8602
|
+
* 不登记、不接续;齐全才登记并以自配档接续 phase-1——正式执行只能发生在
|
|
8603
|
+
* 第 1/2/3 步证据登记之后,且必须按第二步理清的方法、流程、步骤执行。
|
|
8515
8604
|
* 已登记自配档的旧叶子重派直接 phase-1(零迁移),其结算门禁仍验产物。
|
|
8516
8605
|
*/
|
|
8517
|
-
const
|
|
8518
|
-
if (!
|
|
8519
|
-
const missing = leafDeepThinkCheck.code === 'MAIN_DEEP_THINK_MISSING'
|
|
8606
|
+
const leafStartCheck = validateStartPhaseEvidence(args?.startPhases)
|
|
8607
|
+
if (!leafStartCheck.ok) {
|
|
8520
8608
|
return {
|
|
8521
8609
|
ok: false,
|
|
8522
|
-
code:
|
|
8610
|
+
code: leafStartCheck.code ?? 'START_EVIDENCE_INCOMPLETE',
|
|
8523
8611
|
subtaskId: String(row.subtaskId),
|
|
8524
8612
|
member: member.member,
|
|
8525
|
-
error:
|
|
8613
|
+
error: `开工证据${leafStartCheck.code === 'START_EVIDENCE_MISSING' ? '缺失' : '不合格'}:全球顶尖专家开始执行自己的任务前,必须先完成五步前三步——第一步全面、全盘、深入梳理、研究、思考自己的任务;第二步基于第一步完成好的所有结果研究需要哪些资源、哪些工具、具体实施方案(方法、流程、步骤,含依据);第三步把资源与工具真正备齐并给出就绪证据。请在 self_effort 一并携带 startPhases={ planning{ problemAnalysis[], approach[], approachBasis[], resources[], tools[] }, preparation{ prepared[], evidence[] } }。${leafStartCheck.error ?? ''}`,
|
|
8526
8614
|
}
|
|
8527
8615
|
}
|
|
8528
|
-
const
|
|
8616
|
+
const leafStartPhases = leafStartCheck.evidence!
|
|
8529
8617
|
/*
|
|
8530
8618
|
* [T6][D9] 开工前预估硬门禁(T6 冻结契约 §2,校验顺序最后一项:
|
|
8531
|
-
* reasoningEffort→complexityRationale→
|
|
8619
|
+
* reasoningEffort→complexityRationale→startPhases→timeNotice)。timeNotice=
|
|
8532
8620
|
* { declaredMinutes: 正整数分钟(1..10080), reason?: ≤300 }。缺交=ESTIMATE_MISSING;
|
|
8533
8621
|
* 非对象/非整数/越界=ESTIMATE_INVALID;error 必须含 D9 原话+形状说明。拒绝一律
|
|
8534
8622
|
* 不登记、不投递、不接续(A1)。预估登记后经 T5 通道送达部门负责人(§4)才准
|
|
@@ -8597,7 +8685,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
8597
8685
|
status: written?.status ?? row.status,
|
|
8598
8686
|
...(patch.delegates === undefined ? {} : { delegates: written?.delegates }),
|
|
8599
8687
|
...(patch.delegateSelfEfforts === undefined ? {} : { delegateSelfEfforts: written?.delegateSelfEfforts }),
|
|
8600
|
-
...(patch.
|
|
8688
|
+
...(patch.delegateStartPhases === undefined ? {} : { delegateStartPhases: written?.delegateStartPhases }),
|
|
8601
8689
|
// [T6][契约v1 §3] 预估台账随 durable workplan-update 回放(重启不丢)。
|
|
8602
8690
|
...(patch.delegateEstimates === undefined ? {} : { delegateEstimates: written?.delegateEstimates }),
|
|
8603
8691
|
revision: written?.revision ?? revision,
|
|
@@ -8616,16 +8704,16 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
8616
8704
|
: { declaredMinutes: rawMinutes, ...(estimateReason ? { reason: estimateReason } : {}), at: Date.now(), delivery: 'failed' }
|
|
8617
8705
|
const registerList = (currentRow()?.delegates ?? row.delegates)
|
|
8618
8706
|
.map((d: any) => (d?.childId === childSession.id
|
|
8619
|
-
? { ...d, selfEffort, ...(correction.adjusted ? { selfEffortRequested: raw } : {}), complexityRationale: truncate(rationale, 300),
|
|
8707
|
+
? { ...d, selfEffort, ...(correction.adjusted ? { selfEffortRequested: raw } : {}), complexityRationale: truncate(rationale, 300), startPhases: leafStartPhases, estimate: estimateDraft, status: 'running', error: null }
|
|
8620
8708
|
: d))
|
|
8621
8709
|
const stash = { ...(currentRow()?.delegateSelfEfforts ?? {}), [member.member]: selfEffort }
|
|
8622
|
-
// [
|
|
8623
|
-
//
|
|
8624
|
-
const
|
|
8710
|
+
// [3.0.8] 开工证据与自配档同为任务级配置:delegates[].startPhases +
|
|
8711
|
+
// delegateStartPhases 双通道落档,重置保留、durable 回放(G1 双侧接线)。
|
|
8712
|
+
const startPhasesStash = { ...(currentRow()?.delegateStartPhases ?? {}), [member.member]: leafStartPhases }
|
|
8625
8713
|
// [T6][契约v1 §3] 预估双通道:delegates[].estimate + delegateEstimates(任务级
|
|
8626
|
-
// 配置,重置保留、durable 回放),与 selfEffort/
|
|
8714
|
+
// 配置,重置保留、durable 回放),与 selfEffort/startPhases 同范式。
|
|
8627
8715
|
const estimateStash = { ...(currentRow()?.delegateEstimates ?? {}), [member.member]: estimateDraft }
|
|
8628
|
-
persistSelf({ delegates: registerList, delegateSelfEfforts: stash,
|
|
8716
|
+
persistSelf({ delegates: registerList, delegateSelfEfforts: stash, delegateStartPhases: startPhasesStash, delegateEstimates: estimateStash })
|
|
8629
8717
|
/*
|
|
8630
8718
|
* [T6][D9][契约v1 §4] 预估送达部门负责人:登记之后、interrupt/接续之前。
|
|
8631
8719
|
* 路由 row.childId(部门行负责人会话),缺失回退 leaderId;两者皆缺 ⇒
|
|
@@ -8680,7 +8768,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
8680
8768
|
code: 'ESTIMATE_DELIVERY_FAILED',
|
|
8681
8769
|
subtaskId,
|
|
8682
8770
|
member: member.member,
|
|
8683
|
-
error: `预估投递失败(预估已以 delivery:'failed' 落档,未接续执行):${estimateDeliveryError}。请重试 self_effort(携带完整原子对:reasoningEffort+complexityRationale+
|
|
8771
|
+
error: `预估投递失败(预估已以 delivery:'failed' 落档,未接续执行):${estimateDeliveryError}。请重试 self_effort(携带完整原子对:reasoningEffort+complexityRationale+startPhases+timeNotice),重试将重新投递。`,
|
|
8684
8772
|
...estimateJournalInfo,
|
|
8685
8773
|
}
|
|
8686
8774
|
}
|
|
@@ -8697,8 +8785,8 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
8697
8785
|
* ① 解析移到 interrupt 之前:ctx.get('agents') 安全访问器(宿主
|
|
8698
8786
|
* dsh-subagent / dsh-tool-jobs 同款范式),整体 try/catch;无 get 方法
|
|
8699
8787
|
* 的上下文(旧测试夹具)回退属性访问,同样在 try/catch 内。
|
|
8700
|
-
* ② 解析失败 ⇒ 不中断 phase-0
|
|
8701
|
-
* (delegateSelfEfforts /
|
|
8788
|
+
* ② 解析失败 ⇒ 不中断 phase-0;自配档与开工证据已登记保留
|
|
8789
|
+
* (delegateSelfEfforts / delegateStartPhases 已 durable 落档,负责人
|
|
8702
8790
|
* 重派该成员时读档直连 phase-1),显式返回
|
|
8703
8791
|
* SELF_EFFORT_CONTINUATION_FAILED,绝不静默。
|
|
8704
8792
|
*/
|
|
@@ -8708,7 +8796,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
8708
8796
|
leaderAgent = agentsService?.get?.(leaderId) ?? null
|
|
8709
8797
|
} catch { leaderAgent = null }
|
|
8710
8798
|
if (!leaderAgent) {
|
|
8711
|
-
const message = '
|
|
8799
|
+
const message = '自配档与开工证据已登记,但负责人 agent 解析失败(agents 服务不可用):phase-0 未被中断,登记保留——负责人可重派该成员,重派将读档直接以自配档接续 phase-1(禁止静默降档)'
|
|
8712
8800
|
const failedList = (currentRow()?.delegates ?? [])
|
|
8713
8801
|
.map((d: any) => (d?.childId === childSession.id ? { ...d, status: 'failed', error: truncate(message, 300), finishedAt: Date.now() } : d))
|
|
8714
8802
|
persistSelf({ delegates: failedList })
|
|
@@ -8739,7 +8827,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
8739
8827
|
rulesBrief,
|
|
8740
8828
|
cwd: typeof childSession.header?.cwd === 'string' ? childSession.header.cwd : '',
|
|
8741
8829
|
leadSessionId: leaderId,
|
|
8742
|
-
extraContext: `【phase-0→phase-1 接续——继续勿重做】你已在 phase-0 完成复杂度评估并自配推理等级 \`${selfEffort}\`(依据:${truncate(rationale, 300)}${correction.adjusted ? `;请求档 ${raw} 越界已被平台钳制为 ${selfEffort}` : ''}
|
|
8830
|
+
extraContext: `【phase-0→phase-1 接续——继续勿重做】你已在 phase-0 完成复杂度评估并自配推理等级 \`${selfEffort}\`(依据:${truncate(rationale, 300)}${correction.adjusted ? `;请求档 ${raw} 越界已被平台钳制为 ${selfEffort}` : ''}),并登记了五步第 1/2/3 步开工证据。平台已按你的自配档接续:直接执行正式任务,不要重新评估复杂度,不要重做 phase-0 已完成的工作。正式执行必须严格按你第二步理清的方法、流程、步骤进行(你的第二步产物:${leafStartPhases.planning.approach.join(';').slice(0, 300)}…),全程少走弯路:先查历史教训、先验证再动手、不重复试错。`,
|
|
8743
8831
|
})
|
|
8744
8832
|
// [3.0.1][P1a] 宿主 subagent.maxDepth < 2 时一次性告警(scope=计划根会话)。
|
|
8745
8833
|
notifyDepthOverrideConflict(ctx, typeof rootId === 'string' ? rootId : null)
|
|
@@ -8906,6 +8994,8 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
8906
8994
|
subtaskId,
|
|
8907
8995
|
status: written?.status ?? row.status,
|
|
8908
8996
|
...(patch.consolidation === undefined ? {} : { consolidation: written?.consolidation }),
|
|
8997
|
+
// [3.0.8] 行级开工证据随 durable workplan-update 落盘(与 consolidation 同口径)。
|
|
8998
|
+
...(patch.startPhases === undefined ? {} : { startPhases: written?.startPhases }),
|
|
8909
8999
|
...(patch.delegates === undefined ? {} : { delegates: written?.delegates }),
|
|
8910
9000
|
// [2.5.4][T3R1] 门禁审计随 durable workplan-update 落盘(A3 可复核)。
|
|
8911
9001
|
...(patch.gateAudit === undefined ? {} : { gateAudit: written?.gateAudit }),
|
|
@@ -8977,7 +9067,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
8977
9067
|
// 且分工表为空/缺失 ⇒ low 直执;复杂任务被钳制到 low 的行(assignments 非空)
|
|
8978
9068
|
// 不命中,避免误导(规格 §5.6)。
|
|
8979
9069
|
hint: row.effortOverride === 'low' && (!Array.isArray((row.consolidation as any)?.assignments) || (row.consolidation as any).assignments.length === 0)
|
|
8980
|
-
? 'low 任务(含视同 low
|
|
9070
|
+
? 'low 任务(含视同 low):禁止第三层下派,负责人亲自执行;开工证据 startPhases 经 action="direct" 登记(已登记则直接执行)。'
|
|
8981
9071
|
: !row.consolidation
|
|
8982
9072
|
? '尚未提交梳理产物:先调用 action="review"(用户要求 4 的硬门禁)。'
|
|
8983
9073
|
: delegates.length === 0
|
|
@@ -8991,9 +9081,9 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
8991
9081
|
/*
|
|
8992
9082
|
* [2.5.5][T3] 用户裁决 D2/D4:low 任务负责人亲自执行登记(direct)。
|
|
8993
9083
|
* low(含视同 low)任务禁止第三层下派——planDelegations 禁派闸对 review/dispatch
|
|
8994
|
-
* 一律硬拒(DELEGATE_LOW_TASK_FORBIDDEN
|
|
8995
|
-
*
|
|
8996
|
-
*
|
|
9084
|
+
* 一律硬拒(DELEGATE_LOW_TASK_FORBIDDEN);负责人亲自执行,五步第 1/2/3 步开工
|
|
9085
|
+
* 证据经本动作登记(复用 validateStartPhaseEvidence,与主 Agent/叶子/review
|
|
9086
|
+
* 同一判据)。登记 effortOverride='low' ⇒ phase-0 结算闸(runSubtaskAttempt 内
|
|
8997
9087
|
* SELF_EFFORT_MISSING 分支)只查 effortOverride 非空,逻辑零改动即可接续。
|
|
8998
9088
|
* 防旁路(规格 §5.8):不收 consolidation/分工表;只接受 reasoningEffort='low'
|
|
8999
9089
|
* (缺省默认 low);已有复杂分工表的行不得降级;下级 running 中不得改走;
|
|
@@ -9025,18 +9115,18 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9025
9115
|
ok: false,
|
|
9026
9116
|
code: 'DELEGATE_DIRECT_ASSIGNMENTS_FORBIDDEN',
|
|
9027
9117
|
subtaskId,
|
|
9028
|
-
error: 'direct 不接受 consolidation/分工表(low 任务禁止下派,用户裁决 D2):只提交
|
|
9118
|
+
error: 'direct 不接受 consolidation/分工表(low 任务禁止下派,用户裁决 D2):只提交 startPhases={ planning{ problemAnalysis[], approach[], approachBasis[], resources[], tools[] }, preparation{ prepared[], evidence[] } }(第 1/2/3 步证据,字数下限:' + START_EVIDENCE_MIN_CHARS_BRIEF + ')与可选 reasoningEffort="low"。',
|
|
9029
9119
|
}
|
|
9030
9120
|
}
|
|
9031
|
-
const
|
|
9032
|
-
if (!
|
|
9033
|
-
const code =
|
|
9121
|
+
const startCheck = validateStartPhaseEvidence(args?.startPhases)
|
|
9122
|
+
if (!startCheck.ok || !startCheck.evidence) {
|
|
9123
|
+
const code = startCheck.code === 'START_EVIDENCE_MISSING' ? 'DELEGATE_DIRECT_START_MISSING' : 'DELEGATE_DIRECT_START_INCOMPLETE'
|
|
9034
9124
|
recordGate('direct', false, code)
|
|
9035
9125
|
return {
|
|
9036
9126
|
ok: false,
|
|
9037
9127
|
code,
|
|
9038
9128
|
subtaskId,
|
|
9039
|
-
error: `${
|
|
9129
|
+
error: `${startCheck.error ?? '开工证据缺失或不合格。'}(direct 登记与主 Agent/叶子同一判据:${START_EVIDENCE_MIN_CHARS_BRIEF}。)`,
|
|
9040
9130
|
}
|
|
9041
9131
|
}
|
|
9042
9132
|
const directEffortRaw = args?.reasoningEffort
|
|
@@ -9051,10 +9141,9 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9051
9141
|
}
|
|
9052
9142
|
const hadEffortOverride = typeof row.effortOverride === 'string' && row.effortOverride.length > 0
|
|
9053
9143
|
const written = persist({
|
|
9144
|
+
// [3.0.8] 第 1/2/3 步开工证据存行级 startPhases(结算一致性比对读档用)。
|
|
9145
|
+
startPhases: startCheck.evidence,
|
|
9054
9146
|
consolidation: {
|
|
9055
|
-
problemAnalysis: think.deepThink.problemAnalysis,
|
|
9056
|
-
approach: think.deepThink.approach,
|
|
9057
|
-
approachBasis: think.deepThink.approachBasis,
|
|
9058
9147
|
assignments: [], // 空分工表=直执标记(派生判据,规格 §5.6)
|
|
9059
9148
|
taskReasoningEffort: 'low',
|
|
9060
9149
|
submittedAt: Date.now(),
|
|
@@ -9073,7 +9162,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9073
9162
|
action: 'direct',
|
|
9074
9163
|
effortOverride: 'low',
|
|
9075
9164
|
consolidation: written?.consolidation ?? null,
|
|
9076
|
-
hint: 'low 直执已登记(durable,刷新后门禁依然生效):平台将以 low 档接续本会话进入 phase-1。负责人亲自执行本任务,禁止再调用 review/dispatch(low
|
|
9165
|
+
hint: 'low 直执已登记(durable,刷新后门禁依然生效):平台将以 low 档接续本会话进入 phase-1。负责人亲自执行本任务,禁止再调用 review/dispatch(low 禁派闸会硬拒);完成后按五步契约提交证据与结论。',
|
|
9077
9166
|
}
|
|
9078
9167
|
}
|
|
9079
9168
|
|
|
@@ -9084,7 +9173,19 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9084
9173
|
ok: false,
|
|
9085
9174
|
code: 'MISSING_CONSOLIDATION',
|
|
9086
9175
|
subtaskId,
|
|
9087
|
-
error:
|
|
9176
|
+
error: `review 必须携带 consolidation 分工表:{ assignments[{member, role:"expert", task, qualityRequirements[], reasoningEffort}] },并随附 startPhases={ planning{ problemAnalysis[], approach[], approachBasis[], resources[], tools[] }, preparation{ prepared[], evidence[] } }——五步第 1/2/3 步开工证据(第一步任务梳理;第二步基于第一步全部结果研究资源、工具与具体实施方案;第三步把资源与工具真正备齐并给出就绪证据)+ 分工表(至少 1 名、最多 ${MAX_COMPLEX_DELEGATE_MEMBERS} 名本部门全球顶尖专家;组员角色已取消;每项任务必须极简并附质量要求)。`,
|
|
9177
|
+
}
|
|
9178
|
+
}
|
|
9179
|
+
// [3.0.8] 负责人 review 开工闸:与 direct/dispatch/self_effort 同一
|
|
9180
|
+
// validateStartPhaseEvidence 判据,缺交/不合格硬拒,不登记。
|
|
9181
|
+
const reviewStartCheck = validateStartPhaseEvidence(args?.startPhases)
|
|
9182
|
+
if (!reviewStartCheck.ok) {
|
|
9183
|
+
recordGate('review', false, reviewStartCheck.code ?? 'START_EVIDENCE_INCOMPLETE')
|
|
9184
|
+
return {
|
|
9185
|
+
ok: false,
|
|
9186
|
+
code: reviewStartCheck.code ?? 'START_EVIDENCE_INCOMPLETE',
|
|
9187
|
+
subtaskId,
|
|
9188
|
+
error: `开工证据${reviewStartCheck.code === 'START_EVIDENCE_MISSING' ? '缺失' : '不合格'}:部门负责人执行自己的任务前必须先完成五步前三步(任务梳理 + 资源/工具/方案研究 + 准备就绪),随 review 一并提交 startPhases={ planning{ problemAnalysis[], approach[], approachBasis[], resources[], tools[] }, preparation{ prepared[], evidence[] } }。${reviewStartCheck.error ?? ''}`,
|
|
9088
9189
|
}
|
|
9089
9190
|
}
|
|
9090
9191
|
// [2.5.0][R2×R4] 重新 review 未再配整体等级时,继承行上已持久化的
|
|
@@ -9107,13 +9208,9 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9107
9208
|
// [2.5.2][stall-fix] 中断判据快照:本次 review 之前是否已登记整体档。
|
|
9108
9209
|
const hadEffortOverride = typeof row.effortOverride === 'string' && row.effortOverride.length > 0
|
|
9109
9210
|
const written = persist({
|
|
9211
|
+
// [3.0.8] 负责人开工证据存行级 startPhases(结算一致性比对读档用)。
|
|
9212
|
+
startPhases: reviewStartCheck.evidence,
|
|
9110
9213
|
consolidation: {
|
|
9111
|
-
problemAnalysis: input.problemAnalysis,
|
|
9112
|
-
constraints: input.constraints,
|
|
9113
|
-
unknowns: input.unknowns,
|
|
9114
|
-
approach: input.approach,
|
|
9115
|
-
// [2.5.1] 两轮深度思考协议:第二轮依据随梳理产物留档,dispatch 读回同口径。
|
|
9116
|
-
approachBasis: input.approachBasis,
|
|
9117
9214
|
assignments: input.assignments,
|
|
9118
9215
|
// [2.5.0] 整体任务等级随梳理产物留档,dispatch 读回时同口径消费。
|
|
9119
9216
|
...(preview.taskEffort ? { taskReasoningEffort: preview.taskEffort } : {}),
|
|
@@ -9154,7 +9251,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9154
9251
|
taskEffort: preview.taskEffort,
|
|
9155
9252
|
...(preview.taskEffortClamped ? { taskEffortClamped: preview.taskEffortClamped } : {}),
|
|
9156
9253
|
model: model ?? '(未知,未施加静态等级约束)',
|
|
9157
|
-
hint: '
|
|
9254
|
+
hint: '分工表与开工证据已登记(durable,刷新后门禁依然生效)。现在可调用 action="dispatch" 正式派发;每位下级的推理等级已按当前模型家族合法集合钳制(clamped 列出越界修正与原因,留痕可审计)。'
|
|
9158
9255
|
+ (preview.taskEffort ? `整体任务等级已配置为 ${preview.taskEffort}(负责人自配档),本任务重试/续跑全程沿用;下级以 self_effort 自配为权威。` : '未配置整体任务等级:负责人须按先配置后开工经 review 自配(consolidation.taskReasoningEffort);下级经 self_effort 自配。'),
|
|
9159
9256
|
}
|
|
9160
9257
|
}
|
|
@@ -9192,6 +9289,10 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9192
9289
|
? parentSession.header.cwd
|
|
9193
9290
|
: undefined)
|
|
9194
9291
|
const delegates: any[] = []
|
|
9292
|
+
// [3.1.0] 排队可见化:派发期间每次「首次退避」记一条用户可见通知,循环结束
|
|
9293
|
+
// 后统一投递(不在工具执行中途重入会话事件流);每成员至多一条,防刷屏。
|
|
9294
|
+
const queueNotices: string[] = []
|
|
9295
|
+
let skippedDone = 0
|
|
9195
9296
|
/*
|
|
9196
9297
|
* [2.5.0][R4] 重试/续跑不丢已完成部分(第三层落点):重派时 row.delegates
|
|
9197
9298
|
* 仍是上一次尝试的台账——为每位下级附上次状态/失败原因/已回报结论与已核实
|
|
@@ -9199,8 +9300,21 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9199
9300
|
* 旧实现这里直接发全新任务书,叶子失败后重派只能整步重跑。
|
|
9200
9301
|
*/
|
|
9201
9302
|
const priorDelegates = Array.isArray(row.delegates) ? row.delegates : []
|
|
9202
|
-
|
|
9303
|
+
// [3.0.8] retry brief 的负责人执行蓝图改从行级 startPhases.planning.approach
|
|
9304
|
+
// 读取(consolidation 不再携带两轮思考产物)。
|
|
9305
|
+
const consolidationApproach = Array.isArray((row as any)?.startPhases?.planning?.approach) ? (row as any).startPhases.planning.approach : []
|
|
9203
9306
|
for (const assignment of delegationPlan.members) {
|
|
9307
|
+
const prior = priorDelegates.find((item: any) => item?.member === assignment.member) ?? null
|
|
9308
|
+
/*
|
|
9309
|
+
* [3.1.0] 重派跳过已完成成员:done 结论已经过 F10 汇报核验,是已交付的
|
|
9310
|
+
* 有效成果;旧实现对分工表成员无条件重新拉起,已完成专家被重复派活
|
|
9311
|
+
* (浪费 token,还可能覆盖已验收产物)。跳过激活、原样保留台账条目。
|
|
9312
|
+
*/
|
|
9313
|
+
if (prior?.status === 'done') {
|
|
9314
|
+
delegates.push(prior)
|
|
9315
|
+
skippedDone += 1
|
|
9316
|
+
continue
|
|
9317
|
+
}
|
|
9204
9318
|
const rulesBrief = buildLlmRulesBrief({
|
|
9205
9319
|
model,
|
|
9206
9320
|
effort: assignment.effort,
|
|
@@ -9210,7 +9324,6 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9210
9324
|
memberName: assignment.member,
|
|
9211
9325
|
memberRole: assignment.role,
|
|
9212
9326
|
})
|
|
9213
|
-
const prior = priorDelegates.find((item: any) => item?.member === assignment.member) ?? null
|
|
9214
9327
|
const retryBrief = prior
|
|
9215
9328
|
? buildDelegateRetryBrief(prior, probeDelegateLandedArtifacts(cwd, assignment.member), consolidationApproach)
|
|
9216
9329
|
: ''
|
|
@@ -9221,12 +9334,12 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9221
9334
|
const priorSelf = typeof stashedSelf === 'string' && stashedSelf ? stashedSelf
|
|
9222
9335
|
: (typeof prior?.selfEffort === 'string' && prior.selfEffort ? prior.selfEffort : '')
|
|
9223
9336
|
/*
|
|
9224
|
-
* [
|
|
9225
|
-
* delegates[].
|
|
9226
|
-
* 未登记(含旧计划遗留叶子)⇒ 仍走 phase-0
|
|
9337
|
+
* [3.0.8] 开工证据读档:已登记证据(delegateStartPhases 或
|
|
9338
|
+
* delegates[].startPhases)⇒ 随接续提示词下发执行蓝图,直接 phase-1;
|
|
9339
|
+
* 未登记(含旧计划遗留叶子)⇒ 仍走 phase-0 补齐证据+自配后才准执行。
|
|
9227
9340
|
*/
|
|
9228
|
-
const
|
|
9229
|
-
??
|
|
9341
|
+
const stashedStartPhases = sanitizeStartPhaseEvidence((row.delegateStartPhases as any)?.[assignment.member])
|
|
9342
|
+
?? sanitizeStartPhaseEvidence(prior?.startPhases)
|
|
9230
9343
|
/*
|
|
9231
9344
|
* [T6][D9][契约v1 §5] 预估读档门禁:已登记且已送达(delivery='sent')的预估
|
|
9232
9345
|
* 才算门禁通过。未预估、或预估投递失败(failed)⇒ 回 phase-0 补交完整原子对
|
|
@@ -9237,9 +9350,9 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9237
9350
|
const stashedEstimate = sanitizeLeafEstimate((row.delegateEstimates as any)?.[assignment.member])
|
|
9238
9351
|
?? sanitizeLeafEstimate(prior?.estimate)
|
|
9239
9352
|
const registeredEstimate = stashedEstimate?.delivery === 'sent' ? stashedEstimate : null
|
|
9240
|
-
const leafPhaseZero = !priorSelf || !
|
|
9241
|
-
const selfContinuation = priorSelf &&
|
|
9242
|
-
?
|
|
9353
|
+
const leafPhaseZero = !priorSelf || !stashedStartPhases || !registeredEstimate
|
|
9354
|
+
const selfContinuation = priorSelf && stashedStartPhases && registeredEstimate
|
|
9355
|
+
? `【自配档接续·开工证据读档】你的自配推理等级 \`${priorSelf}\` 与五步第 1/2/3 步开工证据均已登记生效(成员自配为权威)。继续勿重做:直接执行正式任务,不要重新评估复杂度、不要重复提交开工证据。正式执行必须严格按你第二步理清的方法、流程、步骤进行(你的第一步产物:${stashedStartPhases.planning.problemAnalysis.join(';').slice(0, 200)}…;你的第二步产物:${stashedStartPhases.planning.approach.join(';').slice(0, 300)}…),全程少走弯路:先查历史教训、先验证再动手、不重复试错。你的开工预估已登记并送达部门负责人(约 ${registeredEstimate.declaredMinutes} 分钟,整数分钟),无需重复上报。`
|
|
9243
9356
|
: (priorSelf
|
|
9244
9357
|
? `【自配档接续】你的自配推理等级 \`${priorSelf}\` 已登记生效(成员自配为权威)。继续勿重做:直接执行正式任务,不要重新评估复杂度。`
|
|
9245
9358
|
: '')
|
|
@@ -9261,6 +9374,10 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9261
9374
|
let childId: string | null = null
|
|
9262
9375
|
let memberStatus = 'running'
|
|
9263
9376
|
let memberError: string | null = null
|
|
9377
|
+
// [3.1.0] 排队计量:只有真的发生退避等待才记录 queuedMs(不把正常激活
|
|
9378
|
+
// 延迟误标成排队)。
|
|
9379
|
+
let memberQueued = false
|
|
9380
|
+
const activationBeganAt = Date.now()
|
|
9264
9381
|
try {
|
|
9265
9382
|
// [3.0.1][P1a] 宿主 subagent.maxDepth < 2 时一次性告警(scope=计划根会话)。
|
|
9266
9383
|
notifyDepthOverrideConflict(ctx, typeof parentSession?.header?.parentSession === 'string' ? parentSession.header.parentSession : (typeof parentId === 'string' ? parentId : null))
|
|
@@ -9286,6 +9403,13 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9286
9403
|
}),
|
|
9287
9404
|
signal,
|
|
9288
9405
|
`派发成员 ${assignment.member}(${subtaskId})`,
|
|
9406
|
+
(info) => {
|
|
9407
|
+
// [3.1.0] 排队可见化:首次退避时记录一条用户可见通知(循环结束后
|
|
9408
|
+
// 统一投递,不在工具执行中途重入会话事件流);按成员去重,防刷屏。
|
|
9409
|
+
memberQueued = true
|
|
9410
|
+
if (queueNotices.some((line) => line.includes(`成员 ${assignment.member}(`))) return
|
|
9411
|
+
queueNotices.push(`【排队中】成员 ${assignment.member}(${subtaskId}):子代理并发空位已满,已等待约 ${Math.round(info.elapsedMs / 1000)} 秒。这不是失败——空位一出现就会自动开始;长时间无进展可在「设置 → 子代理」调大 subagent.maxActiveSubagents,或设 DSH_WORKPLAN_ACTIVATION_QUEUE_MAX_WAIT_MS 调大排队等待上限。`)
|
|
9412
|
+
},
|
|
9289
9413
|
)
|
|
9290
9414
|
childId = typeof activation?.childId === 'string' ? activation.childId : null
|
|
9291
9415
|
if (activation && typeof activation.result?.then === 'function') {
|
|
@@ -9354,8 +9478,17 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9354
9478
|
error: memberError,
|
|
9355
9479
|
startedAt: Date.now(),
|
|
9356
9480
|
finishedAt: null,
|
|
9481
|
+
// [3.1.0] 排队留痕:status=queued 期间实际等待毫秒数,供看板/复盘展示。
|
|
9482
|
+
...(memberQueued ? { queuedMs: Date.now() - activationBeganAt } : {}),
|
|
9357
9483
|
})
|
|
9358
9484
|
}
|
|
9485
|
+
// [3.1.0] 排队可见化:派发期间发生过的排队等待,统一向根会话投递用户可见
|
|
9486
|
+
// 通知(每成员一条);投递失败不影响派发结果。
|
|
9487
|
+
for (const line of queueNotices) {
|
|
9488
|
+
try {
|
|
9489
|
+
appendUserMessage(parentSession, makeUserMessage(line, { kind: 'workplan', form: 'notice', summary: line.slice(0, 80) }))
|
|
9490
|
+
} catch { /* 通知投递失败不影响派发结果 */ }
|
|
9491
|
+
}
|
|
9359
9492
|
// [2.5.4][T3R1] 分派门禁放行留痕(A3):并入台账 persist,同一动作不二次
|
|
9360
9493
|
// persist(避免 revision 竞争);gateAudit 经 applyStatus 消毒 + durable 回放。
|
|
9361
9494
|
const written = persist({
|
|
@@ -9373,7 +9506,8 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9373
9506
|
taskEffort: delegationPlan.taskEffort,
|
|
9374
9507
|
effortOverride: written?.effortOverride ?? row.effortOverride ?? null,
|
|
9375
9508
|
...(rejected.length ? { rejected: rejected.map((item) => ({ member: item.member, error: item.error })) } : {}),
|
|
9376
|
-
|
|
9509
|
+
...(skippedDone ? { skippedDone } : {}),
|
|
9510
|
+
hint: '第三层已派发(一层下级、叶子层,第四层会被硬拒)。每位全球顶尖专家的完成结论会送回本会话(delivery=caller);收齐后由你汇总核验,再写最终结果块。用 action="status" 查看进度。成员遇阻会经 dsh_workplan_escalate 在你这里落「待指示」(delegates[].closure=escalated):必须当轮用 dsh_workplan_instruct(subtaskId=本部门行 ID,多个成员同时请示时加 member)答复,投递成功后该成员恢复执行。3.0.5 硬规则:任何成员待指示期间,review/dispatch/direct 一律拒绝改派,必须由原成员继续执行。' + (skippedDone ? ` 本次重派跳过 ${skippedDone} 名已完成成员(成果已保留,未重复拉起)。` : ''),
|
|
9377
9511
|
}
|
|
9378
9512
|
}
|
|
9379
9513
|
|
|
@@ -9469,7 +9603,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9469
9603
|
* [3.0.1] 认可闸门硬门禁:被按住(keyword/manual)且未派发的计划,派发一律
|
|
9470
9604
|
* 拒绝——这是「未经用户认可不得开跑」的执行侧;唯一的合法出口是
|
|
9471
9605
|
* dsh_workplan_release(它登记用户认可留痕后解除闸门并派发)。
|
|
9472
|
-
*
|
|
9606
|
+
* 落点在终态闸门之后、开工证据门禁之前:拒绝不产生副作用。
|
|
9473
9607
|
*/
|
|
9474
9608
|
if (isDispatchHeld(record)) {
|
|
9475
9609
|
const snapshot = derivePlanSnapshot(record.statuses)
|
|
@@ -9484,26 +9618,27 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9484
9618
|
stats: snapshot.stats,
|
|
9485
9619
|
code: 'DISPATCH_HELD',
|
|
9486
9620
|
error: `计划处于认可闸门之下(${truncate(String(record.dispatchHold?.reason ?? '未注明原因'), 200)}):任务要求先经用户认可再执行,在用户明确认可前不得派发。`,
|
|
9487
|
-
hint: '请先征得用户明确认可,然后调用 dsh_workplan_release(可附 note 留痕、附
|
|
9621
|
+
hint: '请先征得用户明确认可,然后调用 dsh_workplan_release(可附 note 留痕、附 startPhases 直接开跑);不要用 dsh_workplan_dispatch 绕过闸门。',
|
|
9488
9622
|
}
|
|
9489
9623
|
}
|
|
9490
9624
|
/*
|
|
9491
|
-
* [
|
|
9625
|
+
* [3.0.8] 主 Agent 开工证据硬门禁(五步工作法单框架;取代 2.5.1 两轮深度思考
|
|
9626
|
+
* deepThink 门禁——两轮内容本就是五步第 1、2 步的子集,同一内容不再双份提交)。
|
|
9492
9627
|
*
|
|
9493
|
-
* 主 Agent
|
|
9494
|
-
*
|
|
9495
|
-
*
|
|
9496
|
-
*
|
|
9497
|
-
*
|
|
9628
|
+
* 主 Agent 执行自己的任务同样必须先完成五步前三步:第一步全面、全盘、深入
|
|
9629
|
+
* 梳理、研究、思考自己的任务;第二步基于第一步完成好的所有结果研究资源、
|
|
9630
|
+
* 工具与具体实施方案;第三步把资源与工具真正备齐并给出就绪证据——派发就是
|
|
9631
|
+
* 主 Agent 执行的起点,因此首次派发必须随附 startPhases 证据,未交/不合格
|
|
9632
|
+
* 硬拒(START_EVIDENCE_MISSING / START_EVIDENCE_INCOMPLETE),提示词绕不过。
|
|
9498
9633
|
*
|
|
9499
9634
|
* 落点=已通过 NO_PLAN / PLAN_ID_MISMATCH / 终态闸门之后、派发预告与任何
|
|
9500
9635
|
* 子 Agent 启动之前:拒绝不产生副作用,也不刷派发预告。登记后持久化
|
|
9501
9636
|
* (record + durable workplan-update),续跑/重试/join/重启回放读档放行;
|
|
9502
|
-
*
|
|
9637
|
+
* 证据按 planId 记账——重规划换新计划是新任务,必须重新完成前三步。
|
|
9503
9638
|
*/
|
|
9504
|
-
if (!record.
|
|
9505
|
-
const
|
|
9506
|
-
if (!
|
|
9639
|
+
if (!record.mainStartPhases || record.mainStartPhasesPlanId !== record.plan.planId) {
|
|
9640
|
+
const startCheck = validateStartPhaseEvidence(args?.startPhases)
|
|
9641
|
+
if (!startCheck.ok) {
|
|
9507
9642
|
const snapshot = derivePlanSnapshot(record.statuses)
|
|
9508
9643
|
return {
|
|
9509
9644
|
ok: false,
|
|
@@ -9514,19 +9649,19 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9514
9649
|
complete: false,
|
|
9515
9650
|
remaining: Math.max(0, Number(snapshot.stats.total ?? 0) - Number(snapshot.stats.done ?? 0)),
|
|
9516
9651
|
stats: snapshot.stats,
|
|
9517
|
-
code:
|
|
9518
|
-
error:
|
|
9519
|
-
hint: '
|
|
9652
|
+
code: startCheck.code,
|
|
9653
|
+
error: startCheck.error,
|
|
9654
|
+
hint: '先完成五步前三步再派发:第一步任务梳理,第二步基于第一步全部结果研究资源、工具与具体实施方案(含依据 approachBasis),第三步准备就绪,随 dsh_workplan_dispatch 的 startPhases 参数提交;登记后续跑/重启自动读档,无需重复提交。',
|
|
9520
9655
|
}
|
|
9521
9656
|
}
|
|
9522
|
-
record.
|
|
9523
|
-
record.
|
|
9657
|
+
record.mainStartPhases = startCheck.evidence
|
|
9658
|
+
record.mainStartPhasesPlanId = record.plan.planId
|
|
9524
9659
|
// durable 持久化(计划级字段,subtaskId=null 不落任何子任务行);回放消费端同口径消毒。
|
|
9525
9660
|
appendUserMessage(session, buildUpdateMessage({
|
|
9526
9661
|
planId: record.plan.planId,
|
|
9527
9662
|
subtaskId: null,
|
|
9528
|
-
|
|
9529
|
-
|
|
9663
|
+
mainStartPhases: startCheck.evidence,
|
|
9664
|
+
mainStartPhasesPlanId: record.plan.planId,
|
|
9530
9665
|
}))
|
|
9531
9666
|
}
|
|
9532
9667
|
/*
|
|
@@ -9841,9 +9976,9 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9841
9976
|
/**
|
|
9842
9977
|
* [3.0.1] 解除认可闸门并立即派发。release 是「用户已明确认可」的唯一合法
|
|
9843
9978
|
* 出口:它把按住事实追加进 gateHistory(只增审计,durable 回放),清空
|
|
9844
|
-
* dispatchHold,然后走 dispatchTool
|
|
9845
|
-
* 若 dispatch
|
|
9846
|
-
* 不让它人质化;补齐
|
|
9979
|
+
* dispatchHold,然后走 dispatchTool 的同一套闸门(终态/开工证据等照常生效)。
|
|
9980
|
+
* 若 dispatch 因开工证据等门禁被拒,闸门保持已解除——认可事实是用户给的,
|
|
9981
|
+
* 不让它人质化;补齐 startPhases 后直接重发 dispatch 即可。
|
|
9847
9982
|
*/
|
|
9848
9983
|
async function releaseTool(agent: any, args: any, signal: any) {
|
|
9849
9984
|
const session = agent?.session
|
|
@@ -9885,7 +10020,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9885
10020
|
}
|
|
9886
10021
|
const dispatched = await dispatchTool(agent, {
|
|
9887
10022
|
planId: record.plan.planId,
|
|
9888
|
-
|
|
10023
|
+
startPhases: args?.startPhases,
|
|
9889
10024
|
mode: args?.mode,
|
|
9890
10025
|
}, signal)
|
|
9891
10026
|
return { ok: dispatched?.ok !== false, gateReleased: true, hold, note, dispatch: dispatched }
|
|
@@ -10112,7 +10247,9 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
10112
10247
|
const message = payload?.message
|
|
10113
10248
|
if (humanMessages([message]).length === 0) return
|
|
10114
10249
|
const taskText = taskTextFromMessages([message])
|
|
10115
|
-
|
|
10250
|
+
// [3.0.7] 确认回复不取代在途后台规划:它会被 pre-step 标记为 userConfirmed,
|
|
10251
|
+
// 计划落地即自动放行派发;此处若不排除,确认消息会先把原规划中止掉。
|
|
10252
|
+
if (!taskText || isSocialMessage(taskText) || isVagueContinuation(taskText) || isStatusQuestion(taskText) || isUserConfirmation(taskText)) return
|
|
10116
10253
|
if (planning.taskText === taskText) return
|
|
10117
10254
|
const alreadySuperseded = planning.superseded === true
|
|
10118
10255
|
planning.superseded = true
|
|
@@ -10945,7 +11082,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
10945
11082
|
/**
|
|
10946
11083
|
* [2.0.0] 只读的「永久教训记忆」入口。
|
|
10947
11084
|
*
|
|
10948
|
-
* 用户要求这些经验必须能被复核。主 Agent
|
|
11085
|
+
* 用户要求这些经验必须能被复核。主 Agent 在第四步可以用它查:记住了什么、
|
|
10949
11086
|
* 哪些同类错误在重复发生、文件到底写在哪。它只读文件,不改任何计划状态。
|
|
10950
11087
|
*/
|
|
10951
11088
|
/*
|
|
@@ -11112,6 +11249,80 @@ async function maybePlan(ctx: any, state: any, payload: any, downstream: any, op
|
|
|
11112
11249
|
if (isSocialMessage(taskText)) return downstream
|
|
11113
11250
|
if (isVagueContinuation(taskText)) return downstream
|
|
11114
11251
|
if (isStatusQuestion(taskText)) return downstream
|
|
11252
|
+
/*
|
|
11253
|
+
* [3.0.7] 确认回复路由(用户想法,原话):「收到用户确认回复后,你应该结合所
|
|
11254
|
+
* 有上下文全面、深入分析、思考、研究后,开始依据得出的所有结果分配任务」。
|
|
11255
|
+
* 用户 2026-11-18 补充裁决:「用户确认后,无论任务是否已经生成,都必须结合
|
|
11256
|
+
* 所有上下文和用户的回复,全面、深入开展分析、思考、研究,然后依据得出的
|
|
11257
|
+
* 所有结果开始分配任务」——分析在先、派发现在,插件不得在钩子层不经分析
|
|
11258
|
+
* 机械开跑。落到三条出口,全部在 activeTurns 标记与取代/取消逻辑之前:
|
|
11259
|
+
* ① 已有已提交未派发的计划(被认可闸门按住或 plan-first 未派发)→ 解除
|
|
11260
|
+
* 闸门(留痕 gateHistory,记下用户确认原文)、刷新 conversationContext
|
|
11261
|
+
* (含确认消息的全量上下文),并给主 Agent 下分析-派发指令;本回合标记
|
|
11262
|
+
* activeTurns:主 Agent 若未在回合内派发,收尾闸门会拦停 steer「请派发」
|
|
11263
|
+
* 作为兜底,绝不留下「确认后无人派发」的尾巴;
|
|
11264
|
+
* ② 任务分解正在后台进行 → 只标记 userConfirmed,原分解不被取代中止。后台
|
|
11265
|
+
* 分解本身就是「结合所有上下文的深入分析研究」,计划一生成即跳过认可
|
|
11266
|
+
* 闸门、刷新上下文后自动派发(=依据分析得出的结果分配任务);
|
|
11267
|
+
* ③ 其余(无计划/已在执行/终态)→ 交还主 Agent 结合上下文正常答复,绝不做
|
|
11268
|
+
* 任务分解——确认消息不再是新任务。
|
|
11269
|
+
*/
|
|
11270
|
+
if (isUserConfirmation(taskText)) {
|
|
11271
|
+
if (existing?.plan && !existing.dispatchedAt && !isTerminalPhase(existing.phase)
|
|
11272
|
+
&& !existing.dispatchPromise && existing.phase !== 'executing' && !existing.degraded
|
|
11273
|
+
&& existing.planner?.outcome !== 'SALVAGED') {
|
|
11274
|
+
if (planMode) return downstream
|
|
11275
|
+
const wasHeld = isDispatchHeld(existing)
|
|
11276
|
+
if (wasHeld) {
|
|
11277
|
+
const hold = existing.dispatchHold
|
|
11278
|
+
existing.dispatchHold = null
|
|
11279
|
+
existing.gateHistory = [
|
|
11280
|
+
...(Array.isArray(existing.gateHistory) ? existing.gateHistory : []),
|
|
11281
|
+
{ hold, releasedAt: Date.now(), note: `用户确认消息自动放行:${truncate(taskText, 60)}`, by: 'user' },
|
|
11282
|
+
].slice(-10)
|
|
11283
|
+
}
|
|
11284
|
+
existing.conversationContext = recentConversation(session)
|
|
11285
|
+
existing.updatedAt = Date.now()
|
|
11286
|
+
try {
|
|
11287
|
+
appendUserMessage(session, buildUpdateMessage({
|
|
11288
|
+
planId: existing.plan.planId,
|
|
11289
|
+
subtaskId: null,
|
|
11290
|
+
status: existing.phase,
|
|
11291
|
+
...(wasHeld ? { dispatchHold: null, gateHistory: existing.gateHistory } : {}),
|
|
11292
|
+
}))
|
|
11293
|
+
appendUserMessage(session, makeUserMessage(
|
|
11294
|
+
[
|
|
11295
|
+
`✅ 已收到并采纳您的确认回复("${truncate(taskText, 40)}"):${wasHeld ? '认可闸门已按您的确认解除。' : ''}`,
|
|
11296
|
+
'【主 Agent 指令·必须执行】您必须结合当前所有上下文和用户的这条确认回复,全面、深入地开展分析、思考、研究;然后依据得出的所有结果,调用 dsh_workplan_dispatch 开始分配任务(dispatch 时必须提交 startPhases,即您刚才的完整分析——五步第 1/2/3 步开工证据,它会作为登记在案的分析依据)。',
|
|
11297
|
+
'若分析发现计划需要按用户意图调整:先调用 dsh_workplan_replan 调整,再派发调整后的计划。',
|
|
11298
|
+
'禁止:不分析直接派发;把计划重新按住;把本条确认当成新任务重新分解。',
|
|
11299
|
+
].join('\n'),
|
|
11300
|
+
{ kind: 'workplan-confirm-analyze', form: 'notice', summary: '用户已确认:请深入分析后调用 workplan_dispatch 派发' },
|
|
11301
|
+
))
|
|
11302
|
+
} catch (error) {
|
|
11303
|
+
pushRecordError(existing, error)
|
|
11304
|
+
}
|
|
11305
|
+
if (!state.activeTurns) state.activeTurns = new Map()
|
|
11306
|
+
state.activeTurns.set(session.id, Number(payload.turn ?? 0))
|
|
11307
|
+
return downstream
|
|
11308
|
+
}
|
|
11309
|
+
const planning = state.planningInFlight?.get(session.id)
|
|
11310
|
+
if (planning && planning.superseded !== true) {
|
|
11311
|
+
if (planning.userConfirmed !== true) {
|
|
11312
|
+
planning.userConfirmed = true
|
|
11313
|
+
try {
|
|
11314
|
+
appendUserMessage(session, makeUserMessage(
|
|
11315
|
+
'✅ 已收到您的确认回复:原计划的后台分解不会被本条消息取代;任务分解完成后将自动放行并派发,无需再次确认。',
|
|
11316
|
+
{ kind: 'workplan-confirm-received', form: 'notice', summary: '确认已接收:计划生成后将自动派发' },
|
|
11317
|
+
))
|
|
11318
|
+
} catch (error) {
|
|
11319
|
+
pushRecordError(state.records.get(session.id) ?? {}, error)
|
|
11320
|
+
}
|
|
11321
|
+
}
|
|
11322
|
+
return downstream
|
|
11323
|
+
}
|
|
11324
|
+
return downstream
|
|
11325
|
+
}
|
|
11115
11326
|
/*
|
|
11116
11327
|
* [1.8.7] Remember that this turn carries a real task.
|
|
11117
11328
|
*
|
|
@@ -11462,7 +11673,10 @@ async function maybePlan(ctx: any, state: any, payload: any, downstream: any, op
|
|
|
11462
11673
|
budget: {
|
|
11463
11674
|
totalMinutes: 0,
|
|
11464
11675
|
childMinutes: 0,
|
|
11465
|
-
|
|
11676
|
+
// [3.1.0] 规划器并发预算环境变量化:宿主不向插件暴露 maxActiveSubagents,
|
|
11677
|
+
// 故以 DSH_WORKPLAN_PLANNER_CONCURRENCY 显式可配(默认不变 = MAX_CONCURRENT)。
|
|
11678
|
+
// 调大宿主 subagent.maxActiveSubagents 后,同步调大此值让规划器按真实并行度排预算。
|
|
11679
|
+
concurrency: envPositiveInt('DSH_WORKPLAN_PLANNER_CONCURRENCY', MAX_CONCURRENT),
|
|
11466
11680
|
maxResumes: Number(options?.limits?.maxResumes ?? MAX_PLAN_RESUMES),
|
|
11467
11681
|
},
|
|
11468
11682
|
})
|
|
@@ -11548,8 +11762,11 @@ async function maybePlan(ctx: any, state: any, payload: any, downstream: any, op
|
|
|
11548
11762
|
* [3.0.1] 认可闸门:任务锚点命中「先经用户认可再执行」门槛语时,计划照出、
|
|
11549
11763
|
* 按住不派(dispatchHold 落档),直到用户明确认可、主 Agent 调用
|
|
11550
11764
|
* dsh_workplan_release。必须在 record 字面量之前声明——字面量引用了它。
|
|
11765
|
+
*
|
|
11766
|
+
* [3.0.7] 例外:分解期间用户已回过确认(planningEntry.userConfirmed)——
|
|
11767
|
+
* 认可事实先于计划成立,闸门不再按住,计划落地即自动放行派发。
|
|
11551
11768
|
*/
|
|
11552
|
-
const approvalHeld = !planMode && approvalGateVerdict.held
|
|
11769
|
+
const approvalHeld = !planMode && approvalGateVerdict.held && planningEntry.userConfirmed !== true
|
|
11553
11770
|
const fullPlan = attachPlanMeta(plan, {
|
|
11554
11771
|
planId,
|
|
11555
11772
|
sessionId: session.id,
|
|
@@ -11637,7 +11854,7 @@ async function maybePlan(ctx: any, state: any, payload: any, downstream: any, op
|
|
|
11637
11854
|
if (!planMode) {
|
|
11638
11855
|
if (approvalHeld) {
|
|
11639
11856
|
/*
|
|
11640
|
-
* [3.0.1] 认可闸门:durable 落档(与
|
|
11857
|
+
* [3.0.1] 认可闸门:durable 落档(与 mainStartPhases 同一写入口径,
|
|
11641
11858
|
* subtaskId=null 计划级)——刷新/重启后回放读档,闸门不丢;
|
|
11642
11859
|
* 随后发用户可见通知,计划保持 phase=pending、不派发。
|
|
11643
11860
|
*/
|
|
@@ -11664,8 +11881,27 @@ async function maybePlan(ctx: any, state: any, payload: any, downstream: any, op
|
|
|
11664
11881
|
])
|
|
11665
11882
|
return
|
|
11666
11883
|
}
|
|
11667
|
-
|
|
11884
|
+
/*
|
|
11885
|
+
* [3.0.7] 用户已在分解期间确认:把确认事实与计划一起展示,让用户清楚
|
|
11886
|
+
* 本轮派发来自他自己的确认(而非系统自作主张)。后台分解本身就是「结合
|
|
11887
|
+
* 所有上下文的深入分析研究」,派发=依据分析结果分配任务;派发前刷新
|
|
11888
|
+
* conversationContext,让各部门 Agent 拿到含确认消息的全量上下文。
|
|
11889
|
+
*/
|
|
11890
|
+
if (planningEntry.userConfirmed === true) {
|
|
11891
|
+
deliver([
|
|
11892
|
+
planMessage,
|
|
11893
|
+
makeUserMessage(
|
|
11894
|
+
'✅ 已采纳您此前的确认回复:后台分解(结合全部上下文的深入分析)已纳入您的确认,本计划不再等待认可,正在自动放行并派发。',
|
|
11895
|
+
{ kind: 'workplan-confirm-dispatch', form: 'notice', summary: '已按用户确认自动放行并派发' },
|
|
11896
|
+
),
|
|
11897
|
+
])
|
|
11898
|
+
} else {
|
|
11899
|
+
deliver([planMessage])
|
|
11900
|
+
}
|
|
11668
11901
|
if (autoDispatched) {
|
|
11902
|
+
if (planningEntry.userConfirmed === true) {
|
|
11903
|
+
record.conversationContext = recentConversation(session)
|
|
11904
|
+
}
|
|
11669
11905
|
record.dispatchedAt = Date.now()
|
|
11670
11906
|
// [T7] C3 整轮预算:自动派发同样重置(与显式派发同口径)。
|
|
11671
11907
|
resetRoundInjectionBudget(session, `${record.plan.planId}:${record.dispatchedAt}`)
|