oira666_pi-limits-wait 0.5.8 → 0.5.9

package/README.md

@@ -26,7 +26,7 @@ Restart Pi or run `/reload` after installing.
 - For any other (unclassified) provider error — including an API `Internal server error` and HTTP `400`/`403` failures — waits and retries the same model. There is deliberately no permanent-HTTP-status allowlist. This retry-all behavior is enabled by default and uses a configurable retry limit and interval; it does not alter model-limit wait intervals.
 - Reports retry/fallback waits in chat notifications without adding persistent TUI status lines.
 - In non-interactive hosts (`rpc` and `json` modes) the extension never reports a planned retry as an error. While it is waiting to retry, it publishes `info`-level liveliness notifications (plus a `setStatus` entry) describing what it is doing, how long it will wait, and why. An `error`-level notification is emitted only when the extension stops retrying and surfaces the terminal failure. See [Non-interactive (RPC) reporting](#non-interactive-rpc-reporting).
-- Press Enter during a retry wait to skip the wait and retry immediately.
+- Leaves terminal input to Pi, so built-in selectors remain usable during a wait. Choosing another model with `/model` immediately ends the pending wait and continues with the newly selected provider/model.
 - Optionally falls back to configured models when the current/default model is rate-limited. Every fallback to a different model—even on the same provider—deliberately discards request-owned credentials, headers, environment overrides, and provider-specific options so the target runtime resolves its own configuration.
 - Preserves Pi's `before_provider_request` / `after_provider_response` callback flow and sanitises only the exact Anthropic OAuth system-block shape generated by current Pi; Pi remains responsible for OAuth identity insertion.
 
@@ -119,7 +119,7 @@ import {
 
 ### Skipping a wait from the host
 
-In `rpc`/`json` mode there is no terminal, so the interactive "press Enter to retry now" affordance is unavailable. Instead, set `PI_LIMITS_WAIT_CONTROL_FILE` to an absolute path (one per pi process; the extension echoes it back as `controlFile` in every structured frame). While — and only while — a wait is in progress, the extension polls that path once per second from the countdown ticker it already runs. Signals are deliberately **not** used: `SIGUSR2` with no handler installed terminates the process, and a signal cannot carry a `waitId`.
+To skip a wait without changing models, set `PI_LIMITS_WAIT_CONTROL_FILE` to an absolute path (one per pi process; the extension echoes it back as `controlFile` in every structured frame). While — and only while — a wait is in progress, the extension polls that path once per second from the countdown ticker it already runs. Signals are deliberately **not** used: `SIGUSR2` with no handler installed terminates the process, and a signal cannot carry a `waitId`.
 
 Write a token to make the extension stop waiting and retry immediately:
 
@@ -132,7 +132,7 @@ Write a token to make the extension stop waiting and retry immediately:
 - `issuedAt` is epoch ms and must be `>= startedAt` of the current wait.
 - Writers should write a temp file and rename it into place (atomic move) so a partial read is impossible.
 
-The extension consumes a token by atomically renaming the canonical control path to a unique `.consumed-<waitId>-<random>` path in the same directory, then reading and validating that claimed file. It removes only the unique claimed path. A writer may therefore rename a newer token onto the canonical path immediately after the claim without cleanup deleting that replacement. An accepted claim settles the wait with `outcome: "skipped"` — the exact same path the Enter key uses, so the retry proceeds normally and a `wait_end` frame with `"outcome":"skipped"` is published. Polls are serialized; a slow filesystem operation cannot overlap the next one-second tick.
+The extension consumes a token by atomically renaming the canonical control path to a unique `.consumed-<waitId>-<random>` path in the same directory, then reading and validating that claimed file. It removes only the unique claimed path. A writer may therefore rename a newer token onto the canonical path immediately after the claim without cleanup deleting that replacement. An accepted claim settles the wait with `outcome: "skipped"`, so the retry proceeds normally and a `wait_end` frame with `"outcome":"skipped"` is published. Polls are serialized; a slow filesystem operation cannot overlap the next one-second tick.
 
 Two content guards ensure a claimed leftover token can never skip a **later** legitimate wait: (a) `waitId` equality — a token written for wait *N* cannot match wait *N+1*'s freshly generated id; (b) `issuedAt >= startedAt` — a `"*"` token issued before this wait began is rejected. Claimed malformed, stale, and non-matching files are discarded, while any newer token at the canonical path is left untouched. The extension deliberately does not unlink the canonical path at wait start, because that would race with a token written microseconds earlier.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oira666_pi-limits-wait",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "Extension for PI that allows to automatically wait for limits to reset and retry the request",
   "type": "module",
   "exports": {

package/src/ui.ts

@@ -215,15 +215,12 @@ function startLivelinessReporting(
   };
 }
 
-function countdownText(reason: RetryReason, deadline: number, allowSkip: boolean): string {
+function countdownText(reason: RetryReason, deadline: number): string {
   const remaining = Math.max(0, deadline - Date.now());
   const totalSecs = Math.ceil(remaining / 1_000);
   const mins = Math.floor(totalSecs / 60);
   const secs = (totalSecs % 60).toString().padStart(2, "0");
-  return (
-    `⏳ ${reasonLabel(reason)} — next retry in ${mins}m ${secs}s` +
-    (allowSkip ? "  (Enter to retry now)" : "")
-  );
+  return `⏳ ${reasonLabel(reason)} — next retry in ${mins}m ${secs}s`;
 }
 
 export function showAmbientRetryStatus(reason: RetryReason, waitMs: number): void {
@@ -239,7 +236,7 @@ export function showAmbientRetryStatus(reason: RetryReason, waitMs: number): voi
       state.ambientStatusCleanup?.();
       return;
     }
-    ctx.ui.setWorkingMessage(countdownText(reason, deadline, false));
+    ctx.ui.setWorkingMessage(countdownText(reason, deadline));
   };
 
   tick();
@@ -341,7 +338,6 @@ export function waitForRetry(
     const ctx = state.sharedCtx;
     let done = false;
     const stopLiveliness = startLivelinessReporting(statusContext, reason, plannedDeadline, model, telemetry?.error);
-    let unsubInput: (() => void) | undefined;
     let ticker: ReturnType<typeof setInterval> | undefined;
     let timer: ReturnType<typeof setTimeout> | undefined;
 
@@ -355,7 +351,6 @@ export function waitForRetry(
       state.activeWaitSkips.delete(skipWait);
       try { stopLiveliness(false); } catch { /* UI unavailable */ }
       signal?.removeEventListener("abort", onAbort);
-      try { unsubInput?.(); } catch { /* UI unavailable */ }
       try { ctx?.ui.setWorkingMessage(); } catch { /* UI unavailable */ }
       try { clearAmbientRetryStatus(); } catch { /* UI unavailable */ }
     }
@@ -437,32 +432,12 @@ export function waitForRetry(
       return;
     }
 
+    // Raw terminal listeners run before whichever component currently owns
+    // focus. Consuming Enter here would steal confirmation from built-in
+    // selectors such as /model. Model changes and the out-of-band control
+    // channel call this skip function directly instead.
     state.activeWaitSkips.add(skipWait);
 
-    try {
-      const unsubscribe = ctx?.ui.onTerminalInput((data) => {
-        if (done) return undefined;
-        if (data === "\r" || data === "\n") {
-          // Enter belongs to the editor whenever it contains text. In
-          // particular, slash-command autocomplete needs Enter to confirm and
-          // then execute a command; do not steal either press from it.
-          let editorText = "";
-          try { editorText = ctx?.ui.getEditorText() ?? ""; } catch { /* UI unavailable */ }
-          if (editorText.length > 0) return undefined;
-          settle("skipped");
-          return { consume: true };
-        }
-        if (data === "\x1b") {
-          settle("aborted");
-          return { consume: true };
-        }
-        return undefined;
-      });
-      if (done) unsubscribe?.();
-      else unsubInput = unsubscribe;
-    } catch { /* UI unavailable */ }
-    if (done) return;
-
     signal?.addEventListener("abort", onAbort);
     if (signal?.aborted) {
       settle("aborted");
@@ -470,7 +445,7 @@ export function waitForRetry(
     }
 
     const tick = () => {
-      try { ctx?.ui.setWorkingMessage(countdownText(reason, plannedDeadline, Boolean(unsubInput))); } catch { /* UI unavailable */ }
+      try { ctx?.ui.setWorkingMessage(countdownText(reason, plannedDeadline)); } catch { /* UI unavailable */ }
     };
 
     tick();