diff --git a/src/web-server/routes/cliproxy-auth-routes.ts b/src/web-server/routes/cliproxy-auth-routes.ts
index c893324a..fca6f37c 100644
--- a/src/web-server/routes/cliproxy-auth-routes.ts
+++ b/src/web-server/routes/cliproxy-auth-routes.ts
@@ -62,6 +62,7 @@ import { requireLocalAccessWhenAuthDisabled } from '../middleware/auth-middlewar
 
 const router = Router();
 const MANUAL_AUTH_STATE_TTL_MS = 10 * 60 * 1000;
+const POLLED_AUTH_LOCAL_TOKEN_GRACE_MS = 15 * 1000;
 type ProviderTokenSnapshot = {
   file: string;
   mtimeMs: number;
@@ -74,6 +75,7 @@ const pendingManualAuthState = new Map<
     nickname?: string;
     expectedAccountId?: string;
     createdAt: number;
+    upstreamCompletedAt?: number;
     knownTokenFiles: ProviderTokenSnapshot[];
   }
 >();
@@ -122,6 +124,7 @@ function getManualAuthState(state: string | undefined): {
   nickname?: string;
   expectedAccountId?: string;
   createdAt: number;
+  upstreamCompletedAt?: number;
   knownTokenFiles: ProviderTokenSnapshot[];
 } | null {
   if (!state) {
@@ -138,10 +141,27 @@ function getManualAuthState(state: string | undefined): {
     nickname: pending.nickname,
     expectedAccountId: pending.expectedAccountId,
     createdAt: pending.createdAt,
+    upstreamCompletedAt: pending.upstreamCompletedAt,
     knownTokenFiles: pending.knownTokenFiles,
   };
 }
 
+function markManualAuthUpstreamCompleted(state: string, now = Date.now()): number | null {
+  pruneExpiredManualAuthState(now);
+  const pending = pendingManualAuthState.get(state);
+  if (!pending) {
+    return null;
+  }
+
+  if (pending.upstreamCompletedAt !== undefined) {
+    return pending.upstreamCompletedAt;
+  }
+
+  pending.upstreamCompletedAt = now;
+  pendingManualAuthState.set(state, pending);
+  return now;
+}
+
 function listProviderTokenSnapshots(provider: CLIProxyProvider): ProviderTokenSnapshot[] {
   const tokenDir = getProviderTokenDir(provider);
   if (!fs.existsSync(tokenDir)) {
@@ -918,6 +938,16 @@ router.get('/:provider/status', async (req: Request, res: Response): Promise<voi
 
       const tokenSnapshot = findNewTokenSnapshotForPendingAuth(localProvider, pendingAuth);
       if (!tokenSnapshot) {
+        const upstreamCompletedAt =
+          pendingAuth.upstreamCompletedAt ?? markManualAuthUpstreamCompleted(state, Date.now());
+        if (
+          upstreamCompletedAt !== null &&
+          Date.now() - upstreamCompletedAt < POLLED_AUTH_LOCAL_TOKEN_GRACE_MS
+        ) {
+          res.json({ status: 'wait' });
+          return;
+        }
+
         res.status(409).json({
           status: 'error',
           error:
diff --git a/tests/unit/web-server/cliproxy-auth-routes-manual-callback.test.ts b/tests/unit/web-server/cliproxy-auth-routes-manual-callback.test.ts
index 97c8e360..7608ad9b 100644
--- a/tests/unit/web-server/cliproxy-auth-routes-manual-callback.test.ts
+++ b/tests/unit/web-server/cliproxy-auth-routes-manual-callback.test.ts
@@ -206,7 +206,7 @@ describe('cliproxy-auth-routes manual callback nickname persistence', () => {
     });
   });
 
-  it('returns 409 when status polling completes upstream but no new local token was written', async () => {
+  it('keeps polling briefly after upstream completion before surfacing the missing-token error', async () => {
     const tokenDir = path.join(tempHome, '.ccs', 'cliproxy', 'auth');
     fs.mkdirSync(tokenDir, { recursive: true });
     fs.writeFileSync(
@@ -232,15 +232,81 @@ describe('cliproxy-auth-routes manual callback nickname persistence', () => {
     const startResponse = await postJson('/api/cliproxy/auth/codex/start-url', {});
     expect(startResponse.status).toBe(200);
 
-    const statusResponse = await getJson(
-      '/api/cliproxy/auth/codex/status?state=state-status-missing'
+    const realDateNow = Date.now;
+    let now = realDateNow();
+    Date.now = () => now;
+    try {
+      const firstStatusResponse = await getJson(
+        '/api/cliproxy/auth/codex/status?state=state-status-missing'
+      );
+
+      expect(firstStatusResponse.status).toBe(200);
+      expect(firstStatusResponse.body).toEqual({ status: 'wait' });
+
+      now += 16_000;
+
+      const secondStatusResponse = await getJson(
+        '/api/cliproxy/auth/codex/status?state=state-status-missing'
+      );
+
+      expect(secondStatusResponse.status).toBe(409);
+      expect(secondStatusResponse.body).toEqual({
+        status: 'error',
+        error:
+          'Authentication completed upstream, but no new local token was saved for this account. Update CCS/CLIProxy and retry.',
+      });
+    } finally {
+      Date.now = realDateNow;
+    }
+  });
+
+  it('continues polling until the local token appears after upstream completion', async () => {
+    mockFetch([
+      {
+        url: /\/v0\/management\/codex-auth-url\?is_webui=true$/,
+        response: {
+          auth_url: 'https://auth.example.com/authorize?state=state-status-delayed',
+          state: 'state-status-delayed',
+        },
+      },
+      {
+        url: /\/v0\/management\/get-auth-status\?state=state-status-delayed$/,
+        response: { status: 'ok' },
+      },
+    ]);
+
+    const startResponse = await postJson('/api/cliproxy/auth/codex/start-url', {});
+    expect(startResponse.status).toBe(200);
+
+    const firstStatusResponse = await getJson(
+      '/api/cliproxy/auth/codex/status?state=state-status-delayed'
     );
 
-    expect(statusResponse.status).toBe(409);
-    expect(statusResponse.body).toEqual({
-      status: 'error',
-      error:
-        'Authentication completed upstream, but no new local token was saved for this account. Update CCS/CLIProxy and retry.',
+    expect(firstStatusResponse.status).toBe(200);
+    expect(firstStatusResponse.body).toEqual({ status: 'wait' });
+
+    const tokenDir = path.join(tempHome, '.ccs', 'cliproxy', 'auth');
+    fs.mkdirSync(tokenDir, { recursive: true });
+    fs.writeFileSync(
+      path.join(tokenDir, 'codex-delayed@example.com.json'),
+      JSON.stringify({ type: 'codex', email: 'delayed@example.com' }),
+      'utf8'
+    );
+
+    const secondStatusResponse = await getJson(
+      '/api/cliproxy/auth/codex/status?state=state-status-delayed'
+    );
+
+    expect(secondStatusResponse.status).toBe(200);
+    expect(secondStatusResponse.body).toEqual({
+      status: 'ok',
+      account: {
+        id: 'delayed@example.com',
+        email: 'delayed@example.com',
+        nickname: 'delayed',
+        provider: 'codex',
+        isDefault: true,
+      },
     });
   });