takomi 2.1.32 → 2.1.34

package/.pi/extensions/oauth-router/config.ts

@@ -9,6 +9,10 @@ export const CONFIG_PATH = join(DATA_ROOT, "config.json");
 export const CREDENTIALS_PATH = join(DATA_ROOT, "credentials.json");
 export const STATE_PATH = join(DATA_ROOT, "state.json");
 
+const LEGACY_CODEX_CONTEXT_WINDOW = 272000;
+const SAFE_CODEX_CONTEXT_WINDOW = 240000;
+const CODEX_MODEL_IDS = new Set(["gpt-5.1", "gpt-5.4", "gpt-5.4-mini", "gpt-5.5"]);
+
 const DEFAULT_MODELS: RouterModelConfig[] = [
   {
     id: "gpt-4o",
@@ -43,7 +47,7 @@ const DEFAULT_MODELS: RouterModelConfig[] = [
     reasoning: true,
     input: ["text", "image"],
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 272000,
+    contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
     maxTokens: 128000,
   },
   {
@@ -52,7 +56,7 @@ const DEFAULT_MODELS: RouterModelConfig[] = [
     reasoning: true,
     input: ["text", "image"],
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 272000,
+    contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
     maxTokens: 128000,
   },
   {
@@ -61,7 +65,7 @@ const DEFAULT_MODELS: RouterModelConfig[] = [
     reasoning: true,
     input: ["text", "image"],
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 272000,
+    contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
     maxTokens: 128000,
   },
   {
@@ -70,7 +74,7 @@ const DEFAULT_MODELS: RouterModelConfig[] = [
     reasoning: true,
     input: ["text", "image"],
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 272000,
+    contextWindow: SAFE_CODEX_CONTEXT_WINDOW,
     maxTokens: 128000,
   },
 ];
@@ -210,7 +214,12 @@ function mergeModelConfigs(candidateModels: RouterModelConfig[] | undefined): Ro
     const previous = merged.get(model.id) ?? ({} as RouterModelConfig);
     merged.set(model.id, { ...previous, ...deepClone(model), id: model.id });
   }
-  return Array.from(merged.values());
+  return Array.from(merged.values()).map((model) => {
+    if (CODEX_MODEL_IDS.has(model.id) && model.contextWindow === LEGACY_CODEX_CONTEXT_WINDOW) {
+      return { ...model, contextWindow: SAFE_CODEX_CONTEXT_WINDOW };
+    }
+    return model;
+  });
 }
 
 function mergeUpstreamConfigs(candidateUpstreams: RouterUpstreamConfig[] | undefined): RouterUpstreamConfig[] {

package/.pi/extensions/oauth-router/index.ts

@@ -1,130 +1,130 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { registerRouterCommands, formatStatusReport } from "./commands.ts";
-import { registerRouterProvider, RouterRuntime } from "./provider.ts";
-import type { RouterUiEvent } from "./types.ts";
-
-function getHealthSummary(runtime: RouterRuntime) {
-  const rows = runtime.getStatusRows();
-  const healthy = rows.filter((row) => {
-    if (!row.enabled) return false;
-    if (row.authHealth !== "ok") return false;
-    if (row.cooldownUntil && row.cooldownUntil > Date.now()) return false;
-    if (row.penaltyUntil && row.penaltyUntil > Date.now()) return false;
-    return true;
-  }).length;
-
-  return `oauth-router ${healthy}/${rows.length || 0} healthy | ${runtime.getPolicy()}`;
-}
-
-function formatDuration(ms?: number): string {
-  if (!ms || ms <= 0) return "now";
-  if (ms < 1_000) return `${Math.round(ms)}ms`;
-  return `${Math.round(ms / 1_000)}s`;
-}
-
-function truncate(text: string | undefined, max = 110): string {
-  if (!text) return "";
-  const clean = text.replace(/\s+/g, " ").trim();
-  return clean.length > max ? `${clean.slice(0, Math.max(0, max - 1))}…` : clean;
-}
-
-function formatRoute(event: RouterUiEvent): string {
-  const parts = [event.accountLabel || event.accountId, event.upstreamId].filter(Boolean);
-  return parts.length ? parts.join(" @ ") : "router";
-}
-
-function formatActivityStatus(event: RouterUiEvent): string {
-  const route = formatRoute(event);
-  const model = event.modelId ? `${event.modelId} ` : "";
-  const reason = truncate(event.message, 70);
-
-  switch (event.phase) {
-    case "attempt": {
-      const retry = event.retryAttempt && event.maxRetries
-        ? ` retry ${event.retryAttempt}/${event.maxRetries}`
-        : "";
-      return `oauth-router contacting ${model}via ${route}${retry}`;
-    }
-    case "retry":
-      return `oauth-router retry ${event.retryAttempt}/${event.maxRetries} in ${formatDuration(event.delayMs)} | ${reason || event.failureKind || "network error"}`;
-    case "failover":
-      return `oauth-router failover from ${route} | ${reason || event.failureKind || "upstream error"}`;
-    case "success":
-      return `oauth-router ok: ${model}via ${route}`;
-    case "error":
-      return `oauth-router error | ${reason || event.failureKind || "request failed"}`;
-  }
-}
-
-function notifyActivity(ctx: ExtensionContext, event: RouterUiEvent) {
-  if (event.phase === "attempt" || event.phase === "success") return;
-
-  const message = formatActivityStatus(event);
-  const level = event.phase === "error" ? "error" : "info";
-  ctx.ui.notify(message, level);
-}
-
-function installRouterUiBridge(pi: ExtensionAPI, runtime: RouterRuntime, notifyOnLoad = false) {
-  let activeCtx: ExtensionContext | undefined;
-
-  const setBaseStatus = (ctx: ExtensionContext) => {
-    activeCtx = ctx;
-    if (ctx.hasUI) ctx.ui.setStatus("oauth-router", getHealthSummary(runtime));
-  };
-
-  runtime.setUiReporter((event) => {
-    const ctx = activeCtx;
-    if (!ctx?.hasUI) return;
-    try {
-      ctx.ui.setStatus("oauth-router", formatActivityStatus(event));
-      notifyActivity(ctx, event);
-    } catch {
-      // Best-effort UI only; never disturb provider streaming.
-    }
-  });
-
-  pi.on("session_start", async (_event, ctx) => {
-    setBaseStatus(ctx);
-    if (notifyOnLoad) ctx.ui.notify("oauth-router loaded", "info");
-  });
-
-  pi.on("agent_start", async (_event, ctx) => {
-    setBaseStatus(ctx);
-  });
-
-  pi.on("turn_start", async (_event, ctx) => {
-    setBaseStatus(ctx);
-  });
-
-  pi.on("turn_end", async (_event, ctx) => {
-    setBaseStatus(ctx);
-  });
-
-  pi.on("agent_end", async (_event, ctx) => {
-    setBaseStatus(ctx);
-  });
-
-  pi.on("session_shutdown", async () => {
-    activeCtx = undefined;
-  });
-}
-
-export default function (pi: ExtensionAPI) {
-  const runtime = new RouterRuntime();
-
-  registerRouterProvider(pi, runtime);
-  registerRouterCommands(pi, runtime);
-  installRouterUiBridge(pi, runtime, false);
-
-  pi.registerCommand("router-debug-report", {
-    description: "Emit a detailed oauth-router report",
-    handler: async () => {
-      pi.sendMessage({
-        customType: "oauth-router",
-        content: formatStatusReport(runtime),
-        display: true,
-        details: { source: "oauth-router", debug: true },
-      });
-    },
-  });
-}
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { registerRouterCommands, formatStatusReport } from "./commands.ts";
+import { registerRouterProvider, RouterRuntime } from "./provider.ts";
+import type { RouterUiEvent } from "./types.ts";
+
+function getHealthSummary(runtime: RouterRuntime) {
+  const rows = runtime.getStatusRows();
+  const healthy = rows.filter((row) => {
+    if (!row.enabled) return false;
+    if (row.authHealth !== "ok") return false;
+    if (row.cooldownUntil && row.cooldownUntil > Date.now()) return false;
+    if (row.penaltyUntil && row.penaltyUntil > Date.now()) return false;
+    return true;
+  }).length;
+
+  return `oauth-router ${healthy}/${rows.length || 0} healthy | ${runtime.getPolicy()}`;
+}
+
+function formatDuration(ms?: number): string {
+  if (!ms || ms <= 0) return "now";
+  if (ms < 1_000) return `${Math.round(ms)}ms`;
+  return `${Math.round(ms / 1_000)}s`;
+}
+
+function truncate(text: string | undefined, max = 110): string {
+  if (!text) return "";
+  const clean = text.replace(/\s+/g, " ").trim();
+  return clean.length > max ? `${clean.slice(0, Math.max(0, max - 1))}…` : clean;
+}
+
+function formatRoute(event: RouterUiEvent): string {
+  const parts = [event.accountLabel || event.accountId, event.upstreamId].filter(Boolean);
+  return parts.length ? parts.join(" @ ") : "router";
+}
+
+function formatActivityStatus(event: RouterUiEvent): string {
+  const route = formatRoute(event);
+  const model = event.modelId ? `${event.modelId} ` : "";
+  const reason = truncate(event.message, 70);
+
+  switch (event.phase) {
+    case "attempt": {
+      const retry = event.retryAttempt && event.maxRetries
+        ? ` retry ${event.retryAttempt}/${event.maxRetries}`
+        : "";
+      return `oauth-router contacting ${model}via ${route}${retry}`;
+    }
+    case "retry":
+      return `oauth-router retry ${event.retryAttempt}/${event.maxRetries} in ${formatDuration(event.delayMs)} | ${reason || event.failureKind || "network error"}`;
+    case "failover":
+      return `oauth-router failover from ${route} | ${reason || event.failureKind || "upstream error"}`;
+    case "success":
+      return `oauth-router ok: ${model}via ${route}`;
+    case "error":
+      return `oauth-router error | ${reason || event.failureKind || "request failed"}`;
+  }
+}
+
+function notifyActivity(ctx: ExtensionContext, event: RouterUiEvent) {
+  if (event.phase === "attempt" || event.phase === "success") return;
+
+  const message = formatActivityStatus(event);
+  const level = event.phase === "error" ? "error" : "info";
+  ctx.ui.notify(message, level);
+}
+
+function installRouterUiBridge(pi: ExtensionAPI, runtime: RouterRuntime, notifyOnLoad = false) {
+  let activeCtx: ExtensionContext | undefined;
+
+  const setBaseStatus = (ctx: ExtensionContext) => {
+    activeCtx = ctx;
+    if (ctx.hasUI) ctx.ui.setStatus("oauth-router", getHealthSummary(runtime));
+  };
+
+  runtime.setUiReporter((event) => {
+    const ctx = activeCtx;
+    if (!ctx?.hasUI) return;
+    try {
+      ctx.ui.setStatus("oauth-router", formatActivityStatus(event));
+      notifyActivity(ctx, event);
+    } catch {
+      // Best-effort UI only; never disturb provider streaming.
+    }
+  });
+
+  pi.on("session_start", async (_event, ctx) => {
+    setBaseStatus(ctx);
+    if (notifyOnLoad) ctx.ui.notify("oauth-router loaded", "info");
+  });
+
+  pi.on("agent_start", async (_event, ctx) => {
+    setBaseStatus(ctx);
+  });
+
+  pi.on("turn_start", async (_event, ctx) => {
+    setBaseStatus(ctx);
+  });
+
+  pi.on("turn_end", async (_event, ctx) => {
+    setBaseStatus(ctx);
+  });
+
+  pi.on("agent_end", async (_event, ctx) => {
+    setBaseStatus(ctx);
+  });
+
+  pi.on("session_shutdown", async () => {
+    activeCtx = undefined;
+  });
+}
+
+export default function (pi: ExtensionAPI) {
+  const runtime = new RouterRuntime();
+
+  registerRouterProvider(pi, runtime);
+  registerRouterCommands(pi, runtime);
+  installRouterUiBridge(pi, runtime, false);
+
+  pi.registerCommand("router-debug-report", {
+    description: "Emit a detailed oauth-router report",
+    handler: async () => {
+      pi.sendMessage({
+        customType: "oauth-router",
+        content: formatStatusReport(runtime),
+        display: true,
+        details: { source: "oauth-router", debug: true },
+      });
+    },
+  });
+}

package/.pi/extensions/oauth-router/provider.ts

@@ -124,6 +124,20 @@ function isClientNetworkFailure(lower: string): boolean {
   ].some((token) => lower.includes(token));
 }
 
+function isContextOverflowFailure(lower: string): boolean {
+  return [
+    "context_length_exceeded",
+    "context length exceeded",
+    "context window exceeded",
+    "exceeds the context window",
+    "exceeds the model's maximum context length",
+    "exceeds model's maximum context length",
+    "maximum context length",
+    "too many tokens",
+    "token limit exceeded",
+  ].some((token) => lower.includes(token));
+}
+
 function classifyFailure(
   status: number | undefined,
   headers: Record<string, string>,
@@ -137,6 +151,10 @@ function classifyFailure(
     return { kind: "rate-limit", status: status ?? 429, retryAfterMs, message };
   }
 
+  if (isContextOverflowFailure(lower)) {
+    return { kind: "context-overflow", status, message };
+  }
+
   if (status === 401 || status === 403 || lower.includes("unauthorized") || lower.includes("forbidden")) {
     return { kind: "auth", status: status ?? 401, message };
   }
@@ -461,6 +479,11 @@ export class RouterRuntime {
           this.state.recordClientNetworkFailure(accountId, failure.status, failure.message);
         }
         break;
+      case "context-overflow":
+        // Context-size failures are request-level, not account-health failures.
+        // Do not cool down or quarantine accounts; Pi needs the overflow error surfaced
+        // directly so its built-in compaction recovery can compact and retry.
+        break;
       case "fatal":
         this.state.markTransientFailure(accountId, this.config.transientPenaltyMs, failure.status ?? 500, failure.message);
         break;
@@ -567,6 +590,12 @@ export class RouterRuntime {
         }
 
         const failure = classifyFailure(responseStatus, responseHeaders, message, this.config);
+
+        if (failure.kind === "context-overflow") {
+          outerStream.push(event);
+          return { completed: true, emittedMeaningfulOutput, failure };
+        }
+
         this.markFailure(selection.account.id, failure);
 
         if (!emittedMeaningfulOutput) {