paseo-acp-agy 1.2.11 → 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/package.json

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