Skip to content

Keep a finished agent turn idle when a late tool result arrives #15173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teamleaderleo merged 2 commits into from
Sep 28, 2026
Merged

Keep a finished agent turn idle when a late tool result arrives #15173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c366c49
test: a running tool result must not reopen a settled turn
austinywang Sep 28, 2026
0394e53
fix: settle a resolution only on a declared idle phase
austinywang Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Packages/macOS/CmuxAgentJournal/Sources/CmuxAgentJournal/AgentNotificationReconciler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,12 @@ public struct AgentNotificationReconciler: Sendable {
}
if !session.attentionIdentities.isEmpty {
session.phase = .needsInput
} else if let declaredPhase = draft.declaredPhase {
session.phase = declaredPhase
session.rootStopped = declaredPhase == .idle
} else if draft.declaredPhase == .idle {
// Only an idle declaration (a dismissed idle dialog) settles the
// turn. Feed declares every tool result `.running`, which must not
// reopen a turn that already completed.
session.phase = .idle
session.rootStopped = true
} else if session.rootStopped && session.children.isEmpty {
session.phase = .idle
} else if session.phase == .needsInput {
Expand Down
11 changes: 11 additions & 0 deletions ...macOS/CmuxAgentJournal/Tests/CmuxAgentJournalTests/AgentNotificationReconcilerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,17 @@ struct AgentNotificationReconcilerTests {
#expect(reconciler.lifecycleEvent(response).draft.declaredPhase == .idle)
}

@Test(arguments: ["claude", "codex"])
func runningToolResultDoesNotReopenSettledTurn(source: String) {
// Feed declares every tool result `.running`; only an idle declaration settles.
var reconciler = AgentNotificationReconciler()
_ = reconciler.apply(event(1, .turnCompleted, source: source))
let result = event(2, .attentionResolved, source: source, request: "ordinary-tool",
notify: false, declaredPhase: .running)
#expect(reconciler.apply(result).invalidatedCorrelationKeys.isEmpty)
#expect(reconciler.lifecycleEvent(result).draft.declaredPhase == .idle)
}

@Test(arguments: ["claude", "codex"])
func ambiguousOrOlderIdentitylessResponsePreservesAttention(source: String) {
for responseTurn in [nil, "previous", "turn-1"] as [String?] {
Expand Down
Loading