@monotykamary/pi-retry 0.3.9 → 0.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monotykamary/pi-retry",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "description": "Extension suite for pi coding agent that handles 400/413 errors and connection errors with automatic retry",
   "type": "module",
   "author": "Tom X Nguyen",

package/retry.ts

@@ -58,8 +58,18 @@ Agent.prototype.subscribe = function (this: Agent, ...args: any[]) {
 };
 
 // Monkey-patch continue() so the session's built-in retry loop cooperates
-// with our _continueInProgress mutex instead of throwing "Agent is already
-// processing" when we beat it to the punch.
+// with our _continueInProgress mutex AND can convert the "Cannot continue
+// from assistant" error into a prompt([]) call when the agent was mid-task.
+//
+// When continue() throws "Cannot continue from message role: assistant":
+// - stopReason "stop" → agent finished cleanly, don't continue
+// - stopReason "aborted" → user cancelled, don't continue
+// - stopReason "error" → pi-retry IS the error handler, fall back to prompt([])
+//   so the retry actually happens (rather than swallowing and stalling)
+// - stopReason "toolUse" or "length" → mid-task, fall back to prompt([])
+//
+// This ensures the agent loop actually continues after compaction instead
+// of swallowing the error and letting the while-loop die.
 const _origContinue = Agent.prototype.continue as (this: Agent) => Promise<unknown>;
 Agent.prototype.continue = function (this: Agent) {
   const self = this;
@@ -71,15 +81,32 @@ Agent.prototype.continue = function (this: Agent) {
     try {
       return await _origContinue.call(self);
     } catch (e: any) {
-      // After pi-retry finishes, the transcript ends with a fresh
-      // assistant message.  The session's continue() sees this and
-      // would throw "Cannot continue from an assistant message".
-      // Catch it — the while-loop will poll _handlePostAgentRun()
-      // again, find no error, and exit cleanly.
       const msg = e?.message ?? '';
       if (msg.includes('Cannot continue from message role') ||
-          msg.includes('Cannot continue from an assistant message') ||
-          msg.includes('Agent is already processing')) {
+          msg.includes('Cannot continue from an assistant message')) {
+        // Check stopReason — only continue if the agent was mid-task
+        const lastMsg = self.state.messages[self.state.messages.length - 1];
+        if (lastMsg?.role === 'assistant' &&
+            lastMsg.stopReason !== 'stop' &&
+            lastMsg.stopReason !== 'aborted') {
+          // Agent was mid-task (toolUse, length, or error) — fall back to prompt([])
+          // Guard: if triggerInvisibleContinue() just completed (within 500ms),
+          // the agent already continued — skip to avoid double continuation.
+          if (!_continueInProgress && Date.now() - _lastInvisibleContinueTime > 500) {
+            _continueInProgress = true;
+            try {
+              await self.prompt([]);
+            } catch {
+              // Agent already processing or other transient error
+            } finally {
+              _continueInProgress = false;
+            }
+          }
+        }
+        // For stop/aborted: return void, the session loop exits naturally
+        return;
+      }
+      if (msg.includes('Agent is already processing')) {
         return;
       }
       throw e;
@@ -102,6 +129,11 @@ const stateContinuation = new ContinuationState();
 // producing "Agent is already processing".
 let _continueInProgress = false;
 
+// Timestamp of the last completed triggerInvisibleContinue().
+// Used by the continue() monkey-patch to avoid double continuation when
+// triggerInvisibleContinue just ran and the session's continue() unblocks.
+let _lastInvisibleContinueTime = 0;
+
 // Sleep helper
 function sleep(ms: number): Promise<void> {
   return new Promise(resolve => setTimeout(resolve, ms));
@@ -336,6 +368,7 @@ export default function (pi: ExtensionAPI) {
     stateOther.reset();
     stateContinuation.reset();
     _continueInProgress = false;
+    _lastInvisibleContinueTime = 0;
   });
 
   // Resume the agent loop invisibly — no message injected into context.
@@ -370,6 +403,10 @@ export default function (pi: ExtensionAPI) {
       }
     } finally {
       _continueInProgress = false;
+      // Record completion time so the continue() monkey-patch can
+      // detect that an invisible continue just ran and avoid firing
+      // a duplicate prompt([]) (RC7: double continuation guard).
+      _lastInvisibleContinueTime = Date.now();
     }
   }
 }