paseo-acp-agy 1.2.10 → 1.2.12

package/dist/acp-server.js

@@ -610,7 +610,25 @@ export class ACPServer extends EventEmitter {
                             }
                         };
                         try {
-                            const resultEvent = await session.process.sendPrompt(promptText, onStepUpdate);
+                            let resultEvent;
+                            try {
+                                resultEvent = await session.process.sendPrompt(promptText, onStepUpdate);
+                            }
+                            catch (firstErr) {
+                                const firstMsg = firstErr.message || "";
+                                if (stepCount === 0 &&
+                                    !session.isCancelled &&
+                                    firstMsg.includes("agy process exited prematurely")) {
+                                    logger.warn("agy process exited before streaming any steps; retrying prompt with fresh process", {
+                                        sessionId,
+                                        error: firstMsg,
+                                    });
+                                    resultEvent = await session.process.sendPrompt(promptText, onStepUpdate);
+                                }
+                                else {
+                                    throw firstErr;
+                                }
+                            }
                             const turnUsage = resultEvent.result?.usage;
                             const numTurns = resultEvent.result?.num_turns || stepCount || 1;
                             // Usage is billable even when the turn terminates with ERROR
@@ -642,12 +660,14 @@ export class ACPServer extends EventEmitter {
                             }
                         }
                         catch (promptErr) {
-                            if (session.isCancelled) {
+                            const errorMsg = promptErr.message || "Turn execution failed";
+                            if (session.isCancelled ||
+                                errorMsg.includes("cancelled") ||
+                                errorMsg.includes("Turn was cancelled")) {
                                 if (!isNotification)
                                     this.sendSuccess(id, { stopReason: "cancelled" });
                             }
                             else {
-                                const errorMsg = promptErr.message || "Turn execution failed";
                                 logger.error("Error executing prompt turn", { error: errorMsg, sessionId });
                                 this.sendNotification(ACP_METHODS.SESSION_UPDATE, {
                                     sessionId: session.id,

package/dist/antigravity-process.js

@@ -399,6 +399,7 @@ export class AntigravityProcess extends EventEmitter {
         child.stderr.setEncoding("utf-8");
         let stdoutBuffer = "";
         let stderrBuffer = "";
+        const recentStderrLines = [];
         child.stdout.on("data", (chunk) => {
             this.emit("activity");
             stdoutBuffer += chunk;
@@ -424,8 +425,13 @@ export class AntigravityProcess extends EventEmitter {
             const lines = stderrBuffer.split("\n");
             stderrBuffer = lines.pop() || "";
             for (const line of lines) {
-                if (line.trim())
-                    logger.warn("agy stderr: " + line.trim());
+                const trimmed = line.trim();
+                if (trimmed) {
+                    logger.warn("agy stderr: " + trimmed);
+                    recentStderrLines.push(trimmed);
+                    if (recentStderrLines.length > 20)
+                        recentStderrLines.shift();
+                }
             }
         });
         child.on("error", (err) => {
@@ -438,9 +444,24 @@ export class AntigravityProcess extends EventEmitter {
         });
         child.on("close", (code, signal) => {
             logger.info("agy process exited", { code, signal, pid: child.pid });
+            if (stderrBuffer.trim()) {
+                recentStderrLines.push(stderrBuffer.trim());
+                if (recentStderrLines.length > 20)
+                    recentStderrLines.shift();
+            }
+            const stderrDiagnostic = recentStderrLines.join(" ").trim();
+            const exitDiagnostic = stderrDiagnostic
+                ? `agy process exited prematurely with code ${code} signal ${signal}: ${stderrDiagnostic}`
+                : `agy process exited prematurely with code ${code} signal ${signal}`;
             if (this.currentTurnPromise?.child === child) {
-                this.currentTurnPromise.reject(new Error(`agy process exited prematurely with code ${code} signal ${signal}`));
+                const turn = this.currentTurnPromise;
                 this.currentTurnPromise = null;
+                if (turn.cancelled) {
+                    turn.reject(new Error("Turn was cancelled"));
+                }
+                else {
+                    turn.reject(new Error(exitDiagnostic));
+                }
             }
             // The leader can die while a tool subprocess remains in its process
             // group. Keep the group identity long enough to reap those descendants.
@@ -742,6 +763,11 @@ export class AntigravityProcess extends EventEmitter {
         logger.info("Cancelling active agy turn", { hasChild: Boolean(active.child) });
         if (active.child) {
             const child = active.child;
+            // Immediately detach this.child so subsequent turns will NOT attach to this dying process!
+            if (this.child === child) {
+                this.child = null;
+                this.initialInfo = null;
+            }
             this.signalProcessTree(child, "SIGINT");
             setTimeout(() => {
                 if (this.isProcessTreeAlive(child)) {

package/dist/native-sessions.js

@@ -13,69 +13,100 @@ export function getAgyAppDataDir() {
     }
     return path.join(os.homedir(), ".gemini", "antigravity-cli");
 }
+function querySummariesDb(dbPath, query, params = []) {
+    // 1. Try node:sqlite DatabaseSync (Node 22+)
+    try {
+        const DatabaseSync = require("node:sqlite")?.DatabaseSync;
+        if (DatabaseSync) {
+            const db = new DatabaseSync(dbPath, { readOnly: true });
+            return db.prepare(query).all(...params) || [];
+        }
+    }
+    catch { }
+    // 2. Try sqlite3 CLI fallback (macOS, Linux with Node < 22)
+    try {
+        const { execFileSync } = require("node:child_process");
+        let finalQuery = query;
+        if (params.length === 1 && typeof params[0] === "string") {
+            finalQuery = query.replace("?", `'${params[0].replace(/'/g, "''")}'`);
+        }
+        const stdout = execFileSync("sqlite3", ["-json", dbPath, finalQuery], {
+            encoding: "utf-8",
+            timeout: 5000,
+            stdio: ["pipe", "pipe", "ignore"],
+        });
+        if (stdout && stdout.trim()) {
+            return JSON.parse(stdout) || [];
+        }
+    }
+    catch (err) {
+        logger.debug("Failed to query conversation summaries via sqlite3 CLI", {
+            error: err.message,
+        });
+    }
+    return [];
+}
 export function loadNativeAntigravitySessions(cwd) {
     const results = [];
     const appDataDir = getAgyAppDataDir();
     const dbPath = path.join(appDataDir, "conversation_summaries.db");
     const normalizedTargetCwd = cwd ? path.resolve(cwd).toLowerCase() : undefined;
     if (fs.existsSync(dbPath)) {
-        let DatabaseSync = null;
         try {
-            DatabaseSync = require("node:sqlite")?.DatabaseSync;
-        }
-        catch { }
-        if (DatabaseSync) {
-            try {
-                const db = new DatabaseSync(dbPath, { readOnly: true });
-                const rows = db
-                    .prepare(`SELECT conversation_id, title, preview, last_modified_time, workspace_uris
-             FROM conversation_summaries
-             ORDER BY last_modified_time DESC
-             LIMIT 100`)
-                    .all();
-                for (const row of rows) {
-                    if (!row.conversation_id)
-                        continue;
-                    let primaryCwd = process.cwd();
-                    let matchesCwd = false;
-                    if (row.workspace_uris) {
-                        try {
-                            const uris = JSON.parse(row.workspace_uris);
-                            if (Array.isArray(uris) && uris.length > 0) {
-                                const filePaths = uris
-                                    .map((u) => u.replace(/^file:\/\//i, ""))
-                                    .filter(Boolean);
-                                if (filePaths.length > 0) {
-                                    primaryCwd = filePaths[0];
+            const rows = querySummariesDb(dbPath, `SELECT conversation_id, title, preview, last_modified_time, workspace_uris
+         FROM conversation_summaries
+         ORDER BY last_modified_time DESC
+         LIMIT 100`);
+            for (const row of rows) {
+                if (!row.conversation_id)
+                    continue;
+                let primaryCwd = process.cwd();
+                let matchesCwd = false;
+                if (row.workspace_uris) {
+                    try {
+                        const uris = JSON.parse(row.workspace_uris);
+                        if (Array.isArray(uris) && uris.length > 0) {
+                            const filePaths = uris
+                                .map((u) => {
+                                const cleaned = u.replace(/^file:\/\//i, "");
+                                try {
+                                    return path.resolve(decodeURIComponent(cleaned));
                                 }
-                                if (normalizedTargetCwd) {
-                                    matchesCwd = filePaths.some((p) => path.resolve(p).toLowerCase() === normalizedTargetCwd);
+                                catch {
+                                    return path.resolve(cleaned);
                                 }
+                            })
+                                .filter(Boolean);
+                            if (filePaths.length > 0) {
+                                primaryCwd = filePaths[0];
+                            }
+                            if (normalizedTargetCwd) {
+                                matchesCwd = filePaths.some((p) => p.toLowerCase() === normalizedTargetCwd);
                             }
                         }
-                        catch { }
-                    }
-                    if (normalizedTargetCwd && !matchesCwd) {
-                        continue;
                     }
-                    const rawDate = row.last_modified_time;
-                    const dateIso = rawDate ? new Date(rawDate).toISOString() : undefined;
-                    results.push({
-                        sessionId: row.conversation_id,
-                        cwd: primaryCwd,
-                        title: (row.title && row.title.trim()) ||
-                            (row.preview && row.preview.trim()) ||
-                            "Antigravity Session",
-                        updatedAt: dateIso,
-                    });
+                    catch { }
                 }
-            }
-            catch (err) {
-                logger.debug("Failed to read native conversation summaries from sqlite", {
-                    error: err.message,
+                if (normalizedTargetCwd && !matchesCwd) {
+                    continue;
+                }
+                const rawDate = row.last_modified_time;
+                const dateIso = rawDate ? new Date(rawDate).toISOString() : undefined;
+                results.push({
+                    sessionId: row.conversation_id,
+                    cwd: primaryCwd,
+                    title: (row.title && row.title.trim()) ||
+                        (row.preview && row.preview.trim()) ||
+                        "Antigravity Session",
+                    updatedAt: dateIso,
                 });
             }
         }
+        catch (err) {
+            logger.debug("Failed to read native conversation summaries from sqlite", {
+                error: err.message,
+            });
+        }
     }
     // Fallback: Only scan brainDir if no conversations were found in DB
     if (results.length === 0) {
@@ -119,46 +150,41 @@ export function getNativeAntigravitySession(conversationId) {
     const appDataDir = getAgyAppDataDir();
     const dbPath = path.join(appDataDir, "conversation_summaries.db");
     if (fs.existsSync(dbPath)) {
-        let DatabaseSync = null;
         try {
-            DatabaseSync = require("node:sqlite")?.DatabaseSync;
-        }
-        catch { }
-        if (DatabaseSync) {
-            try {
-                const db = new DatabaseSync(dbPath, { readOnly: true });
-                const row = db
-                    .prepare(`SELECT conversation_id, title, preview, last_modified_time, workspace_uris
-             FROM conversation_summaries
-             WHERE conversation_id = ?`)
-                    .get(conversationId);
-                if (row) {
-                    let primaryCwd = process.cwd();
-                    if (row.workspace_uris) {
-                        try {
-                            const uris = JSON.parse(row.workspace_uris);
-                            if (Array.isArray(uris) && uris.length > 0) {
-                                const p = uris[0].replace(/^file:\/\//i, "");
-                                if (p)
-                                    primaryCwd = p;
+            const rows = querySummariesDb(dbPath, `SELECT conversation_id, title, preview, last_modified_time, workspace_uris
+         FROM conversation_summaries
+         WHERE conversation_id = ?`, [conversationId]);
+            const row = rows[0];
+            if (row) {
+                let primaryCwd = process.cwd();
+                if (row.workspace_uris) {
+                    try {
+                        const uris = JSON.parse(row.workspace_uris);
+                        if (Array.isArray(uris) && uris.length > 0) {
+                            const cleaned = uris[0].replace(/^file:\/\//i, "");
+                            try {
+                                primaryCwd = path.resolve(decodeURIComponent(cleaned));
+                            }
+                            catch {
+                                primaryCwd = path.resolve(cleaned);
                             }
                         }
-                        catch { }
                     }
-                    return {
-                        sessionId: row.conversation_id,
-                        cwd: primaryCwd,
-                        title: (row.title && row.title.trim()) ||
-                            (row.preview && row.preview.trim()) ||
-                            "Antigravity Session",
-                        updatedAt: row.last_modified_time
-                            ? new Date(row.last_modified_time).toISOString()
-                            : undefined,
-                    };
+                    catch { }
                 }
+                return {
+                    sessionId: row.conversation_id,
+                    cwd: primaryCwd,
+                    title: (row.title && row.title.trim()) ||
+                        (row.preview && row.preview.trim()) ||
+                        "Antigravity Session",
+                    updatedAt: row.last_modified_time
+                        ? new Date(row.last_modified_time).toISOString()
+                        : undefined,
+                };
             }
-            catch { }
         }
+        catch { }
     }
     // Fallback check transcript file
     const brainDir = path.join(appDataDir, "brain", conversationId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo-acp-agy",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "description": "ACP (Agent Client Protocol) provider for Google Antigravity in Paseo and Zed",
   "type": "module",
   "main": "dist/index.js",