@stage-labs/metro 0.1.0-beta.30 → 0.1.0-beta.301

package/runtime/node_modules/@metro-labs/daemon/src/gateway/claude-logins.ts

@@ -0,0 +1,168 @@
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { ID_RE, newId } from '@metro-labs/core/ids';
+import { isRecord } from '@metro-labs/core/is-record';
+import { errMsg, log } from '@metro-labs/core/log';
+import { ApiError } from '@metro-labs/http/api-error';
+import { readFileSync } from '../agent-user/agent-fs.js';
+import { removeHome } from '../agent-user/home-fs.js';
+import { claudeHome } from '../agent-user/user.js';
+import { claudeAccountIn, type ClaudeAccount, type LoginTarget } from '../claude/login.js';
+import { readClaudeUsage } from '../claude/usage-probe.js';
+import { currentOf, reach, refreshed, type TokenSource, type TokenState } from './subscription.js';
+import { forgetReported } from './usage.js';
+import { addConnection, connectionOf, readModelConfig, setClaudeLogin, writeModelConfig, type ModelConfig } from './model-config.js';
+
+const CREDENTIALS = '.credentials.json';
+const RENEW_MARGIN_MS = 60_000;
+const NEW = 'new';
+const MISSING = 'this Claude login is no longer on the box: sign in again on the Model page';
+
+export interface ClaudeLoginDeps {
+  root?: string;
+  probe?: (env: Record<string, string>) => Promise<unknown>;
+  account?: (env: Record<string, string>) => ClaudeAccount;
+  read?: () => ModelConfig;
+  write?: (cfg: ModelConfig) => void;
+}
+
+interface ClaudeTokens {
+  accessToken: string;
+  expiresAt: number | null;
+  savedAt: string;
+}
+
+const state: TokenState<ClaudeTokens> = new Map();
+const seen = new Map<string, ClaudeTokens>();
+
+const claudeLoginsRoot = (): string => join(claudeHome() ?? homedir(), '.metro', 'claude-logins');
+
+const rootOf = (deps: ClaudeLoginDeps): string => deps.root ?? claudeLoginsRoot();
+
+function claudeLoginEnv(login: string, deps: ClaudeLoginDeps = {}): Record<string, string> {
+  if (!ID_RE.test(login)) throw new Error('not a Claude login id');
+  return { CLAUDE_CONFIG_DIR: join(rootOf(deps), login) };
+}
+
+export const probeClaudeLogin = (login: string, deps: ClaudeLoginDeps = {}): Promise<unknown> =>
+  (deps.probe ?? ((env) => readClaudeUsage({ env })))(claudeLoginEnv(login, deps));
+
+const stale = (tokens: ClaudeTokens, margin = RENEW_MARGIN_MS): boolean => tokens.expiresAt !== null && tokens.expiresAt - margin <= Date.now();
+
+function onDisk(login: string, deps: ClaudeLoginDeps): ClaudeTokens | null {
+  let raw: unknown;
+  try {
+    raw = JSON.parse(readFileSync(join(claudeLoginEnv(login, deps).CLAUDE_CONFIG_DIR ?? '', CREDENTIALS), 'utf8'));
+  } catch {
+    return null;
+  }
+  const oauth = isRecord(raw) && isRecord(raw.claudeAiOauth) ? raw.claudeAiOauth : {};
+  const accessToken = typeof oauth.accessToken === 'string' ? oauth.accessToken : '';
+  const expiresAt = typeof oauth.expiresAt === 'number' && Number.isFinite(oauth.expiresAt) ? oauth.expiresAt : null;
+  return accessToken === '' ? null : { accessToken, expiresAt, savedAt: new Date(expiresAt ?? 0).toISOString() };
+}
+
+function remembered(login: string, tokens: ClaudeTokens | null): ClaudeTokens | null {
+  if (tokens === null) seen.delete(login);
+  else seen.set(login, tokens);
+  return tokens;
+}
+
+function known(login: string, deps: ClaudeLoginDeps): ClaudeTokens | null {
+  const kept = seen.get(login);
+  if (kept !== undefined && !stale(kept)) return kept;
+  const read = onDisk(login, deps);
+  return read === null && kept !== undefined ? kept : remembered(login, read);
+}
+
+function sourceFor(login: string, deps: ClaudeLoginDeps): TokenSource<ClaudeTokens> {
+  return {
+    label: 'Claude',
+    stale: (tokens) => stale(tokens),
+    refresh: async () => {
+      try {
+        await probeClaudeLogin(login, deps);
+      } catch (err) {
+        log.warn({ err: errMsg(err) }, 'claude-logins: Claude Code stumbled while renewing a login, so its folder is read as it is');
+      }
+      const fresh = onDisk(login, deps);
+      if (fresh === null || stale(fresh, 0)) throw new Error('Claude Code could not renew this login');
+      return fresh;
+    },
+    save: (id, tokens) => {
+      remembered(id, tokens);
+    },
+  };
+}
+
+function again(login: string, failed: ClaudeTokens, deps: ClaudeLoginDeps, source: TokenSource<ClaudeTokens>): Promise<ClaudeTokens> {
+  const disk = onDisk(login, deps);
+  if (disk !== null && disk.accessToken !== failed.accessToken && !stale(disk)) return Promise.resolve(remembered(login, disk) ?? disk);
+  return refreshed(state, login, failed, source);
+}
+
+export function withClaudeLogin(login: string, deps: ClaudeLoginDeps, send: (token: string) => Promise<Response>): Promise<Response> {
+  const source = sourceFor(login, deps);
+  return reach(
+    () => currentOf(state, login, known(login, deps), source, MISSING),
+    (failed) => again(login, failed, deps, source),
+    (tokens) => send(tokens.accessToken),
+  );
+}
+
+function dropClaudeLogin(login: string, deps: ClaudeLoginDeps): void {
+  seen.delete(login);
+  state.delete(login);
+  try {
+    removeHome(claudeLoginEnv(login, deps).CLAUDE_CONFIG_DIR ?? '', true);
+  } catch (err) {
+    log.warn({ err: errMsg(err) }, 'claude-logins: could not remove a Claude login that is no longer used');
+  }
+}
+
+export function dropUnusedClaudeLogins(before: ModelConfig, after: ModelConfig, deps: ClaudeLoginDeps = {}): void {
+  const kept = new Set(after.connections.flatMap((c) => (c.claude === null ? [] : [c.claude.id])));
+  for (const c of before.connections) if (c.claude !== null && !kept.has(c.claude.id)) dropClaudeLogin(c.claude.id, deps);
+}
+
+function keep(login: string, connection: string | null, account: ClaudeAccount, deps: ClaudeLoginDeps): string | null {
+  const before = (deps.read ?? readModelConfig)();
+  const cfg = connection === null ? addConnection(before, { provider: 'anthropic' }) : before;
+  const id = connection ?? cfg.connections.at(-1)?.id ?? '';
+  if (connectionOf(cfg, id)?.provider !== 'anthropic') return 'that connection was removed during the sign-in';
+  const next = setClaudeLogin(cfg, id, { id: login, email: account.account, plan: account.plan, savedAt: new Date().toISOString() });
+  (deps.write ?? writeModelConfig)(next);
+  dropUnusedClaudeLogins(before, next, deps);
+  forgetReported(id);
+  log.info({ connection: id, plan: account.plan, added: connection === null }, 'claude-logins: the Claude login was kept for its own connection');
+  return null;
+}
+
+function settle(ok: boolean, login: string, connection: string | null, deps: ClaudeLoginDeps): Promise<string | null> {
+  if (!ok) {
+    dropClaudeLogin(login, deps);
+    return Promise.resolve(null);
+  }
+  let problem: string | null;
+  try {
+    const account = (deps.account ?? claudeAccountIn)(claudeLoginEnv(login, deps));
+    problem = account.signedIn ? keep(login, connection, account, deps) : 'the sign-in finished but Claude Code holds no login; try again';
+  } catch (err) {
+    problem = errMsg(err);
+  }
+  if (problem !== null) dropClaudeLogin(login, deps);
+  return Promise.resolve(problem);
+}
+
+export function claudeLoginTarget(asked: string, deps: ClaudeLoginDeps = {}): LoginTarget {
+  const connection = asked === NEW ? null : asked;
+  if (connection !== null && connectionOf((deps.read ?? readModelConfig)(), connection)?.provider !== 'anthropic')
+    throw new ApiError('no such Anthropic connection', 404);
+  const login = newId();
+  return { key: asked, env: claudeLoginEnv(login, deps), settle: (ok) => settle(ok, login, connection, deps) };
+}
+
+export function forgetClaudeTokens(): void {
+  seen.clear();
+  state.clear();
+}

package/runtime/node_modules/@metro-labs/daemon/src/gateway/codex-auth.ts

@@ -0,0 +1,219 @@
+import { randomBytes, randomUUID } from 'node:crypto';
+import { join } from 'node:path';
+import { isRecord } from '@metro-labs/core/is-record';
+import { readJson, writeSecure } from '@metro-labs/core/secure-fs';
+import { ticketStore } from '@metro-labs/core/tickets';
+import { agentsDir } from '../agents/files.js';
+import { newPkce } from './pkce.js';
+import { nonEmpty } from './text.js';
+
+export const CODEX_ISSUER = 'https://auth.openai.com';
+export const CODEX_REDIRECT = 'http://127.0.0.1:1455/auth/callback';
+export const OPENAI_API = 'https://api.openai.com/v1';
+export const NEW_CLIENT = 'dynamic_agent_client';
+export const APP_NAME = 'Metro';
+export const PLAN_SCOPE = 'chatgpt.tokens.use.direct';
+export const CODEX_SIGN_IN = 'Codex is not signed in: sign in with ChatGPT on the Model page.';
+const SCOPE = `openid profile email offline_access resource.invoke ${PLAN_SCOPE}`;
+const PROFILE_CLAIM = 'https://api.openai.com/profile';
+const HOST_FILE = 'chatgpt-host.json';
+const HOST_RE = /^urn:uuid:[0-9a-f-]{36}$/;
+const PENDING_TTL_MS = 10 * 60_000;
+const DEFAULT_TTL_MS = 60 * 60_000;
+const RENEW_BEFORE_MS = 2 * 60_000;
+const AGAIN = 'press Continue with ChatGPT again';
+
+export type CodexMethod = 'chatgpt' | 'code';
+
+export interface CodexCredential {
+  email: string | null;
+  accessToken: string;
+  refreshToken: string;
+  expiresAt: number;
+  savedAt: string;
+}
+
+export interface ChatgptTokens extends CodexCredential {
+  method: 'chatgpt';
+  clientId: string;
+  subject: string;
+}
+
+export interface CodeTokens extends CodexCredential {
+  method: 'code';
+  accountId: string;
+  plan: string | null;
+}
+
+export type CodexTokens = ChatgptTokens | CodeTokens;
+
+export class CodexAuthError extends Error {}
+
+interface Pending {
+  verifier: string;
+  nonce: string;
+  clientId: string | null;
+  subject: string | null;
+}
+
+const pending = ticketStore<Pending>(PENDING_TTL_MS, 24);
+
+export function chatgptHostId(dir = agentsDir()): string {
+  const path = join(dir, HOST_FILE);
+  const saved = readJson<unknown>(path, null);
+  if (isRecord(saved) && typeof saved.hostId === 'string' && HOST_RE.test(saved.hostId)) return saved.hostId;
+  const made = `urn:uuid:${randomUUID()}`;
+  writeSecure(path, JSON.stringify({ hostId: made }));
+  return made;
+}
+
+function returning(previous: ChatgptTokens | null): Record<string, string> {
+  if (previous === null) return { client_id: NEW_CLIENT, agent_name_hint: APP_NAME };
+  return { client_id: previous.clientId, ...(previous.email === null ? {} : { login_hint: previous.email }) };
+}
+
+export function beginLogin(previous: ChatgptTokens | null, hostId: string, issuer = CODEX_ISSUER, now = Date.now()): string {
+  const { verifier, challenge } = newPkce();
+  const nonce = randomBytes(32).toString('base64url');
+  const { ticket: state } = pending.mint({ verifier, nonce, clientId: previous?.clientId ?? null, subject: previous?.subject ?? null }, now);
+  const query = new URLSearchParams({
+    ...returning(previous),
+    ext_agent_host_id: hostId,
+    response_type: 'code',
+    redirect_uri: CODEX_REDIRECT,
+    scope: SCOPE,
+    resource: OPENAI_API,
+    state,
+    nonce,
+    code_challenge_method: 'S256',
+    code_challenge: challenge,
+  });
+  return `${issuer}/api/accounts/authorize?${query.toString()}`;
+}
+
+function queryOf(raw: string): URLSearchParams {
+  const text = raw.trim();
+  try {
+    return new URL(text).searchParams;
+  } catch {
+    return new URLSearchParams(text.replace(/^\?/, ''));
+  }
+}
+
+const param = (query: URLSearchParams, name: string): string => query.get(name)?.trim() ?? '';
+
+function assertAllowed(query: URLSearchParams): void {
+  const error = param(query, 'error');
+  if (error === 'access_denied') throw new CodexAuthError('you did not allow Metro to use your ChatGPT plan, so nothing was saved');
+  if (error !== '') throw new CodexAuthError(`ChatGPT stopped the sign-in (${query.get('error_description') ?? error}); ${AGAIN}`);
+}
+
+export function parseCallback(raw: string): { code: string; state: string; clientId: string | null } {
+  const query = queryOf(raw);
+  assertAllowed(query);
+  const code = param(query, 'code');
+  const state = param(query, 'state');
+  if (code === '' || state === '') throw new CodexAuthError('paste the whole address the browser landed on; it carries code= and state=');
+  return { code, state, clientId: nonEmpty(param(query, 'client_id')) };
+}
+
+export function decodeJwtPayload(jwt: string): Record<string, unknown> {
+  const part = jwt.split('.')[1] ?? '';
+  try {
+    const parsed: unknown = JSON.parse(Buffer.from(part, 'base64url').toString('utf8'));
+    return isRecord(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+export function emailOf(claims: Record<string, unknown>): string | null {
+  const profile = isRecord(claims[PROFILE_CLAIM]) ? claims[PROFILE_CLAIM] : {};
+  return nonEmpty(claims.email) ?? nonEmpty(profile.email);
+}
+
+function identityOf(idToken: unknown, expected: { issuer: string; clientId: string; nonce: string }): { subject: string; email: string | null } {
+  const claims = decodeJwtPayload(typeof idToken === 'string' ? idToken : '');
+  const audience: unknown[] = Array.isArray(claims.aud) ? claims.aud : [claims.aud];
+  const subject = nonEmpty(claims.sub);
+  if (subject === null || claims.iss !== expected.issuer || !audience.includes(expected.clientId) || claims.nonce !== expected.nonce)
+    throw new CodexAuthError(`OpenAI sent back an identity that does not match this sign-in; ${AGAIN}`);
+  return { subject, email: emailOf(claims) };
+}
+
+interface Encoded {
+  type: string;
+  body: string;
+}
+
+export const asForm = (fields: Record<string, string>): Encoded => ({ type: 'application/x-www-form-urlencoded', body: new URLSearchParams(fields).toString() });
+
+export const asJson = (fields: Record<string, string>): Encoded => ({ type: 'application/json', body: JSON.stringify(fields) });
+
+export async function tokenCall(url: string, sent: Encoded, fetchImpl: typeof fetch): Promise<Record<string, unknown>> {
+  const res = await fetchImpl(url, { method: 'POST', headers: { 'content-type': sent.type, accept: 'application/json' }, body: sent.body });
+  const raw = await res.text();
+  let parsed: unknown = null;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    parsed = null;
+  }
+  const body = isRecord(parsed) ? parsed : {};
+  if (!res.ok) throw new CodexAuthError(`OpenAI refused the token request (${String(res.status)}): ${nonEmpty(body.error_description) ?? nonEmpty(body.error) ?? raw.slice(0, 300)}`);
+  return body;
+}
+
+export function grantOf(body: Record<string, unknown>, keptRefresh: string, now: number): Omit<CodexCredential, 'email'> {
+  const accessToken = nonEmpty(body.access_token) ?? '';
+  const refreshToken = nonEmpty(body.refresh_token) ?? keptRefresh;
+  if (accessToken === '' || refreshToken === '') throw new CodexAuthError('OpenAI returned no usable tokens; sign in again');
+  const ttl = typeof body.expires_in === 'number' && body.expires_in > 0 ? body.expires_in * 1000 : DEFAULT_TTL_MS;
+  return { accessToken, refreshToken, expiresAt: now + ttl, savedAt: new Date(now).toISOString() };
+}
+
+const tokensFrom = (body: Record<string, unknown>, who: Pick<ChatgptTokens, 'clientId' | 'subject' | 'email'>, keptRefresh: string, now: number): ChatgptTokens => ({
+  method: 'chatgpt',
+  clientId: who.clientId,
+  subject: who.subject,
+  email: who.email,
+  ...grantOf(body, keptRefresh, now),
+});
+
+const officialToken = (issuer: string): string => `${issuer}/api/accounts/oauth/token`;
+
+function clientOf(started: Pending, returned: string | null): string {
+  const clientId = started.clientId ?? returned;
+  if (clientId === null || clientId === NEW_CLIENT) throw new CodexAuthError(`ChatGPT did not finish registering Metro; ${AGAIN}`);
+  if (returned !== null && returned !== clientId) throw new CodexAuthError(`ChatGPT answered for another Metro registration; ${AGAIN}`);
+  return clientId;
+}
+
+export async function finishLogin(callback: string, issuer = CODEX_ISSUER, fetchImpl: typeof fetch = fetch, now = Date.now()): Promise<ChatgptTokens> {
+  const { code, state, clientId: returned } = parseCallback(callback);
+  const started = pending.take(state, now);
+  if (started === undefined) throw new CodexAuthError(`this sign-in link has expired or was started elsewhere; ${AGAIN}`);
+  const clientId = clientOf(started, returned);
+  const body = await tokenCall(
+    officialToken(issuer),
+    asForm({ grant_type: 'authorization_code', client_id: clientId, code, code_verifier: started.verifier, redirect_uri: CODEX_REDIRECT, resource: OPENAI_API }),
+    fetchImpl,
+  );
+  const who = identityOf(body.id_token, { issuer, clientId, nonce: started.nonce });
+  if (started.subject !== null && who.subject !== started.subject)
+    throw new CodexAuthError('this is another ChatGPT account than the one this connection signed in with; add a new connection for it');
+  const scopes = (nonEmpty(body.scope) ?? '').split(/\s+/);
+  if (!scopes.includes(PLAN_SCOPE)) throw new CodexAuthError('ChatGPT did not allow Metro to use your plan: sign in again and allow it (it needs ChatGPT Plus or Pro)');
+  return tokensFrom(body, { clientId, ...who }, '', now);
+}
+
+export async function refreshTokens(previous: ChatgptTokens, issuer = CODEX_ISSUER, fetchImpl: typeof fetch = fetch, now = Date.now()): Promise<ChatgptTokens> {
+  const body = await tokenCall(
+    officialToken(issuer),
+    asForm({ grant_type: 'refresh_token', client_id: previous.clientId, refresh_token: previous.refreshToken, resource: OPENAI_API }),
+    fetchImpl,
+  );
+  return tokensFrom(body, previous, previous.refreshToken, now);
+}
+
+export const tokensStale = (tokens: CodexTokens, now = Date.now()): boolean => now >= tokens.expiresAt - RENEW_BEFORE_MS;

package/runtime/node_modules/@metro-labs/daemon/src/gateway/codex-device.ts

@@ -0,0 +1,119 @@
+import { randomBytes } from 'node:crypto';
+import { isRecord } from '@metro-labs/core/is-record';
+import { errMsg } from '@metro-labs/core/log';
+import { stringOf } from '@metro-labs/http/api-http';
+import { asForm, asJson, CODEX_ISSUER, CodexAuthError, decodeJwtPayload, emailOf, grantOf, tokenCall, type CodeTokens } from './codex-auth.js';
+import { nonEmpty } from './text.js';
+
+const CODEX_CLIENT_ID = 'app_EMoamEEZ73f0CkXaXp7hrann';
+const AUTH_CLAIM = 'https://api.openai.com/auth';
+const VERIFY_PATH = '/codex/device';
+const DEVICE_TTL_MS = 15 * 60_000;
+const DEFAULT_INTERVAL_S = 5;
+const ID_BYTES = 18;
+const AGAIN = 'press Sign in with a code again';
+
+export interface DeviceLogin {
+  id: string;
+  userCode: string;
+  verifyUrl: string;
+  interval: number;
+}
+
+export type DeviceStatus = { status: 'pending' } | { status: 'done'; tokens: CodeTokens } | { status: 'failed'; error: string };
+
+interface Entry {
+  deviceAuthId: string;
+  userCode: string;
+  interval: number;
+  issuer: string;
+  startedAt: number;
+  polledAt: number | null;
+}
+
+const logins = new Map<string, Entry>();
+
+function claimsOf(idToken: string): { accountId: string | null; email: string | null; plan: string | null } {
+  const payload = decodeJwtPayload(idToken);
+  const auth = isRecord(payload[AUTH_CLAIM]) ? payload[AUTH_CLAIM] : {};
+  return { accountId: nonEmpty(auth.chatgpt_account_id), email: emailOf(payload), plan: nonEmpty(auth.chatgpt_plan_type) };
+}
+
+function codeTokensFrom(body: Record<string, unknown>, previous: CodeTokens | null, now: number): CodeTokens {
+  const fresh = claimsOf(nonEmpty(body.id_token) ?? '');
+  const kept = previous ?? { accountId: null, email: null, plan: null, refreshToken: '' };
+  const accountId = fresh.accountId ?? kept.accountId ?? '';
+  if (accountId === '') throw new CodexAuthError('the id token carries no ChatGPT account id; sign in with a ChatGPT account that has Codex');
+  return { method: 'code', accountId, email: fresh.email ?? kept.email, plan: fresh.plan ?? kept.plan, ...grantOf(body, kept.refreshToken, now) };
+}
+
+const cliToken = (issuer: string): string => `${issuer}/oauth/token`;
+
+export async function refreshCodeTokens(previous: CodeTokens, issuer = CODEX_ISSUER, fetchImpl: typeof fetch = fetch, now = Date.now()): Promise<CodeTokens> {
+  const body = await tokenCall(cliToken(issuer), asJson({ client_id: CODEX_CLIENT_ID, grant_type: 'refresh_token', refresh_token: previous.refreshToken }), fetchImpl);
+  return codeTokensFrom(body, previous, now);
+}
+
+function intervalOf(value: unknown): number {
+  const n = typeof value === 'number' ? value : typeof value === 'string' ? Number(value) : NaN;
+  return Number.isFinite(n) && n >= 1 ? Math.round(n) : DEFAULT_INTERVAL_S;
+}
+
+function sweep(now: number): void {
+  for (const [id, entry] of logins) if (now - entry.startedAt > DEVICE_TTL_MS) logins.delete(id);
+}
+
+const post = (url: string, body: unknown, fetchImpl: typeof fetch): Promise<Response> =>
+  fetchImpl(url, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(body) });
+
+export async function beginDeviceLogin(issuer = CODEX_ISSUER, fetchImpl: typeof fetch = fetch, now = Date.now()): Promise<DeviceLogin> {
+  sweep(now);
+  const res = await post(`${issuer}/api/accounts/deviceauth/usercode`, { client_id: CODEX_CLIENT_ID }, fetchImpl);
+  if (res.status === 404) throw new CodexAuthError('OpenAI is not offering the code sign-in right now; use Continue with ChatGPT instead');
+  if (!res.ok) throw new CodexAuthError(`OpenAI refused to start the code sign-in (${String(res.status)})`);
+  const body: unknown = await res.json();
+  const parsed = isRecord(body) ? body : {};
+  const deviceAuthId = stringOf(parsed.device_auth_id);
+  const userCode = stringOf(parsed.user_code) || stringOf(parsed.usercode);
+  if (deviceAuthId === '' || userCode === '') throw new CodexAuthError('OpenAI answered without a device code');
+  const id = randomBytes(ID_BYTES).toString('base64url');
+  const interval = intervalOf(parsed.interval);
+  logins.set(id, { deviceAuthId, userCode, interval, issuer, startedAt: now, polledAt: null });
+  return { id, userCode, verifyUrl: `${issuer}${VERIFY_PATH}`, interval };
+}
+
+async function claim(entry: Entry, fetchImpl: typeof fetch, now: number): Promise<DeviceStatus> {
+  const res = await post(`${entry.issuer}/api/accounts/deviceauth/token`, { device_auth_id: entry.deviceAuthId, user_code: entry.userCode }, fetchImpl);
+  if (res.status === 403 || res.status === 404) {
+    await res.body?.cancel();
+    return { status: 'pending' };
+  }
+  if (!res.ok) return { status: 'failed', error: `OpenAI ended the code sign-in (${String(res.status)})` };
+  const body: unknown = await res.json();
+  const parsed = isRecord(body) ? body : {};
+  const code = stringOf(parsed.authorization_code);
+  const verifier = stringOf(parsed.code_verifier);
+  if (code === '' || verifier === '') return { status: 'failed', error: 'OpenAI approved the sign-in but sent no code back' };
+  const granted = await tokenCall(
+    cliToken(entry.issuer),
+    asForm({ grant_type: 'authorization_code', code, redirect_uri: `${entry.issuer}/deviceauth/callback`, client_id: CODEX_CLIENT_ID, code_verifier: verifier }),
+    fetchImpl,
+  );
+  return { status: 'done', tokens: codeTokensFrom(granted, null, now) };
+}
+
+export async function pollDeviceLogin(id: string, fetchImpl: typeof fetch = fetch, now = Date.now()): Promise<DeviceStatus> {
+  sweep(now);
+  const entry = logins.get(id);
+  if (entry === undefined) throw new CodexAuthError(`this sign-in has expired or already finished; ${AGAIN}`);
+  if (entry.polledAt !== null && now - entry.polledAt < entry.interval * 1000) return { status: 'pending' };
+  entry.polledAt = now;
+  let result: DeviceStatus;
+  try {
+    result = await claim(entry, fetchImpl, now);
+  } catch (err) {
+    result = { status: 'failed', error: errMsg(err) };
+  }
+  if (result.status !== 'pending') logins.delete(id);
+  return result;
+}