@madgagarin/pi-agentrouter 1.1.1 → 1.2.0

package/index.ts

@@ -4,6 +4,7 @@ import * as fs from "fs";
 import * as path from "path";
 
 const CONFIG_FILE = path.join(process.env.HOME || "", ".pi/agent/agentrouter.json");
+const SETTINGS_FILE = path.join(process.env.HOME || "", ".pi/agent/settings.json");
 
 export interface AgentRouterConfig {
   apiKey?: string;
@@ -34,10 +35,62 @@ export function normalizeApiKey(key?: string): string {
   return key.trim().replace(/^["']|["']$/g, "").trim();
 }
 
+export interface PackageOrderState {
+  agentRouterIndex: number;
+  cacheOptimizerIndex: number;
+  needsFix: boolean;
+}
+
+export function getPackageOrderState(): PackageOrderState {
+  try {
+    if (!fs.existsSync(SETTINGS_FILE)) {
+      return { agentRouterIndex: -1, cacheOptimizerIndex: -1, needsFix: false };
+    }
+    const settings = JSON.parse(fs.readFileSync(SETTINGS_FILE, "utf-8"));
+    if (!Array.isArray(settings.packages)) {
+      return { agentRouterIndex: -1, cacheOptimizerIndex: -1, needsFix: false };
+    }
+    const arIdx = settings.packages.findIndex((p: string) =>
+      typeof p === "string" && (p.includes("@madgagarin/pi-agentrouter") || p.includes("pi-agentrouter"))
+    );
+    const cacheIdx = settings.packages.findIndex((p: string) =>
+      typeof p === "string" && p.includes("pi-cache-optimizer")
+    );
+    const needsFix = cacheIdx !== -1 && arIdx !== -1 && arIdx > cacheIdx;
+    return { agentRouterIndex: arIdx, cacheOptimizerIndex: cacheIdx, needsFix };
+  } catch {
+    return { agentRouterIndex: -1, cacheOptimizerIndex: -1, needsFix: false };
+  }
+}
+
+export function fixPackagePriorityInSettings(): boolean {
+  try {
+    if (!fs.existsSync(SETTINGS_FILE)) return false;
+    const settings = JSON.parse(fs.readFileSync(SETTINGS_FILE, "utf-8"));
+    if (!Array.isArray(settings.packages)) return false;
+    const arIdx = settings.packages.findIndex((p: string) =>
+      typeof p === "string" && (p.includes("@madgagarin/pi-agentrouter") || p.includes("pi-agentrouter"))
+    );
+    const cacheIdx = settings.packages.findIndex((p: string) =>
+      typeof p === "string" && p.includes("pi-cache-optimizer")
+    );
+    if (cacheIdx !== -1 && arIdx !== -1 && arIdx > cacheIdx) {
+      const pkg = settings.packages.splice(arIdx, 1)[0];
+      const targetCacheIdx = settings.packages.findIndex((p: string) =>
+        typeof p === "string" && p.includes("pi-cache-optimizer")
+      );
+      settings.packages.splice(targetCacheIdx, 0, pkg);
+      fs.writeFileSync(SETTINGS_FILE, JSON.stringify(settings, null, 2), "utf-8");
+      return true;
+    }
+  } catch {}
+  return false;
+}
+
 const initialConfig = loadConfig();
 let currentApiKey = normalizeApiKey(process.env.AGENTROUTER_API_KEY || initialConfig.apiKey || "");
 let minIntervalMs = initialConfig.minIntervalMs ?? 2500;
-let lastRequestTime = 0;
+let lastRequestEndTime = 0;
 
 export function isAgentRouter(providerName?: string, baseUrl?: string): boolean {
   if (providerName && providerName.toLowerCase().includes("agentrouter")) return true;
@@ -120,7 +173,25 @@ export default function (pi: ExtensionAPI) {
 
   pi.on("session_start", async (_event, ctx) => {
     updatePromptRewriteEnvForModel(ctx.model);
-    lastRequestTime = Date.now();
+    lastRequestEndTime = Date.now();
+
+    const order = getPackageOrderState();
+    if (order.needsFix && ctx.hasUI && typeof (ctx.ui as any).confirm === "function") {
+      try {
+        const confirmed = await (ctx.ui as any).confirm(
+          "Pi AgentRouter Package Priority",
+          "@madgagarin/pi-agentrouter is listed AFTER pi-cache-optimizer in settings.json packages.\n\n" +
+          "It must be placed before pi-cache-optimizer so prompt cache bypass takes effect before cache-optimizer transforms the prompt.\n\n" +
+          "Move @madgagarin/pi-agentrouter directly above pi-cache-optimizer in settings.json?"
+        );
+        if (confirmed) {
+          const success = fixPackagePriorityInSettings();
+          if (success) {
+            ctx.ui.notify("@madgagarin/pi-agentrouter moved above pi-cache-optimizer in settings.json. Please restart Pi for changes to take full effect.", "info");
+          }
+        }
+      } catch {}
+    }
   });
 
   pi.on("model_select", async (event) => {
@@ -139,14 +210,26 @@ export default function (pi: ExtensionAPI) {
     }
 
     const now = Date.now();
-    const elapsed = now - lastRequestTime;
+    const elapsed = now - lastRequestEndTime;
 
-    if (lastRequestTime > 0 && elapsed < minIntervalMs) {
+    if (lastRequestEndTime > 0 && elapsed < minIntervalMs) {
       const waitMs = minIntervalMs - elapsed;
       await new Promise((resolve) => setTimeout(resolve, waitMs));
     }
+  });
+
+  pi.on("turn_end", async (_event, ctx) => {
+    const model = ctx.model;
+    if (isAgentRouter(model?.provider, (model as any)?.baseUrl)) {
+      lastRequestEndTime = Date.now();
+    }
+  });
 
-    lastRequestTime = Date.now();
+  pi.on("agent_end", async (_event, ctx) => {
+    const model = ctx.model;
+    if (isAgentRouter(model?.provider, (model as any)?.baseUrl)) {
+      lastRequestEndTime = Date.now();
+    }
   });
 
   pi.on("session_before_compact", async (event, ctx) => {
@@ -241,6 +324,27 @@ export default function (pi: ExtensionAPI) {
         return;
       }
 
+      if (action === "fix-order" || action === "order") {
+        const order = getPackageOrderState();
+        if (!order.needsFix) {
+          if (order.cacheOptimizerIndex === -1) {
+            ctx.ui.notify("pi-cache-optimizer is not installed in settings.json. Package order is optimal.", "info");
+          } else if (order.agentRouterIndex !== -1 && order.agentRouterIndex < order.cacheOptimizerIndex) {
+            ctx.ui.notify("@madgagarin/pi-agentrouter is already placed before pi-cache-optimizer (Optimal).", "info");
+          } else {
+            ctx.ui.notify("@madgagarin/pi-agentrouter was not found in settings.json packages.", "warning");
+          }
+          return;
+        }
+        const success = fixPackagePriorityInSettings();
+        if (success) {
+          ctx.ui.notify("@madgagarin/pi-agentrouter moved directly above pi-cache-optimizer in settings.json. Please restart Pi for changes to take full effect.", "info");
+        } else {
+          ctx.ui.notify("Failed to update settings.json.", "error");
+        }
+        return;
+      }
+
       if (action === "pacing" || action === "throttle") {
         const val = parseInt(parts[1], 10);
         if (isNaN(val) || val < 0) {
@@ -256,16 +360,29 @@ export default function (pi: ExtensionAPI) {
       const maskedKey = currentApiKey.length > 8 ? `${currentApiKey.slice(0, 7)}...${currentApiKey.slice(-4)}` : "not set";
       const activeModel = ctx.model;
       const isAR = isAgentRouter(activeModel?.provider, (activeModel as any)?.baseUrl);
+      const order = getPackageOrderState();
+      let priorityStatus = "Optimal";
+      if (order.needsFix) {
+        priorityStatus = "Listed AFTER pi-cache-optimizer (Run: /agentrouter fix-order)";
+      } else if (order.cacheOptimizerIndex !== -1 && order.agentRouterIndex < order.cacheOptimizerIndex) {
+        priorityStatus = "Before pi-cache-optimizer (Optimal)";
+      } else if (order.agentRouterIndex !== -1) {
+        priorityStatus = "Active (Optimal)";
+      } else {
+        priorityStatus = "Not in packages";
+      }
 
       ctx.ui.notify(
         `[AgentRouter Plugin]\n` +
         `- Active model: ${activeModel?.id || "none"} (${isAR ? "AgentRouter [yes]" : "Other Provider"})\n` +
+        `- Package Priority: ${priorityStatus}\n` +
         `- API Key: ${maskedKey}\n` +
         `- Caching: Enabled (Prompt Cache + Session Affinity + Adaptive Thinking)\n` +
-        `- Pacing Interval: ${minIntervalMs} ms\n` +
+        `- Pacing Interval: ${minIntervalMs} ms (Measured from turn completion)\n` +
         `- Commands:\n` +
         `   /agentrouter key <key>   (update API key)\n` +
-        `   /agentrouter pacing <ms> (set minimum request delay)`,
+        `   /agentrouter pacing <ms> (set request delay after completion)\n` +
+        `   /agentrouter fix-order   (move plugin above pi-cache-optimizer in settings.json)`,
         "info"
       );
     },

package/package.json

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