lazy-gravity 0.2.0 → 0.4.0

package/dist/services/cdpBridgeManager.js

@@ -16,10 +16,9 @@ exports.ensureApprovalDetector = ensureApprovalDetector;
 exports.ensurePlanningDetector = ensurePlanningDetector;
 exports.ensureErrorPopupDetector = ensureErrorPopupDetector;
 exports.ensureUserMessageDetector = ensureUserMessageDetector;
-const discord_js_1 = require("discord.js");
 const i18n_1 = require("../utils/i18n");
 const logger_1 = require("../utils/logger");
-const discordButtonUtils_1 = require("../utils/discordButtonUtils");
+const notificationSender_1 = require("./notificationSender");
 const approvalDetector_1 = require("./approvalDetector");
 const autoAcceptService_1 = require("./autoAcceptService");
 const cdpConnectionPool_1 = require("./cdpConnectionPool");
@@ -230,89 +229,66 @@ function getCurrentCdp(bridge) {
  * Helper to start an approval detector for each workspace.
  * Does nothing if a detector for the same workspace is already running.
  */
-function ensureApprovalDetector(bridge, cdp, projectName, client) {
+function ensureApprovalDetector(bridge, cdp, projectName) {
     const existing = bridge.pool.getApprovalDetector(projectName);
     if (existing && existing.isActive())
         return;
-    // Track the most recent button message for auto-disable on resolve.
-    // Only the latest message is tracked; if a new detection fires before the previous
-    // is resolved, the older message reference is overwritten. This is acceptable because
+    // Track the most recent notification for auto-disable on resolve.
+    // Only the latest is tracked; if a new detection fires before the previous
+    // is resolved, the older reference is overwritten. This is acceptable because
     // the detector's lastDetectedKey deduplication prevents rapid successive notifications.
-    let lastButtonMessage = null;
+    let lastNotification = null;
     const detector = new approvalDetector_1.ApprovalDetector({
         cdpService: cdp,
         pollIntervalMs: 2000,
         onResolved: () => {
-            if (!lastButtonMessage)
+            if (!lastNotification)
                 return;
-            const msg = lastButtonMessage;
-            lastButtonMessage = null;
-            const originalEmbed = msg.embeds[0];
-            const updatedEmbed = originalEmbed
-                ? discord_js_1.EmbedBuilder.from(originalEmbed)
-                : new discord_js_1.EmbedBuilder().setTitle((0, i18n_1.t)('Approval Required'));
-            updatedEmbed
-                .setColor(0x95A5A6)
-                .addFields({ name: (0, i18n_1.t)('Status'), value: (0, i18n_1.t)('Resolved in Antigravity'), inline: false });
-            msg.edit({
-                embeds: [updatedEmbed],
-                components: (0, discordButtonUtils_1.disableAllButtons)(msg.components),
-            }).catch(logger_1.logger.error);
+            const { sent, payload } = lastNotification;
+            lastNotification = null;
+            const resolved = (0, notificationSender_1.buildResolvedOverlay)(payload, (0, i18n_1.t)('Resolved in Antigravity'));
+            sent.edit(resolved).catch(logger_1.logger.error);
         },
         onApprovalRequired: async (info) => {
             logger_1.logger.debug(`[ApprovalDetector:${projectName}] Approval button detected (allow="${info.approveText}", deny="${info.denyText}")`);
             const currentChatTitle = await getCurrentChatTitle(cdp);
             const targetChannel = resolveApprovalChannelForCurrentChat(bridge, projectName, currentChatTitle);
-            const targetChannelId = targetChannel && 'id' in targetChannel ? String(targetChannel.id) : '';
-            if (!targetChannel || !targetChannelId || !('send' in targetChannel)) {
-                logger_1.logger.warn(`[ApprovalDetector:${projectName}] Skipped approval notification because chat is not linked to a Discord session` +
+            const targetChannelId = targetChannel ? targetChannel.id : '';
+            if (!targetChannel || !targetChannelId) {
+                logger_1.logger.warn(`[ApprovalDetector:${projectName}] Skipped approval notification because chat is not linked to a session` +
                     `${currentChatTitle ? ` (title="${currentChatTitle}")` : ''}`);
                 return;
             }
             if (bridge.autoAccept.isEnabled()) {
                 const accepted = await detector.alwaysAllowButton() || await detector.approveButton();
-                const autoEmbed = new discord_js_1.EmbedBuilder()
-                    .setTitle(accepted ? (0, i18n_1.t)('Auto-approved') : (0, i18n_1.t)('Auto-approve failed'))
-                    .setDescription(accepted ? (0, i18n_1.t)('An action was automatically approved.') : (0, i18n_1.t)('Auto-approve attempted but failed. Manual approval required.'))
-                    .setColor(accepted ? 0x2ECC71 : 0xF39C12)
-                    .addFields({ name: (0, i18n_1.t)('Auto-approve mode'), value: (0, i18n_1.t)('ON'), inline: true }, { name: (0, i18n_1.t)('Workspace'), value: projectName, inline: true }, { name: (0, i18n_1.t)('Result'), value: accepted ? (0, i18n_1.t)('Executed Always Allow/Allow') : (0, i18n_1.t)('Manual approval required'), inline: true });
-                if (info.description) {
-                    autoEmbed.addFields({ name: (0, i18n_1.t)('Action Detail'), value: info.description.substring(0, 1024), inline: false });
-                }
-                if (info.approveText) {
-                    autoEmbed.addFields({ name: (0, i18n_1.t)('Approved via'), value: info.approveText, inline: true });
-                }
-                autoEmbed.setTimestamp();
-                await targetChannel.send({ embeds: [autoEmbed] }).catch(logger_1.logger.error);
+                const autoPayload = (0, notificationSender_1.buildAutoApprovedNotification)({
+                    accepted,
+                    projectName,
+                    description: info.description ?? undefined,
+                    approveText: info.approveText ?? undefined,
+                });
+                await targetChannel.send(autoPayload).catch(logger_1.logger.error);
                 if (accepted) {
                     return;
                 }
             }
-            const embed = new discord_js_1.EmbedBuilder()
-                .setTitle((0, i18n_1.t)('Approval Required'))
-                .setDescription(info.description || (0, i18n_1.t)('Antigravity is requesting approval for an action'))
-                .setColor(0xFFA500)
-                .addFields({ name: (0, i18n_1.t)('Allow button'), value: info.approveText, inline: true }, { name: (0, i18n_1.t)('Allow Chat button'), value: info.alwaysAllowText || (0, i18n_1.t)('In Dropdown'), inline: true }, { name: (0, i18n_1.t)('Deny button'), value: info.denyText || (0, i18n_1.t)('(None)'), inline: true }, { name: (0, i18n_1.t)('Workspace'), value: projectName, inline: true })
-                .setTimestamp();
-            const approveBtn = new discord_js_1.ButtonBuilder()
-                .setCustomId(buildApprovalCustomId('approve', projectName, targetChannelId))
-                .setLabel((0, i18n_1.t)('Allow'))
-                .setStyle(discord_js_1.ButtonStyle.Success);
-            const alwaysAllowBtn = new discord_js_1.ButtonBuilder()
-                .setCustomId(buildApprovalCustomId('always_allow', projectName, targetChannelId))
-                .setLabel((0, i18n_1.t)('Allow Chat'))
-                .setStyle(discord_js_1.ButtonStyle.Primary);
-            const denyBtn = new discord_js_1.ButtonBuilder()
-                .setCustomId(buildApprovalCustomId('deny', projectName, targetChannelId))
-                .setLabel((0, i18n_1.t)('Deny'))
-                .setStyle(discord_js_1.ButtonStyle.Danger);
-            const row = new discord_js_1.ActionRowBuilder().addComponents(approveBtn, alwaysAllowBtn, denyBtn);
-            const sent = await targetChannel.send({
-                embeds: [embed],
-                components: [row],
-            }).catch((err) => { logger_1.logger.error(err); return null; });
+            const payload = (0, notificationSender_1.buildApprovalNotification)({
+                title: (0, i18n_1.t)('Approval Required'),
+                description: info.description || (0, i18n_1.t)('Antigravity is requesting approval for an action'),
+                projectName,
+                channelId: targetChannelId,
+                extraFields: [
+                    { name: (0, i18n_1.t)('Allow button'), value: info.approveText, inline: true },
+                    { name: (0, i18n_1.t)('Allow Chat button'), value: info.alwaysAllowText || (0, i18n_1.t)('In Dropdown'), inline: true },
+                    { name: (0, i18n_1.t)('Deny button'), value: info.denyText || (0, i18n_1.t)('(None)'), inline: true },
+                ],
+            });
+            const sent = await targetChannel.send(payload).catch((err) => {
+                logger_1.logger.error(err);
+                return null;
+            });
             if (sent) {
-                lastButtonMessage = sent;
+                lastNotification = { sent, payload };
             }
         },
     });
@@ -324,68 +300,55 @@ function ensureApprovalDetector(bridge, cdp, projectName, client) {
  * Helper to start a planning detector for each workspace.
  * Does nothing if a detector for the same workspace is already running.
  */
-function ensurePlanningDetector(bridge, cdp, projectName, _client) {
+function ensurePlanningDetector(bridge, cdp, projectName) {
     const existing = bridge.pool.getPlanningDetector(projectName);
     if (existing && existing.isActive())
         return;
-    // Track the most recent planning message for auto-disable on resolve.
+    // Track the most recent planning notification for auto-disable on resolve.
     // See ensureApprovalDetector comment for tracking limitation rationale.
-    let lastPlanningMessage = null;
+    let lastNotification = null;
     const detector = new planningDetector_1.PlanningDetector({
         cdpService: cdp,
         pollIntervalMs: 2000,
         onResolved: () => {
-            if (!lastPlanningMessage)
+            if (!lastNotification)
                 return;
-            const msg = lastPlanningMessage;
-            lastPlanningMessage = null;
-            const originalEmbed = msg.embeds[0];
-            const updatedEmbed = originalEmbed
-                ? discord_js_1.EmbedBuilder.from(originalEmbed)
-                : new discord_js_1.EmbedBuilder().setTitle((0, i18n_1.t)('Planning Mode'));
-            updatedEmbed
-                .setColor(0x95A5A6)
-                .addFields({ name: (0, i18n_1.t)('Status'), value: (0, i18n_1.t)('Resolved in Antigravity'), inline: false });
-            msg.edit({
-                embeds: [updatedEmbed],
-                components: (0, discordButtonUtils_1.disableAllButtons)(msg.components),
-            }).catch(logger_1.logger.error);
+            const { sent, payload } = lastNotification;
+            lastNotification = null;
+            const resolved = (0, notificationSender_1.buildResolvedOverlay)(payload, (0, i18n_1.t)('Resolved in Antigravity'));
+            sent.edit(resolved).catch(logger_1.logger.error);
         },
         onPlanningRequired: async (info) => {
             logger_1.logger.debug(`[PlanningDetector:${projectName}] Planning buttons detected (title="${info.planTitle}")`);
             const currentChatTitle = await getCurrentChatTitle(cdp);
             const targetChannel = resolveApprovalChannelForCurrentChat(bridge, projectName, currentChatTitle);
-            const targetChannelId = targetChannel && 'id' in targetChannel ? String(targetChannel.id) : '';
-            if (!targetChannel || !targetChannelId || !('send' in targetChannel)) {
-                logger_1.logger.warn(`[PlanningDetector:${projectName}] Skipped planning notification because chat is not linked to a Discord session` +
+            const targetChannelId = targetChannel ? targetChannel.id : '';
+            if (!targetChannel || !targetChannelId) {
+                logger_1.logger.warn(`[PlanningDetector:${projectName}] Skipped planning notification because chat is not linked to a session` +
                     `${currentChatTitle ? ` (title="${currentChatTitle}")` : ''}`);
                 return;
             }
             const descriptionText = info.description || info.planSummary || (0, i18n_1.t)('A plan has been generated and is awaiting your review.');
-            const embed = new discord_js_1.EmbedBuilder()
-                .setTitle((0, i18n_1.t)('Planning Mode'))
-                .setDescription(descriptionText)
-                .setColor(0x3498DB)
-                .addFields({ name: (0, i18n_1.t)('Plan'), value: info.planTitle || (0, i18n_1.t)('Implementation Plan'), inline: true }, { name: (0, i18n_1.t)('Workspace'), value: projectName, inline: true })
-                .setTimestamp();
+            const extraFields = [
+                { name: (0, i18n_1.t)('Plan'), value: info.planTitle || (0, i18n_1.t)('Implementation Plan'), inline: true },
+                { name: (0, i18n_1.t)('Workspace'), value: projectName, inline: true },
+            ];
             if (info.planSummary && info.description) {
-                embed.addFields({ name: (0, i18n_1.t)('Summary'), value: info.planSummary.substring(0, 1024), inline: false });
+                extraFields.push({ name: (0, i18n_1.t)('Summary'), value: info.planSummary.substring(0, 1024), inline: false });
             }
-            const openBtn = new discord_js_1.ButtonBuilder()
-                .setCustomId(buildPlanningCustomId('open', projectName, targetChannelId))
-                .setLabel((0, i18n_1.t)('Open'))
-                .setStyle(discord_js_1.ButtonStyle.Secondary);
-            const proceedBtn = new discord_js_1.ButtonBuilder()
-                .setCustomId(buildPlanningCustomId('proceed', projectName, targetChannelId))
-                .setLabel((0, i18n_1.t)('Proceed'))
-                .setStyle(discord_js_1.ButtonStyle.Primary);
-            const row = new discord_js_1.ActionRowBuilder().addComponents(openBtn, proceedBtn);
-            const sent = await targetChannel.send({
-                embeds: [embed],
-                components: [row],
-            }).catch((err) => { logger_1.logger.error(err); return null; });
+            const payload = (0, notificationSender_1.buildPlanningNotification)({
+                title: (0, i18n_1.t)('Planning Mode'),
+                description: descriptionText,
+                projectName,
+                channelId: targetChannelId,
+                extraFields,
+            });
+            const sent = await targetChannel.send(payload).catch((err) => {
+                logger_1.logger.error(err);
+                return null;
+            });
             if (sent) {
-                lastPlanningMessage = sent;
+                lastNotification = { sent, payload };
             }
         },
     });
@@ -397,69 +360,51 @@ function ensurePlanningDetector(bridge, cdp, projectName, _client) {
  * Helper to start an error popup detector for each workspace.
  * Does nothing if a detector for the same workspace is already running.
  */
-function ensureErrorPopupDetector(bridge, cdp, projectName, _client) {
+function ensureErrorPopupDetector(bridge, cdp, projectName) {
     const existing = bridge.pool.getErrorPopupDetector(projectName);
     if (existing && existing.isActive())
         return;
-    // Track the most recent error message for auto-disable on resolve.
+    // Track the most recent error notification for auto-disable on resolve.
     // See ensureApprovalDetector comment for tracking limitation rationale.
-    let lastErrorMessage = null;
+    let lastNotification = null;
     const detector = new errorPopupDetector_1.ErrorPopupDetector({
         cdpService: cdp,
         pollIntervalMs: 3000,
         onResolved: () => {
-            if (!lastErrorMessage)
+            if (!lastNotification)
                 return;
-            const msg = lastErrorMessage;
-            lastErrorMessage = null;
-            const originalEmbed = msg.embeds[0];
-            const updatedEmbed = originalEmbed
-                ? discord_js_1.EmbedBuilder.from(originalEmbed)
-                : new discord_js_1.EmbedBuilder().setTitle((0, i18n_1.t)('Agent Error'));
-            updatedEmbed
-                .setColor(0x95A5A6)
-                .addFields({ name: (0, i18n_1.t)('Status'), value: (0, i18n_1.t)('Resolved in Antigravity'), inline: false });
-            msg.edit({
-                embeds: [updatedEmbed],
-                components: (0, discordButtonUtils_1.disableAllButtons)(msg.components),
-            }).catch(logger_1.logger.error);
+            const { sent, payload } = lastNotification;
+            lastNotification = null;
+            const resolved = (0, notificationSender_1.buildResolvedOverlay)(payload, (0, i18n_1.t)('Resolved in Antigravity'));
+            sent.edit(resolved).catch(logger_1.logger.error);
         },
         onErrorPopup: async (info) => {
             logger_1.logger.debug(`[ErrorPopupDetector:${projectName}] Error popup detected (title="${info.title}")`);
             const currentChatTitle = await getCurrentChatTitle(cdp);
             const targetChannel = resolveApprovalChannelForCurrentChat(bridge, projectName, currentChatTitle);
-            const targetChannelId = targetChannel && 'id' in targetChannel ? String(targetChannel.id) : '';
-            if (!targetChannel || !targetChannelId || !('send' in targetChannel)) {
-                logger_1.logger.warn(`[ErrorPopupDetector:${projectName}] Skipped error popup notification because chat is not linked to a Discord session` +
+            const targetChannelId = targetChannel ? targetChannel.id : '';
+            if (!targetChannel || !targetChannelId) {
+                logger_1.logger.warn(`[ErrorPopupDetector:${projectName}] Skipped error popup notification because chat is not linked to a session` +
                     `${currentChatTitle ? ` (title="${currentChatTitle}")` : ''}`);
                 return;
             }
             const bodyText = info.body || (0, i18n_1.t)('An error occurred in the Antigravity agent.');
-            const embed = new discord_js_1.EmbedBuilder()
-                .setTitle(info.title || (0, i18n_1.t)('Agent Error'))
-                .setDescription(bodyText.substring(0, 4096))
-                .setColor(0xE74C3C)
-                .addFields({ name: (0, i18n_1.t)('Buttons'), value: info.buttons.join(', ') || (0, i18n_1.t)('(None)'), inline: true }, { name: (0, i18n_1.t)('Workspace'), value: projectName, inline: true })
-                .setTimestamp();
-            const dismissBtn = new discord_js_1.ButtonBuilder()
-                .setCustomId(buildErrorPopupCustomId('dismiss', projectName, targetChannelId))
-                .setLabel((0, i18n_1.t)('Dismiss'))
-                .setStyle(discord_js_1.ButtonStyle.Secondary);
-            const copyDebugBtn = new discord_js_1.ButtonBuilder()
-                .setCustomId(buildErrorPopupCustomId('copy_debug', projectName, targetChannelId))
-                .setLabel((0, i18n_1.t)('Copy debug info'))
-                .setStyle(discord_js_1.ButtonStyle.Primary);
-            const retryBtn = new discord_js_1.ButtonBuilder()
-                .setCustomId(buildErrorPopupCustomId('retry', projectName, targetChannelId))
-                .setLabel((0, i18n_1.t)('Retry'))
-                .setStyle(discord_js_1.ButtonStyle.Success);
-            const row = new discord_js_1.ActionRowBuilder().addComponents(dismissBtn, copyDebugBtn, retryBtn);
-            const sent = await targetChannel.send({
-                embeds: [embed],
-                components: [row],
-            }).catch((err) => { logger_1.logger.error(err); return null; });
+            const payload = (0, notificationSender_1.buildErrorPopupNotification)({
+                title: info.title || (0, i18n_1.t)('Agent Error'),
+                errorMessage: bodyText.substring(0, 4096),
+                projectName,
+                channelId: targetChannelId,
+                extraFields: [
+                    { name: (0, i18n_1.t)('Buttons'), value: info.buttons.join(', ') || (0, i18n_1.t)('(None)'), inline: true },
+                    { name: (0, i18n_1.t)('Workspace'), value: projectName, inline: true },
+                ],
+            });
+            const sent = await targetChannel.send(payload).catch((err) => {
+                logger_1.logger.error(err);
+                return null;
+            });
             if (sent) {
-                lastErrorMessage = sent;
+                lastNotification = { sent, payload };
             }
         },
     });

package/dist/services/cdpService.js

@@ -225,6 +225,26 @@ class CdpService extends events_1.EventEmitter {
             this.ws.send(JSON.stringify({ id, method, params }));
         });
     }
+    /**
+     * Try call(), and on WebSocket connection error,
+     * attempt a single on-demand reconnect then retry once.
+     * Non-connection errors (timeout, protocol) are NOT retried.
+     */
+    async callWithRetry(method, params = {}, timeoutMs = 10000) {
+        try {
+            return await this.call(method, params);
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const isConnectionError = message === 'WebSocket is not connected' ||
+                message === 'WebSocket disconnected';
+            if (!isConnectionError) {
+                throw error;
+            }
+            await this.reconnectOnDemand(timeoutMs);
+            return await this.call(method, params);
+        }
+    }
     async disconnect() {
         // Stop reconnection attempts
         this.maxReconnectAttempts = 0;
@@ -644,6 +664,72 @@ class CdpService extends events_1.EventEmitter {
         logger_1.logger.error('[CdpService]', finalError.message);
         this.emit('reconnectFailed', finalError);
     }
+    /**
+     * Wait for an in-progress reconnection to complete.
+     * Resolves when 'reconnected' fires, rejects on 'reconnectFailed' or timeout.
+     */
+    waitForReconnection(timeoutMs = 15000) {
+        return new Promise((resolve, reject) => {
+            const timer = setTimeout(() => {
+                cleanup();
+                reject(new Error('WebSocket is not connected'));
+            }, timeoutMs);
+            const onReconnected = () => {
+                cleanup();
+                resolve();
+            };
+            const onFailed = (_err) => {
+                cleanup();
+                reject(new Error('WebSocket is not connected'));
+            };
+            const cleanup = () => {
+                clearTimeout(timer);
+                this.removeListener('reconnected', onReconnected);
+                this.removeListener('reconnectFailed', onFailed);
+            };
+            this.on('reconnected', onReconnected);
+            this.on('reconnectFailed', onFailed);
+        });
+    }
+    /** Shared promise to coalesce concurrent reconnectOnDemand() calls */
+    reconnectOnDemandPromise = null;
+    /**
+     * On-demand reconnect: if already reconnecting, wait; otherwise attempt once.
+     * Throws 'WebSocket is not connected' when no workspace path or reconnect fails.
+     */
+    async reconnectOnDemand(timeoutMs = 15000) {
+        if (this.isReconnecting) {
+            return this.waitForReconnection(timeoutMs);
+        }
+        if (!this.currentWorkspacePath) {
+            throw new Error('WebSocket is not connected');
+        }
+        // Coalesce concurrent calls
+        if (!this.reconnectOnDemandPromise) {
+            this.reconnectOnDemandPromise = (async () => {
+                try {
+                    await this.discoverAndConnectForWorkspace(this.currentWorkspacePath);
+                }
+                catch {
+                    throw new Error('WebSocket is not connected');
+                }
+                finally {
+                    this.reconnectOnDemandPromise = null;
+                }
+            })();
+        }
+        let timer;
+        const timeoutPromise = new Promise((_, reject) => {
+            timer = setTimeout(() => reject(new Error('WebSocket is not connected')), timeoutMs);
+        });
+        try {
+            await Promise.race([this.reconnectOnDemandPromise, timeoutPromise]);
+        }
+        finally {
+            if (timer)
+                clearTimeout(timer);
+        }
+    }
     isConnected() {
         return this.isConnectedFlag;
     }
@@ -1163,7 +1249,7 @@ class CdpService extends events_1.EventEmitter {
      */
     async setUiMode(modeName) {
         if (!this.isConnectedFlag || !this.ws) {
-            throw new Error('Not connected to CDP. Call connect() first.');
+            await this.reconnectOnDemand();
         }
         const safeMode = JSON.stringify(modeName);
         // Internal mode name -> Antigravity UI display name mapping
@@ -1330,7 +1416,7 @@ class CdpService extends events_1.EventEmitter {
      */
     async setUiModel(modelName) {
         if (!this.isConnectedFlag || !this.ws) {
-            throw new Error('Not connected to CDP. Call connect() first.');
+            await this.reconnectOnDemand();
         }
         // DOM manipulation script: based on actual Antigravity UI DOM structure
         // Model list uses div.cursor-pointer elements with class 'px-2 py-1 flex items-center justify-between'

package/dist/services/chatSessionService.js

@@ -78,12 +78,17 @@ const SCRAPE_PAST_CONVERSATIONS_SCRIPT = `(() => {
     const isVisible = (el) => !!el && el instanceof HTMLElement && el.offsetParent !== null;
     const normalize = (text) => (text || '').trim();
 
+    // Scope to the side panel to avoid picking up file tab names
+    const panel = document.querySelector('.antigravity-agent-side-panel');
+    if (!panel) return null;
+
     const items = [];
     const seen = new Set();
 
-    // Find the scrollable conversation list container
-    const containers = Array.from(document.querySelectorAll('div[class*="overflow-auto"], div[class*="overflow-y-scroll"]'));
-    const container = containers.find((c) => isVisible(c) && c.querySelectorAll('div[class*="cursor-pointer"]').length > 0) || document;
+    // Find the scrollable conversation list container within the side panel
+    const containers = Array.from(panel.querySelectorAll('div[class*="overflow-auto"], div[class*="overflow-y-scroll"]'));
+    const container = containers.find((c) => isVisible(c) && c.querySelectorAll('div[class*="cursor-pointer"]').length > 0);
+    if (!container) return null;
 
     // Detect the "Other Conversations" section boundary.
     // Sessions below this header belong to other projects and must be excluded.
@@ -436,6 +441,7 @@ class ChatSessionService {
      * @returns Array of session list items (empty array on failure)
      */
     async listAllSessions(cdpService) {
+        let panelOpened = false;
         try {
             // Step 1: Find Past Conversations button
             const btnState = await this.evaluateOnAnyContext(cdpService, FIND_PAST_CONVERSATIONS_BUTTON_SCRIPT, false);
@@ -444,8 +450,30 @@ class ChatSessionService {
             }
             // Step 2: Click via CDP mouse events (reliable in Electron)
             await this.cdpMouseClick(cdpService, btnState.x, btnState.y);
-            // Step 3: Wait for panel to render
-            await new Promise((r) => setTimeout(r, 500));
+            panelOpened = true;
+            // Step 3: Wait for panel to render (poll for content, up to 3s)
+            const PANEL_READY_CHECK = `(() => {
+                const isVisible = (el) => !!el && el instanceof HTMLElement && el.offsetParent !== null;
+                const panel = document.querySelector('.antigravity-agent-side-panel');
+                if (!panel) return false;
+                const containers = Array.from(
+                    panel.querySelectorAll('div[class*="overflow-auto"], div[class*="overflow-y-scroll"]')
+                );
+                return containers.some((c) =>
+                    isVisible(c) && c.querySelector('div[class*="cursor-pointer"]')
+                );
+            })()`;
+            let panelReady = false;
+            const deadline = Date.now() + 3000;
+            while (Date.now() < deadline) {
+                panelReady = Boolean(await this.evaluateOnAnyContext(cdpService, PANEL_READY_CHECK, false));
+                if (panelReady)
+                    break;
+                await new Promise((r) => setTimeout(r, 200));
+            }
+            if (!panelReady) {
+                return [];
+            }
             // Step 4: Scrape sessions
             let scrapeResult = await this.evaluateOnAnyContext(cdpService, SCRAPE_PAST_CONVERSATIONS_SCRIPT, false);
             let sessions = scrapeResult?.sessions ?? [];
@@ -460,7 +488,22 @@ class ChatSessionService {
                     sessions = scrapeResult?.sessions ?? [];
                 }
             }
-            // Step 7: Close panel with Escape
+            return sessions.slice(0, ChatSessionService.LIST_SESSIONS_TARGET);
+        }
+        catch (_) {
+            return [];
+        }
+        finally {
+            if (panelOpened) {
+                await this.closePanelWithEscape(cdpService);
+            }
+        }
+    }
+    /**
+     * Close the Past Conversations panel by sending Escape key events.
+     */
+    async closePanelWithEscape(cdpService) {
+        try {
             await cdpService.call('Input.dispatchKeyEvent', {
                 type: 'keyDown', key: 'Escape', code: 'Escape',
                 windowsVirtualKeyCode: 27, nativeVirtualKeyCode: 27,
@@ -469,11 +512,8 @@ class ChatSessionService {
                 type: 'keyUp', key: 'Escape', code: 'Escape',
                 windowsVirtualKeyCode: 27, nativeVirtualKeyCode: 27,
             });
-            return sessions.slice(0, ChatSessionService.LIST_SESSIONS_TARGET);
-        }
-        catch (_) {
-            return [];
         }
+        catch (_) { /* best-effort cleanup */ }
     }
     /**
      * Evaluate a script on the first context that returns a truthy value.

package/dist/services/defaultModelApplicator.js

@@ -0,0 +1,54 @@
+"use strict";
+/**
+ * Single-responsibility module for applying the user's default model
+ * preference when a CDP session connects.
+ *
+ * Strategy: exact match only — no fuzzy matching to avoid selecting
+ * the wrong model after Antigravity renames a model.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyDefaultModel = applyDefaultModel;
+const logger_1 = require("../utils/logger");
+/**
+ * Apply the user's default model preference to a CDP session.
+ *
+ * 1. Read modelService.getDefaultModel() — if null, skip
+ * 2. Read cdp.getCurrentModel() — if already matches, skip (mark synced)
+ * 3. Get available models via cdp.getUiModels()
+ * 4. Exact match → cdp.setUiModel() → mark synced
+ * 5. No match → return stale result with message + available model list
+ */
+async function applyDefaultModel(cdp, modelService) {
+    const defaultModel = modelService.getDefaultModel();
+    if (!defaultModel) {
+        return { applied: false, modelName: null, stale: false, staleMessage: null };
+    }
+    const currentModel = await cdp.getCurrentModel();
+    if (currentModel && currentModel.toLowerCase() === defaultModel.toLowerCase()) {
+        modelService.markSynced();
+        logger_1.logger.debug(`[DefaultModelApplicator] Already on default model: ${defaultModel}`);
+        return { applied: true, modelName: defaultModel, stale: false, staleMessage: null };
+    }
+    const availableModels = await cdp.getUiModels();
+    const exactMatch = availableModels.find(m => m.toLowerCase() === defaultModel.toLowerCase());
+    if (exactMatch) {
+        const result = await cdp.setUiModel(exactMatch);
+        if (result.ok) {
+            modelService.markSynced();
+            logger_1.logger.debug(`[DefaultModelApplicator] Applied default model: ${exactMatch}`);
+            return { applied: true, modelName: exactMatch, stale: false, staleMessage: null };
+        }
+        logger_1.logger.warn(`[DefaultModelApplicator] setUiModel failed: ${result.error}`);
+        return { applied: false, modelName: defaultModel, stale: false, staleMessage: null };
+    }
+    // No exact match — model is stale
+    const availableList = availableModels.join(', ');
+    const staleMessage = `Saved default model "${defaultModel}" is no longer available. Available models: ${availableList}`;
+    logger_1.logger.warn(`[DefaultModelApplicator] ${staleMessage}`);
+    return {
+        applied: false,
+        modelName: defaultModel,
+        stale: true,
+        staleMessage,
+    };
+}

package/dist/services/modeService.js

@@ -33,17 +33,31 @@ exports.DEFAULT_MODE = 'fast';
  */
 class ModeService {
     currentMode = exports.DEFAULT_MODE;
+    pendingSync = false;
     /**
      * Get the current execution mode
      */
     getCurrentMode() {
         return this.currentMode;
     }
+    /**
+     * Check if the current mode is pending sync to Antigravity
+     */
+    isPendingSync() {
+        return this.pendingSync;
+    }
+    /**
+     * Mark the pending mode as synced (clears pendingSync flag)
+     */
+    markSynced() {
+        this.pendingSync = false;
+    }
     /**
      * Switch execution mode
      * @param modeName Mode name to set (case-insensitive)
+     * @param synced Whether the mode has been synced to Antigravity (default: false)
      */
-    setMode(modeName) {
+    setMode(modeName, synced = false) {
         if (!modeName || modeName.trim() === '') {
             return {
                 success: false,
@@ -58,6 +72,7 @@ class ModeService {
             };
         }
         this.currentMode = normalized;
+        this.pendingSync = !synced;
         return {
             success: true,
             mode: this.currentMode,