lazy-gravity 0.1.0 → 0.2.0

package/dist/services/cdpBridgeManager.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCurrentChatTitle = getCurrentChatTitle;
 exports.registerApprovalWorkspaceChannel = registerApprovalWorkspaceChannel;
 exports.registerApprovalSessionChannel = registerApprovalSessionChannel;
 exports.resolveApprovalChannelForCurrentChat = resolveApprovalChannelForCurrentChat;
@@ -14,15 +15,18 @@ exports.getCurrentCdp = getCurrentCdp;
 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 approvalDetector_1 = require("./approvalDetector");
 const autoAcceptService_1 = require("./autoAcceptService");
 const cdpConnectionPool_1 = require("./cdpConnectionPool");
 const errorPopupDetector_1 = require("./errorPopupDetector");
 const planningDetector_1 = require("./planningDetector");
 const quotaService_1 = require("./quotaService");
+const userMessageDetector_1 = require("./userMessageDetector");
 const APPROVE_ACTION_PREFIX = 'approve_action';
 const ALWAYS_ALLOW_ACTION_PREFIX = 'always_allow_action';
 const DENY_ACTION_PREFIX = 'deny_action';
@@ -34,8 +38,8 @@ const ERROR_POPUP_RETRY_ACTION_PREFIX = 'error_popup_retry_action';
 function normalizeSessionTitle(title) {
     return title.trim().toLowerCase();
 }
-function buildSessionRouteKey(workspaceDirName, sessionTitle) {
-    return `${workspaceDirName}::${normalizeSessionTitle(sessionTitle)}`;
+function buildSessionRouteKey(projectName, sessionTitle) {
+    return `${projectName}::${normalizeSessionTitle(sessionTitle)}`;
 }
 const GET_CURRENT_CHAT_TITLE_SCRIPT = `(() => {
     const panel = document.querySelector('.antigravity-agent-side-panel');
@@ -67,127 +71,127 @@ async function getCurrentChatTitle(cdp) {
     }
     return null;
 }
-function registerApprovalWorkspaceChannel(bridge, workspaceDirName, channel) {
-    bridge.approvalChannelByWorkspace.set(workspaceDirName, channel);
+function registerApprovalWorkspaceChannel(bridge, projectName, channel) {
+    bridge.approvalChannelByWorkspace.set(projectName, channel);
 }
-function registerApprovalSessionChannel(bridge, workspaceDirName, sessionTitle, channel) {
+function registerApprovalSessionChannel(bridge, projectName, sessionTitle, channel) {
     if (!sessionTitle || sessionTitle.trim().length === 0)
         return;
-    bridge.approvalChannelBySession.set(buildSessionRouteKey(workspaceDirName, sessionTitle), channel);
-    bridge.approvalChannelByWorkspace.set(workspaceDirName, channel);
+    bridge.approvalChannelBySession.set(buildSessionRouteKey(projectName, sessionTitle), channel);
+    bridge.approvalChannelByWorkspace.set(projectName, channel);
 }
-function resolveApprovalChannelForCurrentChat(bridge, workspaceDirName, currentChatTitle) {
+function resolveApprovalChannelForCurrentChat(bridge, projectName, currentChatTitle) {
     // Try session-level match first (most precise routing)
     if (currentChatTitle && currentChatTitle.trim().length > 0) {
-        const key = buildSessionRouteKey(workspaceDirName, currentChatTitle);
+        const key = buildSessionRouteKey(projectName, currentChatTitle);
         const sessionChannel = bridge.approvalChannelBySession.get(key);
         if (sessionChannel)
             return sessionChannel;
     }
     // Fall back to workspace-level routing
-    return bridge.approvalChannelByWorkspace.get(workspaceDirName) ?? null;
+    return bridge.approvalChannelByWorkspace.get(projectName) ?? null;
 }
-function buildApprovalCustomId(action, workspaceDirName, channelId) {
+function buildApprovalCustomId(action, projectName, channelId) {
     const prefix = action === 'approve'
         ? APPROVE_ACTION_PREFIX
         : action === 'always_allow'
             ? ALWAYS_ALLOW_ACTION_PREFIX
             : DENY_ACTION_PREFIX;
     if (channelId && channelId.trim().length > 0) {
-        return `${prefix}:${workspaceDirName}:${channelId}`;
+        return `${prefix}:${projectName}:${channelId}`;
     }
-    return `${prefix}:${workspaceDirName}`;
+    return `${prefix}:${projectName}`;
 }
 function parseApprovalCustomId(customId) {
     if (customId === APPROVE_ACTION_PREFIX) {
-        return { action: 'approve', workspaceDirName: null, channelId: null };
+        return { action: 'approve', projectName: null, channelId: null };
     }
     if (customId === ALWAYS_ALLOW_ACTION_PREFIX) {
-        return { action: 'always_allow', workspaceDirName: null, channelId: null };
+        return { action: 'always_allow', projectName: null, channelId: null };
     }
     if (customId === DENY_ACTION_PREFIX) {
-        return { action: 'deny', workspaceDirName: null, channelId: null };
+        return { action: 'deny', projectName: null, channelId: null };
     }
     if (customId.startsWith(`${APPROVE_ACTION_PREFIX}:`)) {
         const rest = customId.substring(`${APPROVE_ACTION_PREFIX}:`.length);
-        const [workspaceDirName, channelId] = rest.split(':');
-        return { action: 'approve', workspaceDirName: workspaceDirName || null, channelId: channelId || null };
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'approve', projectName: projectName || null, channelId: channelId || null };
     }
     if (customId.startsWith(`${ALWAYS_ALLOW_ACTION_PREFIX}:`)) {
         const rest = customId.substring(`${ALWAYS_ALLOW_ACTION_PREFIX}:`.length);
-        const [workspaceDirName, channelId] = rest.split(':');
-        return { action: 'always_allow', workspaceDirName: workspaceDirName || null, channelId: channelId || null };
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'always_allow', projectName: projectName || null, channelId: channelId || null };
     }
     if (customId.startsWith(`${DENY_ACTION_PREFIX}:`)) {
         const rest = customId.substring(`${DENY_ACTION_PREFIX}:`.length);
-        const [workspaceDirName, channelId] = rest.split(':');
-        return { action: 'deny', workspaceDirName: workspaceDirName || null, channelId: channelId || null };
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'deny', projectName: projectName || null, channelId: channelId || null };
     }
     return null;
 }
-function buildPlanningCustomId(action, workspaceDirName, channelId) {
+function buildPlanningCustomId(action, projectName, channelId) {
     const prefix = action === 'open'
         ? PLANNING_OPEN_ACTION_PREFIX
         : PLANNING_PROCEED_ACTION_PREFIX;
     if (channelId && channelId.trim().length > 0) {
-        return `${prefix}:${workspaceDirName}:${channelId}`;
+        return `${prefix}:${projectName}:${channelId}`;
     }
-    return `${prefix}:${workspaceDirName}`;
+    return `${prefix}:${projectName}`;
 }
 function parsePlanningCustomId(customId) {
     if (customId === PLANNING_OPEN_ACTION_PREFIX) {
-        return { action: 'open', workspaceDirName: null, channelId: null };
+        return { action: 'open', projectName: null, channelId: null };
     }
     if (customId === PLANNING_PROCEED_ACTION_PREFIX) {
-        return { action: 'proceed', workspaceDirName: null, channelId: null };
+        return { action: 'proceed', projectName: null, channelId: null };
     }
     if (customId.startsWith(`${PLANNING_OPEN_ACTION_PREFIX}:`)) {
         const rest = customId.substring(`${PLANNING_OPEN_ACTION_PREFIX}:`.length);
-        const [workspaceDirName, channelId] = rest.split(':');
-        return { action: 'open', workspaceDirName: workspaceDirName || null, channelId: channelId || null };
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'open', projectName: projectName || null, channelId: channelId || null };
     }
     if (customId.startsWith(`${PLANNING_PROCEED_ACTION_PREFIX}:`)) {
         const rest = customId.substring(`${PLANNING_PROCEED_ACTION_PREFIX}:`.length);
-        const [workspaceDirName, channelId] = rest.split(':');
-        return { action: 'proceed', workspaceDirName: workspaceDirName || null, channelId: channelId || null };
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'proceed', projectName: projectName || null, channelId: channelId || null };
     }
     return null;
 }
-function buildErrorPopupCustomId(action, workspaceDirName, channelId) {
+function buildErrorPopupCustomId(action, projectName, channelId) {
     const prefix = action === 'dismiss'
         ? ERROR_POPUP_DISMISS_ACTION_PREFIX
         : action === 'copy_debug'
             ? ERROR_POPUP_COPY_DEBUG_ACTION_PREFIX
             : ERROR_POPUP_RETRY_ACTION_PREFIX;
     if (channelId && channelId.trim().length > 0) {
-        return `${prefix}:${workspaceDirName}:${channelId}`;
+        return `${prefix}:${projectName}:${channelId}`;
     }
-    return `${prefix}:${workspaceDirName}`;
+    return `${prefix}:${projectName}`;
 }
 function parseErrorPopupCustomId(customId) {
     if (customId === ERROR_POPUP_DISMISS_ACTION_PREFIX) {
-        return { action: 'dismiss', workspaceDirName: null, channelId: null };
+        return { action: 'dismiss', projectName: null, channelId: null };
     }
     if (customId === ERROR_POPUP_COPY_DEBUG_ACTION_PREFIX) {
-        return { action: 'copy_debug', workspaceDirName: null, channelId: null };
+        return { action: 'copy_debug', projectName: null, channelId: null };
     }
     if (customId === ERROR_POPUP_RETRY_ACTION_PREFIX) {
-        return { action: 'retry', workspaceDirName: null, channelId: null };
+        return { action: 'retry', projectName: null, channelId: null };
     }
     if (customId.startsWith(`${ERROR_POPUP_DISMISS_ACTION_PREFIX}:`)) {
         const rest = customId.substring(`${ERROR_POPUP_DISMISS_ACTION_PREFIX}:`.length);
-        const [workspaceDirName, channelId] = rest.split(':');
-        return { action: 'dismiss', workspaceDirName: workspaceDirName || null, channelId: channelId || null };
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'dismiss', projectName: projectName || null, channelId: channelId || null };
     }
     if (customId.startsWith(`${ERROR_POPUP_COPY_DEBUG_ACTION_PREFIX}:`)) {
         const rest = customId.substring(`${ERROR_POPUP_COPY_DEBUG_ACTION_PREFIX}:`.length);
-        const [workspaceDirName, channelId] = rest.split(':');
-        return { action: 'copy_debug', workspaceDirName: workspaceDirName || null, channelId: channelId || null };
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'copy_debug', projectName: projectName || null, channelId: channelId || null };
     }
     if (customId.startsWith(`${ERROR_POPUP_RETRY_ACTION_PREFIX}:`)) {
         const rest = customId.substring(`${ERROR_POPUP_RETRY_ACTION_PREFIX}:`.length);
-        const [workspaceDirName, channelId] = rest.split(':');
-        return { action: 'retry', workspaceDirName: workspaceDirName || null, channelId: channelId || null };
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'retry', projectName: projectName || null, channelId: channelId || null };
     }
     return null;
 }
@@ -226,20 +230,42 @@ 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, workspaceDirName, client) {
-    const existing = bridge.pool.getApprovalDetector(workspaceDirName);
+function ensureApprovalDetector(bridge, cdp, projectName, client) {
+    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
+    // the detector's lastDetectedKey deduplication prevents rapid successive notifications.
+    let lastButtonMessage = null;
     const detector = new approvalDetector_1.ApprovalDetector({
         cdpService: cdp,
         pollIntervalMs: 2000,
+        onResolved: () => {
+            if (!lastButtonMessage)
+                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);
+        },
         onApprovalRequired: async (info) => {
-            logger_1.logger.info(`[ApprovalDetector:${workspaceDirName}] Approval button detected (allow="${info.approveText}", deny="${info.denyText}")`);
+            logger_1.logger.debug(`[ApprovalDetector:${projectName}] Approval button detected (allow="${info.approveText}", deny="${info.denyText}")`);
             const currentChatTitle = await getCurrentChatTitle(cdp);
-            const targetChannel = resolveApprovalChannelForCurrentChat(bridge, workspaceDirName, currentChatTitle);
+            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:${workspaceDirName}] Skipped approval notification because chat is not linked to a Discord session` +
+                logger_1.logger.warn(`[ApprovalDetector:${projectName}] Skipped approval notification because chat is not linked to a Discord session` +
                     `${currentChatTitle ? ` (title="${currentChatTitle}")` : ''}`);
                 return;
             }
@@ -247,10 +273,16 @@ function ensureApprovalDetector(bridge, cdp, workspaceDirName, client) {
                 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(info.description || (0, i18n_1.t)('Antigravity is requesting approval for an action'))
+                    .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: workspaceDirName, 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 })
-                    .setTimestamp();
+                    .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);
                 if (accepted) {
                     return;
@@ -260,49 +292,72 @@ function ensureApprovalDetector(bridge, cdp, workspaceDirName, client) {
                 .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: workspaceDirName, inline: true })
+                .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', workspaceDirName, targetChannelId))
+                .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', workspaceDirName, targetChannelId))
+                .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', workspaceDirName, targetChannelId))
+                .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);
-            targetChannel.send({
+            const sent = await targetChannel.send({
                 embeds: [embed],
                 components: [row],
-            }).catch(logger_1.logger.error);
+            }).catch((err) => { logger_1.logger.error(err); return null; });
+            if (sent) {
+                lastButtonMessage = sent;
+            }
         },
     });
     detector.start();
-    bridge.pool.registerApprovalDetector(workspaceDirName, detector);
-    logger_1.logger.info(`[ApprovalDetector:${workspaceDirName}] Started approval button detection`);
+    bridge.pool.registerApprovalDetector(projectName, detector);
+    logger_1.logger.debug(`[ApprovalDetector:${projectName}] Started approval button detection`);
 }
 /**
  * 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, workspaceDirName, _client) {
-    const existing = bridge.pool.getPlanningDetector(workspaceDirName);
+function ensurePlanningDetector(bridge, cdp, projectName, _client) {
+    const existing = bridge.pool.getPlanningDetector(projectName);
     if (existing && existing.isActive())
         return;
+    // Track the most recent planning message for auto-disable on resolve.
+    // See ensureApprovalDetector comment for tracking limitation rationale.
+    let lastPlanningMessage = null;
     const detector = new planningDetector_1.PlanningDetector({
         cdpService: cdp,
         pollIntervalMs: 2000,
+        onResolved: () => {
+            if (!lastPlanningMessage)
+                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);
+        },
         onPlanningRequired: async (info) => {
-            logger_1.logger.info(`[PlanningDetector:${workspaceDirName}] Planning buttons detected (title="${info.planTitle}")`);
+            logger_1.logger.debug(`[PlanningDetector:${projectName}] Planning buttons detected (title="${info.planTitle}")`);
             const currentChatTitle = await getCurrentChatTitle(cdp);
-            const targetChannel = resolveApprovalChannelForCurrentChat(bridge, workspaceDirName, currentChatTitle);
+            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:${workspaceDirName}] Skipped planning notification because chat is not linked to a Discord session` +
+                logger_1.logger.warn(`[PlanningDetector:${projectName}] Skipped planning notification because chat is not linked to a Discord session` +
                     `${currentChatTitle ? ` (title="${currentChatTitle}")` : ''}`);
                 return;
             }
@@ -311,48 +366,71 @@ function ensurePlanningDetector(bridge, cdp, workspaceDirName, _client) {
                 .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: workspaceDirName, inline: true })
+                .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();
             if (info.planSummary && info.description) {
                 embed.addFields({ name: (0, i18n_1.t)('Summary'), value: info.planSummary.substring(0, 1024), inline: false });
             }
             const openBtn = new discord_js_1.ButtonBuilder()
-                .setCustomId(buildPlanningCustomId('open', workspaceDirName, targetChannelId))
+                .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', workspaceDirName, targetChannelId))
+                .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);
-            targetChannel.send({
+            const sent = await targetChannel.send({
                 embeds: [embed],
                 components: [row],
-            }).catch(logger_1.logger.error);
+            }).catch((err) => { logger_1.logger.error(err); return null; });
+            if (sent) {
+                lastPlanningMessage = sent;
+            }
         },
     });
     detector.start();
-    bridge.pool.registerPlanningDetector(workspaceDirName, detector);
-    logger_1.logger.info(`[PlanningDetector:${workspaceDirName}] Started planning button detection`);
+    bridge.pool.registerPlanningDetector(projectName, detector);
+    logger_1.logger.debug(`[PlanningDetector:${projectName}] Started planning button detection`);
 }
 /**
  * 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, workspaceDirName, _client) {
-    const existing = bridge.pool.getErrorPopupDetector(workspaceDirName);
+function ensureErrorPopupDetector(bridge, cdp, projectName, _client) {
+    const existing = bridge.pool.getErrorPopupDetector(projectName);
     if (existing && existing.isActive())
         return;
+    // Track the most recent error message for auto-disable on resolve.
+    // See ensureApprovalDetector comment for tracking limitation rationale.
+    let lastErrorMessage = null;
     const detector = new errorPopupDetector_1.ErrorPopupDetector({
         cdpService: cdp,
         pollIntervalMs: 3000,
+        onResolved: () => {
+            if (!lastErrorMessage)
+                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);
+        },
         onErrorPopup: async (info) => {
-            logger_1.logger.info(`[ErrorPopupDetector:${workspaceDirName}] Error popup detected (title="${info.title}")`);
+            logger_1.logger.debug(`[ErrorPopupDetector:${projectName}] Error popup detected (title="${info.title}")`);
             const currentChatTitle = await getCurrentChatTitle(cdp);
-            const targetChannel = resolveApprovalChannelForCurrentChat(bridge, workspaceDirName, currentChatTitle);
+            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:${workspaceDirName}] Skipped error popup notification because chat is not linked to a Discord session` +
+                logger_1.logger.warn(`[ErrorPopupDetector:${projectName}] Skipped error popup notification because chat is not linked to a Discord session` +
                     `${currentChatTitle ? ` (title="${currentChatTitle}")` : ''}`);
                 return;
             }
@@ -361,28 +439,50 @@ function ensureErrorPopupDetector(bridge, cdp, workspaceDirName, _client) {
                 .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: workspaceDirName, inline: true })
+                .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', workspaceDirName, targetChannelId))
+                .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', workspaceDirName, targetChannelId))
+                .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', workspaceDirName, targetChannelId))
+                .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);
-            targetChannel.send({
+            const sent = await targetChannel.send({
                 embeds: [embed],
                 components: [row],
-            }).catch(logger_1.logger.error);
+            }).catch((err) => { logger_1.logger.error(err); return null; });
+            if (sent) {
+                lastErrorMessage = sent;
+            }
         },
     });
     detector.start();
-    bridge.pool.registerErrorPopupDetector(workspaceDirName, detector);
-    logger_1.logger.info(`[ErrorPopupDetector:${workspaceDirName}] Started error popup detection`);
+    bridge.pool.registerErrorPopupDetector(projectName, detector);
+    logger_1.logger.debug(`[ErrorPopupDetector:${projectName}] Started error popup detection`);
+}
+/**
+ * Helper to start a user message detector for a workspace.
+ * Detects messages typed directly in the Antigravity UI (e.g., from a PC)
+ * and mirrors them to a Discord channel.
+ * Does nothing if a detector for the same workspace is already running.
+ */
+function ensureUserMessageDetector(bridge, cdp, projectName, onUserMessage) {
+    const existing = bridge.pool.getUserMessageDetector(projectName);
+    if (existing && existing.isActive())
+        return;
+    const detector = new userMessageDetector_1.UserMessageDetector({
+        cdpService: cdp,
+        pollIntervalMs: 2000,
+        onUserMessage,
+    });
+    detector.start();
+    bridge.pool.registerUserMessageDetector(projectName, detector);
+    logger_1.logger.debug(`[UserMessageDetector:${projectName}] Started user message detection`);
 }