Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(cli): respect cancellation during device authorization retries (#44315)
huyengiang101086-spec847a8a207473
diff --git a/cli/src/auth/device-flow.test.ts b/cli/src/auth/device-flow.test.tsindex 5bc16bfc23d..6b84aa7ada6 100644--- a/cli/src/auth/device-flow.test.ts+++ b/cli/src/auth/device-flow.test.ts@@ -1,9 +1,11 @@import type { CodeResponse, PollRequest, PollResult, PollSuccess } from './device-api'import type { Clock } from './device-flow'+import { startMock } from '@test/fixtures/dify-mock/server'import { describe, expect, it, vi } from 'vite-plus/test'import { BaseError } from '@/errors/base'import { ErrorCode, ExitCode } from '@/errors/codes'import { isCancelled } from '@/plugins/commands/cancel'+import { deviceApi } from './device-api'import {awaitAuthorization,DEFAULT_INTERVAL_MS,@@ -11,6 +13,7 @@ import {POLL_RETRY_ATTEMPTS,POLL_RETRY_CAP_MS,POLL_RETRY_INITIAL_MS,+ pollAuthorization,realClock,} from './device-flow'@@ -178,3 +181,48 @@ describe('awaitAuthorization', () => {await expect(awaitAuthorization(api, code, { clock })).rejects.toThrow(/old server/)})})++it('does not retry device polling after cancellation during backoff', async () => {+ const mock = await startMock({ scenario: 'server-5xx' })+ const clock = new FakeClock()+ clock.sleepMs = async (ms) => {+ clock.sleeps.push(ms)+ clock.cancelled = true+ mock.setScenario('happy')+ }+ try {+ const api = deviceApi(mock.url, { insecure: true })+ await expect(awaitAuthorization(api, code, { clock })).rejects.toMatchObject({+ code: ErrorCode.Unknown,+ message: 'cancelled',+ })+ expect(mock.requestCount).toBe(1)+ expect(clock.sleeps).toEqual([POLL_RETRY_INITIAL_MS])+ } finally {+ await mock.stop()+ }+})++it('does not poll a resumed authorization when already cancelled', async () => {+ const pollOnce = vi.fn().mockResolvedValue({ status: 'approved', success: successPayload })+ const clock = new FakeClock()+ clock.cancelled = true+ await expect(pollAuthorization({ pollOnce }, code.device_code, { clock })).rejects.toMatchObject({+ code: ErrorCode.Unknown,+ message: 'cancelled',+ })+ expect(pollOnce).not.toHaveBeenCalled()+})++it('does not accept approval if cancellation happened while polling', async () => {+ const clock = new FakeClock()+ const pollOnce = async (): Promise<PollResult> => {+ clock.cancelled = true+ return { status: 'approved', success: successPayload }+ }+ await expect(awaitAuthorization({ pollOnce }, code, { clock })).rejects.toMatchObject({+ code: ErrorCode.Unknown,+ message: 'cancelled',+ })+ expect(clock.sleeps).toEqual([])+})diff --git a/cli/src/auth/device-flow.ts b/cli/src/auth/device-flow.tsindex f8b0f6cca33..12516d6f541 100644--- a/cli/src/auth/device-flow.ts+++ b/cli/src/auth/device-flow.ts@@ -89,7 +89,9 @@ async function pollWithRetry(): Promise<PollResult> {let backoff = POLL_RETRY_INITIAL_MSfor (let attempt = 1; attempt <= POLL_RETRY_ATTEMPTS; attempt++) {+ if (clock.isCancelled()) throw cancelledError()const result = await api.pollOnce(req)+ if (clock.isCancelled()) throw cancelledError()if (result.status !== 'retry_5xx') return resultif (attempt === POLL_RETRY_ATTEMPTS) breakawait clock.sleepMs(backoff)