@thegitai/cli 1.0.0-preview.47 → 1.0.0-preview.49

package/README.md

@@ -52,6 +52,31 @@ CLI login tokens use a rolling 48-hour inactivity timeout. If one expires during
 any server request, the CLI removes the expired credential and signs you in
 again on the next run.
 
+## When the connection drops
+
+A dropped connection does not end your turn. The CLI shows
+`Connection interrupted · retrying in 10s · retry 1/3` under the working timer,
+waits ten seconds, and reconnects to the same turn — it never starts the request
+over, and a command, edit or browser action that already ran is not run again.
+It tries three times. Once it is back, the turn simply continues and a short
+`Connection restored` note stays in the transcript.
+
+The same applies when you start `ai` while TheGitAI is briefly unavailable:
+startup shows `Couldn't reach TheGitAI (…) · retrying in 10s · retry 1/3` and
+waits up to three times before giving up.
+
+If TheGitAI itself restarted while it was working, the turn cannot resume
+where it was. It continues instead: the CLI sends your request once more with
+the steps that already finished on your machine and everything you told it
+during the turn, and the work picks up from there — a command that already ran
+is not run again, and a correction you made still stands — with a short
+`Server restarted` note in the transcript.
+
+Press Esc at any point to stop the turn instead. If all three retries fail, the
+turn ends with an error that names what was interrupted, notes that some actions
+may already have completed, and leaves anything you had queued in the composer
+rather than sending it on top of a turn whose outcome is unknown.
+
 ## Chrome browser control
 
 The TheGitAI Chrome extension is separately installed. After installing it,

package/dist/bin/ai.js

@@ -4,7 +4,9 @@ import { ServerApi } from '../src/api/index.js';
 import { DEFAULT_THEGITAI_HOST } from '../src/api/default-host.js';
 import { isSignInCancelled } from '../src/api/browser-login.js';
 import { runSignIn } from '../src/signin.js';
-import { STARTUP_RETRY_BUDGET, authenticationErrorMessage, isAuthenticationError, isTransientNetworkError, } from '../src/api/http.js';
+import { ServerApiError, authenticationErrorMessage, isAuthenticationError, isTransientNetworkError, } from '../src/api/http.js';
+import { loadStartupHandshake } from '../src/api/startup-handshake.js';
+import { TURN_RECOVERY_DELAY_MS, TURN_RECOVERY_RETRIES, } from '../src/api/turn-recovery.js';
 import { formatCliHelpText } from '../src/help-text.js';
 import { createSession, disposeSession } from '../src/session.js';
 import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, sessionHasUserMessage, } from '../src/session-store.js';
@@ -172,16 +174,24 @@ export async function main() {
     const authConfig = await ensureCliAuthConfig();
     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,
-        }),
-    ]);
+    const { models: modelsOutcome, whoami: whoamiOutcome } = await loadStartupHandshake({
+        config: authConfig,
+        canStartOffline: Boolean(cachedModels?.models.length),
+        onStatus: (status, lastFailure) => {
+            if (status.phase === 'waiting') {
+                const reason = lastFailure instanceof ServerApiError
+                    ? `HTTP ${lastFailure.status}`
+                    : unreachableReason(lastFailure);
+                console.error(chalk.yellow(`⚠ Couldn't reach TheGitAI (${reason}) · retrying in ${TURN_RECOVERY_DELAY_MS / 1000}s · retry ${status.retry}/${TURN_RECOVERY_RETRIES}`));
+            }
+            else if (status.phase === 'reconnecting') {
+                console.error(chalk.dim(`  Reconnecting · retry ${status.retry}/${TURN_RECOVERY_RETRIES}`));
+            }
+            else if (status.phase === 'restored') {
+                console.error(chalk.green('✓ Reconnected to TheGitAI'));
+            }
+        },
+    });
     let offlineNotice = null;
     let serverModels;
     if (modelsOutcome.status === 'fulfilled') {