@thegitai/cli 1.0.0-preview.3 → 1.0.0-preview.31

package/dist/src/api/browser-login.js

@@ -1,17 +1,31 @@
+import { execSync } from 'node:child_process';
 import crypto from 'node:crypto';
+import { readFileSync } from 'node:fs';
 import http from 'node:http';
 import os from 'node:os';
 import { openUrl } from '../core/open-url.js';
-import { ServerApiError, createTraceContext, failureMessage, normalizeServerUrl, readJsonResponse, } from './http.js';
-const DEFAULT_WEBSITE_URL = 'https://thegit.ai';
-const DEFAULT_SERVER_URL = 'https://thegit.ai';
-const DEFAULT_TIMEOUT_MS = 5 * 60 * 1000;
+import { ServerApiError, createTraceContext, failureCode, failureMessage, normalizeServerUrl, readJsonResponse, } from './http.js';
+import { DEFAULT_THEGITAI_HOST } from './default-host.js';
+const DEFAULT_TIMEOUT_MS = 10 * 60 * 1000;
 function shutDownServer(server) {
     server.closeAllConnections?.();
     server.close();
 }
+export class SignInCancelledError extends Error {
+    constructor() {
+        super('Sign-in cancelled.');
+        this.name = 'SignInCancelledError';
+    }
+}
+export function isSignInCancelled(error) {
+    return error instanceof SignInCancelledError;
+}
+function isAbortError(error) {
+    const err = error;
+    return err?.name === 'AbortError' || err?.code === 'ABORT_ERR';
+}
 export function resolveWebsiteUrl() {
-    return DEFAULT_WEBSITE_URL.replace(/\/+$/, '');
+    return DEFAULT_THEGITAI_HOST.replace(/\/+$/, '');
 }
 function defaultDeviceName() {
     try {
@@ -21,6 +35,73 @@ function defaultDeviceName() {
         return os.hostname();
     }
 }
+function readLinuxOsPrettyName() {
+    try {
+        const content = readFileSync('/etc/os-release', 'utf8');
+        return content.match(/^PRETTY_NAME="?([^"\n]*)"?$/m)?.[1]?.trim() ?? '';
+    }
+    catch {
+        return '';
+    }
+}
+function macArchLabel() {
+    try {
+        if (process.arch === 'arm64')
+            return 'Apple Silicon';
+        if (os.cpus().some((cpu) => cpu.model.includes('Apple'))) {
+            return 'Apple Silicon';
+        }
+    }
+    catch {
+    }
+    return 'Intel';
+}
+export function describeOperatingSystem() {
+    try {
+        if (process.platform === 'linux') {
+            const base = readLinuxOsPrettyName() || `Linux ${os.release()}`;
+            return process.arch === 'arm64' ? `${base}, ARM64` : base;
+        }
+        if (process.platform === 'darwin') {
+            let version = '';
+            try {
+                version = execSync('sw_vers -productVersion', {
+                    stdio: ['ignore', 'pipe', 'ignore'],
+                })
+                    .toString()
+                    .trim();
+            }
+            catch {
+            }
+            return `${version ? `macOS ${version}` : 'macOS'}, ${macArchLabel()}`;
+        }
+        if (process.platform === 'win32') {
+            let label = '';
+            try {
+                label = os.version();
+            }
+            catch {
+            }
+            const build = Number(os.release().split('.')[2] ?? '0');
+            if (build >= 22000)
+                label = label.replace(/Windows 10/i, 'Windows 11');
+            const base = label || `Windows ${os.release()}`;
+            return process.arch === 'arm64' ? `${base}, ARM64` : base;
+        }
+        return `${process.platform} ${os.release()}`;
+    }
+    catch {
+        return process.platform;
+    }
+}
+export function withOperatingSystemInfo(name) {
+    const trimmed = name.trim();
+    const osLabel = describeOperatingSystem();
+    const combined = osLabel && !trimmed.includes(osLabel)
+        ? `${trimmed} (${osLabel})`
+        : trimmed;
+    return combined.slice(0, 180);
+}
 export function generatePkce() {
     const verifier = crypto.randomBytes(32).toString('base64url');
     const challenge = crypto
@@ -33,12 +114,8 @@ function buildAuthUrl(websiteUrl, params) {
     const url = new URL(`${websiteUrl}/cli-auth`);
     url.searchParams.set('code_challenge', params.codeChallenge);
     url.searchParams.set('device_name', params.deviceName);
-    if (params.redirectUri)
-        url.searchParams.set('redirect_uri', params.redirectUri);
-    if (params.state)
-        url.searchParams.set('state', params.state);
-    if (params.paste)
-        url.searchParams.set('mode', 'paste');
+    url.searchParams.set('redirect_uri', params.redirectUri);
+    url.searchParams.set('state', params.state);
     return url.toString();
 }
 const RESULT_PAGE = (heading, detail) => `<!doctype html><html><head><meta charset="utf-8"><title>TheGitAI CLI</title>` +
@@ -56,7 +133,7 @@ async function exchangeCodeForToken({ serverUrl, code, codeVerifier, fetchImpl,
     });
     const data = (await readJsonResponse(response));
     if (!response.ok) {
-        throw new ServerApiError(failureMessage(data, response.status), response.status, trace.traceId);
+        throw new ServerApiError(failureMessage(data, response.status), response.status, trace.traceId, failureCode(data));
     }
     const token = String(data?.token ?? '').trim();
     const customer = data?.customer;
@@ -71,36 +148,38 @@ async function exchangeCodeForToken({ serverUrl, code, codeVerifier, fetchImpl,
         customer,
     };
 }
+async function readPastedResult({ promptCode, signal, serverUrl, codeVerifier, fetchImpl, onPasteRejected, }) {
+    while (!signal.aborted) {
+        const code = (await promptCode(signal)).trim();
+        if (code) {
+            try {
+                return await exchangeCodeForToken({ serverUrl, code, codeVerifier, fetchImpl });
+            }
+            catch (error) {
+                if (signal.aborted)
+                    break;
+                onPasteRejected?.(error.message);
+            }
+        }
+        await new Promise((resolve) => setImmediate(resolve));
+    }
+    return await new Promise(() => { });
+}
 export async function loginViaBrowser(options) {
-    const serverUrl = normalizeServerUrl(options.serverUrl ?? DEFAULT_SERVER_URL);
+    const serverUrl = normalizeServerUrl(options.serverUrl ?? DEFAULT_THEGITAI_HOST);
     const websiteUrl = resolveWebsiteUrl();
     const fetchImpl = options.fetchImpl ?? globalThis.fetch;
     const openBrowser = options.openBrowser ?? openUrl;
     const onUrl = options.onUrl ?? (() => { });
-    const deviceName = options.deviceName ?? defaultDeviceName();
+    const deviceName = withOperatingSystemInfo(options.deviceName ?? defaultDeviceName());
     const { verifier, challenge } = generatePkce();
-    if (options.noBrowser) {
-        const authUrl = buildAuthUrl(websiteUrl, {
-            codeChallenge: challenge,
-            deviceName,
-            paste: true,
-        });
-        onUrl(authUrl);
-        if (!options.promptCode) {
-            throw new Error('No way to read the authorization code in this context.');
-        }
-        const code = (await options.promptCode()).trim();
-        if (!code) {
-            throw new Error('No authorization code was entered.');
-        }
-        return exchangeCodeForToken({ serverUrl, code, codeVerifier: verifier, fetchImpl });
-    }
     const state = crypto.randomBytes(16).toString('base64url');
     const server = http.createServer();
+    let timer;
     const codePromise = new Promise((resolve, reject) => {
-        const timer = setTimeout(() => {
+        timer = setTimeout(() => {
             shutDownServer(server);
-            reject(new Error('Timed out waiting for the browser login to complete.'));
+            reject(new Error('Sign-in timed out. Authorization codes last 10 minutes — run `ai` again to start over.'));
         }, options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
         server.on('request', (req, res) => {
             const requestUrl = new URL(req.url ?? '/', 'http://127.0.0.1');
@@ -113,7 +192,7 @@ export async function loginViaBrowser(options) {
             const returnedState = requestUrl.searchParams.get('state') ?? '';
             if (!code || returnedState !== state) {
                 res.writeHead(400, { 'content-type': 'text/html', connection: 'close' });
-                res.end(RESULT_PAGE('Login failed', 'The request could not be verified. Please run ai login again.'));
+                res.end(RESULT_PAGE('Login failed', 'The request could not be verified. Please run `ai` again.'));
                 clearTimeout(timer);
                 shutDownServer(server);
                 reject(new Error('The login callback could not be verified.'));
@@ -143,8 +222,44 @@ export async function loginViaBrowser(options) {
         state,
     });
     onUrl(authUrl);
-    await openBrowser(authUrl).catch(() => false);
-    options.onWaiting?.();
-    const code = await codePromise;
-    return exchangeCodeForToken({ serverUrl, code, codeVerifier: verifier, fetchImpl });
+    const opened = await openBrowser(authUrl).catch(() => false);
+    options.onBrowserOpen?.(opened);
+    let raceSettled = false;
+    const untilSettled = (promise) => promise.catch((error) => {
+        if (raceSettled)
+            return new Promise(() => { });
+        throw error;
+    });
+    const pasteAbort = new AbortController();
+    const routes = [
+        untilSettled(codePromise.then((code) => exchangeCodeForToken({ serverUrl, code, codeVerifier: verifier, fetchImpl }))),
+    ];
+    if (options.promptCode) {
+        const pasted = readPastedResult({
+            promptCode: options.promptCode,
+            signal: pasteAbort.signal,
+            serverUrl,
+            codeVerifier: verifier,
+            fetchImpl,
+            onPasteRejected: options.onPasteRejected,
+        }).catch((error) => {
+            if (!raceSettled && isAbortError(error))
+                throw new SignInCancelledError();
+            if (!raceSettled) {
+                return new Promise(() => { });
+            }
+            throw error;
+        });
+        routes.push(untilSettled(pasted));
+    }
+    try {
+        return await Promise.race(routes);
+    }
+    finally {
+        raceSettled = true;
+        pasteAbort.abort();
+        if (timer)
+            clearTimeout(timer);
+        shutDownServer(server);
+    }
 }