@madgagarin/pi-agentrouter 1.2.0 → 1.3.0

package/README.md

@@ -120,6 +120,9 @@ AgentRouter performs client fingerprint verification. Raw summarization requests
 #### Q: Does the 2.5s pacing delay affect local or other cloud models?
 No. The pacing logic specifically filters for AgentRouter endpoints (`isAgentRouter`). Native OpenAI, Anthropic, Gemini, or local models run at full speed without delay.
 
+#### Q: How to use custom subagents with AgentRouter?
+AgentRouter strictly verifies client authenticity (`pi-code` / `claude-code` prompt signature). If you define custom subagents in extensions like `pi-subagents`, make sure to specify `systemPromptMode: append` in your agent definition frontmatter so the base Pi system prompt identity is preserved.
+
 ---
 
 ## 📄 License

package/index.ts

@@ -90,7 +90,27 @@ export function fixPackagePriorityInSettings(): boolean {
 const initialConfig = loadConfig();
 let currentApiKey = normalizeApiKey(process.env.AGENTROUTER_API_KEY || initialConfig.apiKey || "");
 let minIntervalMs = initialConfig.minIntervalMs ?? 2500;
-let lastRequestEndTime = 0;
+const PACING_FILE = path.join(process.env.HOME || "", ".pi/agent/.agentrouter-pacing");
+
+export function getLastRequestEndTime(): number {
+  try {
+    if (fs.existsSync(PACING_FILE)) {
+      const val = parseInt(fs.readFileSync(PACING_FILE, "utf-8").trim(), 10);
+      if (!isNaN(val)) return val;
+    }
+  } catch {}
+  return 0;
+}
+
+export function setLastRequestEndTime(ts: number): void {
+  try {
+    const dir = path.dirname(PACING_FILE);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.writeFileSync(PACING_FILE, String(ts), "utf-8");
+  } catch {}
+}
 
 export function isAgentRouter(providerName?: string, baseUrl?: string): boolean {
   if (providerName && providerName.toLowerCase().includes("agentrouter")) return true;
@@ -98,6 +118,53 @@ export function isAgentRouter(providerName?: string, baseUrl?: string): boolean
   return false;
 }
 
+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.";
+
+/**
+ * Enforces that the canonical pi-code system prompt signature is strictly at index 0.
+ * If another plugin or wrapper prepended text before the canonical header, it reorders
+ * the header to the very top and shifts the injected prefix right after it.
+ * If the header is missing entirely (e.g. from replace mode), it prepends the canonical header.
+ * This guarantees both WAF client authentication and stable prompt cache prefix matching.
+ */
+export function enforceCanonicalRootPrompt(systemPrompt: string | any[] | undefined): string | any[] {
+  if (!systemPrompt) {
+    return CANONICAL_PI_HEADER;
+  }
+
+  if (typeof systemPrompt === "string") {
+    const text = systemPrompt.trim();
+    const piHeaderRegex = /(?:You are [^\n\r]*operating inside pi[^\n\r]*\n?|You are (?:pi|Pi)[^\n\r]*\n?)/i;
+
+    if (piHeaderRegex.test(text)) {
+      const match = text.match(piHeaderRegex);
+      if (match && match.index !== undefined && match.index > 0) {
+        const header = match[0].trim();
+        const prefix = text.slice(0, match.index).trim();
+        const rest = text.slice(match.index + match[0].length).trim();
+        return `${header}\n\n${prefix}${rest ? "\n\n" + rest : ""}`;
+      }
+      return text;
+    } else {
+      return `${CANONICAL_PI_HEADER}\n\n${text}`;
+    }
+  }
+
+  if (Array.isArray(systemPrompt)) {
+    if (systemPrompt.length === 0) {
+      return [{ type: "text", text: CANONICAL_PI_HEADER }];
+    }
+    const firstBlock = systemPrompt[0];
+    if (firstBlock && typeof firstBlock.text === "string") {
+      firstBlock.text = enforceCanonicalRootPrompt(firstBlock.text) as string;
+    }
+    return systemPrompt;
+  }
+
+  return systemPrompt;
+}
+
 export default function (pi: ExtensionAPI) {
   function registerAgentRouterProviders(apiKey: string): void {
     pi.registerProvider("agentrouter-openai", {
@@ -129,8 +196,10 @@ export default function (pi: ExtensionAPI) {
       baseUrl: "https://agentrouter.org",
       apiKey,
       api: "anthropic-messages",
+      
       compat: {
         forceAdaptiveThinking: true,
+        sendSessionAffinityHeaders: true,
       },
       models: [
         {
@@ -143,6 +212,7 @@ export default function (pi: ExtensionAPI) {
           cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
           compat: {
             forceAdaptiveThinking: true,
+            sendSessionAffinityHeaders: true,
           },
         },
         {
@@ -155,6 +225,7 @@ export default function (pi: ExtensionAPI) {
           cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
           compat: {
             forceAdaptiveThinking: true,
+            sendSessionAffinityHeaders: true,
           },
         },
       ],
@@ -171,9 +242,37 @@ export default function (pi: ExtensionAPI) {
     }
   }
 
+    // Enforce root system prompt signature and prompt prefix stability at the lowest transport level
+  pi.on("before_provider_request", async (event, ctx) => {
+    const provider = ((event as any)?.model?.provider || ctx?.model?.provider || "").toLowerCase();
+    const baseUrl = ((event as any)?.model?.baseUrl || (ctx?.model as any)?.baseUrl || "");
+
+    if (isAgentRouter(provider, baseUrl)) {
+      const payload = event.payload;
+      if (payload) {
+        // 1. Enforce canonical root system prompt in payload.system (Anthropic format)
+        if (payload.system !== undefined) {
+          payload.system = enforceCanonicalRootPrompt(payload.system);
+        }
+
+        // 2. Enforce canonical root system prompt in payload.messages[0] (OpenAI format)
+        if (Array.isArray(payload.messages) && payload.messages.length > 0) {
+          const firstMsg = payload.messages[0];
+          if (firstMsg && firstMsg.role === "system") {
+            if (typeof firstMsg.content === "string") {
+              firstMsg.content = enforceCanonicalRootPrompt(firstMsg.content);
+            } else if (Array.isArray(firstMsg.content)) {
+              firstMsg.content = enforceCanonicalRootPrompt(firstMsg.content);
+            }
+          }
+        }
+      }
+    }
+  });
+
   pi.on("session_start", async (_event, ctx) => {
     updatePromptRewriteEnvForModel(ctx.model);
-    lastRequestEndTime = Date.now();
+    setLastRequestEndTime(Date.now());
 
     const order = getPackageOrderState();
     if (order.needsFix && ctx.hasUI && typeof (ctx.ui as any).confirm === "function") {
@@ -209,10 +308,11 @@ export default function (pi: ExtensionAPI) {
       return;
     }
 
+    const lastEnd = getLastRequestEndTime();
     const now = Date.now();
-    const elapsed = now - lastRequestEndTime;
+    const elapsed = now - lastEnd;
 
-    if (lastRequestEndTime > 0 && elapsed < minIntervalMs) {
+    if (lastEnd > 0 && elapsed < minIntervalMs) {
       const waitMs = minIntervalMs - elapsed;
       await new Promise((resolve) => setTimeout(resolve, waitMs));
     }
@@ -221,14 +321,14 @@ export default function (pi: ExtensionAPI) {
   pi.on("turn_end", async (_event, ctx) => {
     const model = ctx.model;
     if (isAgentRouter(model?.provider, (model as any)?.baseUrl)) {
-      lastRequestEndTime = Date.now();
+      setLastRequestEndTime(Date.now());
     }
   });
 
   pi.on("agent_end", async (_event, ctx) => {
     const model = ctx.model;
     if (isAgentRouter(model?.provider, (model as any)?.baseUrl)) {
-      lastRequestEndTime = Date.now();
+      setLastRequestEndTime(Date.now());
     }
   });
 
@@ -276,6 +376,7 @@ export default function (pi: ExtensionAPI) {
           signal,
         }
       );
+      setLastRequestEndTime(Date.now());
 
       const summary = response.content
         .filter((c: any): c is { type: "text"; text: string } => c.type === "text")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madgagarin/pi-agentrouter",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Pi coding agent extension for AgentRouter (GPT-5.6 Sol & Claude Opus 5) with rate-limit pacing and caching.",
   "publishConfig": {
     "access": "public"