dsh-agent-board 1.7.1 → 1.7.3
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 +40 -15
- package/index.mjs +15 -7
- package/lib/client/board-list.js +37 -5
- package/lib/client/dashboard.js +164 -25
- package/lib/client/kernel.js +84 -13
- package/lib/client/task-detail.js +142 -11
- package/lib/client.js +427 -54
- package/lib/core.mjs +355 -35
- package/lib/dispatch.mjs +1032 -196
- package/lib/health.mjs +43 -11
- package/lib/notify.mjs +42 -12
- package/lib/policy.mjs +17 -1
- package/lib/rpc.mjs +159 -25
- package/lib/session.mjs +7 -2
- package/lib/store.mjs +28 -2
- package/lib/usage.mjs +238 -17
- package/package.json +1 -1
- package/test/core.test.mjs +3469 -88
- package/test/health.test.mjs +86 -4
package/lib/client/kernel.js
CHANGED
|
@@ -219,7 +219,7 @@
|
|
|
219
219
|
|
|
220
220
|
var COLUMNS = ['draft', 'pending', 'in-progress', 'verifying', 'resolved', 'blocked']
|
|
221
221
|
var reqEpoch = 0 // 会话切换纪元:切会话时自增,旧会话在途响应按纪元丢弃
|
|
222
|
-
var state = { sessionId: null, tasks: [], boardMode: 'auto', teamMode: false, workMode: 'auto', minWorkers: 1, maxWorkers: 3, minVerifiers: 0, maxVerifiers: 2, workerModel: '', verifierModel: '', softTimeoutMin: 30, hardTimeoutMin: 120, feedbackEnabled: true, lessonPushed: {}, isRoot: true, open: false, detailId: null, children: [], dragOver: null, dragTask: null, dispatchInfo: '', view: 'board', layoutLeft: 280, layoutRight: 0, poolStatus: null, escalatedIds: [], filterQ: '', filterPrio: [], filterTag: '', selectMode: false, selected: {}, undoSnapshot: null, cardHover: '', archSort: 'time-desc', dateRange: { from: '', to: '' }, rfOpen: false, gboOpen: false, activity: {}, archived: [], archQ: '', globalBoards: [], createOpen: false, createFlash: '', usageSummary: null, childStats: {}, tasksErr: '', tasksHash: '' }
|
|
222
|
+
var state = { sessionId: null, tasks: [], boardMode: 'auto', teamMode: false, workMode: 'auto', minWorkers: 1, maxWorkers: 3, minVerifiers: 0, maxVerifiers: 2, workerModel: '', verifierModel: '', softTimeoutMin: 30, hardTimeoutMin: 120, feedbackEnabled: true, notifyDispatch: true, notifyDone: true, epicSplit: true, lessonPushed: {}, isRoot: true, isRootEverTrue: false, isRootFalseN: 0, isRootStable: true, open: false, detailId: null, children: [], dragOver: null, dragTask: null, dispatchInfo: '', view: 'board', layoutLeft: 280, layoutRight: 0, poolStatus: null, escalatedIds: [], filterQ: '', filterPrio: [], filterTag: '', selectMode: false, selected: {}, undoSnapshot: null, cardHover: '', archSort: 'time-desc', dateRange: { from: '', to: '' }, rfOpen: false, gboOpen: false, activity: {}, archived: [], archQ: '', globalBoards: [], createOpen: false, createFlash: '', usageSummary: null, childStats: {}, tasksErr: '', tasksHash: '' }
|
|
223
223
|
|
|
224
224
|
// #16 快捷键:Esc 逐级关闭(详情→看板→面板);输入框聚焦时不劫持
|
|
225
225
|
try {
|
|
@@ -258,10 +258,54 @@
|
|
|
258
258
|
function clearReadErr() { state.tasksErr = '' } // 仅 fetchTasks 成功路径调用(3s 轮询兜底,任何错误条都能随之消失)
|
|
259
259
|
function readErrText(e) { return String((e && e.message) || e || '网络异常') }
|
|
260
260
|
|
|
261
|
+
// ===== isRoot 蝶变防抖(反馈 n-muuerxv9ijxs / task-muupr8ld)=====
|
|
262
|
+
// 为什么防抖:host rpc.mjs L97 的 isRoot 是每次 get-tasks 现算的
|
|
263
|
+
// (agents.roots() 是否含本会话 id)。生成开始/结束瞬间 agents 树重建,roots() 存在一个
|
|
264
|
+
// 瞬态窗口返回不含本 sid → 单次 isRoot=false 就触发 L303 强收抽屉(state.open=false),
|
|
265
|
+
// 用户表现为「看板在生成状态切换时突然消失,每次都要重新打开」;按钮/面板同病闪烁。
|
|
266
|
+
// 防抖口径:已确认过 true 的会话(everTrue)需连续 IS_ROOT_FALSE_LIMIT 次 false
|
|
267
|
+
// (host 3s 心跳 ≈ 9s)才把 isRootStable 翻成 false——覆盖瞬态窗口,真正降级仍会收敛。
|
|
268
|
+
// 为什么子代理会话不防抖:everTrue=false 的会话(新打开的子代理)立即 isRootStable=false,
|
|
269
|
+
// 保护语义不削弱——子代理会话本就不该出现看板入口/抽屉,即时收起没有代价。
|
|
270
|
+
// 消费口径:强收(本函数)/按钮(BoardButton)/面板(TopPanel)/活动心跳省流(fetchActivity)
|
|
271
|
+
// 四处一律读 isRootStable,不读单次轮询的 state.isRoot 原始值。
|
|
272
|
+
var IS_ROOT_FALSE_LIMIT = 3
|
|
273
|
+
function applyIsRoot(rawIsRoot) {
|
|
274
|
+
state.isRoot = rawIsRoot
|
|
275
|
+
if (rawIsRoot) {
|
|
276
|
+
state.isRootEverTrue = true // 曾确认 true:此后 false 需连续累计(会话生命周期内粘滞,切换会话时重置)
|
|
277
|
+
state.isRootFalseN = 0
|
|
278
|
+
state.isRootStable = true
|
|
279
|
+
} else if (!state.isRootEverTrue) {
|
|
280
|
+
state.isRootStable = false // 从未 true(新打开的子代理会话):即时收起,不防抖
|
|
281
|
+
} else {
|
|
282
|
+
state.isRootFalseN++
|
|
283
|
+
if (state.isRootFalseN >= IS_ROOT_FALSE_LIMIT) state.isRootStable = false // 连续 3 次 false:真降级(子代理树已重建不含本 sid),收敛
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
// ===== 设置开关权威纠偏(反馈:勾选几秒才同步,task-muw5uudk)=====
|
|
288
|
+
// 开关字段(学习反馈/派发回执/完成回执/史诗拆分)在 get-tasks 里**无条件**照常赋值,但取值口径是
|
|
289
|
+
// 「缺字段/脏值=开,只有显式 false 才关」,与 host core.cfg 同口径——单点定义,避免纠偏把脏值当真值。
|
|
290
|
+
function cfgKnobOf(src, key) { return !(src && src[key] === false) }
|
|
291
|
+
// 变更检测:与 notify 同类的轻量浅比较(只看这几个布尔开关;settings 无嵌套对象)。
|
|
292
|
+
function cfgKnobsChanged(a, b) { return a.feedbackEnabled !== b.feedbackEnabled || a.notifyDispatch !== b.notifyDispatch || a.notifyDone !== b.notifyDone || a.epicSplit !== b.epicSplit }
|
|
293
|
+
|
|
261
294
|
function fetchTasks() {
|
|
262
295
|
if (!state.sessionId) return
|
|
263
296
|
var epoch = reqEpoch
|
|
264
|
-
|
|
297
|
+
// ===== 统计范围随轮询带给 host(Token 区的模型分布/Top8/累计要按范围重算)=====
|
|
298
|
+
// 为什么过滤在 host 做:run 级数据(runs[i].usage + runs[i].at)只在 host,客户端只拿聚合,
|
|
299
|
+
// 想按范围裁只能重拉一次 host 聚合——所以范围变化时由 RangeFilter 的 setRange 触发本函数(见 dashboard.js)。
|
|
300
|
+
// 空范围(两端皆空)不传 field:host 收到 undefined 即全量聚合,与老 host 的调用形态完全一致;
|
|
301
|
+
// 绝不用空字符串占位(host 侧 `from`/`to` 空串虽也判为无范围,但少传一个字段就少一处口径分叉)。
|
|
302
|
+
var rgSend = activeRange()
|
|
303
|
+
var rpcArgs = (rgSend.from || rgSend.to) ? { range: rgSend } : undefined
|
|
304
|
+
// 范围守卫:范围已在本轮响应回来前被改掉 → 这份响应属于旧范围,丢弃 usageSummary 赋值
|
|
305
|
+
// (否则旧范围的旧聚合会覆盖新范围的新聚合,用户看到「切了范围数字没变」直到下一次轮询)。
|
|
306
|
+
// 注意 tasksHash 短路只管 tasks:usageSummary 照常赋值(现状已对,保持)。
|
|
307
|
+
var rgKey = rgSend.from + '~' + rgSend.to
|
|
308
|
+
rpc('get-tasks', rpcArgs).then(function (d) {
|
|
265
309
|
if (epoch !== reqEpoch) return // 会话已切换,丢弃过期响应
|
|
266
310
|
if (d && d.error) { reportReadErr('看板数据刷新失败:' + d.error); return } // error 分支:保留旧 tasks/设置,绝不当空板渲染
|
|
267
311
|
clearReadErr()
|
|
@@ -272,6 +316,11 @@
|
|
|
272
316
|
// 老 host 不返回 tasksHash → 恒视为变化,行为与旧版完全一致。
|
|
273
317
|
var newHash = (d && d.tasksHash) || ''
|
|
274
318
|
var tasksChanged = !newHash || newHash !== state.tasksHash
|
|
319
|
+
// 设置开关的权威纠偏(task-muw5uudk):开关不走 tasksHash,hash 不变分支里照常赋值也没有 notify
|
|
320
|
+
// → 勾选框必须等下一次任意 notify 才翻面(安静板卡数秒)。这里在赋值前快照、赋值后比对,
|
|
321
|
+
// 有变化就补一次 notify:乐观更新(PoolCfgPopover)已让点击瞬时翻面,本兜底是服务端权威值纠偏
|
|
322
|
+
// (乐观值与服务端不一致时以服务端为准,失败回滚亦由此收敛)。
|
|
323
|
+
var cfgKnobs = { feedbackEnabled: state.feedbackEnabled, notifyDispatch: state.notifyDispatch, notifyDone: state.notifyDone, epicSplit: state.epicSplit }
|
|
275
324
|
if (tasksChanged) {
|
|
276
325
|
state.tasksHash = newHash
|
|
277
326
|
state.tasks = (d && d.tasks) || []
|
|
@@ -290,7 +339,18 @@
|
|
|
290
339
|
state.softTimeoutMin = (d && d.softTimeoutMin) || 30
|
|
291
340
|
state.hardTimeoutMin = (d && d.hardTimeoutMin) || 120
|
|
292
341
|
state.poolStatus = (d && d.poolStatus) || null
|
|
293
|
-
|
|
342
|
+
// token 消耗聚合(board 级,host 端现算):范围守卫——响应回来时范围若已变,保留旧值不覆盖
|
|
343
|
+
// (新范围的那次请求会带着新聚合回来;老 host 不返回该字段 → null,零渲染)
|
|
344
|
+
// ===== usageSummary 变化检测(task-muwq9u04:选范围不重渲染)=====
|
|
345
|
+
// 病根:范围切换只让 state.usageSummary 换对象,tasksHash 与四个 cfg 开关都不变 → 无 notify
|
|
346
|
+
// → Token 区冻在旧数字上,要等下一次任意 notify(改任务/切开关)才翻新。
|
|
347
|
+
// 为什么用「上一次的 JSON 串」比对而不是对象引用:host 每次 get-tasks 都现算聚合、**必然返回新对象**
|
|
348
|
+
// (引用比较恒真)→ 3s 轮询每轮都 notify,tasksHash 的渲染节约当场作废。JSON 串只在这份聚合
|
|
349
|
+
// 真变了时才不等(KB 级体积、3s 一次,代价可忽略);赋值前先快照,赋值后比对。
|
|
350
|
+
var usageJsonPrev = JSON.stringify(state.usageSummary || null)
|
|
351
|
+
var rgNow = activeRange()
|
|
352
|
+
if (rgKey === (rgNow.from + '~' + rgNow.to)) state.usageSummary = (d && d.usageSummary) || null
|
|
353
|
+
var usageDelta = !tasksChanged && JSON.stringify(state.usageSummary || null) !== usageJsonPrev
|
|
294
354
|
// 架构健康提示(架构自省 L1):与 tasks 同源透传,HealthHints 组件直接读 state.healthHints,
|
|
295
355
|
// 不再自持 rpc('get-tasks')——消灭仪表盘打开期间的双轮询。老 host 无此字段 → 空数组零渲染
|
|
296
356
|
state.healthHints = (d && Array.isArray(d.healthHints)) ? d.healthHints : []
|
|
@@ -298,9 +358,18 @@
|
|
|
298
358
|
// 缺省兼容——老 host 不返回该字段时置空对象,卡片/详情层遇空一律不渲染相关元素
|
|
299
359
|
state.childStats = (d && d.childStats) || {}
|
|
300
360
|
// 学习飞轮 v1 能力检测:老 host 不返回该字段 → 视为开启(默认开);只有显式 false 才关。
|
|
301
|
-
state.feedbackEnabled =
|
|
302
|
-
|
|
303
|
-
|
|
361
|
+
state.feedbackEnabled = cfgKnobOf(d, 'feedbackEnabled')
|
|
362
|
+
// 回执开关(设置区「通知」):同口径——老 host 不返回 → 视为开,只有显式 false 才关
|
|
363
|
+
state.notifyDispatch = cfgKnobOf(d, 'notifyDispatch')
|
|
364
|
+
state.notifyDone = cfgKnobOf(d, 'notifyDone')
|
|
365
|
+
// 史诗拆分总开关(设置区「功能」):同上——老 host 不返回 = 开(引导照旧),只有显式 false 才关
|
|
366
|
+
state.epicSplit = cfgKnobOf(d, 'epicSplit')
|
|
367
|
+
// 开关有变 / Token 区聚合有变 → 补一次 notify(tasksChanged 分支已在上面 notify 过,
|
|
368
|
+
// 这里只管 hash 不变时被跳过的那两次:开关乐观更新纠偏 + 统计范围切换后的新聚合)
|
|
369
|
+
var cfgDelta = !tasksChanged && cfgKnobsChanged(cfgKnobs, state)
|
|
370
|
+
if (cfgDelta || usageDelta) notify()
|
|
371
|
+
applyIsRoot(!d || d.isRoot !== false) // 原始值只喂给防抖器,消费点一律读 isRootStable
|
|
372
|
+
if (!state.isRootStable && state.open) { state.open = false; state.detailId = null } // 子代理会话(含连续 3 次 false 的真降级):强制收起看板
|
|
304
373
|
if (d && d.dispatchInfo && d.dispatchInfoAt && Date.now() - new Date(d.dispatchInfoAt).getTime() < 120000) { state.dispatchInfo = d.dispatchInfo } else { state.dispatchInfo = '' } // 瞬时通知 2min 内有效,过期强制清空(服务端写后不清曾致残留数天)
|
|
305
374
|
// escalation 一等公民:出现新的待裁决任务 → 面板自动弹开直达该任务详情
|
|
306
375
|
// (escalation.question 在 tasksHash 序列化口径内:新歧义必然改变 hash → 必然走变化分支,不会漏弹)
|
|
@@ -318,7 +387,7 @@
|
|
|
318
387
|
|
|
319
388
|
// 活动心跳:对进行中/验收中的任务轮询子代理最近动作(卡片与详情展示"现在跑到哪了")
|
|
320
389
|
function fetchActivity() {
|
|
321
|
-
if (!state.sessionId || !state.
|
|
390
|
+
if (!state.sessionId || !state.isRootStable || !state.open) return // 面板关闭时不轮询活动(省同步 I/O);isRootStable 口径见 isRoot 蝶变防抖
|
|
322
391
|
var running = state.tasks.filter(function (t) { return t.status === 'in-progress' || t.status === 'verifying' })
|
|
323
392
|
if (!running.length) { if (Object.keys(state.activity).length) { state.activity = {}; notify() } return }
|
|
324
393
|
var pending = running.length
|
|
@@ -469,9 +538,9 @@
|
|
|
469
538
|
function BoardButton(props) {
|
|
470
539
|
var _R = React; var useState = _R.useState, useEffect = _R.useEffect
|
|
471
540
|
var _a = useState(0), pendingCount = _a[0], setPendingCount = _a[1]; var _b = useState(false), isOpen = _b[0], setIsOpen = _b[1]; var _c = useState(0), escCount = _c[0], setEscCount = _c[1]; var _d2 = useState(true), isRoot = _d2[0], setIsRoot = _d2[1]
|
|
472
|
-
useEffect(function () { if (props && props.sessionId) { var sid = String(props.sessionId); if (state.sessionId !== sid) { state.sessionId = sid; reqEpoch++; state.tasks = []; state.tasksHash = ''; state.children = []; state.activity = {}; state.archived = []; state.detailId = null; state.childStats = {}; state.tasksErr = ''; notify(); fetchTasks(); fetchChildren() } } }, [props && props.sessionId])
|
|
473
|
-
useEffect(function () { function update() { var n = 0, e = 0; for (var i = 0; i < state.tasks.length; i++) { if (state.tasks[i].status === 'pending') n++; if (state.tasks[i].escalation) e++ }; setPendingCount(n); setEscCount(e); setIsOpen(state.open); setIsRoot(state.
|
|
474
|
-
if (!isRoot) return null //
|
|
541
|
+
useEffect(function () { if (props && props.sessionId) { var sid = String(props.sessionId); if (state.sessionId !== sid) { state.sessionId = sid; reqEpoch++; state.tasks = []; state.tasksHash = ''; state.children = []; state.activity = {}; state.archived = []; state.detailId = null; state.childStats = {}; state.tasksErr = ''; state.isRootEverTrue = false; state.isRootFalseN = 0; state.isRootStable = false; notify(); fetchTasks(); fetchChildren() } } }, [props && props.sessionId]) // 会话切换重置 isRoot 防抖态(everTrue/计数/stable 都按会话生命周期——旧会话的"曾确认 true"不得漂到新会话);reset 后首轮 get-tasks 判定前按"未确认 root"保守隐藏,避免切进子代理会话时入口闪现
|
|
542
|
+
useEffect(function () { function update() { var n = 0, e = 0; for (var i = 0; i < state.tasks.length; i++) { if (state.tasks[i].status === 'pending') n++; if (state.tasks[i].escalation) e++ }; setPendingCount(n); setEscCount(e); setIsOpen(state.open); setIsRoot(state.isRootStable) }; listeners.push(update); update(); return function () { var i = listeners.indexOf(update); if (i >= 0) listeners.splice(i, 1) } }, [])
|
|
543
|
+
if (!isRoot) return null // 子代理会话不显示看板入口(读 isRootStable:瞬态 false 不收,见 isRoot 蝶变防抖)
|
|
475
544
|
return React.createElement('button', { onClick: function () { state.open = !state.open; notify() }, title: '智能看板' + (pendingCount > 0 ? '(' + pendingCount + ' 待办)' : '') + (escCount > 0 ? '(' + escCount + ' 待裁决)' : ''), style: { display: 'inline-flex', alignItems: 'center', gap: 4, padding: '3px 10px', border: '1px solid ' + (escCount > 0 ? C.err : C.border), borderRadius: 6, background: isOpen ? C.nested : 'transparent', color: C.text, cursor: 'pointer', fontSize: 12 } }, React.createElement('span', { style: { display: 'inline-flex', alignItems: 'center' } }, ic('clipboard-list', 14)), React.createElement('span', null, '智能看板'), escCount > 0 ? React.createElement('span', { style: { minWidth: 16, height: 16, padding: '0 4px', borderRadius: 8, background: C.err, color: C_INV, fontSize: 10, fontWeight: 700, display: 'inline-flex', alignItems: 'center', justifyContent: 'center', gap: 1, animation: 'tskb-pulse 1s ease-in-out infinite' }, title: escCount + ' 个任务待裁决' }, ic('alert-triangle', 10), escCount) : null, pendingCount > 0 ? React.createElement('span', { style: { minWidth: 16, height: 16, padding: '0 4px', borderRadius: 8, background: C.brand, color: C_INV, fontSize: 10, fontWeight: 600, display: 'inline-flex', alignItems: 'center', justifyContent: 'center' } }, String(pendingCount)) : null)
|
|
476
545
|
}
|
|
477
546
|
|
|
@@ -487,9 +556,11 @@
|
|
|
487
556
|
var _te = useState(state.tasksErr), tasksErr = _te[0], setTasksErr = _te[1] // 读路径错误条(无错不渲染)
|
|
488
557
|
var _sto = useState(state.softTimeoutMin), softT = _sto[0], setSoftT = _sto[1]; var _hto = useState(state.hardTimeoutMin), hardT = _hto[0], setHardT = _hto[1]
|
|
489
558
|
var _fbo = useState(state.feedbackEnabled), fbEnabled = _fbo[0], setFbEnabled = _fbo[1]
|
|
490
|
-
|
|
559
|
+
var _ndo = useState(state.notifyDispatch), ndOn = _ndo[0], setNdOn = _ndo[1]; var _nno = useState(state.notifyDone), nnOn = _nno[0], setNnOn = _nno[1]
|
|
560
|
+
var _eso = useState(state.epicSplit), esOn = _eso[0], setEsOn = _eso[1] // 史诗拆分总开关勾选态(设置区「功能」)
|
|
561
|
+
useEffect(function () { function update() { setOpen(state.open); setTasksState(state.tasks); setModeState(state.boardMode); setDetailId(state.detailId); setDragOver(state.dragOver); setDispatchInfo(state.dispatchInfo); setViewState(state.view); setLayL(state.layoutLeft); setLayR(state.layoutRight); setMinW(state.minWorkers); setMaxW(state.maxWorkers); setMinV(state.minVerifiers); setMaxV(state.maxVerifiers); setWorkerModel(state.workerModel); setVerifierModel(state.verifierModel); setTeamMode(state.teamMode); setWorkModeState(state.workMode); setDR(state.dateRange); setSoftT(state.softTimeoutMin); setHardT(state.hardTimeoutMin); setFbEnabled(state.feedbackEnabled); setNdOn(state.notifyDispatch); setNnOn(state.notifyDone); setEsOn(state.epicSplit); setCreateOpen(state.createOpen); setCreateFlash(state.createFlash); setTasksErr(state.tasksErr) }; listeners.push(update); update(); return function () { var i = listeners.indexOf(update); if (i >= 0) listeners.splice(i, 1) } }, [])
|
|
491
562
|
if (!open) return null
|
|
492
|
-
if (state.
|
|
563
|
+
if (!state.isRootStable) return null // 子代理会话不渲染看板面板(读 isRootStable:瞬态 false 不闪,见 isRoot 蝶变防抖)
|
|
493
564
|
var active = tasks.filter(function (t) { return t.status !== 'archived' }); var archived = tasks.filter(function (t) { return t.status === 'archived' })
|
|
494
565
|
var hasFilter = state.filterQ.trim() || state.filterPrio.length > 0 || state.filterTag
|
|
495
566
|
if (hasFilter) { active = active.filter(passFilter); archived = archived.filter(passFilter) }
|
|
@@ -513,7 +584,7 @@
|
|
|
513
584
|
React.createElement('div', { style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', padding: '6px 12px', borderBottom: '1px solid ' + C.border, flexShrink: 0, flexWrap: 'wrap', gap: 4 } },
|
|
514
585
|
React.createElement('div', { style: { display: 'flex', alignItems: 'center', gap: 6 } }, React.createElement('span', { style: { fontWeight: 600, fontSize: 13, color: C.text, display: 'inline-flex', alignItems: 'center', gap: 5 } }, ic('clipboard-list', 15), '智能看板'), React.createElement(ViewTab, null), React.createElement(PoolStatus, null)),
|
|
515
586
|
React.createElement('div', { style: { display: 'flex', alignItems: 'center', gap: 4, flexWrap: 'wrap' } },
|
|
516
|
-
React.createElement(PoolCfgPopover, { minW: minW, maxW: maxW, minV: minV, maxV: maxV, workerModel: workerModel, verifierModel: verifierModel, softT: softT, hardT: hardT, feedbackEnabled: fbEnabled }),
|
|
587
|
+
React.createElement(PoolCfgPopover, { minW: minW, maxW: maxW, minV: minV, maxV: maxV, workerModel: workerModel, verifierModel: verifierModel, softT: softT, hardT: hardT, feedbackEnabled: fbEnabled, notifyDispatch: ndOn, notifyDone: nnOn, epicSplit: esOn }),
|
|
517
588
|
dispatchInfo ? React.createElement('span', { style: { fontSize: 9, color: C.brand, maxWidth: 120, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }, title: dispatchInfo }, dispatchInfo) : null,
|
|
518
589
|
React.createElement('button', { onClick: function () { state.createOpen = true; notify() }, title: '新建任务(可存为草稿)', style: { fontSize: 11, padding: '3px 8px', border: '1px solid ' + C.border, borderRadius: 6, cursor: 'pointer', background: 'transparent', color: C.text2, display: 'inline-flex', alignItems: 'center', gap: 3 } }, ic('plus', 11), '新建任务'),
|
|
519
590
|
createFlash ? React.createElement('span', { style: { fontSize: 10, color: C.ok } }, createFlash) : null,
|
|
@@ -69,30 +69,155 @@
|
|
|
69
69
|
|
|
70
70
|
// 父子区块(与 DepsSection 并列):
|
|
71
71
|
// 子卡 = 父链面包屑「↳ 史诗:<父标题>」,点击回跳父卡详情;
|
|
72
|
-
// 父卡 =
|
|
72
|
+
// 父卡 = 子任务清单(状态色点 + 标题 + 状态标签,点击直达子卡详情;标题行汇总 settled/total)。
|
|
73
|
+
// 归档留档(反馈 task-muupgfot):清单**含已归档子任务**——归档后子任务不该从详情消失,
|
|
74
|
+
// 否则史诗拆分过程整段丢失、只剩一个分母缩水的数字。归档行灰化(降透明度 + 次要文字色)
|
|
75
|
+
// + 行尾「已归档」徽章,并沉底排在未归档之后(稳定排序:未归档保持 state.tasks 既有顺序);
|
|
76
|
+
// 仅降视觉权重不改交互——点击照旧进子卡详情看留档。
|
|
77
|
+
// 口径与卡片 📦 徽章同源:settled = resolved | cancelled | archived(宿主 aggregateChildStats 的
|
|
78
|
+
// settled/resolved 字段),total 含归档,所以详情与卡片永远显示同一个 N/M。
|
|
73
79
|
// 数据源是 state.tasks 按 parentId 现算(parentId 为老字段),不依赖 host 的 childStats,天然缺省兼容;
|
|
74
80
|
// 既无父也无子的普通卡整块不渲染。嵌套史诗(本身也是子卡的父卡)两段同区块上下排列。
|
|
75
81
|
function FamilySection(props) {
|
|
76
82
|
var task = props.task
|
|
77
83
|
var parentT = task.parentId ? getTask(task.parentId) : null
|
|
78
|
-
|
|
84
|
+
// 不按状态过滤(归档也要留在清单里);仅按「是否归档」稳定排序把归档沉底(V8 sort 稳定,未归档保序)
|
|
85
|
+
var kids = state.tasks.filter(function (x) { return x.parentId === task.id })
|
|
86
|
+
.sort(function (a, b) { return (a.status === 'archived' ? 1 : 0) - (b.status === 'archived' ? 1 : 0) })
|
|
79
87
|
if (!task.parentId && kids.length === 0) return null
|
|
80
|
-
var
|
|
88
|
+
var settledN = kids.filter(function (x) { return x.status === 'resolved' || x.status === 'cancelled' || x.status === 'archived' }).length
|
|
81
89
|
function jump(id) { state.detailId = id; notify() }
|
|
82
90
|
return React.createElement('div', { style: { marginBottom: 8, padding: '6px 8px', border: '1px solid ' + C.border, borderRadius: 6, background: C.card } },
|
|
83
91
|
task.parentId ? React.createElement('div', { style: { fontSize: 11, marginBottom: kids.length ? 6 : 0 } },
|
|
84
92
|
React.createElement('span', { style: { color: C.text2, fontWeight: 600 } }, '↳ 史诗:'),
|
|
85
93
|
React.createElement('span', { onClick: function () { if (parentT) jump(task.parentId) }, title: parentT ? parentT.title + ' (' + task.parentId + ')' : task.parentId, style: { color: parentT ? C.brand : C.text2, cursor: parentT ? 'pointer' : 'default', fontWeight: 600 } }, parentT && parentT.title ? parentT.title : shortId(task.parentId))) : null,
|
|
86
94
|
kids.length > 0 ? React.createElement('div', null,
|
|
87
|
-
React.createElement('div', { style: { fontSize: 11, fontWeight: 600, color: C.text2, marginBottom: 4 } }, '📦 子任务 · ' +
|
|
95
|
+
React.createElement('div', { style: { fontSize: 11, fontWeight: 600, color: C.text2, marginBottom: 4 } }, '📦 子任务 · ' + settledN + '/' + kids.length + ' 已了结'),
|
|
88
96
|
kids.map(function (x) {
|
|
89
|
-
|
|
97
|
+
var arch = x.status === 'archived'
|
|
98
|
+
return React.createElement('div', { key: x.id, onClick: function () { jump(x.id) }, title: (statusLabels[x.status] || x.status) + ' · ' + x.id + (arch ? ' · 已归档留档(点击查看)' : ''), style: { display: 'flex', alignItems: 'center', gap: 6, marginBottom: 3, fontSize: 10, cursor: 'pointer', opacity: arch ? 0.55 : 1 } },
|
|
90
99
|
React.createElement('span', { style: { width: 7, height: 7, borderRadius: '50%', background: statusColors[x.status] || C.text2, flexShrink: 0 } }),
|
|
91
|
-
React.createElement('span', { style: { color: C.brand, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, x.title || x.id),
|
|
92
|
-
|
|
100
|
+
React.createElement('span', { style: { color: arch ? C.text2 : C.brand, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, x.title || x.id),
|
|
101
|
+
arch
|
|
102
|
+
? React.createElement('span', { style: { fontSize: 9, padding: '0 4px', borderRadius: 2, background: C.nested, color: C.text2, border: '1px solid ' + C.border, flexShrink: 0 } }, '已归档')
|
|
103
|
+
: React.createElement('span', { style: { fontSize: 9, color: C.text2, flexShrink: 0 } }, statusLabels[x.status] || x.status))
|
|
93
104
|
})) : null)
|
|
94
105
|
}
|
|
95
106
|
|
|
107
|
+
// ===== Hooks(可选点位)· 史诗前置/后置 agent run 的编辑与状态面板(task-muuw56yf)=====
|
|
108
|
+
// 契约以 host core.normalizeHooks / mergeHooks 为准(勿凭记忆改字段名):
|
|
109
|
+
// epic.hooks = { pre: { enabled, prompt, state, runId, pending? }, post: 同构 },state ∈ idle|running|done|failed;
|
|
110
|
+
// hook run 记在 epic.runs[](role 'hook-pre'/'hook-post',字段 { role, id, at, endedAt, outcome, model })。
|
|
111
|
+
// 写入通道 = update-task RPC 的 hooks 字段(浅合并:未提交的点位保留原值,传 null 撤点位)。
|
|
112
|
+
// 三条 UI 口径:
|
|
113
|
+
// ① 老卡零渲染:既无子任务、也未声明 hooks 的普通卡整块不出现(与卡片相位徽章同一门禁);
|
|
114
|
+
// ② 权限不在 UI 判断——「hooks 仅主窗口可设」由 host 双重门禁裁决,失败原因原样 ⚠️ 回显;
|
|
115
|
+
// 客户端预判角色只会把真实错误变成灰按钮,反而更难查;
|
|
116
|
+
// ③ state 只读展示(host 状态机推进,重启可恢复);重试=把 state 置回 idle,走裁决通道,
|
|
117
|
+
// 这里只负责给 failed 一个「前往裁决」锚点,不另造裁决入口。
|
|
118
|
+
function hookRunOf(task, phase, runId) {
|
|
119
|
+
var role = 'hook-' + phase
|
|
120
|
+
// host 侧 run id 落位不对称:pre 在 spawn 成功时回填 hooks.pre.runId,post 复用 verifierRun 位
|
|
121
|
+
// (claim 占位换真 id);且两端结算都把 runId 归零——所以取不到时按角色回退「最后一条」。
|
|
122
|
+
var rid = runId || (phase === 'post' ? task.verifierRun : null)
|
|
123
|
+
var runs = Array.isArray(task.runs) ? task.runs : []
|
|
124
|
+
var hit = null
|
|
125
|
+
for (var i = 0; i < runs.length; i++) {
|
|
126
|
+
if (!runs[i] || runs[i].role !== role) continue
|
|
127
|
+
if (rid && runs[i].id !== rid) continue
|
|
128
|
+
hit = runs[i] // 顺序遍历取最后一条匹配:重试后的新 run 覆盖旧展示
|
|
129
|
+
}
|
|
130
|
+
return hit
|
|
131
|
+
}
|
|
132
|
+
function hookStateMeta(task, phase) {
|
|
133
|
+
var h = (task.hooks && task.hooks[phase]) || null
|
|
134
|
+
var st = (h && h.state) || 'idle'
|
|
135
|
+
var off = !h || !h.enabled
|
|
136
|
+
var run = hookRunOf(task, phase, h && h.runId)
|
|
137
|
+
var meta = { idle: { label: off ? '未启用' : '待运行', color: C.text2 }, running: { label: '运行中', color: C.brand }, done: { label: '已完成', color: C.ok }, failed: { label: '失败', color: C.err } }[st] || { label: String(st), color: C.text2 }
|
|
138
|
+
// 耗时:运行中 = 距 spawn 的已跑时长;已落定 = spawn → endedAt 净耗时(老 run 无 endedAt 则不显示)
|
|
139
|
+
var dur = ''
|
|
140
|
+
if (run && run.at) {
|
|
141
|
+
if (st === 'running') dur = '已跑 ' + elapsedSince(run.at)
|
|
142
|
+
else if (run.endedAt) dur = '耗时 ' + fmtDur(new Date(run.at).getTime(), new Date(run.endedAt).getTime())
|
|
143
|
+
}
|
|
144
|
+
return { state: st, off: off, label: meta.label, color: meta.color, run: run, dur: dur }
|
|
145
|
+
}
|
|
146
|
+
function HooksSection(props) {
|
|
147
|
+
var _R = React; var useState = _R.useState // 与全库组件同例:bundler 只注入 React 本体,hook 须自行解构(漏了就是运行期 ReferenceError,shell 容错层直接卸载整个 overlay——2026-10-05 详情页崩板事故)
|
|
148
|
+
var task = props.task
|
|
149
|
+
var kHooks = task.hooks || null
|
|
150
|
+
var _a = useState(''), msg = _a[0], setMsg = _a[1]
|
|
151
|
+
var _b = useState(false), saving = _b[0], setSaving = _b[1]
|
|
152
|
+
// 编辑缓冲以「卡上现值」为初值;父层以 key=task.id 挂载 → 切换任务自动重挂,缓冲不会串卡
|
|
153
|
+
var _c = useState({ pre: { enabled: !!(kHooks && kHooks.pre && kHooks.pre.enabled), prompt: (kHooks && kHooks.pre && kHooks.pre.prompt) || '' }, post: { enabled: !!(kHooks && kHooks.post && kHooks.post.enabled), prompt: (kHooks && kHooks.post && kHooks.post.prompt) || '' } }), buf = _c[0], setBuf = _c[1]
|
|
154
|
+
var kids = state.tasks.filter(function (x) { return x.parentId === task.id })
|
|
155
|
+
var declared = !!(kHooks && (kHooks.pre || kHooks.post))
|
|
156
|
+
if (kids.length === 0 && !declared) return null
|
|
157
|
+
function setPhase(ph, patch) { var nb = { pre: buf.pre, post: buf.post }; nb[ph] = Object.assign({}, nb[ph], patch); setBuf(nb) }
|
|
158
|
+
// 提交体组装(三条口径缺一都踩坑):
|
|
159
|
+
// a) prompt 清空 = 撤掉该点位:host normalizeHooks 明确拒绝空 prompt,撤点位用 null 表达才在契约内
|
|
160
|
+
// (不该把「我不想要这个 hook 了」变成一条报错);**例外**——该点位 state='running' 时不清空:
|
|
161
|
+
// run 还在飞,撤掉声明会让它的结算落到空点位(表现为白跑一轮),删除意图原样保留并回一行提示;
|
|
162
|
+
// b) 已声明点位的 state/runId/pending 原样回传:normalizeHooks 对缺省 state 归零成 idle,
|
|
163
|
+
// 不透传就等于「改一下 prompt 把在跑/已落定的 hook 打回待运行」;
|
|
164
|
+
// c) 凑不出 prompt 的点位一律提交 null(幂等删除,不凭空造点位)。
|
|
165
|
+
function payloadFor(ph) {
|
|
166
|
+
var cur = (task.hooks && task.hooks[ph]) || null
|
|
167
|
+
var b = buf[ph] || { enabled: false, prompt: '' }
|
|
168
|
+
function keep(h) { var it = { enabled: !!h.enabled, prompt: String(h.prompt || '') }; if (h.state) it.state = h.state; if (h.runId) it.runId = h.runId; if (h.pending) it.pending = true; return it }
|
|
169
|
+
if (!String(b.prompt || '').trim()) {
|
|
170
|
+
if (cur && cur.state === 'running') return { item: keep(cur), warn: ph + ' 运行中:本次不清空该点位(run 还在跑),等它跑完再撤' }
|
|
171
|
+
return { item: null }
|
|
172
|
+
}
|
|
173
|
+
var item = { enabled: !!b.enabled, prompt: String(b.prompt).slice(0, 4000) }
|
|
174
|
+
if (cur) {
|
|
175
|
+
if (cur.state) item.state = cur.state
|
|
176
|
+
if (cur.runId) item.runId = cur.runId
|
|
177
|
+
if (cur.pending) item.pending = true
|
|
178
|
+
}
|
|
179
|
+
return { item: item }
|
|
180
|
+
}
|
|
181
|
+
function save() {
|
|
182
|
+
if (saving) return
|
|
183
|
+
var pre = payloadFor('pre'), post = payloadFor('post')
|
|
184
|
+
var warns = [pre.warn, post.warn].filter(Boolean)
|
|
185
|
+
setSaving(true); setMsg('')
|
|
186
|
+
rpc('update-task', { taskId: task.id, hooks: { pre: pre.item, post: post.item } }).then(function (r) {
|
|
187
|
+
setSaving(false)
|
|
188
|
+
if (r && r.ok === false) { setMsg('⚠️ ' + (r.error || '保存失败')); return }
|
|
189
|
+
setMsg(warns.length ? '⚠️ ' + warns.join(';') : '✅ 已保存 hooks 配置')
|
|
190
|
+
fetchTasks()
|
|
191
|
+
}).catch(function (e) { setSaving(false); setMsg('⚠️ ' + String(e)) })
|
|
192
|
+
}
|
|
193
|
+
// 「前往裁决」= 同页锚点跳转(裁决区 id 固定 tskb-escalation,由 DetailView 渲染);
|
|
194
|
+
// hook 失败时 host 已把 epic 转 blocked 并挂好 escalation,这里只把视线送过去。
|
|
195
|
+
function goArbitration() { var el = document.getElementById('tskb-escalation'); if (el && el.scrollIntoView) el.scrollIntoView({ block: 'center' }) }
|
|
196
|
+
function phaseRow(ph, title, hint) {
|
|
197
|
+
var m = hookStateMeta(task, ph)
|
|
198
|
+
var b = buf[ph] || { enabled: false, prompt: '' }
|
|
199
|
+
return React.createElement('div', { key: ph, style: { marginBottom: 6, padding: '5px 7px', border: '1px solid ' + C.border, borderRadius: 5, background: C.nested } },
|
|
200
|
+
React.createElement('div', { style: { display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap', marginBottom: 4 } },
|
|
201
|
+
React.createElement('label', { style: { fontSize: 11, fontWeight: 600, color: C.text, display: 'inline-flex', alignItems: 'center', gap: 4, cursor: 'pointer' } },
|
|
202
|
+
React.createElement('input', { type: 'checkbox', checked: !!b.enabled, onChange: function (e) { setPhase(ph, { enabled: e.target.checked }) }, title: '启用该点位(停用后 host 全链路跳过它)' }),
|
|
203
|
+
title),
|
|
204
|
+
React.createElement('span', { title: 'state 由 host 状态机推进(写在卡上,重启可恢复);失败后重试=把 state 置回 idle,走裁决通道', style: { fontSize: 9, padding: '0 5px', borderRadius: 3, background: 'color-mix(in srgb, ' + m.color + ' 16%, transparent)', color: m.color, fontWeight: 600 } }, m.label),
|
|
205
|
+
m.dur ? React.createElement('span', { style: { fontSize: 9, color: C.text2 } }, m.dur) : null,
|
|
206
|
+
m.run && m.run.id ? React.createElement('button', { onClick: function () { if (uiWorkspaceSvc) uiWorkspaceSvc.openSession(m.run.id) }, title: '查看该 hook run 的会话(' + m.run.id + (m.run.model ? ' · ' + m.run.model : '') + ')', style: { fontSize: 9, padding: '1px 6px', border: '1px solid ' + C.brand, borderRadius: 3, background: 'transparent', color: C.brand, cursor: 'pointer' } }, '→ 查看会话') : null,
|
|
207
|
+
m.state === 'failed' ? React.createElement('button', { onClick: goArbitration, title: '跳到本页裁决区:重试(置回 idle)/ 跳过(置 done 放行)/ 放弃(终止史诗)', style: { fontSize: 9, padding: '1px 6px', border: 'none', borderRadius: 3, background: C.err, color: C_INV, cursor: 'pointer', fontWeight: 600 } }, '前往裁决') : null),
|
|
208
|
+
React.createElement('textarea', { value: b.prompt, onChange: function (e) { setPhase(ph, { prompt: e.target.value }) }, rows: 2, placeholder: '补充指令(可选)——前置=让子任务具备开跑条件;后置=把这批活收口。具体动作由 hook agent 自行决策', style: { width: '100%', fontSize: 11, padding: '4px 6px', border: '1px solid ' + C.border2, borderRadius: 4, background: C.card, color: C.text, resize: 'vertical', boxSizing: 'border-box', fontFamily: 'inherit' } }),
|
|
209
|
+
React.createElement('div', { style: { fontSize: 9, color: C.text2, marginTop: 3, lineHeight: 1.6 } }, hint))
|
|
210
|
+
}
|
|
211
|
+
return React.createElement('div', { style: { marginBottom: 8, padding: '6px 8px', border: '1px solid ' + C.border, borderRadius: 6, background: C.card } },
|
|
212
|
+
React.createElement('div', { style: { fontSize: 11, fontWeight: 600, color: C.text2, marginBottom: 4, display: 'flex', alignItems: 'center', gap: 4 } }, ic('zap', 11), 'Hooks(可选点位)'),
|
|
213
|
+
phaseRow('pre', '⏳ 前置(pre)', '让子任务具备开跑条件:未完成前该史诗的子任务一张都不派(串行闸门)。'),
|
|
214
|
+
phaseRow('post', '🧪 收尾(post)', '把这批活收口:全部子任务了结后跑一遍,完成后史诗才转验证中。'),
|
|
215
|
+
React.createElement('div', { style: { display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap' } },
|
|
216
|
+
React.createElement('button', { onClick: save, disabled: saving, title: '保存到卡上(update-task RPC,hooks 字段浅合并)', style: { fontSize: 10, padding: '3px 8px', border: 'none', borderRadius: 3, background: C.brand, color: C_INV, cursor: saving ? 'default' : 'pointer', opacity: saving ? 0.6 : 1, fontWeight: 600, display: 'inline-flex', alignItems: 'center', gap: 3 } }, saving ? '保存中…' : [ic('save', 10), ' 保存 hooks']),
|
|
217
|
+
msg ? React.createElement('span', { style: { fontSize: 10, color: C.text2 } }, msg) : null),
|
|
218
|
+
React.createElement('div', { style: { fontSize: 9, color: C.text2, marginTop: 4, lineHeight: 1.6 } }, '每个点位是一次真实 agent 运行(不是声明式命令):prompt 只给薄框架契约与上下文,动作由 hook agent 自行决策,吃不准会歧义上报;失败即转阻塞等人裁决(重试/跳过/放弃),不会自动重跑。清空 prompt 保存 = 撤掉该点位。hooks 仅主窗口可设(host 门禁,失败原因原样回显)。'))
|
|
219
|
+
}
|
|
220
|
+
|
|
96
221
|
function DetailView() {
|
|
97
222
|
var _R = React; var useState = _R.useState, useEffect = _R.useEffect; var task = getTask(state.detailId)
|
|
98
223
|
var _a = useState(task ? task.title : ''), editTitle = _a[0], setEditTitle = _a[1]; var _b = useState(task ? task.description || '' : ''), editDesc = _b[0], setEditDesc = _b[1]; var _c = useState(false), saving = _c[0], setSaving = _c[1]; var _d = useState(state.boardMode), mode = _d[0], setMode = _d[1]
|
|
@@ -115,7 +240,7 @@
|
|
|
115
240
|
if (r && r.ok === false && r.error === 'touches-conflict') {
|
|
116
241
|
var ids = Array.isArray(r.conflicts) ? r.conflicts : []
|
|
117
242
|
var names = ids.map(function (id) { var t2 = getTask(id); return (t2 ? t2.title : id) + ' (' + id + ')' }).join('、')
|
|
118
|
-
if (window.confirm('⚠️
|
|
243
|
+
if (window.confirm('⚠️ 文件锁冲突:以下任务正持有同一批文件(touches 重叠;in-progress/verifying 卡持锁,状态流转到 resolved/cancelled/归档 即自动放行):\n\n' + (names || ids.join('、')) + '\n\n强行并行可能互相覆盖改动/diff 冲突。仍要越权派发吗?')) return send(true)
|
|
119
244
|
setActionMsg('⛔ 已取消派发(等文件锁释放,或调整 touches 声明)')
|
|
120
245
|
return { ok: false, cancelled: true }
|
|
121
246
|
}
|
|
@@ -171,7 +296,7 @@
|
|
|
171
296
|
React.createElement('span', null, '已运行 ' + elapsedSince(task.claimedAt) + '(软超时 ' + state.softTimeoutMin + ' 分提醒 · 硬超时 ' + state.hardTimeoutMin + ' 分自动终止)'),
|
|
172
297
|
elapsedMin(task.claimedAt) > state.softTimeoutMin ? React.createElement('span', { style: { color: C.warn, fontWeight: 600 } }, '⏱ 已超软超时') : null,
|
|
173
298
|
React.createElement('button', { onClick: doTerminate, title: '终止该执行 Agent,任务回 pending 重新排队', style: { fontSize: 10, padding: '2px 8px', border: '1px solid ' + C.err, borderRadius: 3, background: 'transparent', color: C.err, cursor: 'pointer', marginLeft: 'auto' } }, '⏹ 立即终止')) : null,
|
|
174
|
-
task.escalation ? React.createElement('div', { style: { marginBottom: 8, padding: '8px 10px', border: '1px solid ' + C.err, borderRadius: 6, background: 'color-mix(in srgb, ' + C.err + ' 8%, transparent)' } },
|
|
299
|
+
task.escalation ? React.createElement('div', { id: 'tskb-escalation', style: { marginBottom: 8, padding: '8px 10px', border: '1px solid ' + C.err, borderRadius: 6, background: 'color-mix(in srgb, ' + C.err + ' 8%, transparent)' } },
|
|
175
300
|
React.createElement('div', { style: { fontSize: 12, fontWeight: 700, color: C.err, marginBottom: 4, display: 'flex', alignItems: 'center', gap: 4 } }, ic('alert-triangle', 13), 'Worker 上报歧义 — 等待主窗口裁决'),
|
|
176
301
|
React.createElement('div', { style: { fontSize: 11, color: C.text, marginBottom: 6, whiteSpace: 'pre-wrap', maxHeight: 160, overflowY: 'auto' } }, task.escalation.question),
|
|
177
302
|
React.createElement('div', { style: { fontSize: 10, color: C.text2, marginBottom: 6 } }, '上报于 ' + ago(task.escalation.at) + ' · ' + (task.escalation.by || '')),
|
|
@@ -214,6 +339,8 @@
|
|
|
214
339
|
'📎 调研注入: ' + (empty ? '无调研注入——Worker 需自行定位,建议补 contextFiles/contextNotes' : parts.join(' · ')))
|
|
215
340
|
})(),
|
|
216
341
|
React.createElement(FamilySection, { task: task }),
|
|
342
|
+
// Hooks 区(史诗可选点位):key=task.id 保证切换任务时重挂,编辑缓冲不串卡
|
|
343
|
+
React.createElement(HooksSection, { key: task.id, task: task }),
|
|
217
344
|
React.createElement(DepsSection, { task: task }),
|
|
218
345
|
task.acceptance ? React.createElement('div', { style: { fontSize: 11, color: C.text, marginBottom: 6, padding: '5px 8px', background: C.nested, borderRadius: 4, borderLeft: '2px solid ' + C.ok, fontFamily: 'monospace', display: 'flex', alignItems: 'center', gap: 4 } }, ic('flask-conical', 11), '硬性验收: ' + task.acceptance) : null,
|
|
219
346
|
task.resolution ? React.createElement('div', { style: { fontSize: 11, color: C.text, marginBottom: 6, padding: '5px 8px', background: C.nested, borderRadius: 4, borderLeft: '2px solid ' + C.warn, maxHeight: 120, overflowY: 'auto', whiteSpace: 'pre-wrap' } }, '📝 ' + task.resolution) : null,
|
|
@@ -255,11 +382,15 @@
|
|
|
255
382
|
var seq = r.role === 'verifier' ? (++vN) : (++wN)
|
|
256
383
|
var isCur = (r.role === 'worker' && task.claimedBy === r.id) || (r.role === 'verifier' && task.verifierRun === r.id)
|
|
257
384
|
var okMark = r.outcome === 'completed' ? ' ✅' : (r.outcome === 'running' ? ' ⏳' : (r.outcome ? ' ⚠' : ''))
|
|
385
|
+
// 续跑标记(卡2 落的 runs[i].resume 字段;卡3 Step3 在此显式标注):同一条会话的第二次及以后
|
|
386
|
+
// 派发是「冷复活续跑」而不是新开 Worker,不标出来会让人把「第 2/3 次」误读成又开了一个新会话。
|
|
387
|
+
// 只读 r.resume,不猜(老留档没有该字段 → 零渲染,与改造前逐字一致)。
|
|
388
|
+
var rsMark = r.resume === true ? ' ↻' : ''
|
|
258
389
|
return React.createElement('button', {
|
|
259
390
|
key: i, onClick: function () { if (uiWorkspaceSvc) uiWorkspaceSvc.openSession(r.id) },
|
|
260
|
-
title: rm.tip + ' 第 ' + seq + ' 次' + (r.at ? ' · ' + ago(r.at) : '') + (r.model ? ' · ' + r.model : '') + (r.outcome ? ' · ' + r.outcome : '') + '(' + r.id + ')',
|
|
391
|
+
title: rm.tip + ' 第 ' + seq + ' 次' + (r.resume === true ? '(↻ 冷复活续跑:沿用上一次的子会话,非新开)' : '') + (r.at ? ' · ' + ago(r.at) : '') + (r.model ? ' · ' + r.model : '') + (r.outcome ? ' · ' + r.outcome : '') + '(' + r.id + ')',
|
|
261
392
|
style: { fontSize: 10, padding: '2px 8px', border: '1px solid ' + (isCur ? rm.color : C.border), borderRadius: 3, background: isCur ? C.card : 'transparent', color: rm.color, cursor: 'pointer', fontWeight: isCur ? 600 : 400 }
|
|
262
|
-
}, '→ ' + rm.tip + ' #' + seq + (r.at ? ' · ' + ago(r.at) : '') + okMark)
|
|
393
|
+
}, '→ ' + rm.tip + ' #' + seq + (r.at ? ' · ' + ago(r.at) : '') + okMark + rsMark)
|
|
263
394
|
})))
|
|
264
395
|
})(),
|
|
265
396
|
canIntervene ? React.createElement('div', { style: { marginTop: 8, padding: '6px 8px', border: '1px dashed ' + C.warn, borderRadius: 6 } },
|