dsh-workplan 3.0.9 → 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 +5 -0
- package/README.en.md +2 -2
- package/README.md +2 -2
- package/README.zh.md +2 -2
- package/docs/release-notes-3.1.0.md +7 -0
- package/lib/caps.js +43 -0
- package/lib/comm-format.js +2 -2
- package/lib/host.js +8 -6
- package/lib/llm-rules.js +53 -28
- package/lib/plan.js +32 -16
- package/lib/runtime.js +61 -7
- package/lib/v3-contract.js +7 -4
- package/package.json +1 -1
- package/src/caps.ts +49 -0
- package/src/comm-format.ts +2 -1
- package/src/host.ts +8 -6
- package/src/llm-rules.ts +60 -32
- package/src/plan.ts +30 -14
- package/src/runtime.ts +56 -5
- package/src/v3-contract.ts +7 -4
package/src/runtime.ts
CHANGED
|
@@ -159,6 +159,10 @@ import {
|
|
|
159
159
|
} from './lessons.js'
|
|
160
160
|
import { computeMappingDigest, verifyMappingDigest } from './supersede-digest.js'
|
|
161
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'
|
|
162
166
|
import { createProgressWatchdog, describeError } from './watchdog.js'
|
|
163
167
|
import { AUTO_RESUME_DEFAULTS, autoResumeAttemptCap, decideAutoResume, liveResumeCounts } from './auto-resume.js'
|
|
164
168
|
/*
|
|
@@ -371,8 +375,12 @@ export function describeSubagentActivationError(error: any, context: string): Er
|
|
|
371
375
|
* 多个等待者共享一个模块级冷却时间,避免同一毫秒一起撞门(惊群)。
|
|
372
376
|
* 这不是“精确信号量”(宿主没有暴露当前活跃数),而是“有界排队退避”:
|
|
373
377
|
* 空位一出现,等待者按退避节奏自然补位。
|
|
378
|
+
*
|
|
379
|
+
* [3.1.0] 等待上限可用 DSH_WORKPLAN_ACTIVATION_QUEUE_MAX_WAIT_MS 覆盖
|
|
380
|
+
* (默认 10 分钟不变);新增 onWait 回调:每次退避决策后通知调用方,
|
|
381
|
+
* 供派发循环向用户暴露「排队中」状态(排队可见化)。
|
|
374
382
|
*/
|
|
375
|
-
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)
|
|
376
384
|
const ACTIVATION_QUEUE_BASE_DELAY_MS = 1000
|
|
377
385
|
const ACTIVATION_QUEUE_MAX_DELAY_MS = 15000
|
|
378
386
|
let activationQueueCooldownUntil = 0
|
|
@@ -386,6 +394,7 @@ export async function startActivationQueued<T>(
|
|
|
386
394
|
start: () => Promise<T>,
|
|
387
395
|
signal: any,
|
|
388
396
|
context: string,
|
|
397
|
+
onWait?: (info: { waits: number; elapsedMs: number }) => void,
|
|
389
398
|
): Promise<T> {
|
|
390
399
|
const beganAt = Date.now()
|
|
391
400
|
let waits = 0
|
|
@@ -411,6 +420,10 @@ export async function startActivationQueued<T>(
|
|
|
411
420
|
// 全局冷却只增不减:所有等待者共用同一个“下一次可以再试”的时刻。
|
|
412
421
|
activationQueueCooldownUntil = Math.max(activationQueueCooldownUntil, now + backoff)
|
|
413
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
|
+
}
|
|
414
427
|
await sleepAbortable(signal, delay + Math.floor(Math.random() * 250))
|
|
415
428
|
if (signal?.aborted) throw new PlanError('排队等待子代理空位时被取消', 'ABORTED')
|
|
416
429
|
}
|
|
@@ -9160,7 +9173,7 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9160
9173
|
ok: false,
|
|
9161
9174
|
code: 'MISSING_CONSOLIDATION',
|
|
9162
9175
|
subtaskId,
|
|
9163
|
-
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} 名本部门全球顶尖专家;组员角色已取消;每项任务必须极简并附质量要求)。`,
|
|
9164
9177
|
}
|
|
9165
9178
|
}
|
|
9166
9179
|
// [3.0.8] 负责人 review 开工闸:与 direct/dispatch/self_effort 同一
|
|
@@ -9276,6 +9289,10 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9276
9289
|
? parentSession.header.cwd
|
|
9277
9290
|
: undefined)
|
|
9278
9291
|
const delegates: any[] = []
|
|
9292
|
+
// [3.1.0] 排队可见化:派发期间每次「首次退避」记一条用户可见通知,循环结束
|
|
9293
|
+
// 后统一投递(不在工具执行中途重入会话事件流);每成员至多一条,防刷屏。
|
|
9294
|
+
const queueNotices: string[] = []
|
|
9295
|
+
let skippedDone = 0
|
|
9279
9296
|
/*
|
|
9280
9297
|
* [2.5.0][R4] 重试/续跑不丢已完成部分(第三层落点):重派时 row.delegates
|
|
9281
9298
|
* 仍是上一次尝试的台账——为每位下级附上次状态/失败原因/已回报结论与已核实
|
|
@@ -9287,6 +9304,17 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9287
9304
|
// 读取(consolidation 不再携带两轮思考产物)。
|
|
9288
9305
|
const consolidationApproach = Array.isArray((row as any)?.startPhases?.planning?.approach) ? (row as any).startPhases.planning.approach : []
|
|
9289
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
|
+
}
|
|
9290
9318
|
const rulesBrief = buildLlmRulesBrief({
|
|
9291
9319
|
model,
|
|
9292
9320
|
effort: assignment.effort,
|
|
@@ -9296,7 +9324,6 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9296
9324
|
memberName: assignment.member,
|
|
9297
9325
|
memberRole: assignment.role,
|
|
9298
9326
|
})
|
|
9299
|
-
const prior = priorDelegates.find((item: any) => item?.member === assignment.member) ?? null
|
|
9300
9327
|
const retryBrief = prior
|
|
9301
9328
|
? buildDelegateRetryBrief(prior, probeDelegateLandedArtifacts(cwd, assignment.member), consolidationApproach)
|
|
9302
9329
|
: ''
|
|
@@ -9347,6 +9374,10 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9347
9374
|
let childId: string | null = null
|
|
9348
9375
|
let memberStatus = 'running'
|
|
9349
9376
|
let memberError: string | null = null
|
|
9377
|
+
// [3.1.0] 排队计量:只有真的发生退避等待才记录 queuedMs(不把正常激活
|
|
9378
|
+
// 延迟误标成排队)。
|
|
9379
|
+
let memberQueued = false
|
|
9380
|
+
const activationBeganAt = Date.now()
|
|
9350
9381
|
try {
|
|
9351
9382
|
// [3.0.1][P1a] 宿主 subagent.maxDepth < 2 时一次性告警(scope=计划根会话)。
|
|
9352
9383
|
notifyDepthOverrideConflict(ctx, typeof parentSession?.header?.parentSession === 'string' ? parentSession.header.parentSession : (typeof parentId === 'string' ? parentId : null))
|
|
@@ -9372,6 +9403,13 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9372
9403
|
}),
|
|
9373
9404
|
signal,
|
|
9374
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
|
+
},
|
|
9375
9413
|
)
|
|
9376
9414
|
childId = typeof activation?.childId === 'string' ? activation.childId : null
|
|
9377
9415
|
if (activation && typeof activation.result?.then === 'function') {
|
|
@@ -9440,8 +9478,17 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9440
9478
|
error: memberError,
|
|
9441
9479
|
startedAt: Date.now(),
|
|
9442
9480
|
finishedAt: null,
|
|
9481
|
+
// [3.1.0] 排队留痕:status=queued 期间实际等待毫秒数,供看板/复盘展示。
|
|
9482
|
+
...(memberQueued ? { queuedMs: Date.now() - activationBeganAt } : {}),
|
|
9443
9483
|
})
|
|
9444
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
|
+
}
|
|
9445
9492
|
// [2.5.4][T3R1] 分派门禁放行留痕(A3):并入台账 persist,同一动作不二次
|
|
9446
9493
|
// persist(避免 revision 竞争);gateAudit 经 applyStatus 消毒 + durable 回放。
|
|
9447
9494
|
const written = persist({
|
|
@@ -9459,7 +9506,8 @@ export function createWorkplanRuntime(ctx: any, options: WorkplanRuntimeOptions
|
|
|
9459
9506
|
taskEffort: delegationPlan.taskEffort,
|
|
9460
9507
|
effortOverride: written?.effortOverride ?? row.effortOverride ?? null,
|
|
9461
9508
|
...(rejected.length ? { rejected: rejected.map((item) => ({ member: item.member, error: item.error })) } : {}),
|
|
9462
|
-
|
|
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} 名已完成成员(成果已保留,未重复拉起)。` : ''),
|
|
9463
9511
|
}
|
|
9464
9512
|
}
|
|
9465
9513
|
|
|
@@ -11625,7 +11673,10 @@ async function maybePlan(ctx: any, state: any, payload: any, downstream: any, op
|
|
|
11625
11673
|
budget: {
|
|
11626
11674
|
totalMinutes: 0,
|
|
11627
11675
|
childMinutes: 0,
|
|
11628
|
-
|
|
11676
|
+
// [3.1.0] 规划器并发预算环境变量化:宿主不向插件暴露 maxActiveSubagents,
|
|
11677
|
+
// 故以 DSH_WORKPLAN_PLANNER_CONCURRENCY 显式可配(默认不变 = MAX_CONCURRENT)。
|
|
11678
|
+
// 调大宿主 subagent.maxActiveSubagents 后,同步调大此值让规划器按真实并行度排预算。
|
|
11679
|
+
concurrency: envPositiveInt('DSH_WORKPLAN_PLANNER_CONCURRENCY', MAX_CONCURRENT),
|
|
11629
11680
|
maxResumes: Number(options?.limits?.maxResumes ?? MAX_PLAN_RESUMES),
|
|
11630
11681
|
},
|
|
11631
11682
|
})
|
package/src/v3-contract.ts
CHANGED
|
@@ -257,13 +257,16 @@ export function checkAtomicAssignment(task: string, qualityRequirements?: unknow
|
|
|
257
257
|
/** 单个汇报数组的条数上限:精简的量化口径。 */
|
|
258
258
|
export const MAX_REPORT_ITEMS = 6
|
|
259
259
|
/**
|
|
260
|
-
* [3.0.6][第 3 批③] sources(部门汇总「覆盖的专家汇报」)专用上限。
|
|
261
|
-
*
|
|
260
|
+
* [3.0.6][第 3 批③][3.1.0 改数] sources(部门汇总「覆盖的专家汇报」)专用上限。
|
|
261
|
+
* 死锁修复史:复杂任务按用户裁决 D1/D2 强制 ≥8 名专家(上限原 12),而 sources
|
|
262
262
|
* 必须覆盖全部已派发专家——若与其他数组共用 6 条上限,7–12 人的部门永远
|
|
263
263
|
* 交不出合法汇总(覆盖诚实要求 vs 精简上限互相矛盾)。覆盖是硬要求,
|
|
264
|
-
* 故 sources
|
|
264
|
+
* 故 sources 单独放宽;3.1.0 专家上限 12→25,本条数同步 16→30(25 + 余量 5)。
|
|
265
|
+
* 单一真源在 caps.ts(可用 DSH_WORKPLAN_MAX_SOURCES_ITEMS 覆盖),此处 re-export
|
|
266
|
+
* 保持既有 import 路径不变。
|
|
265
267
|
*/
|
|
266
|
-
|
|
268
|
+
import { MAX_SOURCES_ITEMS } from './caps.js'
|
|
269
|
+
export { MAX_SOURCES_ITEMS }
|
|
267
270
|
/** 单条汇报文本的字符上限。 */
|
|
268
271
|
export const MAX_REPORT_ITEM_CHARS = 200
|
|
269
272
|
|