@thegitai/cli 1.0.0-preview.46 → 1.0.0-preview.48

package/dist/src/browser/bridge.js

@@ -13,6 +13,13 @@ export class BrowserBridgeError extends Error {
         this.code = code;
     }
 }
+function rejectDisconnectedRequests(browser) {
+    for (const pending of browser.pending.values()) {
+        clearTimeout(pending.timer);
+        pending.reject(new BrowserBridgeError(`The browser disconnected while ${pending.op} was in flight, so its outcome is unknown. Check the page before doing anything that could repeat.`, 'disconnected'));
+    }
+    browser.pending.clear();
+}
 function safeUnlink(target) {
     try {
         fs.unlinkSync(target);
@@ -28,15 +35,20 @@ export function startBrowserBridge({ sessionKey, label, cwd, env = process.env,
     if (socketIsFile())
         safeUnlink(socketPath);
     const browsers = new Map();
+    const sockets = new Set();
     const listeners = new Set();
     let selected = null;
+    let everConnected = false;
     let closed = false;
     const registration = registerNativeHost({ env });
     const server = net.createServer((socket) => {
         socket.setNoDelay(true);
+        sockets.add(socket);
         let buffer = '';
         let key = null;
         socket.on('data', (chunk) => {
+            if (socket.destroyed)
+                return;
             buffer += chunk.toString('utf8');
             let newline = buffer.indexOf('\n');
             while (newline !== -1) {
@@ -62,7 +74,12 @@ export function startBrowserBridge({ sessionKey, label, cwd, env = process.env,
                     }
                     const announced = frame.browser?.key ?? crypto.randomUUID();
                     const existing = key ? browsers.get(key) : null;
-                    if (existing) {
+                    const displaced = browsers.get(announced);
+                    if (displaced && displaced.socket !== socket) {
+                        displaced.socket.destroy();
+                        rejectDisconnectedRequests(displaced);
+                    }
+                    if (existing?.socket === socket) {
                         if (announced !== key) {
                             browsers.delete(key);
                             browsers.set(announced, existing);
@@ -82,13 +99,14 @@ export function startBrowserBridge({ sessionKey, label, cwd, env = process.env,
                             selected = announced;
                     }
                     key = announced;
+                    everConnected = true;
                     for (const listener of listeners) {
                         listener('connected', { browser: frame.browser });
                     }
                     continue;
                 }
                 const browser = key ? browsers.get(key) : null;
-                if (!browser)
+                if (!browser || browser.socket !== socket)
                     continue;
                 if (frame.t === 'res') {
                     const pending = browser.pending.get(frame.id);
@@ -109,16 +127,16 @@ export function startBrowserBridge({ sessionKey, label, cwd, env = process.env,
             }
         });
         const drop = () => {
+            sockets.delete(socket);
             if (!key)
                 return;
             const browser = browsers.get(key);
+            if (!browser || browser.socket !== socket)
+                return;
             browsers.delete(key);
             if (selected === key)
                 selected = browsers.keys().next().value ?? null;
-            for (const pending of browser?.pending.values() ?? []) {
-                clearTimeout(pending.timer);
-                pending.reject(new BrowserBridgeError(`The browser disconnected while ${pending.op} was in flight, so its outcome is unknown. Check the page before doing anything that could repeat.`, 'disconnected'));
-            }
+            rejectDisconnectedRequests(browser);
             for (const listener of listeners)
                 listener('disconnected', { browser: key });
         };
@@ -152,7 +170,10 @@ export function startBrowserBridge({ sessionKey, label, cwd, env = process.env,
             return;
         closed = true;
         for (const browser of browsers.values())
-            browser.socket.destroy();
+            rejectDisconnectedRequests(browser);
+        for (const socket of sockets)
+            socket.destroy();
+        sockets.clear();
         browsers.clear();
         server.close();
         safeUnlink(socketPath);
@@ -164,12 +185,21 @@ export function startBrowserBridge({ sessionKey, label, cwd, env = process.env,
         status() {
             return {
                 connected: browsers.size > 0,
+                everConnected,
                 browsers: [...browsers.values()].map((browser) => browser.identity),
                 selected,
                 socketPath,
                 registrationErrors: registration.errors,
             };
         },
+        resync() {
+            if (closed || browsers.size > 0 || sockets.size === 0)
+                return false;
+            for (const socket of sockets)
+                socket.destroy();
+            sockets.clear();
+            return true;
+        },
         selectBrowser(key) {
             if (browsers.has(key))
                 selected = key;

package/dist/src/browser/native-host.js

@@ -201,9 +201,19 @@ export function chromiumProcessRunning(platform = process.platform) {
             timeout: 2000,
             stdio: ['ignore', 'pipe', 'ignore'],
         });
-        return /(google[- ]?chrome|chromium|brave|msedge|microsoft edge|vivaldi)/i.test(output);
+        return output.split('\n').some((line) => isBrowserProcessName(line));
     }
     catch {
         return false;
     }
 }
+const BROWSER_PROCESS_NAME = /^(google[ -]?chrome|chrome|chromium|brave|msedge|microsoft[ -]?edge|vivaldi)/i;
+const NOT_A_BROWSER_PROCESS = /crashpad|crashhandler|native|sandbox|driver|updater?\b/i;
+export function isBrowserProcessName(psLine) {
+    const name = psLine.trim().split('/').pop()?.trim() ?? '';
+    if (!name)
+        return false;
+    if (NOT_A_BROWSER_PROCESS.test(name))
+        return false;
+    return BROWSER_PROCESS_NAME.test(name);
+}

package/dist/src/browser/session-bridge.js

@@ -86,19 +86,45 @@ export function browserAvailability(options) {
     if (status.connected) {
         return {
             connected: true,
+            everConnected: true,
             browsers: status.browsers,
             selected: status.selected,
         };
     }
-    const hint = status.registrationErrors.length
-        ? `TheGitAI could not register its browser bridge with Chrome: ${status.registrationErrors[0]}`
-        : chromiumProcessRunning()
-            ? 'Chrome is running but the TheGitAI extension has not connected. Install or enable the extension, then reload it from chrome://extensions.'
-            : 'Chrome does not appear to be running. Open Chrome with the TheGitAI extension installed.';
+    const hint = connectionHint({
+        registrationError: status.registrationErrors[0] ?? null,
+        everConnected: status.everConnected,
+        chromeRunning: () => chromiumProcessRunning(),
+        extensionSeen: () => browserExtensionSeen(options.env),
+    });
     return {
         connected: false,
+        everConnected: status.everConnected,
         browsers: [],
         selected: null,
         hint,
     };
 }
+export function connectionHint(state) {
+    if (state.registrationError) {
+        return `TheGitAI could not register its browser bridge with Chrome: ${state.registrationError}`;
+    }
+    if (state.everConnected) {
+        return 'The browser was connected to this session but is disconnected now. Check Chrome and the connection status shown by the TheGitAI extension.';
+    }
+    if (!state.chromeRunning()) {
+        return 'Chrome does not appear to be running. Open Chrome with the TheGitAI extension enabled and check its connection status.';
+    }
+    if (state.extensionSeen()) {
+        return 'The TheGitAI extension has connected on this machine before, but has not connected to this session yet. Check the connection status shown by the extension.';
+    }
+    return 'Chrome is running, but no browser connection reached this session. Check that the TheGitAI extension is installed and enabled, and inspect its connection status.';
+}
+export function resyncBrowserBridge(options) {
+    try {
+        return ensureBrowserBridge(options).resync();
+    }
+    catch {
+        return false;
+    }
+}

package/dist/src/tools/browser.js

@@ -3,11 +3,12 @@ import path from 'node:path';
 import { normalizeProjectRelativePath } from '../artifact-policy.js';
 import { BrowserBridgeError } from '../browser/bridge.js';
 import { storeSessionImageBytes } from '../core/session-image-store.js';
-import { browserAvailability, drainBrowserEvents, ensureBrowserBridge, } from '../browser/session-bridge.js';
+import { browserAvailability, drainBrowserEvents, ensureBrowserBridge, resyncBrowserBridge, } from '../browser/session-bridge.js';
 import { ensurePermission, originForUrl } from '../permissions.js';
 const READ_TIMEOUT_MS = 20000;
 const NAVIGATE_TIMEOUT_MS = 45000;
 const MAX_UPLOAD_BYTES = 10 * 1024 * 1024;
+const DISCOVERY_TIMEOUT_MS = 2500;
 export const READ_ONLY_BROWSER_TOOLS = new Set([
     'browser',
     'browser_tabs',
@@ -31,25 +32,33 @@ function missing(argument, tool) {
         },
     };
 }
-function notConnected(context) {
-    const availability = browserAvailability({
-        cwd: context.rootDir,
-        env: context.env,
-    });
+async function waitForBrowser(options, timeoutMs) {
+    const deadline = Date.now() + timeoutMs;
+    const bridge = ensureBrowserBridge(options);
+    while (!bridge.status().connected && Date.now() < deadline) {
+        await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+    return browserAvailability(options);
+}
+async function notConnected(context) {
+    const options = { cwd: context.rootDir, env: context.env };
+    const status = ensureBrowserBridge(options).status();
+    if (status.connected)
+        return { ok: true };
+    if (status.everConnected)
+        resyncBrowserBridge(options);
+    const availability = await waitForBrowser(options, DISCOVERY_TIMEOUT_MS);
     if (availability.connected)
         return { ok: true };
     return {
         ok: false,
+        connected: false,
+        browserErrorCode: 'not_connected',
         error: `TheGitAI is not connected to a browser. ${availability.hint ?? ''}`.trim(),
         failureCategory: 'external_service',
-        failureDetails: {
-            category: 'external_service',
-            tool: 'browser',
-            action: 'Report the connection instructions. The extension is a separate installation. Do not retry in a loop or invent a download URL.',
-        },
     };
 }
-function bridgeFailure(error, tool) {
+function bridgeFailure(error) {
     const code = error instanceof BrowserBridgeError ? error.code : 'browser_error';
     const message = String(error?.message ?? error);
     return {
@@ -57,15 +66,6 @@ function bridgeFailure(error, tool) {
         error: message,
         failureCategory: code === 'not_connected' ? 'external_service' : 'tool_exception',
         browserErrorCode: code,
-        failureDetails: {
-            category: code === 'not_connected' ? 'external_service' : 'tool_exception',
-            tool,
-            action: code === 'timeout' || code === 'disconnected'
-                ? 'The outcome is unknown. Read the page before repeating anything that submits, sends, buys, or deletes.'
-                : code === 'stale_refs' || code === 'unknown_ref'
-                    ? 'Re-read the page and use the references from that read.'
-                    : 'Report what failed. Do not retry the same call more than once.',
-        },
     };
 }
 async function call(context, op, args = {}, timeoutMs = READ_TIMEOUT_MS) {
@@ -106,10 +106,10 @@ function attachEvents(result) {
     };
 }
 export async function browserGateway(context) {
+    const guard = await notConnected(context);
+    if (guard.ok === false)
+        return guard;
     const availability = browserAvailability({ cwd: context.rootDir, env: context.env });
-    if (!availability.connected) {
-        return notConnected(context);
-    }
     const platform = availability.browsers[0]?.platform ?? process.platform;
     return {
         ok: true,
@@ -125,7 +125,7 @@ export async function browserGateway(context) {
     };
 }
 export async function browserTabs(context, args) {
-    const guard = notConnected(context);
+    const guard = await notConnected(context);
     if (guard.ok === false)
         return guard;
     try {
@@ -135,11 +135,11 @@ export async function browserTabs(context, args) {
         return attachEvents({ ok: true, ...result });
     }
     catch (error) {
-        return bridgeFailure(error, 'browser_tabs');
+        return bridgeFailure(error);
     }
 }
 export async function browserTabNew(context) {
-    const guard = notConnected(context);
+    const guard = await notConnected(context);
     if (guard.ok === false)
         return guard;
     try {
@@ -147,11 +147,11 @@ export async function browserTabNew(context) {
         return attachEvents({ ok: true, ...result });
     }
     catch (error) {
-        return bridgeFailure(error, 'browser_tab_new');
+        return bridgeFailure(error);
     }
 }
 export async function browserTabClose(context, args) {
-    const guard = notConnected(context);
+    const guard = await notConnected(context);
     if (guard.ok === false)
         return guard;
     const tabId = Number(args.tabId ?? args.tab_id);
@@ -162,11 +162,11 @@ export async function browserTabClose(context, args) {
         return attachEvents({ ok: true, ...result });
     }
     catch (error) {
-        return bridgeFailure(error, 'browser_tab_close');
+        return bridgeFailure(error);
     }
 }
 export async function browserNavigate(context, args) {
-    const guard = notConnected(context);
+    const guard = await notConnected(context);
     if (guard.ok === false)
         return guard;
     const url = String(args.url ?? '').trim();
@@ -195,11 +195,11 @@ export async function browserNavigate(context, args) {
         return attachEvents({ ok: true, ...result });
     }
     catch (error) {
-        return bridgeFailure(error, 'browser_navigate');
+        return bridgeFailure(error);
     }
 }
 async function gatedTabCall(context, { tool, op, args, summary, timeoutMs = READ_TIMEOUT_MS, }) {
-    const guard = notConnected(context);
+    const guard = await notConnected(context);
     if (guard.ok === false)
         return guard;
     const tabId = Number(args.tabId ?? args.tab_id);
@@ -232,7 +232,7 @@ async function gatedTabCall(context, { tool, op, args, summary, timeoutMs = READ
         return attachEvents({ ok: true, tabId, url: tab.url, ...result });
     }
     catch (error) {
-        return bridgeFailure(error, tool);
+        return bridgeFailure(error);
     }
 }
 export function browserReadPage(context, args) {
@@ -389,7 +389,7 @@ export async function browserDownloads(context, args) {
             error: `Plan mode blocked browser_downloads ${action}. Listing downloads is allowed; saving or cancelling one changes the user's disk. Switch to Default mode to decide on a download.`,
         };
     }
-    const guard = notConnected(context);
+    const guard = await notConnected(context);
     if (guard.ok === false)
         return guard;
     if (action === 'list') {
@@ -459,7 +459,7 @@ export function browserResize(context, args) {
     });
 }
 export async function browserFileUpload(context, args) {
-    const guard = notConnected(context);
+    const guard = await notConnected(context);
     if (guard.ok === false)
         return guard;
     const ref = String(args.ref ?? '').trim();
@@ -540,7 +540,7 @@ export async function browserFileUpload(context, args) {
         return attachEvents({ ok: true, ...result, files: files.map((file) => file.name) });
     }
     catch (error) {
-        return bridgeFailure(error, 'browser_file_upload');
+        return bridgeFailure(error);
     }
 }
 function guessMimeType(file) {
@@ -580,7 +580,7 @@ const BATCH_TOOLS = {
     browser_downloads: browserDownloads,
 };
 export async function browserBatch(context, args) {
-    const guard = notConnected(context);
+    const guard = await notConnected(context);
     if (guard.ok === false)
         return guard;
     const actions = Array.isArray(args.actions) ? args.actions : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.46",
+  "version": "1.0.0-preview.48",
   "description": "TheGitAI is an agentic AI coding tool for your terminal. It reads and searches your repository, writes and edits files, runs your tests, and verifies the change before handing it back.",
   "keywords": [
     "agentic-ai",
@@ -44,11 +44,11 @@
     "@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.46",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.46",
-    "@thegitai/tui-linux-arm64": "1.0.0-preview.46",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.46",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.46",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.48",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.48",
+    "@thegitai/tui-linux-arm64": "1.0.0-preview.48",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.48",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.48",
     "@vscode/ripgrep": "1.18.0"
   },
   "repository": {