Skip to content

agentHost: Reconcile retained-child status after stale reads #335979

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

Draft
Dmitriy Vasyura (dmitrivMS) wants to merge 3 commits into
base: main
Choose a base branch
from
+435 −17
Draft

agentHost: Reconcile retained-child status after stale reads #335979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d79781a
agentHost: Reconcile retained-child status after stale reads
dmitrivMS Sep 12, 2026
9eda9c8
agentHost: Clear aborted child bookkeeping before reuse
dmitrivMS Sep 13, 2026
4b91fb8
Merge branch 'main' into agents/retained-child-state-fix-validation
dmitrivMS Sep 14, 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
39 changes: 30 additions & 9 deletions src/vs/platform/agentHost/node/copilot/copilotAgentSession.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,7 @@ export class CopilotAgentSession extends Disposable {
private readonly _autoModeResolvedByToolCallId = new Map<string, NonNullable<UsageInfoMeta['autoModeResolved']>>();
private readonly _activeSubagentAgentIds = new Set<string>();
private _subagentTaskStatusRevision = 0;
private _subagentTaskStatusReconciledRevision = 0;
private readonly _subagentTaskStatusRefreshThrottler = this._register(new Throttler());
private readonly _unroutableSubagentToolCallIds = new Set<string>();
private readonly _autoApprovals = new Map<string, PermissionAssistedApproval | null>();
Expand Down Expand Up @@ -1590,19 +1591,33 @@ export class CopilotAgentSession extends Disposable {
}

private _reconcileSubagentTaskStatuses(): Promise<void> {
const revision = ++this._subagentTaskStatusRevision;
this._subagentTaskStatusRevision++;
const abortToken = this._abortToken;
return this._subagentTaskStatusRefreshThrottler.queue(async () => {
const tasks = await this._wrapper.session.rpc.tasks.list();
if (this._store.isDisposed || revision !== this._subagentTaskStatusRevision) {
return;
}
for (const task of tasks.tasks) {
if (task.type !== 'agent') {
while (!this._store.isDisposed && !abortToken.isCancellationRequested
&& this._subagentTaskStatusReconciledRevision !== this._subagentTaskStatusRevision) {
const revision = this._subagentTaskStatusRevision;
const tasks = await this._wrapper.session.rpc.tasks.list();
if (this._store.isDisposed || abortToken.isCancellationRequested) {
Comment thread
dmitrivMS marked this conversation as resolved.
return;
}
if (revision !== this._subagentTaskStatusRevision) {
this._logService.trace(`[Copilot:${this.sessionId}] Refreshing stale subagent task status: revision=${revision}, currentRevision=${this._subagentTaskStatusRevision}`);
continue;
}
if (task.status === 'idle' || task.status === 'completed' || task.status === 'failed' || task.status === 'cancelled') {
this._completeSubagentTurn(task.id, task.toolCallId);
for (const task of tasks.tasks) {
if (this._store.isDisposed || abortToken.isCancellationRequested || revision !== this._subagentTaskStatusRevision) {
break;
}
if (task.type !== 'agent') {
continue;
}
if (task.status === 'idle' || task.status === 'completed' || task.status === 'failed' || task.status === 'cancelled') {
this._logService.trace(`[Copilot:${this.sessionId}] Reconciling subagent task status: agentId=${task.id}, status=${task.status}, revision=${revision}`);
this._completeSubagentTurn(task.id, task.toolCallId);
}
}
this._subagentTaskStatusReconciledRevision = revision;
}
});
}
Expand Down Expand Up @@ -3430,6 +3445,12 @@ export class CopilotAgentSession extends Disposable {
this._abortingTurn = abortTarget;
if (abortingTurn) {
this._dropLateRootTurnEvents = true;
for (const agentId of this._activeSubagentAgentIds) {
const parentToolCallId = this._parentToolCallIdsByAgentId.get(agentId);
if (parentToolCallId && this._rootTurnIdBySubagentToolCallId.get(parentToolCallId) === abortingTurn.id) {
this._completeSubagentTurn(agentId, parentToolCallId);
}
}
}
this._beginAbort();
this._drainPendingSteeringFlips();
Expand Down
Loading