oira666_pi-limits-wait 0.6.4 → 0.6.5

package/README.md

@@ -30,7 +30,7 @@ Restart Pi or run `/reload` after installing.
 - During a wait, pressing Enter in an empty editor retries immediately. Typed commands, autocomplete, and model-picker navigation still work normally. Choosing another model with `/model` immediately ends the pending wait and tries that exact model, even if it was previously marked unavailable.
 - Keeps a manually chosen model ahead of the configured priority list until it fails. After failure, normal retry/fallback rules apply and subsequent calls use the configured order again.
 - 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.
+- Preserves Pi's `before_provider_request` / `after_provider_response` callback flow. When Pi's exact Anthropic OAuth identity block is present, sanitises both the initial prompt and later system-message updates, repeating the Claude Code identity in textual updates. User/assistant messages and tool blocks stay untouched. Pi remains responsible for initial OAuth identity insertion and authentication; this does not repair invalid credentials.
 
 ### Unsupported interception limitation
 

package/package.json

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

package/src/constants.ts

@@ -43,7 +43,7 @@ export const DEFAULT_LIVELINESS_INTERVAL_MS = 15 * 1_000; // 15 seconds
 export const LIVELINESS_JSON_STATUS_KEY = "oira666.pi-limits-wait.json";
 /** Payload schema version for LIVELINESS_JSON_STATUS_KEY. Bump only on a breaking change. */
 export const LIVELINESS_JSON_VERSION = 1;
-export const EXTENSION_VERSION = "0.6.4";
+export const EXTENSION_VERSION = "0.6.5";
 
 export const SETTINGS_FILE_NAME = "limits-wait.json";
 export const FALLBACK_MODELS_KEY = "fallback-models";

package/src/index.ts

@@ -100,9 +100,9 @@ export type { FallbackModel } from "./types.js";
 
 export default function (pi: ExtensionAPI) {
   // Current pi-ai inserts the Claude Code identity as the first system block
-  // for Anthropic OAuth. Sanitise only that exact payload shape; authentication,
-  // identity insertion, Anthropic headers, and all other request composition
-  // remain owned by ModelRuntime.
+  // for Anthropic OAuth. Use that exact shape to guard sanitisation of the
+  // initial prompt and later system updates, which repeat the identity.
+  // Authentication, initial identity insertion, and headers remain runtime-owned.
   pi.on("before_provider_request", (event) => sanitiseAnthropicPayloadSystem(event.payload));
 
   // Keep prompt sanitisation and the runtime's normal Anthropic header path,

package/src/prompt.ts

@@ -34,7 +34,8 @@ function isPiClaudeCodeIdentityBlock(block: unknown): block is SystemTextBlock {
  * current pi-ai runtime: the Claude Code identity is the first system block.
  * Looking only at that exact first block avoids treating a later user-authored
  * identity mention as proof of OAuth. The runtime remains solely responsible
- * for inserting the identity and selecting OAuth headers.
+ * for inserting the initial identity and selecting OAuth headers. Later system
+ * updates are sanitised too and repeat the identity alongside their instructions.
  */
 export function sanitiseAnthropicPayloadSystem(payload: unknown): unknown {
   if (!payload || typeof payload !== "object") return payload;
@@ -60,5 +61,50 @@ export function sanitiseAnthropicPayloadSystem(payload: unknown): unknown {
     }
   }
 
-  return changed ? { ...payload, system: newSystem } : payload;
+  // Pi 0.86+ can send prompt updates as system messages in the transcript.
+  // Only transform their text; tool additions/removals and conversation content
+  // must remain unchanged. Keep the OAuth guard above for every transformation.
+  const messages = (payload as { messages?: unknown }).messages;
+  const newMessages = Array.isArray(messages) ? messages.map((message: unknown) => {
+    if (!message || typeof message !== "object") return message;
+    const candidate = message as { role?: unknown; content?: unknown };
+    if (candidate.role !== "system") return message;
+
+    if (typeof candidate.content === "string") {
+      const cleaned = sanitiseSystemPrompt(candidate.content);
+      const content = cleaned ? `${CLAUDE_CODE_IDENTITY}\n\n${cleaned}` : CLAUDE_CODE_IDENTITY;
+      if (content === candidate.content) return message;
+      changed = true;
+      return { ...message, content };
+    }
+    if (!Array.isArray(candidate.content)) return message;
+
+    let messageChanged = false;
+    let hasIdentity = false;
+    const content = candidate.content.map((block: unknown) => {
+      if (!block || typeof block !== "object") return block;
+      const textBlock = block as SystemTextBlock;
+      if (textBlock.type !== "text" || typeof textBlock.text !== "string") return block;
+      const cleaned = sanitiseSystemPrompt(textBlock.text);
+      const text = hasIdentity ? cleaned
+        : cleaned ? `${CLAUDE_CODE_IDENTITY}\n\n${cleaned}` : CLAUDE_CODE_IDENTITY;
+      hasIdentity = true;
+      if (text === textBlock.text) return block;
+      messageChanged = true;
+      return { ...textBlock, text };
+    }).filter((block: unknown) => {
+      if (!block || typeof block !== "object") return true;
+      const candidate = block as SystemTextBlock;
+      return candidate.type !== "text" || candidate.text !== "";
+    });
+    if (!messageChanged) return message;
+    changed = true;
+    return { ...message, content };
+  }) : undefined;
+
+  return changed ? {
+    ...payload,
+    system: newSystem,
+    ...(newMessages ? { messages: newMessages } : {}),
+  } : payload;
 }