Skip to content

fix(acp): keep SDK prompt owner across session continuations #6354

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yeachan-Heo merged 2 commits into from
Oct 5, 2026
Merged

fix(acp): keep SDK prompt owner across session continuations #6354

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
cdd5f7d
fix(acp): preserve correlation across provider retries
probepark Oct 5, 2026
60e1f36
fix(acp): type retry correlation propagation
probepark Oct 5, 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
3 changes: 3 additions & 0 deletions packages/coding-agent/changelog.d/fix-acp-retry-terminal-correlation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Fixed

- Preserve ACP prompt correlation across provider-error retry terminals so completed turns settle instead of being abandoned by the watchdog.
8 changes: 7 additions & 1 deletion packages/coding-agent/src/session/agent-session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24346,6 +24346,11 @@ export class AgentSession {
scope?: AttemptScope,
scopeWasClean = this.#isRetryScopeClean(scope),
): Promise<boolean | ManagedAttemptDecision> {
// Capture the SDK owner before the failed attempt retires its active scope.
// Retry/continuation terminals must remain attributed to the prompt that
// admitted the provider call, even when the retry starts after agent_end.
const retrySdkRunToken =
(scope ? this.#sdkRunTokensByAttemptScope.get(scope) : undefined) ?? this.#activeSdkRunToken;
const retryAbortEpoch = this.#abortAdmissionEpoch;
const retryCancelled = () =>
this.#isDisposed || this.#sessionAdmissionClosing || this.#abortAdmissionEpoch !== retryAbortEpoch;
Expand Down Expand Up @@ -24959,7 +24964,7 @@ export class AgentSession {
await this.agent.continue({
...this.#managedFallbackPromptOptions(),
onRunAccepted: (handle: AttemptRunHandle) => {
this.#acceptSdkAttemptRun(handle, this.#activeSdkRunToken);
this.#acceptSdkAttemptRun(handle, retrySdkRunToken);
},
});
return;
Expand Down Expand Up @@ -24987,6 +24992,7 @@ export class AgentSession {
allowDuringCancelAndSubmit: true,
suppressPredecessorAgentEnd: resourceRunId !== undefined,
resourceRunId,
sdkRunToken: retrySdkRunToken,
onError: () => this.#failRetryRecovery("Retry continuation failed to start"),
onSkip: () => this.#failRetryRecovery("Retry continuation was superseded"),
});
Expand Down
Loading