lazy-gravity 0.9.2 → 0.11.0

package/dist/services/approvalDetector.js

@@ -1,29 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApprovalDetector = void 0;
+exports.ApprovalDetector = exports.DETECT_APPROVAL_SCRIPT = void 0;
 exports.buildClickScript = buildClickScript;
 const logger_1 = require("../utils/logger");
+const consecutiveEmptyPollGate_1 = require("../utils/consecutiveEmptyPollGate");
 /**
  * Approval button detection script for the Antigravity UI
  *
  * Detects allow/deny button pairs and extracts descriptions with fallbacks.
  */
-const DETECT_APPROVAL_SCRIPT = `(() => {
-    const ALLOW_ONCE_PATTERNS = ['allow once', 'allow one time', '今回のみ許可', '1回のみ許可', '一度許可'];
+exports.DETECT_APPROVAL_SCRIPT = `(() => {
+    const ALLOW_ONCE_PATTERNS = ['allow once', 'allow one time', 'yes, allow this time', '今回のみ許可', '1回のみ許可', '一度許可'];
     const ALWAYS_ALLOW_PATTERNS = [
         'allow this conversation',
         'allow this chat',
         'always allow',
+        'yes, and always allow',
         '常に許可',
         'この会話を許可',
     ];
-    const ALLOW_PATTERNS = ['allow', 'permit', '許可', '承認', '確認'];
-    const DENY_PATTERNS = ['deny', '拒否', 'decline'];
+    const ALLOW_PATTERNS = ['allow', 'permit', 'accept', 'approve', '許可', '承認', '確認'];
+    const DENY_PATTERNS = ['deny', 'reject', '拒否', 'decline', 'no (tell the agent'];
 
     const normalize = (text) => (text || '').toLowerCase().replace(/\\s+/g, ' ').trim();
 
-    const allButtons = Array.from(document.querySelectorAll('button'))
-        .filter(btn => btn.offsetParent !== null);
+    const allButtons = Array.from(document.querySelectorAll('button, [role="button"], span.cursor-pointer, div.cursor-pointer'))
+        .filter(btn => btn.offsetParent !== null)
+        .reverse();
+
+    const STOP_PATTERNS_GEN = [/^stop$/, /^stop generating$/, /^stop response$/, /^停止$/, /^生成を停止$/, /^応答を停止$/];
+    const isGenerating = allButtons.some(btn => {
+        const tooltipId = btn.getAttribute('data-tooltip-id');
+        if (tooltipId === 'input-send-button-cancel-tooltip') return true;
+        const labels = [btn.textContent || '', btn.getAttribute('aria-label') || '', btn.getAttribute('title') || ''];
+        return labels.some(val => {
+            const normalized = (val || '').toLowerCase().replace(/\\s+/g, ' ').trim();
+            return normalized && STOP_PATTERNS_GEN.some(re => re.test(normalized));
+        });
+    });
+
+    if (isGenerating) return null; // Wait for generation to finish!
 
     let approveBtn = allButtons.find(btn => {
         const t = normalize(btn.textContent || '');
@@ -45,8 +61,9 @@ const DETECT_APPROVAL_SCRIPT = `(() => {
         || approveBtn.parentElement
         || document.body;
 
-    const containerButtons = Array.from(container.querySelectorAll('button'))
-        .filter(btn => btn.offsetParent !== null);
+    const containerButtons = Array.from(container.querySelectorAll('button, [role="button"], span.cursor-pointer, div.cursor-pointer'))
+        .filter(btn => btn.offsetParent !== null)
+        .reverse();
 
     const denyBtn = containerButtons.find(btn => {
         const t = normalize(btn.textContent || '');
@@ -60,9 +77,9 @@ const DETECT_APPROVAL_SCRIPT = `(() => {
         return ALWAYS_ALLOW_PATTERNS.some(p => t.includes(p));
     }) || null;
 
-    const approveText = (approveBtn.textContent || '').trim();
-    const alwaysAllowText = alwaysAllowBtn ? (alwaysAllowBtn.textContent || '').trim() : '';
-    const denyText = (denyBtn.textContent || '').trim();
+    const approveText = (approveBtn.innerText || approveBtn.textContent || '').trim();
+    const alwaysAllowText = alwaysAllowBtn ? (alwaysAllowBtn.innerText || alwaysAllowBtn.textContent || '').trim() : '';
+    const denyText = (denyBtn.innerText || denyBtn.textContent || '').trim();
 
     // Description extraction (multiple fallbacks)
     let description = '';
@@ -78,14 +95,56 @@ const DETECT_APPROVAL_SCRIPT = `(() => {
 
     // 2. Parent element text (excluding button text)
     if (!description) {
-        const parent = approveBtn.parentElement?.parentElement || approveBtn.parentElement;
-        if (parent) {
-            const clone = parent.cloneNode(true);
-            const buttons = clone.querySelectorAll('button');
-            buttons.forEach(b => b.remove());
-            const parentText = (clone.textContent || '').trim();
-            if (parentText.length > 5 && parentText.length < 500) {
-                description = parentText;
+        let modal = approveBtn.closest('.notify-user-container, [role="dialog"], .modal, .dialog, .approval-container, .permission-dialog');
+        
+        if (!modal) {
+            // New Antigravity IDE uses a sticky footer with no identifying modal classes.
+            // Traverse up until we find a container that includes the file list popup (.bottom-full)
+            let p = approveBtn.parentElement;
+            while (p && p.tagName !== 'BODY') {
+                if (p.querySelector('.bottom-full')) {
+                    modal = p;
+                    break;
+                }
+                p = p.parentElement;
+            }
+            if (!modal) {
+                modal = approveBtn.parentElement?.parentElement?.parentElement || approveBtn.parentElement?.parentElement;
+                if (modal === document.body || modal?.id === 'root') modal = null;
+            }
+        }
+
+        if (modal) {
+            const parts = [];
+            const walk = (node) => {
+                if (node.nodeType === 1) {
+                    // Skip buttons entirely
+                    if (node.tagName === 'BUTTON' || node.getAttribute('role') === 'button') return;
+                    
+                    // Skip menu bars and sidebars
+                    if (node.tagName === 'NAV' || node.getAttribute('role') === 'menubar' || node.closest('nav') || node.closest('.monaco-menu') || node.closest('.sidebar') || node.classList.contains('sidebar')) return;
+
+                    const display = window.getComputedStyle(node).display;
+                    if (display === 'none') return;
+                    
+                    const isBlock = display === 'block' || display === 'flex' || node.tagName === 'DIV' || node.tagName === 'LI';
+                    if (isBlock && parts.length > 0 && parts[parts.length - 1] !== '\\n') parts.push('\\n');
+                    for (const child of node.childNodes) walk(child);
+                    if (isBlock && parts.length > 0 && parts[parts.length - 1] !== '\\n') parts.push('\\n');
+                } else if (node.nodeType === 3) {
+                    const t = node.textContent || '';
+                    if (t.trim()) parts.push(t.trim());
+                }
+            };
+            walk(modal);
+            
+            const parentText = parts.join(' ').replace(/\\n\\s*/g, '\\n').replace(/\\n{3,}/g, '\\n\\n').trim();
+            if (parentText.length > 5) {
+                if (parentText.length > 800 || parentText.includes('F ile\\nE dit\\nS election')) {
+                    description = 'Code changes require your approval.';
+                } else {
+                    description = parentText;
+                }
             }
         }
     }
@@ -102,17 +161,18 @@ const DETECT_APPROVAL_SCRIPT = `(() => {
  * Press the toggle on the right side of Allow Once to expand the Always Allow dropdown.
  */
 const EXPAND_ALWAYS_ALLOW_MENU_SCRIPT = `(() => {
-    const ALLOW_ONCE_PATTERNS = ['allow once', 'allow one time', '今回のみ許可', '1回のみ許可', '一度許可'];
+    const ALLOW_ONCE_PATTERNS = ['allow once', 'allow one time', 'yes, allow this time', '今回のみ許可', '1回のみ許可', '一度許可'];
     const ALWAYS_ALLOW_PATTERNS = [
         'allow this conversation',
         'allow this chat',
         'always allow',
+        'yes, and always allow',
         '常に許可',
         'この会話を許可',
     ];
 
     const normalize = (text) => (text || '').toLowerCase().replace(/\\s+/g, ' ').trim();
-    const visibleButtons = Array.from(document.querySelectorAll('button'))
+    const visibleButtons = Array.from(document.querySelectorAll('button, [role="button"], span.cursor-pointer, div.cursor-pointer'))
         .filter(btn => btn.offsetParent !== null);
 
     const directAlways = visibleButtons.find(btn => {
@@ -132,7 +192,7 @@ const EXPAND_ALWAYS_ALLOW_MENU_SCRIPT = `(() => {
         || allowOnceBtn.parentElement
         || document.body;
 
-    const containerButtons = Array.from(container.querySelectorAll('button'))
+    const containerButtons = Array.from(container.querySelectorAll('button, [role="button"], span.cursor-pointer, div.cursor-pointer'))
         .filter(btn => btn.offsetParent !== null);
 
     const toggleBtn = containerButtons.find(btn => {
@@ -181,17 +241,25 @@ function buildClickScript(buttonText) {
         const normalize = (text) => (text || '').toLowerCase().replace(/\\s+/g, ' ').trim();
         const text = ${safeText};
         const wanted = normalize(text);
-        const allButtons = Array.from(document.querySelectorAll('button'));
+        const allButtons = Array.from(document.querySelectorAll('button, [role="button"], a.action-btn, a[class*="btn"], span.cursor-pointer, div.cursor-pointer')).reverse();
         const target = allButtons.find(btn => {
-            if (!btn.offsetParent) return false;
-            const buttonText = normalize(btn.textContent || '');
+            const style = window.getComputedStyle(btn);
+            if (style.display === 'none' || style.visibility === 'hidden' || btn.disabled) return false;
+            const buttonText = normalize(btn.innerText || btn.textContent || '');
             const ariaLabel = normalize(btn.getAttribute('aria-label') || '');
+            
+            const isShort = wanted.length < 5;
+            if (isShort) {
+                return buttonText === wanted || ariaLabel === wanted;
+            }
+            
             return buttonText === wanted ||
                 ariaLabel === wanted ||
-                buttonText.includes(wanted) ||
-                ariaLabel.includes(wanted);
+                (buttonText.includes(wanted) && buttonText.length < wanted.length + 10) ||
+                (ariaLabel.includes(wanted) && ariaLabel.length < wanted.length + 10);
         });
         if (!target) return { ok: false, error: 'Button not found: ' + text };
+        target.scrollIntoView({ block: 'center' });
         const rect = target.getBoundingClientRect();
         const x = rect.left + rect.width / 2;
         const y = rect.top + rect.height / 2;
@@ -199,6 +267,7 @@ function buildClickScript(buttonText) {
         for (const type of ['pointerdown', 'mousedown', 'pointerup', 'mouseup', 'click']) {
             target.dispatchEvent(new PointerEvent(type, { ...eventInit, pointerId: 1 }));
         }
+        if (typeof target.click === 'function') target.click();
         return { ok: true };
     })()`;
 }
@@ -219,6 +288,8 @@ class ApprovalDetector {
     lastDetectedKey = null;
     /** Full ApprovalInfo from the last detection (used for clicking) */
     lastDetectedInfo = null;
+    /** Gate for empty polls before reset */
+    emptyPollGate = new consecutiveEmptyPollGate_1.ConsecutiveEmptyPollGate(3);
     constructor(options) {
         this.cdpService = options.cdpService;
         this.pollIntervalMs = options.pollIntervalMs ?? 1500;
@@ -234,6 +305,7 @@ class ApprovalDetector {
         this.isRunning = true;
         this.lastDetectedKey = null;
         this.lastDetectedInfo = null;
+        this.emptyPollGate.reset();
         this.schedulePoll();
     }
     /**
@@ -274,7 +346,7 @@ class ApprovalDetector {
         try {
             const contextId = this.cdpService.getPrimaryContextId();
             const callParams = {
-                expression: DETECT_APPROVAL_SCRIPT,
+                expression: exports.DETECT_APPROVAL_SCRIPT,
                 returnByValue: true,
                 awaitPromise: false,
             };
@@ -284,6 +356,7 @@ class ApprovalDetector {
             const result = await this.cdpService.call('Runtime.evaluate', callParams);
             const info = result?.result?.value ?? null;
             if (info) {
+                this.emptyPollGate.recordDetection();
                 // Duplicate prevention: use approveText + description combination as key
                 const key = `${info.approveText}::${info.description}`;
                 if (key !== this.lastDetectedKey) {
@@ -293,12 +366,14 @@ class ApprovalDetector {
                 }
             }
             else {
-                // Reset when buttons disappear (prepare for next approval detection)
-                const wasDetected = this.lastDetectedKey !== null;
-                this.lastDetectedKey = null;
-                this.lastDetectedInfo = null;
-                if (wasDetected && this.onResolved) {
-                    this.onResolved();
+                if (this.emptyPollGate.recordEmptyPoll()) {
+                    // Reset when buttons disappear for consecutive polls
+                    const wasDetected = this.lastDetectedKey !== null;
+                    this.lastDetectedKey = null;
+                    this.lastDetectedInfo = null;
+                    if (wasDetected && this.onResolved) {
+                        this.onResolved();
+                    }
                 }
             }
         }

package/dist/services/artifactService.js

@@ -69,9 +69,17 @@ const COMMON_WORDS = new Set(['the', 'and', 'for', 'with', 'from', 'this', 'that
 class ArtifactService {
     brainBasePath;
     constructor(brainBasePath) {
-        this.brainBasePath =
-            brainBasePath ??
-                path.join(os.homedir(), '.gemini', 'antigravity', 'brain');
+        if (brainBasePath) {
+            this.brainBasePath = brainBasePath;
+        }
+        else {
+            const idePath = path.join(os.homedir(), '.gemini', 'antigravity-ide', 'brain');
+            const defaultPath = path.join(os.homedir(), '.gemini', 'antigravity', 'brain');
+            this.brainBasePath = fs.existsSync(idePath) ? idePath : defaultPath;
+        }
+    }
+    getBrainBasePath() {
+        return this.brainBasePath;
     }
     /**
      * List all conversations in the brain directory (UUIDs).
@@ -148,11 +156,12 @@ class ArtifactService {
         }
     }
     /**
-     * Try to find a conversation UUID whose overview.txt contains the given session title.
+     * Try to find a conversation UUID whose transcript or overview contains the given session title.
      * Uses an exact match first, falling back to keyword overlap scoring.
+     * If workspaceFilter is provided, restricts matching exclusively to conversations belonging to that workspace.
      * Returns the UUID or null if not found.
      */
-    findConversationByTitle(title) {
+    findConversationByTitle(title, workspaceFilter) {
         if (!title || !title.trim())
             return null;
         const needle = title.trim().toLowerCase();
@@ -186,40 +195,60 @@ class ArtifactService {
         const uniqueNeedleWords = Array.from(new Set(cleanNeedleWords));
         // Require a stronger minimum score of 2 to prevent weak one-word matches.
         const minScore = 2;
+        const filterStr = workspaceFilter ? workspaceFilter.toLowerCase() : null;
         for (const id of sortedIds) {
-            const overviewPath = path.join(this.brainBasePath, id, '.system_generated', 'logs', 'overview.txt');
-            try {
-                if (!fs.existsSync(overviewPath))
-                    continue;
-                // Only read the first 4KB to avoid huge files
-                let fd = null;
+            let score = 0;
+            let exactMatch = false;
+            let belongsToWorkspace = !filterStr; // True if no filter, or if we prove it belongs
+            const scanFile = (filePath, readSize) => {
                 try {
-                    fd = fs.openSync(overviewPath, 'r');
-                    const buf = Buffer.alloc(4096);
-                    const bytesRead = fs.readSync(fd, buf, 0, buf.length, 0);
-                    const header = buf.slice(0, bytesRead).toString('utf-8').toLowerCase();
-                    if (header.includes(needle)) {
-                        return id; // Exact match takes precedence
+                    if (!fs.existsSync(filePath))
+                        return;
+                    let fd = null;
+                    try {
+                        fd = fs.openSync(filePath, 'r');
+                        const buf = Buffer.alloc(readSize);
+                        const bytesRead = fs.readSync(fd, buf, 0, buf.length, 0);
+                        const content = buf.slice(0, bytesRead).toString('utf-8').toLowerCase();
+                        if (filterStr) {
+                            const escapedFilter = filterStr.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+                            const regex = new RegExp(`(?:file:\\/\\/\\/[^"\\)]*?\\/|[a-zA-Z]:[\\\\/](?!.*(?:\\.gemini|brain|antigravity))[^"\\)]*?[\\\\/])${escapedFilter}\\b`, 'i');
+                            if (regex.test(content)) {
+                                belongsToWorkspace = true;
+                            }
+                        }
+                        if (content.includes(needle)) {
+                            exactMatch = true;
+                        }
+                        else {
+                            const contentTokens = new Set(content.replace(/[^\p{L}\p{N}]+/gu, ' ').split(/\s+/));
+                            let currentScore = 0;
+                            for (const word of uniqueNeedleWords) {
+                                if (contentTokens.has(word))
+                                    currentScore++;
+                            }
+                            if (currentScore > score)
+                                score = currentScore;
+                        }
                     }
-                    // Use same Unicode-aware split for header tokens
-                    const headerTokens = new Set(header.replace(/[^\p{L}\p{N}]+/gu, ' ').split(/\s+/));
-                    let score = 0;
-                    for (const word of uniqueNeedleWords) {
-                        if (headerTokens.has(word))
-                            score++;
+                    finally {
+                        if (fd !== null)
+                            fs.closeSync(fd);
                     }
-                    if (score > bestScore) {
-                        bestScore = score;
-                        bestId = id;
-                    }
-                }
-                finally {
-                    if (fd !== null)
-                        fs.closeSync(fd);
                 }
-            }
-            catch {
-                // Skip unreadable files
+                catch { /* ignore */ }
+            };
+            // 1. Check transcript.jsonl (modern)
+            scanFile(path.join(this.brainBasePath, id, '.system_generated', 'logs', 'transcript.jsonl'), 16384);
+            // 2. Check overview.txt (legacy)
+            scanFile(path.join(this.brainBasePath, id, '.system_generated', 'logs', 'overview.txt'), 4096);
+            if (!belongsToWorkspace)
+                continue;
+            if (exactMatch)
+                return id; // Exact match in the right workspace takes precedence immediately
+            if (score > bestScore) {
+                bestScore = score;
+                bestId = id;
             }
         }
         if (bestScore >= minScore) {
@@ -232,10 +261,11 @@ class ArtifactService {
      * that has at least one artifact. Falls back to the most recent conversation
      * overall if none have artifacts.
      */
-    getLatestConversationWithArtifacts() {
+    getLatestConversationWithArtifacts(workspaceFilter) {
         const ids = this.listConversationIds();
         if (ids.length === 0)
             return null;
+        const filterStr = workspaceFilter ? workspaceFilter.toLowerCase() : null;
         // Sort by directory mtime descending
         const sorted = ids
             .map((id) => {
@@ -248,14 +278,50 @@ class ArtifactService {
             }
         })
             .sort((a, b) => b.mtime - a.mtime);
-        // Find the first one that has artifacts
+        if (filterStr) {
+            const escapedFilter = filterStr.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            const workspaceIds = sorted.filter(({ id }) => {
+                let belongs = false;
+                const regex = new RegExp(`(?:file:\\/\\/\\/[^"\\)]*?\\/|[a-zA-Z]:[\\\\/](?!.*(?:\\.gemini|brain|antigravity))[^"\\)]*?[\\\\/])${escapedFilter}\\b`, 'i');
+                const checkFile = (filePath) => {
+                    try {
+                        if (fs.existsSync(filePath)) {
+                            const content = fs.readFileSync(filePath, 'utf-8').toLowerCase();
+                            if (regex.test(content)) {
+                                belongs = true;
+                            }
+                        }
+                    }
+                    catch { /* ignore */ }
+                };
+                checkFile(path.join(this.brainBasePath, id, '.system_generated', 'logs', 'transcript.jsonl'));
+                if (!belongs) {
+                    checkFile(path.join(this.brainBasePath, id, 'implementation_plan.md'));
+                }
+                return belongs;
+            });
+            if (workspaceIds.length === 0)
+                return null;
+            const latestId = workspaceIds[0].id;
+            if (this.listArtifacts(latestId).length > 0) {
+                return latestId;
+            }
+            return null;
+        }
+        // Original fallback behavior for no filter
         for (const { id } of sorted) {
             if (this.listArtifacts(id).length > 0)
                 return id;
         }
-        // Nothing has artifacts — return most recent anyway (caller handles empty list)
         return sorted[0]?.id ?? null;
     }
+    /**
+     * Build the filesystem path for a specific artifact file.
+     */
+    getArtifactPath(conversationId, filename) {
+        const safe = path.basename(filename);
+        return path.join(this.brainBasePath, conversationId, safe);
+    }
     /**
      * Read the markdown content of a specific artifact file.
      * Returns null if the file cannot be read.