Skip to content

fix: handle abort() promise rejection in CopilotCLISession (fixes #316429) #316435

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

Open
vs-code-engineering wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

fix: handle abort() promise rejection in CopilotCLISession (fixes #316429) #316435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions extensions/copilot/src/extension/chatSessions/copilotcli/node/copilotcliSession.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,9 +929,9 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
const logStartTime = Date.now();
disposables.add(token.onCancellationRequested(() => {
this._cancelPendingCancellationAbort?.();
this._sdkSession.abort();
this._sdkSession.abort().catch(() => { /* expected AbortError on cancellation */ });
}));
disposables.add(toDisposable(() => this._sdkSession.abort()));
disposables.add(toDisposable(() => { this._sdkSession.abort().catch(() => { /* expected AbortError on dispose */ }); }));

try {
if ('command' in input && input.command !== 'plan') {
Expand Down Expand Up @@ -1048,13 +1048,13 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
this.logService.trace(`[CopilotCLISession] Unable to mark interrupted response: ${error instanceof Error ? error.message : String(error)}`);
}
}
this._sdkSession.abort();
this._sdkSession.abort().catch(() => { /* expected AbortError on cancellation timeout */ });
}, 250);
this._cancelPendingCancellationAbort?.();
this._cancelPendingCancellationAbort = cancelAbort;
cancelCancellationAbort = cancelAbort;
}));
disposables.add(toDisposable(() => this._sdkSession.abort()));
disposables.add(toDisposable(() => { this._sdkSession.abort().catch(() => { /* expected AbortError on dispose */ }); }));

this._status = ChatSessionStatus.InProgress;
this._statusChange.fire(this._status);
Expand Down
Loading