Skip to content

fix(core): handle AbortError thrown during processTurn #21296

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
gsquared94 merged 2 commits into from
Mar 6, 2026
Merged

fix(core): handle AbortError thrown during processTurn #21296

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
d20259a
fix(core): handle AbortError in sendMessageStream
MumuTW Mar 5, 2026
59b23cd
Merge branch 'main' into fix-process-turn-aborterror-21122
gsquared94 Mar 6, 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
17 changes: 17 additions & 0 deletions packages/core/src/core/client.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,23 @@ describe('Gemini Client (client.ts)', () => {
);
});

it('yields UserCancelled when processTurn throws AbortError', async () => {
const abortError = new Error('Aborted');
abortError.name = 'AbortError';
vi.spyOn(client['loopDetector'], 'turnStarted').mockRejectedValueOnce(
abortError,
);

const stream = client.sendMessageStream(
[{ text: 'Hi' }],
new AbortController().signal,
'prompt-id-abort-error',
);
const events = await fromAsync(stream);

expect(events).toEqual([{ type: GeminiEventType.UserCancelled }]);
});

it.each([
{
compressionStatus:
Expand Down
8 changes: 7 additions & 1 deletion packages/core/src/core/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
type RetryAvailabilityContext,
} from '../utils/retry.js';
import type { ValidationRequiredError } from '../utils/googleQuotaErrors.js';
import { getErrorMessage } from '../utils/errors.js';
import { getErrorMessage, isAbortError } from '../utils/errors.js';
import { tokenLimit } from './tokenLimits.js';
import type {
ChatRecordingService,
Expand Down Expand Up @@ -957,6 +957,12 @@ export class GeminiClient {
);
}
}
} catch (error) {
if (signal?.aborted || isAbortError(error)) {
yield { type: GeminiEventType.UserCancelled };
return turn;
}
throw error;
} finally {
const hookState = this.hookStateMap.get(prompt_id);
if (hookState) {
Expand Down
Loading