fix(acp-bridge): guarantee exactly-once prompt terminal events in daemon serve mode - #7400
Merged
doudouOUC merged 2 commits intoJul 21, 2026
Merged
Conversation
…mon serve mode Every prompt accepted with 202 now observes exactly one formal turn_complete/turn_error terminal keyed by its promptId, on every path: agent settle, queued removal, wallclock deadline expiry, and session teardown (close/kill/crash/shutdown). A per-prompt terminal latch suppresses duplicates on racing paths; the deadline moves into the bridge dispatch race so a wedged agent can no longer pin the FIFO and active-prompt bookkeeping; teardown flushes error terminals before closing the event bus; close/reap decisions now account for queued prompts and the deferred close runs after the terminal broadcast. Fixes QwenLM#7399
Collaborator
|
Thanks for the PR! Template looks good ✓ Problem: observed bug with concrete reproduction. Issue #7399 documents four distinct paths where accepted prompts never receive their formal terminal event — queued removal emits nothing, a non-cooperative agent under deadline wedges the FIFO permanently, teardown closes the bus before pending prompts settle, and close-on-detach destroys queued work in the hand-off gap. Each path is reproducible at the unit level with specific steps in the issue. This is not theoretical hardening. Direction: aligned. SSE consumers (SDK Size: not applicable — no core module paths ( Approach: the scope feels right. Four holes, four fixes, all in the bridge where the prompt lifecycle lives. The per-prompt terminal latch is the standard exactly-once pattern; moving the deadline from a route-side timer (which could only abort the request signal) into the bridge's dispatch race is necessary because the bridge owns the FIFO, the terminal publication, and the active-prompt bookkeeping. The deferred close-on-prompt-complete moving from Moving on to code review. 🔍 中文说明感谢贡献！ 模板完整 ✓ 问题：已观测到的 bug，有具体复现步骤。Issue #7399 记录了四条不同路径下已接受的 prompt 永远收不到正式终态事件——排队移除不发事件、不配合的 agent 在 deadline 下永久钉死 FIFO、销毁路径在 pending prompt 结算前关闭总线、close-on-detach 在交接间隙销毁排队工作。每条路径都有 issue 中的具体单元级复现步骤。这不是理论性加固。 方向：对齐。SSE 消费者（SDK 规模：不适用——未触及核心模块路径。生产代码 417 行（6 个文件），测试 570 行（2 个文件）。 方案：范围合理。四个漏洞、四处修复，全部在 bridge 中——prompt 生命周期所在之处。per-prompt 终态闩锁是标准的 exactly-once 模式；将 deadline 从路由侧定时器（只能 abort 请求信号）移入 bridge 的派发竞速是必要的，因为 bridge 拥有 FIFO、终态发布和 active-prompt 记账。延迟关闭从 进入代码审查 🔍 — Qwen Code · qwen3.7-max Reviewed at |
Collaborator
🩺 serve daemon A/BBuilt the PR base vs this PR head ✅ No response changes against the PR base across 4 scenario(s). — Qwen Code · serve A/B |
Collaborator
Code ReviewIndependent proposal: given four holes in prompt terminal delivery, I would (1) add a per-prompt boolean latch to Comparison: the PR's approach matches this proposal exactly. No simpler path missed. Findings: no critical blockers. The implementation is clean and well-structured:
All 424 bridge tests pass. All 25 prompt deadline server tests pass. Real-Scenario TestingThis PR changes daemon serve mode SSE event delivery — not TUI-visible. Tested by running the daemon from this PR's code and exercising the prompt lifecycle via HTTP/SSE. Test 1: Normal prompt → turn_complete terminal Test 2: Queued prompt removal → cancelled terminal (DAEMON-004) Before this PR, the removed prompt's SSE consumers would hang forever — no terminal was ever published. Now they get Daemon log (tmux capture-pane): 中文说明代码审查独立方案： 针对 prompt 终态投递的四个漏洞，我会 (1) 在 对比： PR 方案与上述独立提案完全一致。未发现更简路径。 发现： 无关键阻塞项。实现干净、结构良好：闩锁正确放置，五个终态来源统一归口； 全部 424 个 bridge 测试通过。全部 25 个 prompt deadline 服务器测试通过。 真实场景测试本 PR 改变 daemon serve 模式的 SSE 事件投递——非 TUI 可见。通过运行本 PR 代码的 daemon 并经 HTTP/SSE 执行 prompt 生命周期来测试。 测试 1：正常 prompt → — Qwen Code · qwen3.7-max Reviewed at |
Collaborator
|
Confidence: 5/5 — clean across every stage; would merge without hesitation. This is a well-scoped reliability fix for four concrete holes in the daemon's prompt terminal delivery. The problem is real (issue #7399 has unit-level reproductions for each path), the fix is exactly what the problem calls for — a per-prompt latch, deadline in the bridge, teardown flush, and close-gating on pending count — and nothing in the diff goes beyond the minimal set needed. The ownership-gated 中文说明置信度：5/5 —— 每个阶段都干净；毫不犹豫合并。 这是一个范围良好的可靠性修复，针对 daemon prompt 终态投递的四个具体漏洞。问题是真实的（issue #7399 对每条路径都有单元级复现），修复恰好是问题所需的——per-prompt 闩锁、bridge 内的 deadline、销毁冲刷、以及基于 pending 计数的关闭门控——diff 中没有超出最小必要集合的内容。所有权门控的 — Qwen Code · qwen3.7-max Reviewed at |
qwen-code-ci-bot
previously approved these changes
Jul 21, 2026
qwen-code-ci-bot
left a comment
qwen-code-ci-bot
left a comment
Collaborator
There was a problem hiding this comment.
LGTM, looks ready to ship. ✅
qwen-code-ci-bot
left a comment
qwen-code-ci-bot
left a comment
Collaborator
There was a problem hiding this comment.
Reviewed. Suggestions are inline. Not reviewed: reverse audit — an auditor ran and opened its brief, but no agent was launched with the prompt the CLI built — the launch was written by hand, and what the agent was actually asked is not what this skill certifies.
— qwen3.7-max via Qwen Code /review
…rdering
Mirrors the session_closed flush test: with an active and a queued prompt pending, killSession must publish one turn_error{code:'session_killed'} per promptId before the session_died frame. A reorder that flushes after events.close() would silently drop the terminals; this pins the ordering for the one teardown path that lacked a dedicated test.
qwen-code-ci-bot
approved these changes
Jul 21, 2026
qwen-code-ci-bot
left a comment
qwen-code-ci-bot
left a comment
Collaborator
There was a problem hiding this comment.
No issues found. LGTM! ✅
— qwen3.7-max via Qwen Code /review
yiliang114
approved these changes
Jul 21, 2026
yiliang114
left a comment
yiliang114
left a comment
Collaborator
There was a problem hiding this comment.
Clean design. The latch + ownership-gated cleanup + teardown flush covers all the competing terminal paths without over-complicating the dispatch logic. Moving the deadline race into the bridge is the right call — the route could never release the FIFO or publish terminals, so it was always the wrong owner.
Verified the key races mentally:
- Deadline fires on a queued prompt that never dispatches: terminal published, abort triggers the FIFO skip,
deadlinePromise.catchswallows the orphaned rejection. - Wedged agent settles late after the next prompt is active:
settleActivePromptStateownership gate prevents the stale settle from stealing the new prompt's counter. flushPromptTerminalsbeforeevents.close()in all four teardown paths, with the killSession ordering now guarded by the test added in 6d366f5.
One non-blocking note: the suppressed-duplicate diagnostic in publishPromptTerminal goes to stderr via writeStderrLine. Bounded in practice (3–4 competing paths per prompt max), but if the daemon ever gets noisier race scenarios this might read like a warning in production logs. A debugLogger channel would be a cleaner fit whenever convenient.
doudouOUC
commented
Jul 21, 2026
doudouOUC
left a comment
doudouOUC
left a comment
Collaborator
Author
There was a problem hiding this comment.
Self-review notes. I ran a review pass over this branch before asking for eyes on it. Recording what it turned up here so reviewers don't have to rediscover it, and so the open questions are visible rather than buried in my head.
One of these is a real gap in the guarantee this PR claims, and I'll fix it before this is mergeable.
Gap I need to fix (bridge.ts:1185)
removePendingPrompt splices running prompts out of pendingPromptList too, so flushPromptTerminals can't see them. A running prompt deleted via the API whose session is then closed/killed/crashed before the agent cooperates gets zero terminal events — which is exactly the failure mode this PR is supposed to close. Both steps are ordinary supported operations, so this isn't a constructed edge case. Fix and test noted inline.
Open questions I want input on
- bridge.ts:4963 — a queued prompt's deadline now reaches
broadcastTurnError, which mutates session-scopedentry.turnError/entry.retryAllowed. Before this PR that could only fire for the active prompt, so a session can now finish a healthy turn while carrying a staleturnErrorandretryAllowed: true. I think the fix is to gate the state mutation onpromptId === entry.activePromptId, but I'd like a second opinion on whether that's the right seam. - bridge.ts:4940 — releasing the FIFO on deadline means the next prompt calls
connection.prompt()while the wedged one is still outstanding: two overlapping prompts on one ACP session. I flagged the channel leak in the description but not this, which is arguably the more user-visible consequence. Leaning toward documenting it and keeping current behavior rather than poisoning the session, since poisoning would give up the "follow-up prompt dispatches normally" property — but I'm not certain. - bridge.ts:4981 — the description claims the deadline surfaces to callers as a typed
PromptDeadlineExceededError. That's only true for a running prompt; one that expires while still queued rejects with plainAbortError. Either I propagate the reason or I fix the description — I'll do one of the two.
Nits I'll clean up: dedup logging is too loud for what's a designed steady state (bridge.ts:1137), the prompt-deadline.ts re-export drags the whole bridge into a leaf module (prompt-deadline.ts:13), and the terminal-before-deferred-close ordering silently depends on handler registration order with nothing enforcing it (bridge.ts:5284).
Test additions I owe on top of the existing suite: removed-running-prompt + teardown, caller rejection type for a queued-deadline expiry, and entry.turnError staying clean when a queued prompt's deadline fires mid-turn.
Things I re-verified while doing this and believe are correct: flush placement on all four teardown paths (terminals strictly before events.close()), the ownership gate in settleActivePromptState, and the deadlineMs clamping in the route (Math.min(serverMs, requestMs), so a client can only shorten).
Self-review done with Claude Code against the head-branch source. The calls on what to fix are mine.
| code: string, | ||
| message: string, | ||
| ): void { | ||
| for (const pending of [...entry.pendingPromptList]) { |
Collaborator
Author
There was a problem hiding this comment.
Gap — fixing before merge. This loop is the only thing standing between a pending prompt and a lost terminal, but it can't see running prompts that were removed via the API.
removePendingPrompt splices unconditionally and only publishes a terminal for the queued case:
entry.pendingPromptList.splice(idx, 1); // running entries are removed too
...
if (target.state === 'queued') {
publishPromptTerminal(entry, target, { kind: 'cancelled' });
}So this sequence still drops the terminal entirely:
- client
DELETEs a running prompt → entry spliced out ofpendingPromptList, no terminal yet (correct so far — the cooperative cancel path is supposed to emit it) - session is closed / killed / the channel crashes before the agent cooperates
flushPromptTerminalsiteratespendingPromptList— the prompt isn't thereentry.events.close()- the agent finally settles →
publishPromptTerminal→broadcastTurnCompletepublishes into a closed bus and is swallowed
Net: no turn_complete, no turn_error, SSE consumer hangs forever.
Planned fix, since it matches the design already in place: stop splicing running entries in removePendingPrompt — leave them on the list until result.finally removes them naturally, and filter on state in getPendingPrompts. That's the same philosophy as keeping the admission slot ("Keep the admission slot until this prompt's FIFO node reaches the head and settles through the original result.finally() path"). The alternative is a side list of removed-but-unsettled entries that this loop also drains; I prefer the former.
Test to add: remove a running prompt, then closeSession before the stub agent resolves, assert a terminal for that promptId lands before session_closed.
| // The race consumer may not be attached yet (or ever, for a queued | ||
| // prompt that never dispatches) — keep the rejection handled. | ||
| deadlinePromise.catch(() => {}); | ||
| const onDeadline = () => { |
Collaborator
Author
There was a problem hiding this comment.
Open question. broadcastTurnError doesn't only publish an event — it also mutates session-scoped state:
entry.retryAllowed = true;
entry.turnError = { message, ...(code ? { code } : {}), ... };Before this PR that was only reachable from the single result reject handler, i.e. always for the active prompt. It's now reachable for a queued prompt (the deadline is armed at admission and covers queue wait) while a different prompt is running, and flushPromptTerminals reaches it N times in a row.
entry.turnError is only cleared on the next dispatch, never on a successful turn_complete. So:
- prompt A is running
- queued prompt B hits its deadline →
entry.turnErrorset,entry.retryAllowed = true - A completes successfully
- session is left advertising a
turnErrorthat corresponds to no failed turn, andretryAllowedis true — which the retry-admission check (const isRetry = requestedRetry && entry.retryAllowed) consumes
My instinct is to split "publish the event" from "mutate session turn state" — only write entry.turnError / entry.retryAllowed when pendingEntry.promptId === entry.activePromptId, publish the event alone otherwise. Would appreciate a sanity check on whether that's the right seam, or whether the session-scoped fields should be per-prompt in the first place.
| state: isQueued ? 'queued' : 'running', | ||
| }; | ||
| entry.pendingPromptList.push(pendingEntry); | ||
| // DAEMON-003: absolute wallclock deadline. Armed at admission (the |
Collaborator
Author
There was a problem hiding this comment.
Open question — this comment understates a consequence I should spell out.
When deadlineReject settles racedPromise, entry.promptQueue advances and the next prompt calls entry.connection.prompt() while the wedged call is still outstanding on the same ACP session. That's two overlapping prompts on one session — the agent may not tolerate it, and a wedged-but-alive agent keeps streaming session/update onto the same bus, interleaving with the new turn's output in every subscriber's transcript.
I called out the channel leak in the PR description but not this, and this is arguably the more user-visible one.
Two options: document it and keep current behavior, or mark the session poisoned on deadline expiry (reject further prompts until the old promise settles or the channel is reclaimed). Poisoning gives up the "follow-up prompt dispatches normally" property the new test asserts, which was a deliberate goal — so I'm leaning toward documenting. Open to being argued out of that.
| // Unlock the dispatch race / FIFO first, then abort so the | ||
| // existing onAbort path (prompt_cancelled UI signal + | ||
| // cancelPendingForSession + best-effort connection.cancel) runs. | ||
| deadlineReject?.(deadlineErr); |
Collaborator
Author
There was a problem hiding this comment.
Description/behavior mismatch — mine to fix. The PR description says:
The deadline rejection surfaces to
sendPromptcallers as a typedPromptDeadlineExceededError.
That only holds for a running prompt. When one expires while still queued, deadlinePromise was never joined into a race (the race is only built at dispatch), so what decides the caller's rejection is the pre-dispatch check at the head of the FIFO:
if (pendingAbort.signal.aborted) {
throw new DOMException('Prompt aborted', 'AbortError');
}The SSE terminal is correct either way — onDeadline already published it — but the caller sees AbortError, and the prompt turn failed: [<errName>] log line in the prompt route varies by timing.
Either propagate pendingAbort.signal.reason from that check when it's a PromptDeadlineExceededError, or correct the description. Leaning toward propagating, since the typed error is more useful to SDK callers. The "expires while still queued" test only asserts the SSE terminal today — I'll extend it to pin the caller rejection type either way.
| ): void { | ||
| if (pendingEntry.terminalPublished) { | ||
| writeStderrLine( | ||
| `publishPromptTerminal: suppressed duplicate ${terminal.kind} terminal ` + |
Collaborator
Author
There was a problem hiding this comment.
Nit, will fix. Dedup is the designed steady state on several paths, not an anomaly: every deadline expiry, every queued removal, and every teardown flush followed by a late agent settle produces one of these lines. On stderr that's noise proportional to normal traffic.
Switching to writeServeDebugLine — broadcastTurnError already uses it a few lines up for the turn_error classified line.
| err: { code, message }, | ||
| }); | ||
| try { | ||
| pending.abortController.abort( |
Collaborator
Author
There was a problem hiding this comment.
Nit. The abort runs after the terminal is published and while the bus is still open, so for a running prompt the existing onAbort listener broadcasts prompt_cancelled after that turn's terminal frame. Harmless for consumers that settle on matchTurnEvent by promptId, but a surprising order for anything rendering the raw stream. Adding a sentence to the doc comment noting the trailing prompt_cancelled is expected.
| activePromptCounter--; | ||
| touchActivity(); | ||
| } | ||
| settleActivePromptState(entry, pendingEntry.promptId); |
Collaborator
Author
There was a problem hiding this comment.
Note to reviewers. The inlined code this replaces did not set entry.sessionLastSeenAt or call touchActivity() on the echo-failure path; the shared helper does. That's intentional convergence, but it's an unannounced behavior change riding along in a refactor — I'll add a line to the PR description so it isn't rediscovered later as a mystery.
| @@ -5116,23 +5283,22 @@ export function createAcpSessionBridge(opts: BridgeOptions): AcpSessionBridge { | |||
| ); | |||
| result.then( | |||
Collaborator
Author
There was a problem hiding this comment.
Nit — fragile invariant. The DAEMON-005 comment explains why the deferred close lives in result.finally, and the ordering is correct: both handlers are registered on the same promise so they run in registration order, and broadcastTurnComplete / broadcastTurnError are synchronous.
But that correctness depends entirely on this result.then being registered before the result.finally below, and nothing enforces it — a future reorder breaks the terminal-before-close guarantee silently. Adding an explicit "do not reorder — the terminal broadcast must be registered first" note here.
| this.deadlineMs = deadlineMs; | ||
| } | ||
| } | ||
| export { PromptDeadlineExceededError } from '../acp-session-bridge.js'; |
Collaborator
Author
There was a problem hiding this comment.
Nit. Moving the class into the bridge package is right, but this re-export turns what was a pure leaf utility into a module that pulls the entire bridge in transitively — anything importing this file just for resolvePromptDeadlineMs now pays for it.
No cycle today (acp-session-bridge.ts doesn't import this file), so it isn't urgent. I'll either mark it @deprecated pointing at acp-session-bridge.js, or just update the remaining import sites and drop the forward.
This was referenced Jul 21, 2026
doudouOUC
added a commit
to doudouOUC/qwen-code
that referenced
this pull request
Jul 22, 2026
…7400 self-review (QwenLM#7453) * fix(acp-bridge): close prompt-terminal follow-ups from PR QwenLM#7400 self-review Keep a removed RUNNING prompt visible to the teardown flush via a removed flag so its terminal still publishes when the session closes before the agent cooperates; gate broadcastTurnError's session turn-state mutation to running prompts; propagate the typed PromptDeadlineExceededError from the pre-dispatch abort check; document the deadline FIFO-release overlap trade-off, the trailing prompt_cancelled after flush, and the result.then/finally ordering invariant; route the dedup log to the debug channel; drop the prompt-deadline re-export that pulled the bridge into a leaf module. Fixes QwenLM#7451 * test(acp-bridge): cover promote-then-remove-then-settle duplicate completed guard (QwenLM#7453) --------- Co-authored-by: Qwen Code Bot <qwen-code-bot@users.noreply.github.com>
chiga0
pushed a commit
that referenced
this pull request
Jul 23, 2026
…elf-review (#7453) * fix(acp-bridge): close prompt-terminal follow-ups from PR #7400 self-review Keep a removed RUNNING prompt visible to the teardown flush via a removed flag so its terminal still publishes when the session closes before the agent cooperates; gate broadcastTurnError's session turn-state mutation to running prompts; propagate the typed PromptDeadlineExceededError from the pre-dispatch abort check; document the deadline FIFO-release overlap trade-off, the trailing prompt_cancelled after flush, and the result.then/finally ordering invariant; route the dedup log to the debug channel; drop the prompt-deadline re-export that pulled the bridge into a leaf module. Fixes #7451 * test(acp-bridge): cover promote-then-remove-then-settle duplicate completed guard (#7453) --------- Co-authored-by: Qwen Code Bot <qwen-code-bot@users.noreply.github.com>
yiliang114
added a commit
to he-yufeng/qwen-code
that referenced
this pull request
Jul 23, 2026
) * fix(cli): correct queued message display style and ordering Mid-turn steer messages (user input queued while the model is responding) had two display bugs: 1. They rendered with notification styling (● icon) instead of user-input styling (> prefix) because accept() added them to UI history as MessageType.NOTIFICATION. 2. They appeared below the model's reply because accept() was only called in the finally block after the entire response stream completed, appending the user message after all model response items. Fix: use MessageType.USER with sentToModel: true for steer messages, and settle the steer input on the first stream event (after the user-content push lands but before model-response events are committed to UI history). Pass steer inputs through to recursive sendMessageStream calls so all takeSteerInput paths benefit from early settlement. Add a WeakSet guard to settleSteerInput for idempotency across recursive invocations. * test(core): add ordering test for early steer settlement Verify that accept() is called after the first stream event is pulled but before subsequent events reach the consumer, pinning the settle-before-content timing that ensures queued user messages render above the model's reply. * fix(cli): use sentToModel: false for steer messages, address review - Use sentToModel: false instead of true: steer messages are injected into an existing tool-result turn, not standalone user turns. sentToModel: true would make isRealUserTurn() count them as real turns, inflating the rewind turn index. - Remove unnecessary as HistoryItemWithoutId cast. - Add post-cleanup assertion in ordering test to verify the WeakSet guard prevents double-settlement. * fix(cli): align resumed mid-turn steer display with live session (#7381) Resume path now renders mid_turn_user_message as MessageType.USER with sentToModel: false, matching the live-session styling. Add a comment documenting the intentional sentToModel: false choice. * fix(cli): exclude steer messages from user-turn filters (#7381) Steer messages (sentToModel: false) were counted as real user turns by five downstream consumers that filter on type === 'user' without checking sentToModel, breaking cancel auto-restore, telemetry turn count, prompt recall, away-recap thresholds, and resume collapse boundaries. Add sentToModel !== false guards at each site. * test(cli): add coverage for sentToModel !== false guards (#7381) * test(cli): add coverage for sentToModel !== false guard in input-history filter (#7381) * test(cli): add coverage for sentToModel !== false guard in YOLO turn-count telemetry (#7381) * fix(cli): restore corrupted docs and classify steer items as synthetic (#7381) * fix(docs): restore corrupted autogenerated input names in GitHub Action docs (#7381) * fix(cli): deduplicate findLastUserItemIndex and add steerInput forwarding test (#7381) * fix(cli): keep code-block copy numbering continuous across steer items (#7381) * test(core): add Hook continuation steerInput forwarding test Verify that steerInput is forwarded through the Stop-hook continuation path and settled early on the first content event of the continuation turn, matching the existing Steer continuation coverage. * fix(cli): sync selection test fixtures with ink FrameCell/ReadonlyFrame types (#7381) * fix(core): align cron day wildcard semantics (#7464) Co-authored-by: destire-mio <248462155+destire-mio@users.noreply.github.com> * feat(core): keep completed background agents resident (#7426) * feat(core): keep background agents resident * fix(core): harden background continuation boundaries * docs(core): move per-spawn cleanup comment to subagentDispose The comment describing the per-spawn cleanup (which stays undefined on the fork-resume path) had drifted above the launchModel declaration, where it no longer applied and could mislead readers. Relocate it to the subagentDispose assignment in the non-fork branch it actually documents. * fix(core): close finishing window and release resident on error in background GOAL path - Non-worktree GOAL completion drained the message queue but never called registry.beginFinishing(), unlike the worktree path. A send_message racing the terminal transition could be accepted (status still running, finishingAgents empty) and then orphaned by complete(). Call beginFinishing() after the empty drain to reject the racing message instead. - The completion catch block never reset keepResident, so a throw from patchAgentMeta/registry.complete left the runtime resident but finalized as failed — a zombie that cleanupRuntime never reclaimed. Reset keepResident in the catch so the finally block disposes it. --------- Co-authored-by: Claude <noreply@anthropic.com> * ci(autofix): continue environment-specific fixes (#7444) * ci(autofix): continue environment-specific fixes * docs(autofix): align verification wording * docs(autofix): require bundle before integration tests * docs(autofix): scope surrogate verification rules * docs(autofix): require focused tests before integration checks * docs(autofix): clarify review verification guidance * fix(acp-bridge): close prompt-terminal follow-ups from the PR #7400 self-review (#7453) * fix(acp-bridge): close prompt-terminal follow-ups from PR #7400 self-review Keep a removed RUNNING prompt visible to the teardown flush via a removed flag so its terminal still publishes when the session closes before the agent cooperates; gate broadcastTurnError's session turn-state mutation to running prompts; propagate the typed PromptDeadlineExceededError from the pre-dispatch abort check; document the deadline FIFO-release overlap trade-off, the trailing prompt_cancelled after flush, and the result.then/finally ordering invariant; route the dedup log to the debug channel; drop the prompt-deadline re-export that pulled the bridge into a leaf module. Fixes #7451 * test(acp-bridge): cover promote-then-remove-then-settle duplicate completed guard (#7453) --------- Co-authored-by: Qwen Code Bot <qwen-code-bot@users.noreply.github.com> * fix(core): strip Qwen-internal daemon secrets from agent-spawned child env (#7256) * fix(core): strip Qwen-internal daemon secrets from agent-spawned child env Shell subprocesses (and the monitor tool and stdio MCP servers) inherited the full daemon process.env, including QWEN_SERVER_TOKEN (the serve-daemon bearer credential), so an agent-run command like printenv QWEN_SERVER_TOKEN could read an internal secret. Add a shared sanitizeChildEnv() that removes Qwen-internal daemon/server tokens (QWEN_SERVER_TOKEN, QWEN_DAEMON_TOKEN) before spawning, and apply it at the shell child_process + PTY paths, monitor.ts, and the mcp-client stdio transport. The denylist is deliberately narrow: it does NOT strip third-party credentials (GH_TOKEN, AWS_*, NPM_TOKEN, ...) that real shell workflows legitimately inherit -- only Qwen-internal secrets. Exported from the package root so the desktop denylists can consolidate onto it later. Fixes #6601. * test(core): cover daemon-secret stripping on monitor and mcp-client spawn sites * test(core): replace process.env instead of mutating in shell sanitization tests The file restores process.env by reference in afterEach, so in-place key mutations leaked into later tests. Use the replacement pattern already used by setupConflictingPathEnv. * docs(core): align JSDoc @param names with actual function signatures (#7492) Fix 6 instances where JSDoc @param tags had drifted from their corresponding function signatures — parameters were renamed, removed, or undocumented over time but the doc blocks were not updated. Closes #7446 * feat(serve): support forced MCP reconnects (#7488) * feat(serve): support forced MCP reconnects * test(serve): cover forced MCP reconnect options --------- Co-authored-by: 克竟 <dingbingzhi.dbz@alibaba-inc.com> * fix(cli): insert newline on Shift+Enter and stop streaming thinking-block flicker (#7397) * fix(cli): re-push Kitty keyboard flags onto the alternate screen in VP mode In VP mode the app renders on the alternate screen (`alternateScreen: true`), but the Kitty keyboard progressive-enhancement flags were pushed only once at startup on the main screen. The Kitty spec tracks these flags per screen buffer, so the alternate screen's stack stays empty and the terminal never reports modifiers: Shift+Enter arrives as a bare Enter (submit) or, when the terminal emits an ESC-prefixed variant, as an orphaned Escape that trips the empty-buffer double-Esc rewind prompt — so Shift+Enter can never insert a newline in VP mode even on Kitty-capable terminals (e.g. cmux). Re-push the flags onto the alternate screen right after Ink enters it (Ink writes the enter-alt-screen sequence synchronously inside render(), so the push is correctly ordered). Ink discards the alternate screen and its flag stack on unmount, leaving the startup main-screen push balanced by the existing disableKittyProtocol() on cleanup. Generated with AI Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(cli): stabilize streaming thinking block height to stop flicker The pending "Thinking…" block renders the tail of the reasoning stream in a content-sized box. As the model emits paragraph separators, a blank line enters and leaves the tail window (and `trimEnd` drops trailing blanks), so the visible line count oscillates and the block flickers 2→3→5 rows during streaming. Track the tallest height the block has reached for the current thought and never render fewer rows than that (capped at the streaming window size), padding at the top so the newest line stays pinned to the bottom. The tracker resets when streaming ends or when the buffer shrinks (a new thought replaced it), so height is monotonic within a thought without leaking across thoughts. Generated with AI Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(cli): decode xterm modifyOtherKeys Shift/Ctrl/Alt+Enter so it inserts a newline Terminals such as Ghostty report Shift+Enter as the xterm modifyOtherKeys sequence `ESC [ 27 ; <mods> ; <key> ~` (e.g. `ESC [ 27 ; 2 ; 13 ~`) when the Kitty keyboard protocol is not negotiated — which is the default, since Kitty detection does not always succeed. Two bugs kept this from inserting a newline: 1. The CSI-u parser read the leading `27` marker as the key code (matching the Escape key code 27) instead of the real key code in the third parameter, so with Kitty enabled Shift+Enter was mistaken for Escape and tripped the double-Esc rewind prompt. 2. The reassembly path that stitches readline's shredded CSI fragments back together was gated behind `kittyProtocolEnabled`, so with Kitty disabled the `ESC [ 27 ; 2 ;` head plus the stray `13~` tail leaked into the composer as literal text and no newline was inserted. Decode the third parameter as the real key code for the `27;…~` form, and route those sequences through the reassembly buffer even when Kitty is off (only the `ESC [ 27` marker opts in, so keys readline already parses cleanly are untouched). Shift/Ctrl/Alt+Enter now insert a newline in both VP and non-VP mode regardless of Kitty negotiation. Generated with AI Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(cli): anchor VP viewport to the top until a conversation turn exists On a fresh VP-mode session the virtualized list holds the banner plus startup notices (tips / MOTD / info), so it is longer than one item. Keying the initial scroll anchor off list length alone selected scroll-to-end, which pinned the banner to the bottom of the full-height viewport and left the top half of the screen blank. Anchor to the top until there is an actual conversation turn (a user/user_shell history item or a pending response), then resume scroll-to-end so the latest output stays in view. Startup notices no longer count as content that forces bottom alignment. Generated with AI Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(cli): stabilize streaming thinking window against availableTerminalHeight drift The grow-only streaming thinking window still flickered because its line cap was derived from availableTerminalHeight. While a thought streams the terminal keeps constrainHeight on, so availableTerminalHeight (and the derived maxLines) drifts up and down as sibling pending content grows, and the grow-only clamp `min(maxLines, …)` shrank the block whenever it dipped. Use a constant window height (MAX_STREAMING_THINKING_VISUAL_LINES) for the pending window instead. The window is only a few lines, so a fixed cap cannot meaningfully overflow (VP scrolls anyway), and the height stays stable while still growing monotonically within a thought. Generated with AI Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * Revert "fix(cli): anchor VP viewport to the top until a conversation turn exists" This reverts commit fbe86a9e159b75ea1f5b689cc327599c9dc91090. * fix(cli): guard modifyOtherKeys detection against keypresses without a sequence The modifyOtherKeys prefix check ran on every keypress, but some synthetic keypresses (and the useKeypress test harness) emit a key with no `sequence`, so `key.sequence.startsWith(...)` threw an unhandled rejection. Use optional chaining so a missing sequence is simply not a modifyOtherKeys start. Generated with AI Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * test(cli): mock pushKittyProtocolFlags in gemini.test.tsx kitty mock The kittyProtocolDetector mock omitted the newly added pushKittyProtocolFlags export. Add it so the mock stays in sync with the real module and a VP-mode startup path exercised through this suite cannot hit an undefined call. Generated with AI Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> --------- Co-authored-by: 秦奇 <gary.gq@alibaba-inc.com> Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(web-shell): open singleton subagent details (#7495) Co-authored-by: ytahdn <ytahdn@gmail.com> * fix(web-shell): avoid redundant git status requests (#7496) Co-authored-by: ytahdn <ytahdn@gmail.com> * fix(agent): ignore empty working_dir placeholders (#7343) * fix(agent): ignore empty working_dir placeholders * test(agent): align empty working_dir expectations * feat(prompts): allow overriding core identity via QWEN_SYSTEM_IDENTITY_MD (#7478) * feat(prompts): update prompts.ts for QWEN_SYSTEM_IDENTITY_MD * feat(prompts): update prompts.test.ts for QWEN_SYSTEM_IDENTITY_MD * fix(prompts): address CR on QWEN_SYSTEM_IDENTITY_MD Keep getDefaultCoreIdentitySentence private, fail loud on path resolution errors, use trimEnd, and resolve identity only on the default-prompt branch. * test(prompts): align identity override tests with CR feedback Sample default identity from live prompt, cover trimEnd trailing whitespace, and assert homedir resolution failures throw. --------- Co-authored-by: 易良 <1204183885@qq.com> * fix(cli): yield to single-slot background agents (#7258) Co-authored-by: hogeheer <267467744+hogeheer499-commits@users.noreply.github.com> * docs(autofix): require evidenced pre-commit verification, not a bare "verified" (#7486) * docs(autofix): require evidenced pre-commit verification, not a bare "verified" The skill already said to run build/typecheck/lint/Vitest before committing, but softly — and #7408 committed a fix with a TS error the gate then rejected while its summary claimed "verified all 3 commits". A self-assessment the gate contradicts wastes a whole round. Strengthens the address-review contract from "run the checks" to: - actually run them, do not assert them from reading the diff; - if typecheck or a touched-package test fails, do NOT commit — treat the feedback as unresolved (failure.md); - end address-summary.md with a `## Verification` section listing each command run and its result; a bare "verified" is not acceptable. The framing is structural, not etiquette: the deterministic gate re-runs the same commands and discards the round on any failure, so skipping them only moves the rejection later. Pinned by a test so it cannot soften back. This is the checkable half of "audit before committing" — the undirected/reverse-audit-until-clean practice does not transfer to an unsupervised agent (no verifiable stopping condition, and it worsens the timeouts seen on large PRs), but "run the gate's own checks first and show the evidence" does. * fix(autofix): clarify Verification section precedes collapsed Chinese translation (#7486) --------- Co-authored-by: wenshao <wenshao@example.com> Co-authored-by: qwen-code-ci-bot <qwen-code-ci-bot@users.noreply.github.com> Co-authored-by: Qwen Code Bot <qwen-code-bot@users.noreply.github.com> * feat(autofix): stop a PR that fails to push for N rounds in a row (#7482) * feat(autofix): stop a PR that fails to push for N rounds in a row Under takeover the round cap is 100, which is right for a PR that needs many PRODUCTIVE rounds. It is wrong for one that fails every round: #6723 ran 7 consecutive failed rounds (3 agent timeouts at 50 min, 4 gate rejections whose fix broke tests) over 8 hours, heading for round 100, because it is a 5700-line, 47-file, 5-day-old PR racing a fast-moving main — every round re-resolves a conflict it cannot finish or that fails the gate. Retrying at the same per-round budget will not converge; a human has to rebase or split it. Adds CONSECUTIVE_FAILURE_CAP (5), distinct from the total round cap. The handoff step already runs only when a round did NOT push, so it counts the unbroken run of prior failure markers — stopping at the first push ("Addressed the latest review feedback") or legitimate no-op ("no changes needed"), either of which proves progress and resets the streak. At the cap it forces the terminal round even under takeover, with a handoff that names the real fix (rebase/split, then /retry). Cause- agnostic: a timeout and a gate rejection both count. * fix(autofix): address review feedback on consecutive-failure circuit breaker (#7482) - Fix misleading comment: the walk is oldest-first (API order) with reset-on-success, not newest-first with early stop - Prefer the already-fetched ic.json over a redundant gh api call, falling back to the API only when the file is missing - Filter eval markers by re-arm window (win=) so pre-re-arm failures do not immediately re-terminate a re-armed PR - Add test coverage for the MARK_ROUND == MAX_ROUNDS guard and for window-scoped streak counting * fix(autofix): exempt transient model errors from consecutive-failure breaker (#7482) --------- Co-authored-by: wenshao <wenshao@example.com> Co-authored-by: qwen-code-dev-bot <qwen-code-dev-bot@users.noreply.github.com> * feat(core): restore background agent roster (#7459) * feat(core): restore background agent roster * fix(web-shell): add list_agents to TOOL_DISPLAY_NAMES The new list_agents core wire tool was added to core's ToolNames but not to the web-shell TOOL_DISPLAY_NAMES map, causing toolFormatting.drift.test.ts to fail (expected ['list_agents'] to deeply equal []). Add the missing 'ListAgents' display-name entry so the browser panel shows a friendly name instead of the raw wire name and the drift guard passes. * fix(cli): reload old-session background agents on failed resume rollback When /resume fails after core has swapped but before the UI swap, the catch block rolls core back to the old session via startNewSession(oldSessionId). However the forward path already called resetBackgroundStateForSessionSwitch, which cleared the old session's in-memory background agents. The rollback did not reload them, so list_agents returned empty for the old session (whose sidecars are still on disk) until the next process start or successful resume. Reload the old session's paused background agents after rolling core back, so the restored roster matches on-disk state. Placed after startNewSession so the loadPausedBackgroundAgents current-session guard is satisfied; best-effort via .catch so it never blocks the rollback path. * fix(web-shell): add zh translation for list_agents tool name The toolFormatting test 'has a zh translation for every tool in the display-name map' failed with expected ['list_agents'] to deeply equal [] because list_agents was added to TOOL_DISPLAY_NAMES without a matching toolName.list_agents zh-CN entry. Add the translation to restore parity. * fix(cli): resolve CI failures for background-agent roster restore - Add toolDisplayName.ListAgents translations (en, zh, zh-TW, ca) so the new list_agents tool has a zh entry; fixes i18n/index.test.ts. - Add loadPausedBackgroundAgents and consumePendingRecoveredAgentsNotice to the acpAgent worktree test config mock, which loadSession now calls via #restoreBackgroundAgentsOnResume; fixes acpAgent.worktree.test.ts. * refactor(core): extract incompatible-isolation blocked reason to a const Move the incompatible-isolation blocked-reason string out of an inline literal into a module-level INCOMPATIBLE_ISOLATION_BLOCKED_REASON const, matching its four sibling reasons so the text is discoverable by constant-name grep and edited alongside the others. * fix(core): preserve retained activity state on failed agent revive Address review feedback on the background-agent roster restore: - On a failed completed-agent revive, restore UI state with a non-empty guard instead of `??`. Because `restorePausedEntry` resets the paused entry's `recentActivities` to `[]`, the previous `failedEntry?.field ?? completedEntry.field` kept that empty array and dropped the pre-revive snapshot (the UI Progress section rendered empty). Applied consistently to pendingMessages, recentActivities, and pendingApprovals. Add regression coverage for previously untested paths: - failed revive preserves pre-revive recentActivities - terminal-agent cap admits only the newest MAX_RETAINED_TERMINAL_AGENTS completed sidecars on restore - /resume rollback reloads the old session's background agents - headless resume prepends the recovered-agents notice to the prompt * test(cli): cover interrupted-turn continuation not consuming recovered-agents notice Add ACP and headless regression tests asserting an interrupted-turn continuation does not consume the one-shot recovered-agents notice (the !isContinue / !continueInterrupted guards), so it is delivered on the user's next ordinary prompt. Mirrors the existing slash-command coverage. --------- Co-authored-by: Claude <noreply@anthropic.com> * feat(cli): support custom skill directories via settings (#7395) * feat(cli): support custom skill directories via settings (#7394) Add skills.directories setting that accepts an array of additional directory paths to scan for skills (SKILL.md files). Paths support ~ expansion. Directories are scanned recursively at user level, after the default ~/.qwen/skills/ directory. Example settings.json: { "skills": { "directories": ["~/.agent/skills", "~/.claude/skills"] } } Changes: - settingsSchema.ts: add skills.directories array setting - core Config: add customSkillDirs param and getCustomSkillDirs() - SkillManager: append custom dirs to user-level skill base dirs - CLI config: read skills.directories and pass to core Config * fix(cli): regenerate settings schema for skills.directories (#7394) * fix(core): address review feedback for custom skill directories (#7395) - Use optional chaining for getCustomSkillDirs() to prevent TypeError on partial Config mocks (workspace-skill-management, workspace-skills-status) - Reuse expandHomeDir utility instead of inline tilde expansion - Fix inaccurate 'scanned recursively' wording to 'one level deep' - Correct JSDoc: paths are raw, expansion happens in SkillManager - Trim whitespace from custom dir entries in CLI layer - Add tests for custom dir expansion, dedup, and partial config safety * fix(core): address review feedback for custom skill directories (#7395) * fix(core): address review feedback for custom skill directories (#7395) * test(core): add relative path resolution test for custom skill dirs (#7395) * fix(cli): add Array.isArray guard for skills.directories and safe mode test (#7395) * fix(skills): address review feedback on custom skill directories (#7395) - Add bare mode test for skills.directories guard - Include resolved absolute path in relative directory warning - Clarify that dedup applies to default user dirs, not bundled skills - Regenerate settings schema --------- Co-authored-by: qwen-code-dev-bot <qwen-code-dev-bot@users.noreply.github.com> Co-authored-by: qwen-code-ci-bot <qwen-code-ci-bot@users.noreply.github.com> Co-authored-by: Qwen Code Bot <qwen-code-bot@users.noreply.github.com> Co-authored-by: Qwen Code Autofix <qwen-code-autofix@users.noreply.github.com> * fix(core): add image modality support for qwen3.8-max and kimi-k3 models (#7491) * fix(core): add image modality support for qwen3.8-max models qwen3.8-max-preview supports image input but was falling through to the catch-all text-only rule because no pattern matched it. This caused the vision bridge to unnecessarily transcribe images via a secondary model instead of sending them directly to the primary model. * fix(core): also add image modality for kimi-k3 Kimi K3 officially supports image + video input but was falling through to the catch-all text-only rule, same issue as qwen3.8-max. * fix(dingtalk): preserve non-bot mention context (#7473) * fix(dingtalk): preserve non-bot mention context * test(dingtalk): cover plural mentions, staffId fallback, and edge cases (#7473) --------- Co-authored-by: qwen-code-dev-bot <qwen-code-dev-bot@users.noreply.github.com> * fix(core): harden the usage salvage around session deletion (#7425) Post-merge review follow-ups on #7391 (three findings): - Salvage the archived transcript in the active-branch deletion too: when both copies co-exist (an interrupted archive) and the fresh active transcript carries no telemetry, the archived copy holds the session's usage history and was deleted unsalvaged. The dedup guard makes the extra call a no-op whenever the active copy already wrote. - Enforce the "never blocks deletion" contract at the call site: a salvageUsageBestEffort wrapper catches and warns, so the guarantee is structural rather than an implementation detail of persistUsageBeforeTranscriptDeletion. The new failure-tolerance test (salvage rejects -> deletion still succeeds) fails without the wrapper — the bare await let the rejection escape through removeSessionFiles' rethrowing catch. - Clear the salvage module mock in beforeEach so the wiring test's invocationCallOrder assertions can never read stale calls. Co-authored-by: Claude Fable 5 <noreply@anthropic.com> * fix(core): make fork subagents discoverable (#7460) * test(core): cover Shell truncation without an artifact (#7470) Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(ci): autofix route checks existing labels on non-trigger label events (#7481) * fix(ci): autofix route checks existing labels on non-trigger label events When triage adds multiple labels in sequence, per-issue concurrency cancels earlier runs. If the last label is not a trigger label (e.g. scope/build-system), the surviving run skips the issue phase even though the issue already has autofix/approved + status/ready-for-agent. Before ignoring a non-trigger label event, check ISSUE_LABELS_JSON for both required labels. If present and the issue is open, proceed with the issue phase. Trust was already established when the trigger labels were applied (both require triage+ permission). * fix(ci): require trusted sender for label fallback * feat(cli): preserve semantic text when copying VP selections (#7286) * docs(cli): define semantic copy fidelity scope * docs(cli): address semantic frame review gaps * docs(cli): preserve soft-wrap source separators * feat(cli): preserve semantic selection copy * fix(cli): address semantic copy review findings * fix(cli): preserve clipped semantic boundaries * fix(cli): limit separator carrier joiner to visible width in wrap metadata The greedy /\s+/ match in wrapTextWithMetadata could capture more source whitespace than the separator carrier row actually consumed (e.g. a tab following a space), causing duplicated whitespace in semantic copy. Limit the match to visibleLine.length characters and add a mixed space/tab regression test. --------- Co-authored-by: 秦奇 <gary.gq@alibaba-inc.com> * test(core): stub the registry methods agent.ts actually calls (#7538) The shared stubRegistry in agent.test.ts was missing six methods that agent.ts reaches: bridgeApprovalEvents, getQueuedCount, registerResidentAgent, restartCompletedAgent, unregisterResidentAgent and waitForMessages. That is not a benign omission. The background body wraps its work in a try/catch that routes any throw into registry.fail(), so a missing method never surfaces as 'not a function' — it silently converts a successful run into a failed one. On the GOAL completion path unregisterResidentAgent is called immediately before complete(), so the TypeError replaced the completion entirely: registry.fail('fork-...', 'registry2.unregisterResidentAgent is not a function', ...) That is what broke 'runs a non-interactive fork through the background registry' on main. #7460 added the registry.complete assertion, which exposed the incomplete stub — before it, nothing checked whether the background body finished successfully and the TypeError was swallowed. Stub all six with their real return shapes (unregisterResidentAgent returns boolean, bridgeApprovalEvents returns the unsubscribe callback agent.ts later invokes, waitForMessages resolves to a list) and assert registry.fail was not called before asserting completion, so a future gap reports the actual error instead of 'complete: 0 calls'. * perf(startup): lazy-load Google GenAI SDK on first use (#7512) * perf(startup): lazy-load Google GenAI SDK on first use Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * codex: address PR review feedback (#7512) Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * codex: address PR review feedback (#7512) Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> --------- Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(vscode): use file picker image paths for vision input (#7493) * fix(vscode): use image paths from file picker * fix(vscode): keep image picker paths raw * fix(vscode): resolve image picker paths on submit * fix(vscode): send picked images as vision context * fix(vscode): encode prompt image file URIs * fix(vscode): address image path review comments * test(vscode): cover image file reference edge cases * fix(cli): open the actual serve fallback port (#7501) * fix(cli): open actual serve fallback port * test(cli): match serve URL to fallback listener * docs(cli): clarify serve listen error handling --------- Co-authored-by: Shaojin Wen <shaojin.wensj@alibaba-inc.com> * fix(ci): don't let one failing scenario sink the whole visual preview (#7511) The web-shell visuals render runs every screenshot and flow in a single `test:e2e:visuals`, and that step had no `continue-on-error`, while the compose and upload steps had no `if: always()`. So one failing or timing-out scenario failed the job, the artifact was never uploaded, and the publish workflow had nothing to post — the entire preview vanished even when every other scenario passed and its PNG was already on disk. A flow (a long multi-click sequence) is the most fragile scenario kind, so the fragile one silently takes down the deterministic screenshots. PR #7498 hit exactly this: 29 scenarios passed, one new channel-management flow timed out, and the PR got no preview and no comment at all. Make the after-capture step `continue-on-error` so the passing captures survive and the later steps still compose and upload them. The publish job only runs on a `success` conclusion, so the job must stay green — but a masked failure must not read as a clean preview. Ship the step's real `.outcome` (which continue-on-error does NOT mask, unlike `.conclusion`) to the publisher as `render-status.txt`, and have the comment builder use it: an empty preview whose render failed says "one or more scenarios failed to render" and is explicitly NOT the reassuring green check or the coverage-gap prompt (both imply the render ran); a partial preview is labelled partial above the shots that did render. A missing status file (older run) defaults to complete, so this only ever adds a warning, never suppresses a real preview. The failing scenario still needs fixing — it's now surfaced in the comment rather than by silently deleting everyone else's preview. Co-authored-by: wenshao <wenshao@example.com> * feat(web-shell): add selective shadow DOM isolation (#7551) Co-authored-by: 钉萁 <dingqi.jww@alibaba-inc.com> * feat(web-shell): add renderChatHeader slot for custom session header (#7553) * fix(cli): say review coverage gaps in the author's units, not chunk ids (#7550) The posted review body rendered coverage disclosures with the run's own bookkeeping as subjects: bare chunk ids, unsorted, one per subject. On a run that certified nothing (PR #7268) the body enumerated all 49 chunk ids across two sentences while opening with "Reviewed. Suggestions are inline." — the opener certified the exact thing every following sentence took back, and nothing on the PR page maps a chunk id to code. Three changes, all render-time — the structural entries, the caps, the caller-echo dedup and the stderr remediation still key on chunk ids, which is where the id is the selector a reader can act on: - Coverage now returns the plan's chunk→files table (DiffChunk.files was already in the plan JSON; the coverage type slice dropped it). - compose-review renders chunk gaps through describeChunkGap: every planned chunk collapses to "the entire diff", a narrow gap with known files names the files, and anything wider is counted against the plan's total. Applied to the receipt sentence, the uncoverable sentence (bare CLI entries only — caller-authored entries render verbatim) and the grouped per-cause sentences. - The COMMENT opener may no longer say "Reviewed." over a disclosure set that denies it: when no chunk is both covered and undisclosed — or no chunk universe could be read at all — it opens with a zero-certified warning instead. A rewritten launch demonstrably read its chunk, so coverage alone is not the test; certified is covered with no disclosure against it. Co-authored-by: verify <verify@local> * fix(autofix): retry a skipped-Prepare instead of stranding the PR terminal (#7490) * fix(autofix): retry a skipped-Prepare instead of stranding the PR terminal A base/infra failure BEFORE the agent runs was misread as an agent crash and terminated the PR forever. When an early step fails — installing or building the trusted base, checkout, node setup — the `Prepare branch and feedback` step is skipped, so NEWEST is empty, and the report step's "crashed before reading feedback" branch fired: MARK_ROUND=MAX_ROUNDS, terminal, scan skips it on every future tick. Observed: a web-shell TypeScript break on `main` failed `Install dependencies and build` (which builds the trusted base) across a whole scan batch, and SIX healthy PRs were stranded terminal at round=100 in one run — including ones at round 9 and 11 that had nothing to do with the break. `round=100` there is a terminal sentinel, not 100 attempts. NEWEST-empty now splits on steps.prepare.outcome: - 'skipped' (an earlier step failed, the agent never ran) is infra/base and transient: retry with a sentinel ts so the feedback stays live, incrementing the round so a PERSISTENTLY broken base is still bounded and stops at the cap (recoverable with /retry). - 'success'/'failure' (Prepare ran, no feedback produced) is a genuine pre-read agent crash: unchanged terminal behaviour. This is the reverse of the asymmetry #7482 addresses: that bounds a crash AFTER reading that retried forever; this stops a transient failure BEFORE reading from going terminal after one. * docs(autofix): note a pre-Prepare cancel also retries intentionally (#7490) * fix(autofix): also retry a cancelled/empty prepare outcome, not just skipped A previous review comment on this PR noted that a job cancelled before Prepare should retry too. It was right about the intent but the code did not do it: `steps.prepare.outcome` is 'cancelled' for a cancel and '' for a job that stopped before Prepare entered the step context — both DISTINCT from 'skipped', so `== 'skipped'` sent them to the terminal branch, the same over-termination this PR exists to fix. Match on "not a real Prepare run" (`!= 'success' && != 'failure'`) instead, so skipped, cancelled, and empty all retry; only a Prepare that actually ran to a verdict (success/failure) with no feedback stays terminal — the genuine pre-read agent crash. Test extended to drive the cancelled and empty cases (retry) and both real-run outcomes (terminal); mutation-verified that reverting to `== 'skipped'` reddens the cancelled case. * test(autofix): update the pre-read-crash case for the broadened retry The prior commit broadened NEWEST-empty retry to skipped/cancelled/empty but left the older 'replays the handoff decision' test asserting the old terminal behaviour for an unset PREPARE_OUTCOME (which now retries). That test's terminal cases now set PREPARE_OUTCOME=success/failure explicitly — the only outcomes that still terminate — so it exercises the genuine pre-read agent crash rather than the infra/cancel path. * test(autofix): anchor the skipped-Prepare extraction past the CONSEC block CI reddened `retries a skipped-Prepare` after main's consecutive-failure cap (#7482) merged into this branch: that block was inserted between this decision block and the report `{`, and it calls `gh api`. The test's `{`-anchored regex over-captured through it, so the extracted script ran the unstubbed `gh api` and failed. Anchor the end on the same `# Consecutive-failure` comment the sibling gate-crash test already uses, so the extraction stops at this decision block's own closing `fi`. * fix(autofix): exempt skipped-Prepare from the consecutive-failure breaker A broken base build skips Prepare, producing no API error file — so the consecutive-failure breaker ran on the new retry path and, after 5 scans, re-introduced the exact mass-stranding this PR exists to prevent. Exempt pre-agent infra failures (skipped/cancelled/empty outcome) from the breaker, mirroring the transient 429/5xx exemption: same failure class (not the PR's fault, self-heals, hits the whole batch). The round cap + sentinel-ts /retry recovery already bounds a persistently broken base. Also trim "checkout" from the retry headlines (checkout failures do not land in this branch) and hoist the duplicated MARK_TS assignment. * fix(autofix): reset the consecutive-failure streak on prior infra-failure markers The streak walker counted prior infra-failure headlines ("AutoFix could not start —…") as failures, inflating the consecutive-failure count on subsequent rounds. A PR with 3 real agent failures, then 3 rounds of base-build infra failures, then 1 more real failure would trip the cap-5 breaker even though only 4 rounds were the PR's fault. Add the two infra-failure headline patterns as reset strings in the streak walker, alongside the existing push and no-op resets. The genuine agent-crash headline ("AutoFix could not start evaluation —…") is deliberately excluded — it is a real failure and must still count. * fix(autofix): clarify infra-failure headlines and else-branch comment (#7490) Address review nits: the retry headline now mentions cancelled runs, the cap headline says 'reached the round cap' instead of overstating 'could not start for N rounds', the else-branch comment says 'prepare itself crashed' instead of 'agent crash', and the streak-reset pattern is simplified now that both infra headlines share the same prefix. --------- Co-authored-by: wenshao <wenshao@example.com> Co-authored-by: qwen-code-dev-bot <qwen-code-dev-bot@users.noreply.github.com> Co-authored-by: qwen-code-ci-bot <qwen-code-ci-bot@users.noreply.github.com> * fix(cli): keep role codenames and brief paths out of the posted review body (#7560) The posted body still carried two operator registers #7550 left in place: roster role subjects rendered their internal codenames ("Agent 1c: Cross-file tracer", "Test coverage matrix (whole-diff)"), and an unread brief's disclosure interpolated its filesystem path. And when verify and the reverse audit failed the same way, the body said it twice, in two near-identical sentences. - Every Brief now carries a publicLabel — the dimension said as what it checks ("the cross-file consistency pass") — and coverage's structural disclosures carry it as publicSubject beside the internal subject, plus a path-free publicReason for unread briefs. The internal label and the path stay on stderr, where they are the selector an operator acts on; every dedup and certification check still keys on the internal subject. - compose-review renders the public fields and groups by the reason the body PRINTS, so two unread briefs share one path-free sentence instead of repeating it per role. - verificationGaps merges verify and reverse-audit failures of the same delivery shape into one sentence with both subjects and both consequences; mixed shapes keep their precise per-role texts, and the per-role rebuild commands stay on stderr either way. Co-authored-by: verify <verify@local> * fix(autofix): retry an agent timeout instead of advancing past its feedback (#7563) A timeout evaluated NOTHING — the agent ran out of budget before finishing, so nothing was committed and the feedback is unaddressed. It was treated as an evaluated verdict (real ts, watermark advances), which strands that feedback: the next scan sees "nothing new" and never retries. Observed on #7471 (round 13/100), a heavily-reviewed 1871-line PR: rounds 11 and 13 timed out, but round 12 pushed — so a timeout is transient far more often than not, and advancing past it left the round-13 feedback unhandled. run-agent.mjs now drops an `agent-timeout` signal on result.timedOut, and the handoff routes it like a pre-verdict crash: sentinel ts (feedback stays live) and a retry, with a headline that names the real fix at the cap (split the PR or raise the budget). A PR that PERSISTENTLY times out is bounded by the round cap and the consecutive-failure cap, so this cannot loop forever — it just stops treating a one-off budget blip as a verdict. The loop guard stays terminal (a tool-call loop is a real defect, not a budget blip). An API error still routes to its own model-key handoff; the timeout signal is written only when NOT an API error. Co-authored-by: wenshao <wenshao@example.com> * feat(serve): add workspace-level generation (#7552) * feat(serve): add workspace-level generation * docs(serve): document workspace generation capability * fix(serve): align workspace generation contracts --------- Co-authored-by: ytahdn <ytahdn@gmail.com> * ci: matrix ECS runner update + sudo install + repository_dispatch trigger (#7513) * ci: matrix ECS runner update with sudo install - Use matrix strategy (ecs-update-sg, ecs-update-64c) to update both physical ECS hosts in parallel (fail-fast: false). - Always use sudo npm install -g so the package lands in /usr/local (system-wide PATH) instead of the runner user's home directory. - Move concurrency to job level (matrix context not available at workflow level per actionlint). - Add repository_dispatch trigger for release-driven updates. - Register new runner labels in actionlint.yaml. * fix(ci): use dispatch version for runner update --------- Co-authored-by: Shaojin Wen <shaojin.wensj@alibaba-inc.com> * fix(web-shell): include managed id in artifact open requests (#7570) Co-authored-by: 钉萁 <dingqi.jww@alibaba-inc.com> * feat(serve): persist workspace channel configuration (#7514) * feat(serve): persist workspace channel configuration * fix(serve): harden channel settings snapshots * fix(serve): validate startup channel names * fix(serve): reserve all channel name --------- Co-authored-by: Shaojin Wen <shaojin.wensj@alibaba-inc.com> * fix(sdk-python): require canonical form in validate_session_id (#7532) uuid.UUID() accepts several non-canonical spellings — braced {...}, urn:uuid:..., and dash-less hex — so validate_session_id let them through after the RFC 4122 variant check. The value is then forwarded to the CLI verbatim as --session-id/--resume, producing a malformed session id downstream rather than a clear error at the SDK boundary. Reject anything whose canonical form differs from the input. Case is deliberately not part of the comparison: UUID() lowercases, and an all-uppercase spelling is still valid canonical input. Co-authored-by: Shaojin Wen <shaojin.wensj@alibaba-inc.com> * fix(web-shell): sync background agent status (#7561) * fix(web-shell): sync background agent status * fix(web-shell): harden background agent reconciliation --------- Co-authored-by: ytahdn <ytahdn@gmail.com> * feat(core): propagate trusted daemon invocation context (#7279) * feat(core): propagate trusted daemon invocation context * test(cli): update ACP startup expectation * refactor(core): centralize ACP capability env key * test(cli): update worktree ACP core mock * test(integration): run daemon context smoke on PRs * test(ci): update no-AK smoke expectation * test(core): cover invocation context isolation * fix(cli): compare ACP capability safely * fix(docs): restore GitHub action input names * fix(core): sanitize private ACP capability from child env * fix(core): reuse private ACP capability env constant * test(cli): cover malformed trusted invocation context * test(acp-bridge): assert exact child environment --------- Co-authored-by: qwen-code-dev-bot <qwen-code-dev-bot@users.noreply.github.com> Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> Co-authored-by: 易良 <1204183885@qq.com> * fix(feishu): await stream cancels in media download teardown (#7465) * fix(feishu): await stream cancels in media download teardown downloadMedia left two reject paths' stream teardown unawaited: - the oversize-stream path called reader.cancel() without awaiting, so a cancel error during teardown became an unhandled rejection (fatal under Node's default --unhandled-rejections=throw); - the Content-Length reject path returned without cancelling resp.body, leaving the connection pinned until GC. Both were already fixed for the sibling DingTalk downloader in #7361 (which was itself modelled on this Feishu code), so this brings Feishu to parity. Adds a regression test that pins the reader.cancel() await via a rejecting cancel, plus an assertion that the Content-Length path releases the body. * test(feishu): cover a rejecting body.cancel() on the Content-Length path Mirrors the existing reader.cancel() teardown test for the other reject path, per review feedback. Removing the await on resp.body?.cancel() flips execution onto the 'rejected: size ... exceeds' branch and the test fails. * fix(autofix): make the review-address report wrapper lines bilingual (#7569) The agent's address-summary.md / no-action.md already ends with a collapsed Chinese translation, but the workflow-appended wrapper lines around it — the "Addressed/Reviewed the latest feedback" lead-in, the "Base-conflict check" line, and the "Re-review when you have a moment" footer — were English-only and sat outside that block. So the posted comment was only half translated, unlike the takeover-ack comments (full collapsed Chinese block) and the "model/模型" sign-off in this same report (already inline-bilingual). Give each wrapper line an inline Chinese translation, matching the model/模型 idiom. The English halves are preserved verbatim — the streak-reset detector globs on "Addressed the latest review feedback" and "no changes needed", and a test extracts these lines — so behaviour is unchanged and old English-only comments still match. A new test pins each English-Chinese pair so a future reword that drops the Chinese fails. The terminal handoff/failure comment is left English-only for now (SKILL.md keeps it so by design); that is a separate change. Co-authored-by: wenshao <wenshao@example.com> * feat(cli): post the review body bilingually when the PR description is Chinese (#7564) When the PR author writes Chinese, the posted /review body was English-only. fetch-pr now records whether the PR description contains Han characters (prDescriptionHasHan, detected from the same gh pr view call and stamped into the plan report), and compose-review renders the body bilingually off that flag: the English body leads, the complete Chinese version rides collapsed in a <details><summary>中文说明</summary> block, and the model footer stays outside the fold. The signal is the CLI's own — the caller cannot toggle the register of a certified body — and a local plan has no field, so nothing changes for terminal-only reviews. Every deterministic body fragment carries an en/zh pair end to end: compose-review's clause templates and describeChunkGap phrases, the coverage disclosures (reasons, publicLabel role subjects via a new publicLabelZh, the path-free unread-brief reason) and the Step 4/5 gap texts including the combined same-shape sentence. Fragments with no deterministic translation — model-written findings, caller echoes, interpolated errors — ride verbatim in both halves. verificationGaps now returns structural {subject, reason, subjectZh, reasonZh} entries, which also removes compose-review's last recover-the-boundary-from-prose parse. SKILL.md instructs the same format for the model-authored inline comments: English finding first (marker and suggestion block stay in the English half — tooling filters on them), full Chinese translation collapsed beneath, footer last. Co-authored-by: verify <verify@local> * feat(autofix): auto-rerun a check that died on infrastructure, once (#7562) * feat(autofix): auto-rerun a check that died on infrastructure, once A failed check can be red because the machine died, not the code — a self-hosted runner losing the server, the disk filling. #7490's E2E failed with "runner lost communication with the server" and went green on a rerun. The scan now reruns such a check's failed jobs automatically. Detection is a conservative annotation whitelist (INFRA_FAILURE_SIGNATURES) — only unambiguous machine failures, never a test-level timeout, which could be a real regression. The one-shot guard is run_attempt, not a marker: a run already retried to attempt 2 and still infra-failing is persistent, so it is left for a human; after a rerun the attempt increments, so the next scan will not rerun it. Every step is fail-safe (any API error → no rerun), it runs only when the PR actually has a failed check, and the gate carries the same review-address carve-out as the other check selectors so the loop never reruns its own runs. This is the transient-infra sibling of #7554 (stale-base): that merges current main when a check is base-inherited; this reruns when a check died on the runner. Neither touches a check that is a genuine failure. Note: rerun-failed-jobs needs the PAT to hold `actions: write`. * fix(autofix): use POSIX ERE groups in infra-failure regex, cover all signatures in tests (#7562) * fix(autofix): also treat a git fetch/clone transport death as infra #6506's checkout died mid-transfer — "fetch-pack: invalid index-pack output" and "RPC failed; curl 92 ... CANCEL" — which then hung the job into the 20m limit. That is infra, not the PR (it only touches a doc), and a re-run made it green. But the infra-signature whitelist did not cover it, so the auto-rerun did not fire and it waited on a human. Add `invalid index-pack output` and `RPC failed` — the two canonical git-transport-death phrases — to INFRA_FAILURE_SIGNATURES. A co-present job-timeout line does not block the match (one matching line classifies the run), and a BARE timeout with no transport signature is still left alone, since it can be a real regression. Both new signatures are pinned in the test's per-signature loop, plus a case on #6506's real composite annotation and a bare-timeout-is-not-rerun guard. * fix(autofix): paginate annotations and filter Autofix runs in infra-rerun loop (#7562) --------- Co-authored-by: wenshao <wenshao@example.com> Co-authored-by: Qwen Code Bot <qwen-code-bot@users.noreply.github.com> Co-authored-by: qwen-code-ci-bot <qwen-code-ci-bot@users.noreply.github.com> * fix(serve): detect stale SSE cursors across daemon restarts via epoch token; preserve turn attribution and surface compaction failures in replay (#7458) * fix(daemon): epoch-token restart detection, compaction attribution, and degraded-snapshot signaling (DAEMON-001/007/008) * fix(acp-bridge): field-level turn attribution merge and replayDegraded bridge test (#7458) * fix(serve): skip bus epoch lookup for virtual subagent SSE streams (#7458) The REST SSE route looked up the bus epoch for every session id, but virtual subagent sessions ride their own bus and their compound ids are not in the bridge's byId map, so the lookup threw and aborted the subscription — breaking subagent event streams. Skip the lookup for the virtual path and degrade a torn-down real session to a headerless stream (mirrors the /acp route). Also bumps the daemon browser SDK bundle budget (167KB -> 168KB) for the epoch fields and declares eventEpoch on DaemonSession so the create/attach path drops its inline type cast. * fix(serve): stamp eventEpoch on accepted continuations and surface replayDegraded in the SDK (#7458) Address three review suggestions: - POST /session/:id/continue now returns eventEpoch alongside lastEventId, mirroring the prompt 202 envelope so continuation-seeded SSE cursors detect daemon restarts (DAEMON-001) - DaemonSessionClient exposes replayDegraded from the load response so SDK consumers can prefer the full transcript over a degraded snapshot - add /acp dispatch-level regression test for the degraded-snapshot stderr breadcrumb (fires only when snapshot.degraded is set) * test(cli): fix load-reply race in the degraded-breadcrumb transport test Await each session/load reply frame before opening the session stream so the GET cannot race conn.ownSession() into a 403; addresses the review Critical on the deg-0 arm. * fix(serve): allow and expose X-Qwen-Event-Epoch in CORS headers Cross-origin SSE clients must send the epoch header through preflight and read it from the response, or stale-cursor detection (DAEMON-001) is silently disabled for every CORS client. --------- Co-authored-by: qwen-code-bot <qwen-code-bot@users.noreply.github.com> Co-authored-by: qwen-code-dev-bot <qwen-code-dev-bot@users.noreply.github.com> Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> Co-authored-by: Qwen Autofix <qwen-autofix[bot]@users.noreply.github.com> * feat(core): Align GenAI telemetry with ARMS (#7536) * feat(core): align GenAI telemetry with ARMS Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(core): remove estimated token usage splits Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(core): address GenAI telemetry review feedback Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> --------- Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> Co-authored-by: Shaojin Wen <shaojin.wensj@alibaba-inc.com> * fix(serve): avoid TOCTOU race dropping live sessions from list response (#7556) * Initial plan * fix(serve): avoid TOCTOU race dropping live sessions from list response --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: 易良 <1204183885@qq.com> * fix(cli): prevent monitor turns after task_stop (#7573) --------- Co-authored-by: 秦奇 <gary.gq@alibaba-inc.com> Co-authored-by: Qwen Code Autofix <qwen-code-autofix@users.noreply.github.com> Co-authored-by: Qwen Code Bot <qwen-code-bot@users.noreply.github.com> Co-authored-by: qwen-code-ci-bot <qwen-code-ci-bot@users.noreply.github.com> Co-authored-by: Qwen Code Autofix <qwen-code-autofix[bot]@users.noreply.github.com> Co-authored-by: qwen-code-dev-bot <qwen-code-dev-bot@users.noreply.github.com> Co-authored-by: destire-mio <qppque@gmail.com> Co-authored-by: destire-mio <248462155+destire-mio@users.noreply.github.com> Co-authored-by: Dragon <52599892+DragonnZhang@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: 易良 <1204183885@qq.com> Co-authored-by: jinye <djy1989418@126.com> Co-authored-by: chinesepowered <nlai@rediffmail.com> Co-authored-by: ovochouovo <18212194+ovochouovo@users.noreply.github.com> Co-authored-by: Edenman <67549719+BZ-D@users.noreply.github.com> Co-authored-by: 克竟 <dingbingzhi.dbz@alibaba-inc.com> Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> Co-authored-by: ytahdn <1294726970@qq.com> Co-authored-by: ytahdn <ytahdn@gmail.com> Co-authored-by: Truraly <94105924+Truraly@users.noreply.github.com> Co-authored-by: zjgzx1988 <zjgzx1988@hotmail.com> Co-authored-by: hogeheer499-commits <hogeheer499@gmail.com> Co-authored-by: hogeheer <267467744+hogeheer499-commits@users.noreply.github.com> Co-authored-by: Shaojin Wen <shaojin.wensj@alibaba-inc.com> Co-authored-by: wenshao <wenshao@example.com> Co-authored-by: qwen-code-dev-bot <qwen-code-dev@service.alibaba.com> Co-authored-by: Nothing Chan <chenliu.cl@alibaba-inc.com> Co-authored-by: 钉萁 <dingqi.jww@alibaba-inc.com> Co-authored-by: yuanyuanAli <135116774+yuanyuanAli@users.noreply.github.com> Co-authored-by: verify <verify@local> Co-authored-by: qqqys <qys177@gmail.com> Co-authored-by: callmeYe <512217680@qq.com> Co-authored-by: Qwen Autofix <qwen-autofix[bot]@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Collaborator
|
Released in v0.20.1. |
Collaborator
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does
This PR makes the daemon serve mode guarantee that every prompt accepted with 202 ends with exactly one formal terminal event — a
turn_completeorturn_errorkeyed by itspromptId— on every path a prompt can take. Concretely:turn_completewithstopReason: 'cancelled'for it, instead of silently discarding the FIFO node.turn_error{code:'prompt_deadline_exceeded'}terminal, the per-session FIFO is released, active-prompt bookkeeping is cleared, and the agent is best-effort cancelled — a wedged agent that ignorescancel()can no longer pin the session forever.session_closed/session_diedframe and closing the event bus, and they abort the flushed prompts' signals.promptActiveflag, so queued prompts survive the FIFO hand-off gap; the deferred close-on-prompt-complete additionally requires the session entry to still be live and runs after the terminal broadcast, not before.The wire protocol is unchanged — no new event types or fields; consumers keyed on
turn_complete/turn_errorbypromptId(SDKmatchTurnEvent, webui turn settlement) just start receiving the terminals they already expect.One deliberate semantic change: prompts queued behind a prompt whose session then crashes now reject their caller with
AbortError(the flush aborts them) instead ofSessionNotFoundError; their SSE observers get a formal error terminal either way.Why it's needed
SSE consumers settle a turn by awaiting a terminal event for their
promptId. Today several ordinary paths drop that terminal entirely: removing a queued prompt emits nothing; a non-cooperative agent under a deadline leaves the prompt unsettled, permanently wedging the session FIFO and exempting the session from idle reaping (an unbounded leak driven by one bad turn); and every teardown path closes the event bus before pending prompts get a terminal, so their outcomes vanish. Separately, a detach landing in the hand-off gap between two prompts closes the session and destroys queued work that was already accepted with 202. Each of these turns into an indefinite client-side hang or silent data loss. Audited as DAEMON-002/003/004/005 in an external reliability review.Reviewer Test Plan
How to verify
The new test suite
prompt terminal exactly-once (DAEMON-002/003/004/005)in the acp-bridge package covers each guarantee behaviorally: dedup under racing publishers, queued-removal terminal, deadline expiry against a wedged agent (terminal + FIFO release + follow-up prompt dispatches), teardown flush ordering (terminals strictly beforesession_closed/session_died), draining before close-on-last-detach, and the deferred-close-vs-broadcast ordering. Run:Expected: all green (424 tests in bridge.test.ts locally). For the deadline behavior end-to-end: start a daemon with
--prompt-deadline-ms, send a prompt to an agent that never settles and ignores cancellation, and observe on the session SSE stream aturn_errorwithcode: 'prompt_deadline_exceeded'for thatpromptId, after which a follow-up prompt on the same session dispatches normally (previously: no event ever, and the session wedged permanently).Mutation testing was used to validate test strength: five hand-injected regressions (latch removed, close-path flush removed, deadline race removed, queued-prompt close condition removed, queued-removal terminal removed) were each caught by at least one failing test.
Evidence (Before & After)
N/A (daemon/SSE behavior, covered by unit tests above).
Tested on
Environment (optional)
Local unit tests via vitest; full
npm run build && npm run typecheckpass.Risk & Scope
sendPromptcallers as a typedPromptDeadlineExceededError.SessionNotFoundErrortoAbortError(see above); no in-repo caller depends on the old type.Linked Issues
Fixes #7399
中文说明
本 PR 做了什么
本 PR 使 daemon serve 模式保证：每个以 202 被接受的 prompt，在其可能经历的每条路径上，都恰好收到一个以其
promptId为键的正式终态事件（turn_complete或turn_error）。具体包括：stopReason: 'cancelled'的turn_complete，不再静默丢弃 FIFO 节点。turn_error{code:'prompt_deadline_exceeded'}终态、释放会话 FIFO、清理 active-prompt 记账并尽力取消 agent——无视cancel()的卡死 agent 不再能永久钉死会话。session_closed/session_died帧和关闭事件总线之前，先为每个未终结 prompt 冲刷一个错误终态，并 abort 这些 prompt 的信号。promptActive标志，排队中的 prompt 得以在 FIFO 交接间隙中存活；延迟关闭额外要求会话条目仍然存活，且在终态广播之后执行而非之前。线上协议无任何变化——没有新增事件类型或字段；按
promptId等待turn_complete/turn_error的消费者（SDKmatchTurnEvent、webui 回合结算）只是开始收到它们本就期待的终态。一处有意的语义变化：排队在崩溃会话后面的 prompt，其调用方现在收到
AbortError（由冲刷主动 abort）而非SessionNotFoundError；其 SSE 观察者无论如何都会收到正式的错误终态。为什么需要
SSE 消费者依靠等待自己
promptId的终态事件来结算回合。当前多条常规路径会彻底丢掉这个终态：移除排队 prompt 不发任何事件；配置 deadline 时遇到不配合的 agent 会让 prompt 永不结算，永久钉死会话 FIFO 并使会话豁免于空闲回收（一个坏回合导致无界资源泄漏）；每条销毁路径都在未终结 prompt 拿到终态之前关闭事件总线，其结局凭空消失。另外，detach 落在两个 prompt 的交接间隙时会关闭会话，销毁已被 202 接受的排队工作。上述每一条都会变成客户端的无限等待或静默数据丢失。这些问题在外部可靠性审计中被记录为 DAEMON-002/003/004/005。审阅者测试计划
如何验证
acp-bridge 包中新增的测试套件
prompt terminal exactly-once (DAEMON-002/003/004/005)从行为层面覆盖每项保证：竞争发布下的去重、排队移除的终态、deadline 对卡死 agent 的到期处理（终态 + FIFO 释放 + 后续 prompt 正常派发）、销毁路径的冲刷顺序（终态严格先于session_closed/session_died）、close-on-last-detach 前的排空、以及延迟关闭与广播的先后顺序。运行：预期：全部通过（本地 bridge.test.ts 共 424 个测试）。端到端验证 deadline 行为：以
--prompt-deadline-ms启动 daemon，向一个永不结束且无视取消的 agent 发送 prompt，在会话 SSE 流上应观察到该promptId的turn_error（code: 'prompt_deadline_exceeded'），之后同一会话的后续 prompt 正常派发（修复前：永远没有事件，会话永久卡死）。测试强度经变异测试验证：手工注入五处回归（移除闩锁、移除关闭路径冲刷、移除 deadline 竞速、移除排队 prompt 关闭条件、移除排队移除终态），每处均被至少一个失败测试捕获。
证据（Before & After）
N/A（daemon/SSE 行为，由上述单元测试覆盖）。
已测试平台
macOS 本地验证通过；Windows/Linux 依赖 CI。
环境（可选）
本地 vitest 单元测试；完整
npm run build && npm run typecheck通过。风险与范围
PromptDeadlineExceededError暴露给sendPrompt调用方。SessionNotFoundError变为AbortError（见上文）；仓库内无调用方依赖旧类型。关联 Issue
Fixes #7399