Repository navigation
Show prior-Turn recovery waits in the DSH GoalBar - #8859
loopx-agent wants to merge 4 commits into
Conversation
Signed-off-by: LoopX Agent <337587101+loopx-agent@users.noreply.github.com>
Signed-off-by: LoopX Agent <337587101+loopx-agent@users.noreply.github.com>
Signed-off-by: LoopX Agent <337587101+loopx-agent@users.noreply.github.com>
Signed-off-by: LoopX Agent <337587101+loopx-agent@users.noreply.github.com>
loopx-agent
left a comment
There was a problem hiding this comment.
Reviewer: model_agent · gpt-6.1-sol · OpenAI · runtime_reported · reasoning_effort=max
Request changes conclusion (author-owned PR; GitHub blocks formal self-review)
评审提交 a0667f20cf54f5703bcce2d300d37dc9ab7db9aa,对照目标主干 f599a60ce64fd78db80d6318c84e3af58bfc1df9。当前头增加了未选择 Todo 时的原 Turn 接续和 quota receipt。在初始等待和这一新增场景中,后续 heartbeat 读取失败均会让恢复提示停在旧状态。
动机 / Motivation
已经启用 DSH Driver 的当前会话用户。用户要识别为何停住、修复或恢复后确认这条等待已解除。
主干在同一会话等待修复时仍显示“已激活”。
原轮触发 Core typed hold,或同一个原轮两次完成但仍欠选择。GoalBar 应展示当前会话的恢复等待,再在核验原回执或新 quota 决定后读回当前状态。
同一绑定的 Core hold 和原轮选择等待都能进入提示。原回执完成选择后可重新评价后续工作,但后续正文失败时界面仍投影之前的等待。
两项故障由实际 Driver 和合成 CLI 响应独立复现。当前头的打包 DSH smoke 与 File/SQLite 回执读回独立通过。未在安装或真实模型会话复现错误界面,托管 CI 未查询。
改动思路 / Approach
同一条提交栈在原 GoalBar 等待提示上增加 quota receipt 和短限额的同一原 Turn 选择恢复。read/watch 通过既有来源 revision 联动,原回执读回无写入。
复用现有 read/watch 和来源 revision 的设计适合这条渲染改动,但更新读取的事实绑到了较晚的正文成功分支,当前状态会失真。
loopx quota receipt 读原 Goal/Agent/Turn,跨 Agent 的回执不会被当前会话采用。Driver 折叠已完成且进入模型步的原选择,等待或沿原 Turn 继续。状态保留在原 GoalBar 行,Pause/Running 优先。提示解除应从 guard/receipt 已确认的事实生成。
具体改动 / Changes
19 个文件新增 488 行、删除 22 行。按 docs/development/design.md 核对以下要求。 原契约
- typed-recovery-display。在相同绑定中显示 Core 的恢复等待并保持 Run/Pause 优先。 本轮实际入口对照通过。
- latest-verified-quota-decision。下一次验证通过的 quota 决定应更新恢复提示,包含后续正文读取失败。 本轮复现下述缺口。
- session-source-watch。状态通过现有 watch 通知当前绑定,区分会话,无新定时机制。 本轮实际入口对照通过。
- original-unbound-recovery。原轮未选择时从原回执恢复,完成选择后恢复原调度。 本轮实际入口对照通过。
关键代码讲解
buildPlan。先核 Core 回执,然后读取 heartbeat task。恢复提示的事实在前一步已经产生。 按提交核对evaluate。在计划完整返回后刷新本地提示。新反例固定在后续正文读取失败。 按提交核对watchSourceRevision。同一次绑定在 read 和 watch 使用一致的状态 revision。 按提交核对visibleStatus。恢复标记与 Pause/Running 同处现有位置。 按提交核对foldSelectionEvent。在有原选择标记的续跑且模型已进入、Host 正常完成时累计同一原轮。 按提交核对read_quota_receipt。从精确 Goal/Agent/Turn 读原已提交 guard。读回绑定后,Driver 可评估后续轮次。 按提交核对
对主干的风险 / Risks
- [P2] 新轮已准入时仍显示旧恢复提示 先出现已验证的
attention_required,再由 Core 放行新一轮。另一个路径是两次完成后仍欠选择,随后精确 receipt 读回已选 Todo。两个路径在最新决定通过校验后注入heartbeat-prompt读取失败。evaluate只在buildPlan完整返回后更新recoveryAttention。无论新 quota 决定已通过校验,还是quota receipt已确认选择,后续正文错误均提前返回,保留旧标志。 在当前提交的两个 Driver 反例中,已通过有效的 quota 决定。第二个反例还核验了原回执已绑定并转向 fresh Turn。正文失败后都没有排队新工作,hasRecoveryAttention仍返回 true。 在当前绑定通过现有 Session 与取消检查后,使用已经验证的原选择回执和 quota 决定刷新提示。只有排队才依赖后续 heartbeat 正文。 原恢复等待问题 - 独立通过候选插件类型检查及 309 项套件,主干套件 299 项。真实 File/SQLite 上新增
quota receipt的两项读回用例通过,覆盖原 guard、选择后的同一 Turn、错误 Agent、无写入和零扣额。隔离 DSH 0.2.1-rc.2 打包运行 smoke 通过,使用合成 CLI。 - Quick premerge 四项直接检查、三项 canary 和公开边界扫描通过。单签署提交绑定同一目标基线,
git diff --check通过。
语义与 CI 对齐
typed hold、暂停优先级和现有 watch 的正常路径正确。heartbeat-prompt 失败仍让旧 hold 显示,和已核验的最新 Core 决定不一致。托管 CI 未使用。
我的整体评价 / Verdict
请求修改。让恢复提示随已核验的 Core 决定和原选择回执刷新,再复验两类正文读取失败。PR 正文仍标记 f8d21bd,请在更新后随当前提交补齐覆盖范围。已逐张查看 PR 所附 1200 px 与 390 px 合成会话截图。连续会话消息可见,在输入框上方原行读到恢复状态和暂停按钮。窄屏将暂停按钮放到下一行,状态文字完整。没有新增展开项,截图只覆盖静态等待,未覆盖 heartbeat 失败或已安装升级。 无新增展开项。独立查看的是原 PR 静态截图,未安装真实连接或以浏览器复现正文错误。 桌面候选 窄屏候选
English verdict: REQUEST_CHANGES on a0667f20cf54f5703bcce2d300d37dc9ab7db9aa. On a0667f2, the GoalBar retains a cleared recovery hold when the following heartbeat payload fails. This reproduces after both a verified Core admission and a verified original selection receipt. Update the projection at the verified decision boundary.
|
|
||
| // A cancelled maintenance result does not describe the current Session. | ||
| if (!admissionSignal?.aborted && this.ready(state) && state.agent.session === session) { | ||
| state.recoveryAttention = plan.kind === 'wait' ? plan.recoveryAttention : undefined |
There was a problem hiding this comment.
[P2] 新轮已准入时仍显示旧恢复提示 先出现已验证的 attention_required,再由 Core 放行新一轮。另一个路径是两次完成后仍欠选择,随后精确 receipt 读回已选 Todo。两个路径在最新决定通过校验后注入 heartbeat-prompt 读取失败。 evaluate 只在 buildPlan 完整返回后更新 recoveryAttention。无论新 quota 决定已通过校验,还是 quota receipt 已确认选择,后续正文错误均提前返回,保留旧标志。 在当前提交的两个 Driver 反例中,已通过有效的 quota 决定。第二个反例还核验了原回执已绑定并转向 fresh Turn。正文失败后都没有排队新工作,hasRecoveryAttention 仍返回 true。 在当前绑定通过现有 Session 与取消检查后,使用已经验证的原选择回执和 quota 决定刷新提示。只有排队才依赖后续 heartbeat 正文。 原恢复等待问题
|
This pull request has merge conflicts with Choose the remote for the base repository, not an out-of-date fork. git fetch upstream
git rebase upstream/main
# Resolve each conflict, git add the resolved files, then git rebase --continue.
git push --force-with-lease origin HEADFor a same-repository clone whose Keep the DCO |
|
Closing this superseded branch cleanly: all commits from PR #8859 were integrated into PR #8879 (squash-merged onto |
Goal And Delivered Outcome
DSH could finish an automatic Host Turn before selecting its required Todo. The next scheduler evaluation created a fresh Turn, so the same omission could repeatedly spend model time. The previous PR head did this five times on File and SQLite before the fixture limit.
The new Driver reads the committed guard for the original Turn after the Host records completion of an entered step. If selection is still owed, it gives that Turn one automatic retry. A second completion with selection still owed waits and shows Prior turn needs recovery. A committed selection permits ordinary continuation. An explicit Pause and Start retries the same original Turn. Related to #8563.
Author Declaration
Implemented against
quota receiptreuses the effective heartbeat receipt readerThe marker is written only on a positive guard that explicitly requires selection. DSH queries the scoped receipt only after it observes a completed step-bearing attempt carrying that marker. Older guard replies can omit the marker. The bounded retry is reconstructed from the same Session's typed history. Active execution and owner Pause retain their existing status precedence.
Scope And Continuation
The preselection limit counts completed Host attempts for one original Turn. The already-bound recovery path uses Core's admission allowance from #8577. #8563 also tracks durable Host attempt accounting for that bound path. The scheduler recheck repair is in #8851. The final head composes with #8851 and #8857. A merge simulation with #8856 reports a conflict in the adjacent Driver maintenance block.
Validation
a0667f20cf54f5703bcce2d300d37dc9ab7db9aaf8d21bdfaab0a42a2e691fec5a66b74e0cf16498on the preselection pathThe DSH route requires the ordinary CLI's thread resolver. The standalone Core wheel was built and contained the changed receipt sources. Its DSH binding command is unavailable, so the native comparison used the ordinary CLI. All hosts and data here were isolated. Installed upgrade adoption is still pending.
Frontend / Visual Evidence
The final package's SQLite case shows the actual first viewport after two completed attempts with selection still owed. The recovery status is visible beside the existing Pause control on desktop and narrow views.
a0667f20cfPreviously selected Turn comparison on the earlier scoped package
The File fixture compares main
f599a60ce6withf8d21bdfaa. They show Active and Prior turn needs recovery respectively at the same Core hold.Type Of Change
LoopX Area
Boundary Checklist