@monotykamary/pi-retry 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monotykamary/pi-retry",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "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

@@ -60,6 +60,12 @@ const stateOther = new RetryState();
 // Max_tokens continuation state (indefinite — no cap needed)
 const stateContinuation = new ContinuationState();
 
+// Mutex: only one triggerInvisibleContinue may be in-flight at a time.
+// Without this, concurrent agent_end events (or a manual /retry during an
+// automatic retry) race through waitForIdle() and both call prompt([]),
+// producing "Agent is already processing".
+let _continueInProgress = false;
+
 // Sleep helper
 function sleep(ms: number): Promise<void> {
   return new Promise(resolve => setTimeout(resolve, ms));
@@ -110,7 +116,8 @@ export default function (pi: ExtensionAPI) {
         `Max tokens reached — auto-continuing (continuation ${stateContinuation.getCount()})...`,
         "info",
       );
-      triggerInvisibleContinue();
+      // Must NOT await — see triggerInvisibleContinue() for explanation
+      void triggerInvisibleContinue();
       stateContinuation.endContinuation();
       return;
     }
@@ -143,7 +150,8 @@ export default function (pi: ExtensionAPI) {
       const delay = calculateDelay(state.getAttempt());
 
       await sleep(delay);
-      triggerInvisibleContinue();
+      // Must NOT await — see triggerInvisibleContinue() for explanation
+      void triggerInvisibleContinue();
       state.endRetry();
       return;
     }
@@ -244,7 +252,7 @@ export default function (pi: ExtensionAPI) {
       // Auto-detect: max_tokens continuation takes priority
       if (hasMaxTokensStop(lastAssistant)) {
         ctx.ui.notify("Manually continuing after max_tokens...", "info");
-        triggerInvisibleContinue();
+        void triggerInvisibleContinue();
         return;
       }
 
@@ -252,21 +260,21 @@ export default function (pi: ExtensionAPI) {
       if (has400or413Error(lastAssistant)) {
         ctx.ui.notify("Manually retrying 400/413 error...", "info");
         state400.reset();
-        triggerInvisibleContinue();
+        void triggerInvisibleContinue();
         return;
       }
 
       if (hasCreditError(lastAssistant)) {
         ctx.ui.notify("Manually retrying credit error...", "info");
         stateCredit.reset();
-        triggerInvisibleContinue();
+        void triggerInvisibleContinue();
         return;
       }
 
       if (hasConnectionError(lastAssistant)) {
         ctx.ui.notify("Manually retrying connection error...", "info");
         stateConnection.reset();
-        triggerInvisibleContinue();
+        void triggerInvisibleContinue();
         return;
       }
 
@@ -274,7 +282,7 @@ export default function (pi: ExtensionAPI) {
       if (hasRetryableError(lastAssistant)) {
         ctx.ui.notify("Manually retrying error...", "info");
         stateOther.reset();
-        triggerInvisibleContinue();
+        void triggerInvisibleContinue();
         return;
       }
 
@@ -290,12 +298,46 @@ export default function (pi: ExtensionAPI) {
     stateConnection.reset();
     stateOther.reset();
     stateContinuation.reset();
+    _continueInProgress = false;
   });
 
   // Resume the agent loop invisibly — no message injected into context.
   // The LLM sees the exact same message list it had before.
-  function triggerInvisibleContinue() {
+  //
+  // IMPORTANT: We must wait for the agent to become idle before calling
+  // prompt().  The agent_end event fires while the active run is still
+  // set (it's cleared in the finally block, after all listeners settle).
+  // Calling prompt() inside an agent_end listener would otherwise throw
+  // "Agent is already processing a prompt" because activeRun is truthy.
+  //
+  // GUARDS (three layers):
+  //   1. _continueInProgress mutex — prevents concurrent calls from racing
+  //   2. isStreaming pre-flight — detects user-initiated runs before prompt()
+  //   3. try/catch — final safety net, swallows the error gracefully
+  async function triggerInvisibleContinue() {
     if (!_agent) return;
-    _agent.prompt([]);
+
+    // Guard 1: mutex — if a previous continue is still in-flight, skip
+    if (_continueInProgress) return;
+    _continueInProgress = true;
+
+    try {
+      await _agent.waitForIdle();
+
+      // Guard 2: pre-flight — the user may have sent a message while we
+      // waited for idle.  agent.state.isStreaming is authoritative (read
+      // directly from the activeRun field, no TOCTOU beyond the next line).
+      if (_agent.state.isStreaming) return;
+
+      try {
+        _agent.prompt([]);
+      } catch {
+        // Guard 3: catch the "already processing" error as a last resort.
+        // This handles the remaining microtask TOCTOU gap between the
+        // isStreaming check and prompt() acquiring the lock.
+      }
+    } finally {
+      _continueInProgress = false;
+    }
   }
 }