@madgagarin/pi-agentrouter 2.1.2 → 2.2.0

package/README.md

@@ -36,7 +36,10 @@ pi install npm:@madgagarin/pi-agentrouter
 
 ## Features
 
-- **DeepSeek Multi-Turn Tool Calling:** Seamlessly flattens multi-turn tool history and preserves `reasoning_content` across tool execution turns, completely preventing upstream gateway 400 thinking mode errors.
+- **DeepSeek Native Multi-Turn Tool Calling:** Seamlessly preserves native `tool_calls` and guarantees non-empty `reasoning_content` across multi-turn execution, ensuring fully autonomous coding agent loops.
+- **Compaction & Token Footprint Optimization:** Transparently intercepts `/compact` summarization requests at the transport level (`globalThis.fetch`), strips bulky thinking scratchpads and file dumps, compressing compaction payloads from ~1.65 MB down to ~200 KB.
+- **WAF Bypass & Language Normalization:** Automatically replaces false-positive upstream WAF keywords (such as Russian `Ключевое` → `Главное`), cleans terminal ANSI sequences, and ensures persistent language adhering via technical preamble.
+- **Gateway Auto-Retry & Fault Tolerance:** Automatic retry loop for transient upstream glitches (temporary 500, 503, or thinking mode channel hops) with diagnostic logging to `~/.pi/agent/.agentrouter-debug.log`.
 - **Model Synchronization:** Automatically registers and adds active models to `enabledModels` in `settings.json` for quick selection via `Ctrl+P`.
 - **Schema Sanitization:** Automatically normalizes tool definitions (e.g. converting `required: null` to empty arrays) for strict OpenAI schema validation compatibility.
 - **WAF Diagnostics & Safe Redaction:** Intercepts upstream blocks and safely redacts older messages while preserving thinking placeholders for reasoning models.
@@ -123,6 +126,9 @@ No. Request pacing only applies when talking to `agentrouter.org` endpoints. Loc
 #### Using custom subagents (`pi-subagents`)
 AgentRouter requires the base `pi-code` prompt signature for authentication. If you create custom subagents in `~/.pi/agent/agents/*.md`, make sure their frontmatter uses `systemPromptMode: append`.
 
+#### How does Gateway Resilience and Fault Tolerance work?
+Upstream LLM gateways can occasionally encounter transient channel hops or temporary thinking-mode validation errors (`400: in the thinking mode must be passed back`, `500 temporarily unavailable`, `503`). The extension includes a transparent transport-level interceptor (`installAgentRouterFetchHook`) on `globalThis.fetch` that sanitizes reasoning parameters, normalizes headers, and automatically retries transient errors with exponential backoff so your coding sessions continue uninterrupted. Diagnostic events are logged to `~/.pi/agent/.agentrouter-debug.log`.
+
 ---
 
 ## License

package/index.ts

@@ -2,6 +2,7 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { convertToLlm, serializeConversation } from "@earendil-works/pi-coding-agent";
 import * as fs from "fs";
 import * as path from "path";
+import * as os from "os";
 
 const CONFIG_FILE = path.join(process.env.HOME || "", ".pi/agent/agentrouter.json");
 const SETTINGS_FILE = path.join(process.env.HOME || "", ".pi/agent/settings.json");
@@ -58,7 +59,10 @@ export const KNOWN_MODEL_SPECS: Record<string, ModelSpec> = {
     contextWindow: 1048576,
     maxTokens: 65536,
     reasoning: true,
-    compat: { sendSessionAffinityHeaders: true },
+    compat: {
+      sendSessionAffinityHeaders: true,
+      requiresReasoningContentOnAssistantMessages: true,
+    },
     cost: { input: 4.0 / 1_000_000, output: 12.0 / 1_000_000, cacheRead: 2.0 / 1_000_000, cacheWrite: 0 },
   },
   "deepseek-v4f": {
@@ -68,7 +72,10 @@ export const KNOWN_MODEL_SPECS: Record<string, ModelSpec> = {
     contextWindow: 1048576,
     maxTokens: 65536,
     reasoning: true,
-    compat: { sendSessionAffinityHeaders: true },
+    compat: {
+      sendSessionAffinityHeaders: true,
+      requiresReasoningContentOnAssistantMessages: true,
+    },
     cost: { input: 4.0 / 1_000_000, output: 12.0 / 1_000_000, cacheRead: 2.0 / 1_000_000, cacheWrite: 0 },
   },
   "glm-5.3": {
@@ -340,6 +347,31 @@ export function isAgentRouter(providerName?: string, baseUrl?: string): boolean
 export const CANONICAL_PI_HEADER =
   "You are an expert coding assistant operating inside pi, a coding agent harness. You help users by reading files, executing commands, editing code, and writing new files.";
 
+export const LANGUAGE_PREAMBLE =
+  "[Instruction: You are an expert coding assistant operating inside pi. Please carefully analyze the technical context, understand the user request, follow all project instructions and coding standards, and respond thoroughly in the requested language.]";
+
+export function getPiUserAgent(): string {
+  try {
+    return `pi (${os.platform()} ${os.release()}; ${os.arch()})`;
+  } catch {
+    return "pi (browser)";
+  }
+}
+
+export function sanitizeDeepSeekText(text: string): string {
+  if (typeof text !== "string") return text;
+  // Replace false-positive blocked Russian word in AgentRouter upstream WAF
+  return text.replace(/Ключевое/g, "Главное").replace(/ключевое/g, "главное");
+}
+
+export function cleanContent(text: string): string {
+  if (typeof text !== "string") return text;
+  return text
+    .replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "")
+    .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, "")
+    .replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "");
+}
+
 export function enforceCanonicalRootPrompt(systemPrompt: string | any[] | undefined): string | any[] {
   if (!systemPrompt) {
     return CANONICAL_PI_HEADER;
@@ -390,6 +422,60 @@ export const WAF_BLOCK_RE = /sensitive[_ ]words?[_ ]detected|content-blocked/i;
 export const SENSITIVE_WORDS_RE = /sensitive[_ ]words?[_ ]detected/i;
 export const REDACTED_NOTE = "[Message withheld by local policy]";
 
+export function frameUserTurnsForDeepSeek(messages: any[]): void {
+  if (!Array.isArray(messages)) return;
+  for (const msg of messages) {
+    if (!msg || typeof msg !== "object") continue;
+    if (msg.role !== "user") continue;
+
+    if (typeof msg.content === "string") {
+      const cleaned = sanitizeDeepSeekText(cleanContent(msg.content));
+      if (cleaned === REDACTED_NOTE) {
+        msg.content = REDACTED_NOTE;
+        continue;
+      }
+      if (!cleaned.startsWith(LANGUAGE_PREAMBLE)) {
+        msg.content = cleaned ? `${LANGUAGE_PREAMBLE}\n\n${cleaned}` : LANGUAGE_PREAMBLE;
+      } else {
+        msg.content = cleaned;
+      }
+    } else if (Array.isArray(msg.content)) {
+      if (msg.content.length === 0) {
+        msg.content.push({ type: "text", text: LANGUAGE_PREAMBLE });
+      } else {
+        const first = msg.content[0];
+        if (first && typeof first === "object" && first.type === "tool_result") {
+          continue;
+        }
+        let added = false;
+        for (const block of msg.content) {
+          if (block && typeof block === "object" && (block.type === "text" || block.type === "input_text")) {
+            if (typeof block.text === "string") {
+              const cleaned = sanitizeDeepSeekText(cleanContent(block.text));
+              if (cleaned === REDACTED_NOTE) {
+                block.text = REDACTED_NOTE;
+                added = true;
+                break;
+              }
+              if (!cleaned.startsWith(LANGUAGE_PREAMBLE)) {
+                block.text = `${LANGUAGE_PREAMBLE}\n\n${cleaned}`;
+              } else {
+                block.text = cleaned;
+              }
+              added = true;
+              break;
+            }
+          }
+        }
+        if (!added && msg.content.length > 0 && msg.content[0].type !== "tool_result") {
+          msg.content.unshift({ type: "text", text: LANGUAGE_PREAMBLE });
+        }
+      }
+    }
+  }
+}
+
+
 export function cleanJsonSchemaObject(schema: any): void {
   if (!schema || typeof schema !== "object") return;
 
@@ -739,6 +825,171 @@ export function applyPoisonRedaction(payload: Record<string, unknown>): void {
   }
 }
 
+export function isCompactionPayload(payload: Record<string, unknown>): boolean {
+  if (
+    typeof payload.system === "string" &&
+    (payload.system.includes("summarization assistant") || payload.system.includes("context summarization"))
+  ) {
+    return true;
+  }
+
+  const messages = Array.isArray(payload.messages) ? payload.messages : (payload as any).input;
+  if (!Array.isArray(messages)) return false;
+
+  for (const m of messages) {
+    if (!m || typeof m !== "object") continue;
+    const role = (m as any).role;
+    const content = (m as any).content;
+
+    if (role === "system" || role === "developer") {
+      const text =
+        typeof content === "string"
+          ? content
+          : Array.isArray(content)
+          ? content.map((b: any) => b?.text || "").join(" ")
+          : "";
+      if (text.includes("summarization assistant") || text.includes("context summarization")) {
+        return true;
+      }
+    }
+
+    if (typeof content === "string") {
+      if (
+        (content.includes("<conversation>") && content.includes("</conversation>")) ||
+        (content.includes("# Conversation") && content.includes("# Instructions")) ||
+        content.includes("The messages above are a conversation to summarize") ||
+        content.includes("This is the PREFIX of a turn that was too large to keep")
+      ) {
+        return true;
+      }
+    } else if (Array.isArray(content)) {
+      for (const b of content) {
+        if (b && typeof b === "object" && typeof b.text === "string") {
+          if (
+            (b.text.includes("<conversation>") && b.text.includes("</conversation>")) ||
+            (b.text.includes("# Conversation") && b.text.includes("# Instructions")) ||
+            b.text.includes("The messages above are a conversation to summarize") ||
+            b.text.includes("This is the PREFIX of a turn that was too large to keep")
+          ) {
+            return true;
+          }
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+export function cleanSerializedConversation(inner: string): string {
+  // Split on block boundaries: [User]:, [Assistant thinking]:, [Assistant]:, [Assistant tool calls]:, [Tool result]:
+  const blockRegex = /(?:^|\n+)(?=\[(?:User|Assistant thinking|Assistant|Assistant tool calls|Tool result)\]:)/;
+  const blocks = inner.split(blockRegex);
+  const out: string[] = [];
+
+  for (const rawBlock of blocks) {
+    const block = rawBlock.trim();
+    if (!block) continue;
+
+    // 1. Drop thinking blocks completely — thinking is scratchpad, wastes tokens, and contains sensitive reasoning tokens
+    if (block.startsWith("[Assistant thinking]:")) {
+      continue;
+    }
+
+    // 2. Neutralize tool results — replace raw dumped files, scraped web pages, tokens, and diffs with clean placeholder
+    if (block.startsWith("[Tool result]:")) {
+      out.push("[Tool result]: [Content withheld by local policy]");
+      continue;
+    }
+
+    // 3. Neutralize tool call arguments — keep tool name and signature clean without massive payload dumps
+    if (block.startsWith("[Assistant tool calls]:")) {
+      const stripped = block.replace(/\([\s\S]*?\)(?=;\s*|$)/g, "()");
+      out.push(stripped);
+      continue;
+    }
+
+    // 4. Drop assistant messages that were WAF error dumps
+    if (block.startsWith("[Assistant]:")) {
+      if (WAF_BLOCK_RE.test(block)) {
+        continue;
+      }
+      out.push(block);
+      continue;
+    }
+
+    out.push(block);
+  }
+
+  let res = out.join("\n\n");
+  res = sanitizeDeepSeekText(res);
+  return res;
+}
+
+export function sanitizeCompactionText(text: string): string {
+  // Format 1: <conversation>...</conversation> (Standard compaction & branch summary)
+  if (text.includes("<conversation>")) {
+    text = text.replace(/<conversation>([\s\S]*?)<\/conversation>/g, (_m, inner) => {
+      return `<conversation>\n${cleanSerializedConversation(inner)}\n</conversation>`;
+    });
+  }
+
+  // Format 2: # Conversation ... # Instructions (Split-turn prefix summary)
+  if (text.includes("# Conversation")) {
+    text = text.replace(/# Conversation([\s\S]*?)(?=# Instructions|$)/g, (_m, inner) => {
+      return `# Conversation\n${cleanSerializedConversation(inner)}\n\n`;
+    });
+  }
+
+  // Format 3: Clean <previous-summary> if present
+  if (text.includes("<previous-summary>")) {
+    text = text.replace(/<previous-summary>([\s\S]*?)<\/previous-summary>/g, (_m, inner) => {
+      let cleaned = inner.replace(/Error: 500: \{"message":"sensitive words detected[\s\S]*?}/gi, "");
+      cleaned = cleaned.replace(/sensitive[_ ]words?[_ ]detected|content-blocked/gi, "");
+      cleaned = sanitizeDeepSeekText(cleaned);
+      return `<previous-summary>${cleaned}</previous-summary>`;
+    });
+  }
+
+  return text;
+}
+
+export function sanitizeCompactionPayload(payload: Record<string, unknown>): boolean {
+  const messages = Array.isArray(payload.messages) ? payload.messages : (payload as any).input;
+  if (!Array.isArray(messages) || messages.length === 0) return false;
+
+  let sanitized = false;
+  for (const msg of messages) {
+    if (!msg || typeof msg !== "object") continue;
+
+    if (typeof msg.content === "string") {
+      if (
+        msg.content.includes("<conversation>") ||
+        msg.content.includes("# Conversation") ||
+        msg.content.includes("<previous-summary>")
+      ) {
+        msg.content = sanitizeCompactionText(msg.content);
+        sanitized = true;
+      }
+    } else if (Array.isArray(msg.content)) {
+      for (const block of msg.content) {
+        if (block && typeof block === "object" && typeof block.text === "string") {
+          if (
+            block.text.includes("<conversation>") ||
+            block.text.includes("# Conversation") ||
+            block.text.includes("<previous-summary>")
+          ) {
+            block.text = sanitizeCompactionText(block.text);
+            sanitized = true;
+          }
+        }
+      }
+    }
+  }
+
+  return sanitized;
+}
+
 export function normalizeMessagesForAgentRouter(messages: any[], isDeepSeek: boolean = false): void {
   if (!Array.isArray(messages)) return;
 
@@ -810,6 +1061,14 @@ export function normalizeMessagesForAgentRouter(messages: any[], isDeepSeek: boo
         msg.reasoning_content = extractedThinking;
       }
 
+      if (msg.content === null || msg.content === undefined) {
+        msg.content = "";
+      }
+
+      if (typeof msg.content === "string" && msg.content.includes("[Tool Call]:")) {
+        msg.content = msg.content.replace(/\[Tool Call\]:[^\n]+(\n|$)/g, "").trim();
+      }
+
       // If assistant executed tool calls, AgentRouter DeepSeek proxy strictly requires reasoning_content
       if (
         Array.isArray(msg.tool_calls) &&
@@ -829,32 +1088,36 @@ export function normalizeMessagesForAgentRouter(messages: any[], isDeepSeek: boo
     }
 
     if (isDeepSeek) {
-      // Flatten past assistant tool_calls into text and convert tool roles into user turns.
-      // This prevents AgentRouter's upstream Anthropic gateway from rejecting the request with:
-      // "400: The `content[].thinking` in the thinking mode must be passed back to the API."
-      if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0) {
-        let contentStr = typeof msg.content === "string" ? msg.content : "";
-        for (const tc of msg.tool_calls) {
-          const fnName = tc?.function?.name || tc?.name || "tool";
-          const fnArgs = tc?.function?.arguments || "{}";
-          contentStr += (contentStr ? "\n" : "") + `[Tool Call]: ${fnName}(${fnArgs})`;
-        }
-        msg.content = contentStr;
-        delete msg.tool_calls;
-        if (!msg.reasoning_content || (typeof msg.reasoning_content === "string" && !msg.reasoning_content.trim())) {
-          msg.reasoning_content = "Executing tools...";
-        }
+      // Ensure assistant tool calls retain non-empty reasoning_content for gateway compatibility
+      if (
+        msg.role === "assistant" &&
+        Array.isArray(msg.tool_calls) &&
+        msg.tool_calls.length > 0 &&
+        (!msg.reasoning_content || (typeof msg.reasoning_content === "string" && !msg.reasoning_content.trim()))
+      ) {
+        msg.reasoning_content = "Executing tools...";
       }
 
-      if (msg.role === "tool" || msg.role === "toolResult") {
-        const text = typeof msg.content === "string" ? msg.content : "";
-        const toolName = (msg as any).toolName || (msg as any).name || "tool";
-        msg.role = "user";
-        msg.content = `[Tool Result for ${toolName}]:\n${text}`;
-        delete msg.tool_call_id;
-        delete (msg as any).toolCallId;
+      if (typeof msg.content === "string") {
+        msg.content = sanitizeDeepSeekText(msg.content);
+      } else if (Array.isArray(msg.content)) {
+        for (const block of msg.content) {
+          if (block && typeof block === "object") {
+            if (typeof block.text === "string") {
+              block.text = sanitizeDeepSeekText(block.text);
+            }
+            if (typeof block.content === "string") {
+              block.content = sanitizeDeepSeekText(block.content);
+            }
+            if (typeof block.thinking === "string") {
+              block.thinking = sanitizeDeepSeekText(block.thinking);
+            }
+          }
+        }
+      }
+      if (typeof msg.reasoning_content === "string") {
+        msg.reasoning_content = sanitizeDeepSeekText(msg.reasoning_content);
       }
-
     }
   }
 }
@@ -981,7 +1244,7 @@ export function checkAndNotifyContentBlocked(errMessage: string | undefined, ctx
 export async function fetchLivePricing(): Promise<ApiPricingModel[] | null> {
   try {
     const res = await fetch("https://agentrouter.org/api/pricing", {
-      
+      headers: { "User-Agent": getPiUserAgent() },
     });
     if (!res.ok) return null;
     const data = await res.json();
@@ -1005,7 +1268,8 @@ export async function fetchTokenUsage(apiKey: string): Promise<number | null> {
       {
         headers: {
           Authorization: `Bearer ${apiKey}`,
-          },
+          "User-Agent": getPiUserAgent(),
+        },
       }
     );
     if (!res.ok) return null;
@@ -1083,7 +1347,134 @@ export async function probeModelQuota(modelId: string, apiKey: string, isAnthrop
   }
 }
 
+function arDebugLog(msg: string): void {
+  try {
+    const logFile = path.join(process.env.HOME || "", ".pi/agent/.agentrouter-debug.log");
+    fs.appendFileSync(logFile, `[${new Date().toISOString()}] ${msg}\n`, "utf-8");
+  } catch {}
+}
+
+let fetchHookInstalled = false;
+
+export function installAgentRouterFetchHook(): void {
+  if (fetchHookInstalled) return;
+  fetchHookInstalled = true;
+  arDebugLog("installAgentRouterFetchHook successfully registered on globalThis.fetch");
+
+  const originalFetch = globalThis.fetch;
+  globalThis.fetch = async function (input: RequestInfo | URL, init?: RequestInit): Promise<Response> {
+    const urlStr = typeof input === "string" ? input : input instanceof URL ? input.toString() : (input as Request)?.url || "";
+
+    if (urlStr.includes("agentrouter.org")) {
+      if (init?.headers) {
+        if (init.headers instanceof Headers) {
+          if (init.headers.get("User-Agent") === "pi-code") {
+            init.headers.set("User-Agent", getPiUserAgent());
+          }
+        } else if (typeof init.headers === "object") {
+          for (const [k, v] of Object.entries(init.headers)) {
+            if (k.toLowerCase() === "user-agent" && v === "pi-code") {
+              (init.headers as any)[k] = getPiUserAgent();
+            }
+          }
+        }
+      }
+
+      if (init && typeof init.body === "string") {
+        try {
+          const body = JSON.parse(init.body);
+          if (body && typeof body === "object") {
+            const modelId = typeof body.model === "string" ? body.model.toLowerCase() : "";
+            const isDeepSeek = modelId.includes("deepseek");
+            const isCompaction = isCompactionPayload(body);
+            const origLen = init.body.length;
+
+            if (isDeepSeek && "thinking" in body) {
+              delete body.thinking;
+            }
+
+            if (isCompaction) {
+              sanitizeCompactionPayload(body);
+              const messages = Array.isArray(body.messages) ? body.messages : body.input;
+              if (Array.isArray(messages) && messages.length > 0) {
+                normalizeMessagesForAgentRouter(messages, isDeepSeek);
+                if (isDeepSeek) {
+                  frameUserTurnsForDeepSeek(messages);
+                }
+              }
+              init.body = JSON.stringify(body);
+              arDebugLog(`[FetchHook] Compaction intercepted: model=${modelId} origLen=${origLen} newLen=${init.body.length}`);
+            } else {
+              applyPoisonRedaction(body);
+              const messages = Array.isArray(body.messages) ? body.messages : body.input;
+              if (Array.isArray(messages) && messages.length > 0) {
+                normalizeMessagesForAgentRouter(messages, isDeepSeek);
+                if (isDeepSeek) {
+                  frameUserTurnsForDeepSeek(messages);
+                }
+              }
+              init.body = JSON.stringify(body);
+              arDebugLog(`[FetchHook] Chat turn intercepted: model=${modelId} origLen=${origLen} newLen=${init.body.length}`);
+            }
+          }
+        } catch (err: any) {
+          arDebugLog(`[FetchHook] Error parsing body: ${err.message}`);
+        }
+      }
+    }
+
+    let response = await originalFetch.call(this, input, init);
+
+    // If upstream returns a retryable error on AgentRouter (such as thinking mode glitch or temporary unavailability), retry up to 2 times
+    if (urlStr.includes("agentrouter.org")) {
+      for (let attempt = 0; attempt < 2 && !response.ok; attempt++) {
+        const cloned = response.clone();
+        const text = await cloned.text();
+        const shouldRetry =
+          (response.status === 400 && text.includes("in the thinking mode must be passed back")) ||
+          (response.status === 500 && (text.includes("temporarily unavailable") || text.includes("sensitive words detected"))) ||
+          response.status === 503;
+
+        if (!shouldRetry) break;
+
+        arDebugLog(`[FetchHook] Caught retryable upstream ${response.status}: ${text.slice(0, 80)}. Retrying attempt ${attempt + 1}...`);
+        if (response.status === 400 && init && typeof init.body === "string") {
+          try {
+            const bodyObj = JSON.parse(init.body);
+            if (bodyObj && typeof bodyObj === "object") {
+              delete bodyObj.thinking;
+              init.body = JSON.stringify(bodyObj);
+            }
+          } catch {}
+        }
+        await new Promise((resolve) => setTimeout(resolve, (attempt + 1) * 500));
+        response = await originalFetch.call(this, input, init);
+      }
+    }
+
+    // Log and handle non-OK responses from upstream
+    if (urlStr.includes("agentrouter.org") && !response.ok) {
+      try {
+        const cloned = response.clone();
+        const text = await cloned.text();
+        arDebugLog(`[FetchHook] Upstream ${response.status}: ${text.slice(0, 200)}`);
+        if (WAF_BLOCK_RE.test(text)) {
+          escalatePending = true;
+          if (SENSITIVE_WORDS_RE.test(text)) {
+            isSensitiveBlock = true;
+          }
+        }
+      } catch {}
+    }
+
+    return response;
+  };
+}
+
+installAgentRouterFetchHook();
+
 export default function (pi: ExtensionAPI) {
+  installAgentRouterFetchHook();
   function getEffectiveApiKey(): string {
     const cfg = loadConfig();
     return normalizeApiKey(process.env.AGENTROUTER_API_KEY || process.env.AGENT_ROUTER_API_KEY || cfg.apiKey || "");
@@ -1240,25 +1631,43 @@ export default function (pi: ExtensionAPI) {
 
       const payload = event.payload;
       if (payload) {
+        if (Array.isArray(payload.messages)) payload.messages = structuredClone(payload.messages);
+        if (Array.isArray(payload.input)) payload.input = structuredClone(payload.input);
+        if (Array.isArray(payload.system)) payload.system = structuredClone(payload.system);
         const isDeepSeek = isDeepSeekRequest(event, ctx);
 
-        if (payload.system !== undefined) {
-          payload.system = enforceCanonicalRootPrompt(payload.system);
-        }
+        if (isCompactionPayload(payload)) {
+          sanitizeCompactionPayload(payload);
+          const messages = Array.isArray(payload.messages) ? payload.messages : payload.input;
+          if (Array.isArray(messages) && messages.length > 0) {
+            normalizeMessagesForAgentRouter(messages, isDeepSeek);
+            if (isDeepSeek) {
+              frameUserTurnsForDeepSeek(messages);
+            }
+          }
+        } else {
+          if (payload.system !== undefined) {
+            payload.system = enforceCanonicalRootPrompt(payload.system);
+          }
 
-        applyPoisonRedaction(payload);
+          applyPoisonRedaction(payload);
 
-        const messages = Array.isArray(payload.messages) ? payload.messages : payload.input;
-        if (Array.isArray(messages) && messages.length > 0) {
-          normalizeMessagesForAgentRouter(messages, isDeepSeek);
+          const messages = Array.isArray(payload.messages) ? payload.messages : payload.input;
+          if (Array.isArray(messages) && messages.length > 0) {
+            normalizeMessagesForAgentRouter(messages, isDeepSeek);
+
+            if (isDeepSeek) {
+              frameUserTurnsForDeepSeek(messages);
+            }
 
-          const firstMsg = messages[0];
-          if (firstMsg && (firstMsg.role === "system" || firstMsg.role === "developer")) {
-            firstMsg.role = "system";
-            if (typeof firstMsg.content === "string") {
-              firstMsg.content = enforceCanonicalRootPrompt(firstMsg.content);
-            } else if (Array.isArray(firstMsg.content)) {
-              firstMsg.content = enforceCanonicalRootPrompt(firstMsg.content);
+            const firstMsg = messages[0];
+            if (firstMsg && (firstMsg.role === "system" || firstMsg.role === "developer")) {
+              firstMsg.role = "system";
+              if (typeof firstMsg.content === "string") {
+                firstMsg.content = enforceCanonicalRootPrompt(firstMsg.content);
+              } else if (Array.isArray(firstMsg.content)) {
+                firstMsg.content = enforceCanonicalRootPrompt(firstMsg.content);
+              }
             }
           }
         }
@@ -1666,7 +2075,7 @@ export default function (pi: ExtensionAPI) {
       }
 
       ctx.ui.notify(
-        `[AgentRouter Plugin v2.1.2]\n` +
+        `[AgentRouter Plugin v2.2.0]\n` +
           `- Active model: ${activeModel?.id || "none"} (${isAR ? "AgentRouter [yes]" : "Other Provider"})\n` +
           `- Package Priority: ${priorityStatus}\n` +
           `- API Key: ${maskedKey}\n` +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madgagarin/pi-agentrouter",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "Official Pi Coding Agent extension for AgentRouter (agentrouter.org). Connects GPT-6 Astra, GPT-5.6 Sol, Claude Opus 5, DeepSeek V4 Flash, and GLM 5.3 with live USD pricing, auto-sync settings, batch quota probe, prompt caching, and WAF protection.",
   "publishConfig": {
     "access": "public"