Mirror 457554c (2026-04-11)

Author: Prompsit CI

src/commands/device-flow.ts

@@ -19,6 +19,12 @@ const log = getLogger(import.meta.url);
 const BROWSER_TIMEOUT_MS = 3000;
 const SLOW_DOWN_INCREMENT = 5; // RFC 8628 §3.5: increase interval by 5s on slow_down
 
+// Adaptive polling: first 30 seconds (while user is actively in browser)
+// poll every 2s for snappy UX. After that, fall back to API-provided interval.
+// If API returns slow_down, we respect it immediately and disable adaptive mode.
+const ADAPTIVE_WINDOW_MS = 30_000;
+const ADAPTIVE_INTERVAL_SEC = 2;
+
 /** Result from a completed device flow. */
 export interface DeviceFlowResult {
   accessToken: string;
@@ -133,8 +139,13 @@ export async function runDeviceFlow(
   }
 
   // 4. Poll for authorization
-  let interval = deviceAuth.interval || DEVICE_FLOW_DEFAULT_INTERVAL;
-  const deadline = Date.now() + deviceAuth.expires_in * 1000;
+  // Adaptive interval: fast polling first 30s, fall back to API interval after.
+  // API-provided interval is the floor once adaptive window ends OR on slow_down.
+  const apiInterval = deviceAuth.interval || DEVICE_FLOW_DEFAULT_INTERVAL;
+  let interval = Math.min(apiInterval, ADAPTIVE_INTERVAL_SEC);
+  let adaptiveMode = true;
+  const pollStart = Date.now();
+  const deadline = pollStart + deviceAuth.expires_in * 1000;
 
   // Spinner: ora for CLI, terminal.dim for REPL (stdin is raw)
   const isRepl = process.stdin.isRaw;
@@ -147,6 +158,13 @@ export async function runDeviceFlow(
 
   try {
     while (Date.now() < deadline) {
+      // Adaptive window expired → switch to API-provided interval
+      if (adaptiveMode && Date.now() - pollStart >= ADAPTIVE_WINDOW_MS) {
+        adaptiveMode = false;
+        interval = apiInterval;
+        log.debug("Adaptive polling window ended", { new_interval: String(interval) });
+      }
+
       // Cancellable sleep (AbortSignal from REPL Ctrl+C or CLI SIGINT)
       try {
         await sleep(interval * 1000, signal);
@@ -175,7 +193,10 @@ export async function runDeviceFlow(
           break;
         }
         case "slow_down": {
-          interval += SLOW_DOWN_INCREMENT;
+          // Server throttling — disable adaptive mode and respect RFC 8628 §3.5:
+          // "the interval MUST be increased by 5 seconds for all subsequent requests"
+          adaptiveMode = false;
+          interval = Math.max(interval, apiInterval) + SLOW_DOWN_INCREMENT;
           log.debug("Polling slowed down", { new_interval: String(interval) });
           break;
         }