@thegitai/cli 1.0.0-preview.23 → 1.0.0-preview.25

package/dist/bin/ai.js

@@ -4,7 +4,7 @@ import { stdin as input, stdout as output } from 'node:process';
 import readline from 'node:readline/promises';
 import { ServerApi } from '../src/api/index.js';
 import { loginViaBrowser } from '../src/api/browser-login.js';
-import { authenticationErrorMessage, isAuthenticationError, isTransientNetworkError, } from '../src/api/http.js';
+import { STARTUP_RETRY_BUDGET, authenticationErrorMessage, isAuthenticationError, isTransientNetworkError, } from '../src/api/http.js';
 import { formatCliHelpText } from '../src/help-text.js';
 import { createIndex } from '../src/project-index.js';
 import { createSession } from '../src/session.js';
@@ -20,6 +20,20 @@ const { auth, chat, models, sessions } = ServerApi;
 function printUsage() {
     console.log(formatCliHelpText({ color: process.stdout.isTTY === true }));
 }
+function unreachableReason(error) {
+    const err = error;
+    const code = err?.code ?? err?.cause?.code;
+    if (err?.name === 'TimeoutError' || err?.name === 'AbortError') {
+        return 'network timeout';
+    }
+    if (code === 'ENOTFOUND' || code === 'EAI_AGAIN')
+        return 'DNS lookup failed';
+    if (code === 'ECONNREFUSED')
+        return 'connection refused';
+    if (code === 'ECONNRESET' || code === 'EPIPE')
+        return 'connection reset';
+    return err?.message ? String(err.message) : 'network error';
+}
 async function promptText(question, fallback = null) {
     const rl = readline.createInterface({ input, output });
     try {
@@ -184,41 +198,51 @@ export async function main() {
     const authConfig = requireCliAuthConfig();
     const serverSessionClient = sessions.createServerSessionClient({ config: authConfig });
     const cachedModels = models.selectCacheForServer(models.readCachedServerModels(), authConfig.serverUrl);
+    const [modelsOutcome, whoamiOutcome] = await Promise.allSettled([
+        models.fetchServerModels({
+            config: authConfig,
+            budget: STARTUP_RETRY_BUDGET,
+        }),
+        auth.fetchWhoamiResponse({
+            config: authConfig,
+            budget: STARTUP_RETRY_BUDGET,
+        }),
+    ]);
     let offlineNotice = null;
     let serverModels;
-    try {
-        serverModels = await models.fetchServerModels({ config: authConfig });
+    if (modelsOutcome.status === 'fulfilled') {
+        serverModels = modelsOutcome.value;
     }
-    catch (error) {
-        if (isTransientNetworkError(error) && cachedModels?.models.length) {
-            serverModels = { models: cachedModels.models };
-            offlineNotice = error?.message ? String(error.message) : 'network error';
-        }
-        else {
-            throw error;
-        }
+    else if (isTransientNetworkError(modelsOutcome.reason) &&
+        cachedModels?.models.length) {
+        serverModels = { models: cachedModels.models };
+        offlineNotice = unreachableReason(modelsOutcome.reason);
+    }
+    else if (isTransientNetworkError(modelsOutcome.reason)) {
+        throw new Error(`Couldn't reach TheGitAI to load your models (${unreachableReason(modelsOutcome.reason)}).\nCheck your internet connection and run \`ai\` again.`);
+    }
+    else {
+        throw modelsOutcome.reason;
     }
     let whoami;
-    try {
-        whoami = await auth.fetchWhoamiResponse({ config: authConfig });
+    if (whoamiOutcome.status === 'fulfilled') {
+        whoami = whoamiOutcome.value;
     }
-    catch (error) {
-        if (isTransientNetworkError(error)) {
-            whoami = {
-                customer: {
-                    id: '',
-                    uuid: '',
-                    email: authConfig.email,
-                    customer_type: authConfig.customerType ?? 'USER',
-                    scopes: [],
-                },
-                debugUi: { showSessionId: false },
-            };
-            offlineNotice ??= error?.message ? String(error.message) : 'network error';
-        }
-        else {
-            throw error;
-        }
+    else if (isTransientNetworkError(whoamiOutcome.reason)) {
+        whoami = {
+            customer: {
+                id: '',
+                uuid: '',
+                email: authConfig.email,
+                customer_type: authConfig.customerType ?? 'USER',
+                scopes: [],
+            },
+            debugUi: { showSessionId: false },
+        };
+        offlineNotice ??= unreachableReason(whoamiOutcome.reason);
+    }
+    else {
+        throw whoamiOutcome.reason;
     }
     if (offlineNotice) {
         console.error(chalk.yellow(`⚠ Couldn't reach TheGitAI (${offlineNotice}). Starting with cached settings — it will reconnect on your next message.`));

package/dist/src/api/auth.js

@@ -50,12 +50,14 @@ export async function fetchWhoami({ config, fetchImpl = globalThis.fetch, }) {
     const data = await fetchWhoamiResponse({ config, fetchImpl });
     return data.customer;
 }
-export async function fetchWhoamiResponse({ config, fetchImpl = globalThis.fetch, }) {
+export async function fetchWhoamiResponse({ config, fetchImpl = globalThis.fetch, budget = {}, }) {
+    const { timeoutMs, ...ladder } = budget;
     const data = (await retryTransient(() => authorizedJson({
         config,
         path: '/v1/auth/whoami',
         fetchImpl,
-    })));
+        ...(timeoutMs == null ? {} : { timeoutMs }),
+    }), ladder));
     if (!data?.customer?.email) {
         throw new Error('Server returned an invalid whoami response.');
     }

package/dist/src/api/http.js

@@ -29,6 +29,14 @@ export function createTraceContext(traceId = createTraceId()) {
     };
 }
 export const REQUEST_TIMEOUT_MS = 8000;
+export const STARTUP_REQUEST_TIMEOUT_MS = 3000;
+export const STARTUP_DEADLINE_MS = 10_000;
+export const STARTUP_RETRY_BUDGET = {
+    retries: 3,
+    baseDelayMs: 200,
+    deadlineMs: STARTUP_DEADLINE_MS,
+    timeoutMs: STARTUP_REQUEST_TIMEOUT_MS,
+};
 const TRANSIENT_NETWORK_CODES = new Set([
     'ECONNRESET',
     'ECONNREFUSED',
@@ -60,7 +68,9 @@ export function isTransientNetworkError(error) {
     }
     return false;
 }
-export async function retryTransient(run, { retries = 2, baseDelayMs = 400 } = {}) {
+export async function retryTransient(run, { retries = 2, baseDelayMs = 400, deadlineMs, now = () => Date.now(), } = {}) {
+    const startedAt = now();
+    const remainingMs = () => deadlineMs == null ? Infinity : deadlineMs - (now() - startedAt);
     let attempt = 0;
     for (;;) {
         try {
@@ -70,6 +80,8 @@ export async function retryTransient(run, { retries = 2, baseDelayMs = 400 } = {
             if (attempt >= retries || !isTransientNetworkError(error))
                 throw error;
             const delayMs = baseDelayMs * 2 ** attempt;
+            if (remainingMs() <= delayMs)
+                throw error;
             attempt += 1;
             await new Promise((resolve) => setTimeout(resolve, delayMs));
         }

package/dist/src/api/models.js

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync, } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync, } from 'node:fs';
 import path from 'node:path';
 import { getClientStateDir } from '../client-state.js';
 import { REQUEST_TIMEOUT_MS, ServerApiError, createTraceContext, failureCode, failureMessage, normalizeServerUrl, readJsonResponse, retryTransient, } from './http.js';
@@ -58,12 +58,21 @@ export function selectCacheForServer(cached, serverUrl) {
 export function writeCachedServerModels(cache, env = process.env) {
     const filePath = getModelsCachePath(env);
     mkdirSync(path.dirname(filePath), { recursive: true, mode: 0o700 });
-    writeFileSync(filePath, `${JSON.stringify(cache, null, 2)}\n`, {
-        encoding: 'utf8',
-        mode: 0o600,
-    });
+    const tempPath = `${filePath}.${process.pid}.tmp`;
+    try {
+        writeFileSync(tempPath, `${JSON.stringify(cache, null, 2)}\n`, {
+            encoding: 'utf8',
+            mode: 0o600,
+        });
+        renameSync(tempPath, filePath);
+    }
+    catch (error) {
+        rmSync(tempPath, { force: true });
+        throw error;
+    }
 }
-export async function fetchServerModels({ config, fetchImpl = globalThis.fetch, }) {
+export async function fetchServerModels({ config, fetchImpl = globalThis.fetch, budget = {}, }) {
+    const { timeoutMs = REQUEST_TIMEOUT_MS, ...ladder } = budget;
     return retryTransient(async () => {
         const trace = createTraceContext();
         const response = await fetchImpl(`${normalizeServerUrl(config.serverUrl)}/v1/models`, {
@@ -71,7 +80,7 @@ export async function fetchServerModels({ config, fetchImpl = globalThis.fetch,
                 authorization: `Bearer ${config.token}`,
                 ...trace.headers,
             },
-            signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+            signal: AbortSignal.timeout(timeoutMs),
         });
         const data = (await readJsonResponse(response));
         if (!response.ok) {
@@ -84,7 +93,7 @@ export async function fetchServerModels({ config, fetchImpl = globalThis.fetch,
             throw new Error('Server returned an invalid model list.');
         }
         return { models };
-    });
+    }, ladder);
 }
 export function selectServerModel({ requestedModelId, cached, serverModels, }) {
     const supportedIds = new Set(serverModels.models.map((model) => model.id));

package/dist/src/ui/repl.js

@@ -504,6 +504,8 @@ function formatToolResultState(result) {
         return 'Blocked';
     if (result?.ok === true)
         return 'OK';
+    if (Number.isInteger(result?.httpStatus))
+        return String(result.httpStatus);
     return 'Failed';
 }
 function formatRunCommandResultState(result) {
@@ -660,7 +662,7 @@ function buildFileChangeEntry(event) {
         title: `Edited ${filePath}${summary}`,
     };
 }
-function buildWorkingToolEntry(event) {
+export function buildWorkingToolEntry(event) {
     const { call, result } = event;
     const error = typeof result?.error === 'string' && result.error.trim()
         ? `\n${truncate(result.error.trim(), 180)}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.23",
+  "version": "1.0.0-preview.25",
   "description": "TheGitAI is an AI coding agent for your terminal. It indexes your repository, writes and edits files, runs commands, and builds features with you.",
   "keywords": [
     "ai",
@@ -37,10 +37,10 @@
     "@lydell/node-pty-linux-x64": "1.1.0",
     "@lydell/node-pty-win32-arm64": "1.1.0",
     "@lydell/node-pty-win32-x64": "1.1.0",
-    "@thegitai/tui-darwin-arm64": "1.0.0-preview.23",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.23",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.23",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.23",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.25",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.25",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.25",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.25",
     "@vscode/ripgrep": "1.18.0"
   },
   "publishConfig": {