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

package/README.md

@@ -34,7 +34,7 @@ always be viewed or resumed from that computer. Continuing it through the
 service requires the TheGitAI account used for that session. Local sessions can
 also be listed while signed out or offline.
 
-CLI login tokens use a rolling 24-hour inactivity timeout. If one expires during
+CLI login tokens use a rolling 48-hour inactivity timeout. If one expires during
 any server request, the CLI saves the local session, removes the expired
 credential, and asks you to run `ai login` before resuming.
 

package/dist/src/api/chat.js

@@ -3,7 +3,7 @@ import { createPromptCheckpoint, sanitizeSessionSafetyForServer, } from '../sess
 import { applySessionSnapshot, saveSessionState, snapshotFromSession, } from '../session-store.js';
 import { executeLocalToolCall } from '../tool-executor.js';
 import { isUserInputQuestionArray } from './contracts.js';
-import { createTraceContext, normalizeServerUrl, readErrorResponse, } from './http.js';
+import { createTraceContext, gatewayFailureCategory, normalizeServerUrl, readErrorResponse, } from './http.js';
 import { collectClientEnvironment } from '../client-environment.js';
 import { collectProjectOrientation } from '../project-orientation.js';
 import { autoAttachImages } from '../core/image-path-extractor.js';
@@ -587,7 +587,10 @@ export async function sendServerUserMessage({ config, projectIndex, session, inp
                 ? error
                 : new TurnCancelledError();
         }
-        const category = error instanceof ChatTurnFailedError ? error.category : 'unknown_error';
+        const category = error instanceof ChatTurnFailedError
+            ? error.category
+            :
+                gatewayFailureCategory(error) ?? 'unknown_error';
         const partial = error instanceof ChatTurnFailedError ? error.partialSnapshot : undefined;
         if (partial) {
             applySessionSnapshot(session, partial, { preserveAgentMode: true });

package/dist/src/api/http.js

@@ -84,6 +84,41 @@ export function normalizeServerUrl(serverUrl) {
     }
     return normalized;
 }
+const MAX_NON_JSON_BODY_CHARS = 200;
+const GATEWAY_STATUS_MESSAGES = {
+    502: 'Could not reach the TheGitAI server (bad gateway).',
+    503: 'The TheGitAI server is temporarily unavailable.',
+    504: 'The TheGitAI server did not respond in time (gateway timeout).',
+    520: 'The connection to the TheGitAI server failed (edge error 520).',
+    521: 'The TheGitAI server is not accepting connections (edge error 521).',
+    522: 'The connection to the TheGitAI server timed out (edge error 522).',
+    523: 'The TheGitAI server is unreachable (edge error 523).',
+    524: 'The TheGitAI server did not respond in time (edge error 524).',
+};
+function truncateByCodePoint(text, maxChars) {
+    if (text.length <= maxChars)
+        return text;
+    const points = Array.from(text);
+    if (points.length <= maxChars)
+        return text;
+    return `${points.slice(0, maxChars).join('').trimEnd()}…`;
+}
+export function nonJsonErrorMessage(body, status) {
+    const rayId = /Cloudflare Ray ID:\s*(?:<[^>]*>\s*)*([0-9a-f]{8,})/i.exec(body)?.[1];
+    const gateway = GATEWAY_STATUS_MESSAGES[status];
+    const summary = truncateByCodePoint(body
+        .replace(/<(script|style)\b[^>]*>[\s\S]*?<\/\1>/gi, ' ')
+        .replace(/<[^>]*>/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim(), MAX_NON_JSON_BODY_CHARS);
+    const base = gateway ?? (summary || `Request failed with ${status}`);
+    return rayId ? `${base} (Cloudflare Ray ID: ${rayId})` : base;
+}
+export function gatewayFailureCategory(error) {
+    if (!(error instanceof ServerApiError))
+        return null;
+    return error.status in GATEWAY_STATUS_MESSAGES ? 'gateway_error' : null;
+}
 export async function readJsonResponse(response) {
     const text = await response.text();
     if (!text.trim())
@@ -92,7 +127,9 @@ export async function readJsonResponse(response) {
         return JSON.parse(text);
     }
     catch {
-        return { error: { message: text } };
+        return {
+            error: { message: nonJsonErrorMessage(text, response.status) },
+        };
     }
 }
 export function failureMessage(data, status) {
@@ -106,7 +143,7 @@ export function isAuthenticationError(error) {
 }
 export function authenticationErrorMessage(error) {
     return error.code === 'AUTH_TOKEN_EXPIRED'
-        ? 'Your login expired after 24 hours of inactivity. Run `ai login` and resume this saved session.'
+        ? 'Your login expired after 48 hours of inactivity. Run `ai login` and resume this saved session.'
         : 'Your login is no longer valid. Run `ai login` and resume this saved session.';
 }
 export async function readErrorResponse(response, traceId = response.headers.get(TRACE_ID_HEADER) ?? '') {

package/dist/src/background-jobs.js

@@ -1,6 +1,6 @@
 import chalk from './colors.js';
 import { spawn } from 'child_process';
-import { buildCommandEnv, commandUsesSudo, sanitizeCommandText, terminateChild, } from './executor.js';
+import { buildCommandEnv, commandUsesSudo, resolveCommandShell, sanitizeCommandText, terminateChild, } from './executor.js';
 import { isTuiMode } from './runtime-mode.js';
 import { redactConnectionStringCredentials } from './secret-preview.js';
 const MAX_RUNNING_JOBS = 8;
@@ -196,7 +196,7 @@ export async function startBackgroundJob(command, cwd, { startupWaitMs, sessionI
     const id = `bg_${++jobCounter}`;
     const child = spawn(command, {
         cwd,
-        shell: true,
+        shell: resolveCommandShell(),
         detached: process.platform !== 'win32',
         stdio: ['pipe', 'pipe', 'pipe'],
         env: buildCommandEnv(cwd),

package/dist/src/executor.js

@@ -1,6 +1,6 @@
 import chalk from './colors.js';
 import { execFileSync, spawn } from 'child_process';
-import { existsSync, statSync } from 'fs';
+import { accessSync, constants as fsConstants, existsSync, statSync } from 'fs';
 import { createRequire } from 'node:module';
 import os from 'os';
 import path from 'path';
@@ -637,6 +637,28 @@ export function buildCommandEnv(cwd) {
         THEGITAI_SCRATCH_DIR: ensureSessionScratchDir(),
     };
 }
+let cachedCommandShell;
+function findBashPath() {
+    const fromPath = (process.env.PATH ?? '')
+        .split(path.delimiter)
+        .filter(Boolean)
+        .map((dir) => path.join(dir, 'bash'));
+    for (const candidate of [...fromPath, '/bin/bash', '/usr/bin/bash']) {
+        try {
+            accessSync(candidate, fsConstants.X_OK);
+            return candidate;
+        }
+        catch { }
+    }
+    return null;
+}
+export function resolveCommandShell() {
+    if (cachedCommandShell !== undefined)
+        return cachedCommandShell;
+    cachedCommandShell =
+        process.platform === 'win32' ? true : (findBashPath() ?? true);
+    return cachedCommandShell;
+}
 function sanitizePtyOutput(command, output, cwd, secrets) {
     return sanitizeCommandText(command, stripSudoPromptText(redactSecrets(output, secrets)), cwd);
 }
@@ -822,7 +844,7 @@ export async function runCommand(command, cwd, { requestSudoPassword, timeout, }
         let killTimer = null;
         const child = spawn(command, {
             cwd,
-            shell: true,
+            shell: resolveCommandShell(),
             detached: process.platform !== 'win32',
             stdio: ['pipe', 'pipe', 'pipe'],
             env: buildCommandEnv(cwd),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.21",
+  "version": "1.0.0-preview.23",
   "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.21",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.21",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.21",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.21",
+    "@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",
     "@vscode/ripgrep": "1.18.0"
   },
   "publishConfig": {