@vsuryav/agent-sim 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vsuryav/agent-sim",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Local TUI and sync client for Agent Sim",
   "type": "module",
   "files": [

package/src/collector/remote-sync.ts

@@ -3,7 +3,7 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 import {
-  authLoginStartResponseSchema,
+  authSessionCompleteResponseSchema,
   authSessionResponseSchema,
   pullResponseSchema,
   type CollectedAgent,
@@ -21,6 +21,24 @@ interface Config {
   token?: string;
 }
 
+type DeviceLoginStartResponse = {
+  mode: 'device';
+  client_id: string;
+  device_code: string;
+  user_code: string;
+  verification_uri: string;
+  verification_uri_complete?: string;
+  poll_interval_ms: number;
+  expires_in_ms: number;
+};
+
+type WebLoginStartResponse = {
+  mode: 'web';
+  url: string;
+  session_id: string;
+  poll_interval_ms: number;
+};
+
 export function loadConfig(): Config {
   try {
     return JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8')) as Config;
@@ -88,6 +106,81 @@ async function pollForLoginSession(
   throw new Error(`Login timed out. Re-run the ${APP_NAME} login command and finish GitHub auth within 5 minutes.`);
 }
 
+async function pollForGitHubDeviceAccessToken(
+  loginStart: DeviceLoginStartResponse,
+): Promise<string> {
+  const deadline = Date.now() + loginStart.expires_in_ms;
+  let intervalMs = loginStart.poll_interval_ms;
+
+  while (Date.now() < deadline) {
+    const res = await fetch('https://github.com/login/oauth/access_token', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        Accept: 'application/json',
+      },
+      body: new URLSearchParams({
+        client_id: loginStart.client_id,
+        device_code: loginStart.device_code,
+        grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
+      }),
+    });
+
+    const body = await res.json() as {
+      access_token?: string;
+      interval?: number;
+      error?: string;
+    };
+
+    if (body.access_token) {
+      return body.access_token;
+    }
+
+    if (body.error === 'authorization_pending') {
+      await sleep(intervalMs);
+      continue;
+    }
+
+    if (body.error === 'slow_down') {
+      intervalMs = body.interval ? body.interval * 1000 : intervalMs + 5000;
+      await sleep(intervalMs);
+      continue;
+    }
+
+    if (body.error === 'access_denied') {
+      throw new Error('GitHub login was denied. Re-run the login command and try again.');
+    }
+
+    if (body.error === 'expired_token') {
+      throw new Error('GitHub device login expired. Re-run the login command and try again.');
+    }
+
+    throw new Error(`GitHub device login failed: ${body.error ?? res.statusText}`);
+  }
+
+  throw new Error(`Login timed out. Re-run the ${APP_NAME} login command and finish GitHub auth within 5 minutes.`);
+}
+
+function isWebLoginStartResponse(value: unknown): value is WebLoginStartResponse {
+  if (!value || typeof value !== 'object') return false;
+  const record = value as Record<string, unknown>;
+  return typeof record.url === 'string'
+    && typeof record.session_id === 'string'
+    && typeof record.poll_interval_ms === 'number';
+}
+
+function isDeviceLoginStartResponse(value: unknown): value is DeviceLoginStartResponse {
+  if (!value || typeof value !== 'object') return false;
+  const record = value as Record<string, unknown>;
+  return record.mode === 'device'
+    && typeof record.client_id === 'string'
+    && typeof record.device_code === 'string'
+    && typeof record.user_code === 'string'
+    && typeof record.verification_uri === 'string'
+    && typeof record.poll_interval_ms === 'number'
+    && typeof record.expires_in_ms === 'number';
+}
+
 export async function login(serverUrl: string): Promise<void> {
   const config = loadConfig();
   config.serverUrl = serverUrl;
@@ -99,13 +192,39 @@ export async function login(serverUrl: string): Promise<void> {
     const error = body as { error?: string };
     throw new Error(`Login failed: ${error.error ?? res.statusText}`);
   }
-  const { url, session_id, poll_interval_ms } = authLoginStartResponseSchema.parse(body);
 
-  console.log(`\n  Open this URL to login with GitHub:\n`);
-  console.log(`  ${url}\n`);
-  console.log('  Waiting for GitHub authorization to complete...\n');
+  let session;
+  if (isDeviceLoginStartResponse(body)) {
+    console.log('\n  Open GitHub device login:\n');
+    console.log(`  ${body.verification_uri_complete ?? body.verification_uri}\n`);
+    if (!body.verification_uri_complete) {
+      console.log(`  Enter this code: ${body.user_code}\n`);
+    }
+    console.log('  Waiting for GitHub authorization to complete...\n');
+
+    const githubAccessToken = await pollForGitHubDeviceAccessToken(body);
+    const exchangeRes = await fetch(`${serverUrl}/auth/exchange/github-token`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ access_token: githubAccessToken }),
+    });
+    const exchangeBody = await exchangeRes.json() as unknown;
+    if (!exchangeRes.ok) {
+      const error = exchangeBody as { error?: string };
+      throw new Error(`Login failed: ${error.error ?? exchangeRes.statusText}`);
+    }
+    session = authSessionCompleteResponseSchema.parse(exchangeBody);
+  } else if (isWebLoginStartResponse(body)) {
+    console.log(`\n  Open this URL to login with GitHub:\n`);
+    console.log(`  ${body.url}\n`);
+    console.log('  Waiting for GitHub authorization to complete...\n');
+    session = await pollForLoginSession(serverUrl, body.session_id, body.poll_interval_ms);
+  } else {
+    throw new Error('Login failed: server returned an unrecognized auth response');
+  }
 
-  const session = await pollForLoginSession(serverUrl, session_id, poll_interval_ms);
   config.token = session.token;
   saveConfig(config);
   console.log(`  Logged in as ${session.githubLogin}. Token saved.`);