lazy-gravity 0.9.2 → 0.11.0

package/dist/services/assistantDomExtractor.js

@@ -27,6 +27,12 @@ function classifyAssistantSegments(payload) {
             finalOutputText: '',
             activityLines: [],
             feedback: [],
+            planCards: [],
+            actionButtons: [],
+            fileChanges: [],
+            citations: [],
+            fileChangesTexts: [],
+            citedFiles: [],
             diagnostics: {
                 source: 'legacy-fallback',
                 segmentCounts: {},
@@ -41,8 +47,13 @@ function classifyAssistantSegments(payload) {
     const bodyTexts = [];
     const activityLines = [];
     const feedbackTexts = [];
+    const planCards = [];
+    const actionButtons = [];
+    const fileChanges = [];
+    const citations = [];
     const segmentCounts = {};
     const allFingerprints = [];
+    const fileChangesTexts = [];
     for (const seg of segments) {
         segmentCounts[seg.kind] = (segmentCounts[seg.kind] ?? 0) + 1;
         switch (seg.kind) {
@@ -65,16 +76,68 @@ function classifyAssistantSegments(payload) {
                     feedbackTexts.push(seg.text.trim());
                 }
                 break;
+            case 'plan-card':
+                if (seg.text && seg.text.trim()) {
+                    planCards.push(seg.text.trim());
+                }
+                break;
+            case 'action-button':
+                if (seg.text && seg.text.trim()) {
+                    actionButtons.push(seg.text.trim());
+                }
+                break;
+            case 'file-change':
+                if (seg.text && seg.text.trim()) {
+                    const parts = seg.text.split('|');
+                    fileChanges.push({ path: parts[0]?.trim() || '', type: parts[1]?.trim() || '' });
+                }
+                break;
+            case 'citation':
+                if (seg.text && seg.text.trim()) {
+                    citations.push(seg.text.trim());
+                }
+                break;
+            case 'file-changes':
+                if (seg.text && seg.text.trim()) {
+                    fileChangesTexts.push(seg.text.trim());
+                }
+                break;
         }
     }
     // Concatenate all body segments — the CDP script may yield multiple nodes
     // (streaming partial + final, multi-block markdown, etc.)
     const lastBody = bodyTexts.join('\n\n') || '';
     const finalOutputText = (0, htmlToDiscordMarkdown_1.htmlToDiscordMarkdown)(lastBody);
+    // Extract file:/// links from finalOutputText and preserve citations from Pass 4
+    const citedFiles = Array.from(new Set([...citations]));
+    const fileRegex = /\[.*?\]\((file:\/\/\/[^\)]+)\)/g;
+    let match;
+    while ((match = fileRegex.exec(finalOutputText)) !== null) {
+        const fileUrl = match[1];
+        if (!citedFiles.includes(fileUrl)) {
+            citedFiles.push(fileUrl);
+        }
+    }
+    // Also extract backticked inline code that looks like a filename with common extensions
+    // e.g., `implementation_plan.md`
+    const inlineCodeRegex = /`([a-zA-Z0-9_\-\.]+\.(?:md|ts|js|json|html|css|txt|csv|py|java|go|cpp|c))`[^`]?/g;
+    let inlineMatch;
+    while ((inlineMatch = inlineCodeRegex.exec(finalOutputText)) !== null) {
+        const filename = inlineMatch[1];
+        if (!citedFiles.includes(filename)) {
+            citedFiles.push(filename);
+        }
+    }
     return {
         finalOutputText,
         activityLines,
         feedback: feedbackTexts,
+        planCards,
+        actionButtons,
+        fileChanges,
+        citations,
+        fileChangesTexts,
+        citedFiles,
         diagnostics: {
             source: 'dom-structured',
             segmentCounts,
@@ -145,10 +208,18 @@ function extractAssistantSegmentsPayloadScript() {
         if (node.closest('details')) return true;
         if (node.closest('[class*="feedback"], footer')) return true;
         if (node.closest('.notify-user-container')) return true;
-        if (node.closest('[role="dialog"]')) return true;
-        if (node.closest('form')) return true;
+        if (node.closest('dialog, [role="dialog"]')) return true;
+        // Guard against other approval forms leaking into the output
+        var formNode = node.closest('form');
+        if (formNode && formNode.querySelector('[data-testid="plan-card"], [class*="plan-summary"], .actions-container, .review-button')) {
+            return true;
+        }
+        
+        // allow interactive tool forms (ask_question, ask_permission)
         if (node.closest('[data-message-author-role="user"], [data-message-role="user"]')) return true;
-        if (node.querySelector('textarea') || node.closest('textarea')) return true;
+        // We do not exclude nodes just because they contain a textarea (e.g. ask_question "Other" option).
+        // The main chat input is excluded by the "ask anything" check below.
+        if (node.tagName && node.tagName.toLowerCase() === 'textarea') return true;
         var text = (node.innerText || '').toLowerCase();
         if (text.includes('ask anything, @ to mention')) return true;
         if (text.includes('0 files with changes')) return true;
@@ -158,6 +229,7 @@ function extractAssistantSegmentsPayloadScript() {
     var segments = [];
     var seen = new Set();
     var bodyFound = false;
+    var latestMessageContainer = null;
 
     // Pass 1: Find assistant body — last non-excluded content node (recency first)
     var combinedSelector = selectors.join(', ');
@@ -238,6 +310,7 @@ function extractAssistantSegmentsPayloadScript() {
                 domPath: 'article:nth(' + i + ')'
             });
             bodyFound = true;
+            latestMessageContainer = node.closest('[data-message-id], .message-row, [class*="message-container"]') || node.parentNode || scope;
             break; // Only capture the single latest assistant message
         }
     }
@@ -362,6 +435,124 @@ function extractAssistantSegmentsPayloadScript() {
         }
     }
 
+    // Pass 4: Extract Antigravity 2.0 structured cards and artifacts
+    var artifactScope = latestMessageContainer || scope;
+    // 4a. Plan Cards
+    var planNodes = artifactScope.querySelectorAll('[data-testid="plan-card"], [class*="plan-summary"]');
+    for (var pi2 = 0; pi2 < planNodes.length; pi2++) {
+        var pnode = planNodes[pi2];
+        var ptext = (pnode.innerText || pnode.textContent || '').trim();
+        if (ptext) {
+            segments.push({
+                kind: 'plan-card',
+                text: ptext,
+                role: 'assistant',
+                messageIndex: 0,
+                domPath: 'plan-card:nth(' + pi2 + ')'
+            });
+        }
+    }
+
+    // 4b. Action Buttons (Open, Proceed, Review, etc.) - outside feedback footers
+    var actionBtns = artifactScope.querySelectorAll('.actions-container button, [class*="action-btn"], .review-button, [class*="review-btn"]');
+    for (var abi = 0; abi < actionBtns.length; abi++) {
+        var abtnText = (actionBtns[abi].textContent || '').trim();
+        if (!abtnText) continue;
+        var lower = abtnText.toLowerCase();
+        // Ignore approval buttons since they are handled by approvalDetector
+        if (lower.includes('accept all') || lower.includes('reject all')) continue;
+
+        segments.push({
+            kind: 'action-button',
+            text: abtnText,
+            role: 'assistant',
+            messageIndex: 0,
+            domPath: 'action-btn.' + abtnText.toLowerCase().replace(/\s+/g, '-')
+        });
+    }
+
+    // 4c. File Edits
+    var fileEdits = artifactScope.querySelectorAll('[class*="file-edit-item"], .file-edit-item, .bottom-full .cursor-pointer');
+    for (var fei = 0; fei < fileEdits.length; fei++) {
+        var editNode = fileEdits[fei];
+        if (seen.has(editNode)) continue;
+        seen.add(editNode);
+        var fpath = (editNode.querySelector('.file-path, [class*="path"]') || {}).textContent || '';
+        var ftype = (editNode.querySelector('.edit-type, [class*="type"]') || {}).textContent || 'Modified';
+        
+        if (!fpath) {
+            var spans = editNode.querySelectorAll('span.whitespace-nowrap.text-sm');
+            if (spans.length > 0) {
+                fpath = spans[0].textContent || '';
+            }
+        }
+        if (!fpath) {
+            fpath = (editNode.textContent || '').trim();
+            if (fpath.endsWith(ftype)) {
+                fpath = fpath.slice(0, -ftype.length).trim();
+            }
+        }
+        if (fpath) {
+            segments.push({
+                kind: 'file-change',
+                text: fpath.trim() + '|' + ftype.trim(),
+                role: 'assistant',
+                messageIndex: 0,
+                domPath: 'file-edit:nth(' + fei + ')'
+            });
+        }
+    }
+
+    // 4d. Citations
+    var citationNodes = artifactScope.querySelectorAll('[class*="citation"], a[href^="file://"]');
+    for (var cti = 0; cti < citationNodes.length; cti++) {
+        var cnode = citationNodes[cti];
+        var ctext = (cnode.getAttribute('href') || cnode.textContent || '').trim();
+        if (ctext) {
+            segments.push({
+                kind: 'citation',
+                text: ctext,
+                role: 'assistant',
+                messageIndex: 0,
+                domPath: 'citation:nth(' + cti + ')'
+            });
+        }
+    }
+    // 4e. File Changes Text Blocks
+    var fcbNodes = artifactScope.querySelectorAll('.file-changes-block code, [class*="file-changes"] code');
+    for (var fci = 0; fci < fcbNodes.length; fci++) {
+        var fcNode = fcbNodes[fci];
+        var fcText = (fcNode.textContent || '').trim();
+        if (fcText) {
+            segments.push({
+                kind: 'file-changes',
+                text: fcText,
+                role: 'assistant',
+                messageIndex: 0,
+                domPath: 'file-changes:nth(' + fci + ')'
+            });
+        }
+    }
+    // 4f. Artifact Cards
+    var artifactCards = artifactScope.querySelectorAll('[data-testid="artifact-card"], [class*="artifact-card"]');
+    for (var aci = 0; aci < artifactCards.length; aci++) {
+        var card = artifactCards[aci];
+        var titleEl = card.querySelector('.title, [class*="title"], h3, h4, span');
+        if (titleEl) {
+            var titleText = (titleEl.textContent || '').trim();
+            if (titleText) {
+                segments.push({
+                    kind: 'citation',
+                    text: titleText + '.md',
+                    role: 'assistant',
+                    messageIndex: 0,
+                    domPath: 'artifact-card:nth(' + aci + ')'
+                });
+            }
+        }
+    }
+
+
     if (!bodyFound && segments.length === 0) return null;
 
     return {

package/dist/services/cdpBridgeManager.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FILE_CHANGE_REJECT_ACTION_PREFIX = exports.FILE_CHANGE_ACCEPT_ACTION_PREFIX = exports.QUESTION_SELECT_ACTION_PREFIX = void 0;
 exports.getCurrentChatTitle = getCurrentChatTitle;
 exports.registerApprovalWorkspaceChannel = registerApprovalWorkspaceChannel;
 exports.registerApprovalSessionChannel = registerApprovalSessionChannel;
@@ -12,6 +13,8 @@ exports.buildErrorPopupCustomId = buildErrorPopupCustomId;
 exports.parseErrorPopupCustomId = parseErrorPopupCustomId;
 exports.buildRunCommandCustomId = buildRunCommandCustomId;
 exports.parseRunCommandCustomId = parseRunCommandCustomId;
+exports.buildFileChangeCustomId = buildFileChangeCustomId;
+exports.parseFileChangeCustomId = parseFileChangeCustomId;
 exports.initCdpBridge = initCdpBridge;
 exports.getCurrentCdp = getCurrentCdp;
 exports.ensureApprovalDetector = ensureApprovalDetector;
@@ -19,6 +22,7 @@ exports.ensurePlanningDetector = ensurePlanningDetector;
 exports.ensureErrorPopupDetector = ensureErrorPopupDetector;
 exports.ensureRunCommandDetector = ensureRunCommandDetector;
 exports.ensureUserMessageDetector = ensureUserMessageDetector;
+exports.ensureQuestionDetector = ensureQuestionDetector;
 const i18n_1 = require("../utils/i18n");
 const logger_1 = require("../utils/logger");
 const notificationSender_1 = require("./notificationSender");
@@ -30,16 +34,21 @@ const planningDetector_1 = require("./planningDetector");
 const runCommandDetector_1 = require("./runCommandDetector");
 const quotaService_1 = require("./quotaService");
 const userMessageDetector_1 = require("./userMessageDetector");
+const questionDetector_1 = require("./questionDetector");
 const APPROVE_ACTION_PREFIX = 'approve_action';
 const ALWAYS_ALLOW_ACTION_PREFIX = 'always_allow_action';
 const DENY_ACTION_PREFIX = 'deny_action';
 const PLANNING_OPEN_ACTION_PREFIX = 'planning_open_action';
 const PLANNING_PROCEED_ACTION_PREFIX = 'planning_proceed_action';
+const PLANNING_REJECT_ACTION_PREFIX = 'planning_reject_action';
 const ERROR_POPUP_DISMISS_ACTION_PREFIX = 'error_popup_dismiss_action';
 const ERROR_POPUP_COPY_DEBUG_ACTION_PREFIX = 'error_popup_copy_debug_action';
 const ERROR_POPUP_RETRY_ACTION_PREFIX = 'error_popup_retry_action';
 const RUN_COMMAND_RUN_ACTION_PREFIX = 'run_command_run_action';
 const RUN_COMMAND_REJECT_ACTION_PREFIX = 'run_command_reject_action';
+exports.QUESTION_SELECT_ACTION_PREFIX = 'question_select_action';
+exports.FILE_CHANGE_ACCEPT_ACTION_PREFIX = 'ide_file_accept_all';
+exports.FILE_CHANGE_REJECT_ACTION_PREFIX = 'ide_file_reject_all';
 function normalizeSessionTitle(title) {
     return title.trim().toLowerCase();
 }
@@ -47,7 +56,7 @@ function buildSessionRouteKey(projectName, sessionTitle) {
     return `${projectName}::${normalizeSessionTitle(sessionTitle)}`;
 }
 const GET_CURRENT_CHAT_TITLE_SCRIPT = `(() => {
-    const panel = document.querySelector('.antigravity-agent-side-panel');
+    const panel = document.querySelector('.antigravity-agent-side-panel') || document.body;
     if (!panel) return '';
     const header = panel.querySelector('div[class*="border-b"]');
     if (!header) return '';
@@ -137,7 +146,9 @@ function parseApprovalCustomId(customId) {
 function buildPlanningCustomId(action, projectName, channelId) {
     const prefix = action === 'open'
         ? PLANNING_OPEN_ACTION_PREFIX
-        : PLANNING_PROCEED_ACTION_PREFIX;
+        : action === 'proceed'
+            ? PLANNING_PROCEED_ACTION_PREFIX
+            : PLANNING_REJECT_ACTION_PREFIX;
     if (channelId && channelId.trim().length > 0) {
         return `${prefix}:${projectName}:${channelId}`;
     }
@@ -150,6 +161,9 @@ function parsePlanningCustomId(customId) {
     if (customId === PLANNING_PROCEED_ACTION_PREFIX) {
         return { action: 'proceed', projectName: null, channelId: null };
     }
+    if (customId === PLANNING_REJECT_ACTION_PREFIX) {
+        return { action: 'reject', projectName: null, channelId: null };
+    }
     if (customId.startsWith(`${PLANNING_OPEN_ACTION_PREFIX}:`)) {
         const rest = customId.substring(`${PLANNING_OPEN_ACTION_PREFIX}:`.length);
         const [projectName, channelId] = rest.split(':');
@@ -160,6 +174,11 @@ function parsePlanningCustomId(customId) {
         const [projectName, channelId] = rest.split(':');
         return { action: 'proceed', projectName: projectName || null, channelId: channelId || null };
     }
+    if (customId.startsWith(`${PLANNING_REJECT_ACTION_PREFIX}:`)) {
+        const rest = customId.substring(`${PLANNING_REJECT_ACTION_PREFIX}:`.length);
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'reject', projectName: projectName || null, channelId: channelId || null };
+    }
     return null;
 }
 function buildErrorPopupCustomId(action, projectName, channelId) {
@@ -228,6 +247,34 @@ function parseRunCommandCustomId(customId) {
     }
     return null;
 }
+function buildFileChangeCustomId(action, projectName, channelId) {
+    const prefix = action === 'accept'
+        ? exports.FILE_CHANGE_ACCEPT_ACTION_PREFIX
+        : exports.FILE_CHANGE_REJECT_ACTION_PREFIX;
+    if (channelId && channelId.trim().length > 0) {
+        return `${prefix}:${projectName}:${channelId}`;
+    }
+    return `${prefix}:${projectName}`;
+}
+function parseFileChangeCustomId(customId) {
+    if (customId === exports.FILE_CHANGE_ACCEPT_ACTION_PREFIX) {
+        return { action: 'accept', projectName: null, channelId: null };
+    }
+    if (customId === exports.FILE_CHANGE_REJECT_ACTION_PREFIX) {
+        return { action: 'reject', projectName: null, channelId: null };
+    }
+    if (customId.startsWith(`${exports.FILE_CHANGE_ACCEPT_ACTION_PREFIX}:`)) {
+        const rest = customId.substring(`${exports.FILE_CHANGE_ACCEPT_ACTION_PREFIX}:`.length);
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'accept', projectName: projectName || null, channelId: channelId || null };
+    }
+    if (customId.startsWith(`${exports.FILE_CHANGE_REJECT_ACTION_PREFIX}:`)) {
+        const rest = customId.substring(`${exports.FILE_CHANGE_REJECT_ACTION_PREFIX}:`.length);
+        const [projectName, channelId] = rest.split(':');
+        return { action: 'reject', projectName: projectName || null, channelId: channelId || null };
+    }
+    return null;
+}
 /** Initialize the CDP bridge (lazy connection: pool creation only) */
 function initCdpBridge(autoApproveDefault, accountPorts = {}, accountUserDataDirs = {}, cdpHost = '127.0.0.1') {
     const pool = new cdpConnectionPool_1.CdpConnectionPool({
@@ -290,6 +337,8 @@ function ensureApprovalDetector(bridge, cdp, projectName, accountName = 'default
         },
         onApprovalRequired: async (info) => {
             logger_1.logger.debug(`[ApprovalDetector:${projectName}] Approval button detected (allow="${info.approveText}", deny="${info.denyText}")`);
+            // Emit approval event for bot text updating
+            cdp.emit('approval_required', info);
             const currentChatTitle = await getCurrentChatTitle(cdp);
             const targetChannel = resolveApprovalChannelForCurrentChat(bridge, projectName, currentChatTitle);
             const targetChannelId = targetChannel ? targetChannel.id : '';
@@ -311,17 +360,47 @@ function ensureApprovalDetector(bridge, cdp, projectName, accountName = 'default
                     return;
                 }
             }
+            const extraFields = [
+                { name: (0, i18n_1.t)('Allow button'), value: info.approveText || (0, i18n_1.t)('(None)'), inline: true },
+            ];
+            if (info.alwaysAllowText) {
+                extraFields.push({ name: (0, i18n_1.t)('Allow Chat button'), value: info.alwaysAllowText, inline: true });
+            }
+            extraFields.push({ name: (0, i18n_1.t)('Deny button'), value: info.denyText || (0, i18n_1.t)('(None)'), inline: true });
+            // Resolve artifact review buttons if they exist
+            let walkthroughCustomId;
+            let taskCustomId;
+            if (bridge.chatSessionRepo && bridge.artifactService) {
+                const session = bridge.chatSessionRepo.findByChannelId(targetChannelId);
+                const activeConversationId = session?.conversationId;
+                if (activeConversationId) {
+                    const artifacts = bridge.artifactService.listArtifacts(activeConversationId);
+                    const walkthrough = artifacts.find((art) => art.filename.toLowerCase() === 'walkthrough.md');
+                    if (walkthrough) {
+                        walkthroughCustomId = `file_open:art:${activeConversationId}:walkthrough.md`;
+                    }
+                    const task = artifacts.find((art) => art.filename.toLowerCase() === 'task.md');
+                    if (task) {
+                        taskCustomId = `file_open:art:${activeConversationId}:task.md`;
+                    }
+                }
+            }
             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 },
-                ],
+                extraFields,
+                hasAlwaysAllow: !!info.alwaysAllowText,
+                alwaysAllowText: info.alwaysAllowText,
+                walkthroughCustomId,
+                taskCustomId,
             });
+            if (lastNotification) {
+                lastNotification.payload = payload;
+                lastNotification.sent.edit(payload).catch(logger_1.logger.error);
+                return;
+            }
             const sent = await targetChannel.send(payload).catch((err) => {
                 logger_1.logger.error(err);
                 return null;
@@ -381,7 +460,15 @@ function ensurePlanningDetector(bridge, cdp, projectName, accountName = 'default
                 projectName,
                 channelId: targetChannelId,
                 extraFields,
+                hasOpenButton: info.hasOpenButton,
+                openText: info.openText,
+                proceedText: info.proceedText,
             });
+            if (lastNotification) {
+                lastNotification.payload = payload;
+                lastNotification.sent.edit(payload).catch(logger_1.logger.error);
+                return;
+            }
             const sent = await targetChannel.send(payload).catch((err) => {
                 logger_1.logger.error(err);
                 return null;
@@ -438,12 +525,23 @@ function ensureErrorPopupDetector(bridge, cdp, projectName, accountName = 'defau
                     { name: (0, i18n_1.t)('Workspace'), value: projectName, inline: true },
                 ],
             });
+            if (lastNotification && detector.lastDetectedKey && lastNotification.key === detector.lastDetectedKey) {
+                // Cooldown triggered for the same popup; edit existing message instead of sending new
+                const edited = await lastNotification.sent.edit(payload).catch((err) => {
+                    logger_1.logger.error(err);
+                    return null;
+                });
+                if (edited) {
+                    lastNotification.payload = payload;
+                }
+                return;
+            }
             const sent = await targetChannel.send(payload).catch((err) => {
                 logger_1.logger.error(err);
                 return null;
             });
             if (sent) {
-                lastNotification = { sent, payload };
+                lastNotification = { sent, payload, key: detector.lastDetectedKey };
             }
         },
     });
@@ -549,3 +647,46 @@ function ensureUserMessageDetector(bridge, cdp, projectName, onUserMessage, acco
     bridge.pool.registerUserMessageDetector(projectName, detector, accountName);
     logger_1.logger.debug(`[UserMessageDetector:${projectName}] Started user message detection`);
 }
+function ensureQuestionDetector(bridge, cdp, projectName, accountName = 'default') {
+    const existing = bridge.pool.getQuestionDetector(projectName, accountName);
+    if (existing && existing.isActive)
+        return;
+    let lastNotification = null;
+    const detector = new questionDetector_1.QuestionDetector({
+        cdpService: cdp,
+        pollIntervalMs: 2000,
+        onResolved: () => {
+            if (!lastNotification)
+                return;
+            const { sent, payload } = lastNotification;
+            lastNotification = null;
+            const resolved = (0, notificationSender_1.buildResolvedOverlay)(payload, (0, i18n_1.t)('Question answered'));
+            sent.edit(resolved).catch(logger_1.logger.error);
+        },
+        onQuestionRequired: async (info) => {
+            const currentChatTitle = await getCurrentChatTitle(cdp);
+            const targetChannel = resolveApprovalChannelForCurrentChat(bridge, projectName, currentChatTitle);
+            const targetChannelId = targetChannel ? targetChannel.id : '';
+            if (!targetChannel || !targetChannelId)
+                return;
+            const payload = (0, notificationSender_1.buildQuestionNotification)({
+                title: info.title,
+                description: info.description,
+                projectName,
+                channelId: targetChannelId,
+                options: info.options,
+            });
+            const sent = await targetChannel.send(payload).catch((err) => {
+                logger_1.logger.error(err);
+                return null;
+            });
+            if (sent) {
+                lastNotification = { sent, payload };
+            }
+        },
+    });
+    detector.setProjectName(projectName);
+    detector.start();
+    bridge.pool.registerQuestionDetector(projectName, detector, accountName);
+    logger_1.logger.debug(`[QuestionDetector:${projectName}] Started question detection`);
+}

package/dist/services/cdpConnectionPool.js

@@ -11,6 +11,7 @@ function buildConnectionKey(projectName, accountName) {
  * Pool that manages independent CdpService instances per workspace/account pair.
  */
 class CdpConnectionPool {
+    lastActiveWorkspace = null;
     connections = new Map();
     workspaceToAccount = new Map();
     approvalDetectors = new Map();
@@ -18,6 +19,7 @@ class CdpConnectionPool {
     planningDetectors = new Map();
     runCommandDetectors = new Map();
     userMessageDetectors = new Map();
+    questionDetectors = new Map();
     connectingPromises = new Map();
     cdpOptions;
     constructor(cdpOptions = {}) {
@@ -39,6 +41,7 @@ class CdpConnectionPool {
         const key = buildConnectionKey(projectName, effectiveAccount);
         const existing = this.connections.get(key);
         if (existing && existing.isConnected()) {
+            this.lastActiveWorkspace = projectName;
             await existing.discoverAndConnectForWorkspace(workspacePath);
             return existing;
         }
@@ -49,7 +52,9 @@ class CdpConnectionPool {
         const connectPromise = this.createAndConnect(workspacePath, projectName, effectiveAccount);
         this.connectingPromises.set(key, connectPromise);
         try {
-            return await connectPromise;
+            const result = await connectPromise;
+            this.lastActiveWorkspace = projectName;
+            return result;
         }
         finally {
             this.connectingPromises.delete(key);
@@ -58,8 +63,9 @@ class CdpConnectionPool {
     }
     getConnected(projectName, accountName = 'default') {
         const effectiveAccount = this.resolveAccountName(projectName, accountName);
-        const cdp = this.connections.get(buildConnectionKey(projectName, effectiveAccount));
+        const cdp = this.connections.get(buildConnectionKey(projectName, effectiveAccount)) || null;
         if (cdp && cdp.isConnected()) {
+            this.lastActiveWorkspace = projectName;
             return cdp;
         }
         return null;
@@ -78,6 +84,8 @@ class CdpConnectionPool {
         this.approvalDetectors.delete(key);
         this.errorPopupDetectors.get(key)?.stop();
         this.errorPopupDetectors.delete(key);
+        this.questionDetectors.get(key)?.stop();
+        this.questionDetectors.delete(key);
         this.planningDetectors.get(key)?.stop();
         this.planningDetectors.delete(key);
         this.runCommandDetectors.get(key)?.stop();
@@ -117,6 +125,16 @@ class CdpConnectionPool {
         this.planningDetectors.get(key)?.stop();
         this.planningDetectors.set(key, detector);
     }
+    getQuestionDetector(projectName, accountName = 'default') {
+        const effectiveAccount = this.resolveAccountName(projectName, accountName);
+        return this.questionDetectors.get(buildConnectionKey(projectName, effectiveAccount));
+    }
+    registerQuestionDetector(projectName, detector, accountName = 'default') {
+        const effectiveAccount = this.resolveAccountName(projectName, accountName);
+        const key = buildConnectionKey(projectName, effectiveAccount);
+        this.questionDetectors.get(key)?.stop();
+        this.questionDetectors.set(key, detector);
+    }
     getPlanningDetector(projectName, accountName = 'default') {
         const effectiveAccount = this.resolveAccountName(projectName, accountName);
         return this.planningDetectors.get(buildConnectionKey(projectName, effectiveAccount));
@@ -182,6 +200,8 @@ class CdpConnectionPool {
             this.errorPopupDetectors.delete(key);
             this.planningDetectors.get(key)?.stop();
             this.planningDetectors.delete(key);
+            this.questionDetectors.get(key)?.stop();
+            this.questionDetectors.delete(key);
             this.runCommandDetectors.get(key)?.stop();
             this.runCommandDetectors.delete(key);
             this.userMessageDetectors.get(key)?.stop();