takomi 2.1.1 → 2.1.3

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

@@ -1,200 +1,200 @@
-import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-import type { RouterConfig, RouterModelConfig, RouterUpstreamConfig } from "./types.ts";
-
-export const EXTENSION_ROOT = join(homedir(), ".pi", "agent", "extensions", "oauth-router");
-export const DATA_ROOT = join(homedir(), ".pi", "agent", "oauth-router");
-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 DEFAULT_MODELS: RouterModelConfig[] = [
-  {
-    id: "gpt-4o",
-    name: "GPT-4o",
-    reasoning: false,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 128000,
-    maxTokens: 16384,
-  },
-  {
-    id: "gpt-4.1",
-    name: "GPT-4.1",
-    reasoning: false,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 128000,
-    maxTokens: 16384,
-  },
-  {
-    id: "o4-mini",
-    name: "o4-mini",
-    reasoning: true,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 200000,
-    maxTokens: 100000,
-  },
-  {
-    id: "gpt-5.1",
-    name: "GPT-5.1",
-    reasoning: true,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 272000,
-    maxTokens: 128000,
-  },
-  {
-    id: "gpt-5.4",
-    name: "GPT-5.4",
-    reasoning: true,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 272000,
-    maxTokens: 128000,
-  },
-  {
-    id: "gpt-5.4-mini",
-    name: "GPT-5.4 Mini",
-    reasoning: true,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 272000,
-    maxTokens: 128000,
-  },
-  {
-    id: "gpt-5.5",
-    name: "GPT-5.5",
-    reasoning: true,
-    input: ["text", "image"],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    contextWindow: 272000,
-    maxTokens: 128000,
-  },
-];
-
-const DEFAULT_UPSTREAMS: RouterUpstreamConfig[] = [
-  {
-    id: "openai-compatible",
-    label: "OpenAI Compatible API",
-    description: "API-key fallback route for standard OpenAI-compatible responses endpoints.",
-    baseUrl: "https://api.openai.com/v1",
-    api: "openai-responses",
-    authMode: "api-key",
-    enabled: true,
-    modelIds: ["gpt-4o", "gpt-4.1", "o4-mini"],
-  },
-  {
-    id: "chatgpt-codex",
-    label: "ChatGPT Codex OAuth",
-    description: "OAuth-backed ChatGPT Plus/Pro Codex route using Pi's OpenAI Codex OAuth implementation.",
-    baseUrl: "https://chatgpt.com/backend-api",
-    api: "openai-codex-responses",
-    authMode: "oauth",
-    oauthProviderId: "openai-codex",
-    enabled: true,
-    modelIds: ["gpt-5.1", "gpt-5.4", "gpt-5.4-mini", "gpt-5.5"],
-  },
-];
-
-export const DEFAULT_CONFIG: RouterConfig = {
-  version: 1,
-  providerName: "oauth-router",
-  policy: "round-robin",
-  tokenRefreshSkewMs: 60_000,
-  rateLimitCooldownMs: 120_000,
-  transientPenaltyMs: 30_000,
-  models: DEFAULT_MODELS,
-  upstreams: DEFAULT_UPSTREAMS,
-};
-
-function applySecurePermissions(path: string, mode: number) {
-  try {
-    chmodSync(path, mode);
-  } catch {
-    // Best effort only. Windows commonly ignores POSIX chmod semantics.
-  }
-}
-
-export function ensureDirectory(path: string) {
-  mkdirSync(path, { recursive: true, mode: 0o700 });
-  applySecurePermissions(path, 0o700);
-}
-
-export function writeJsonFile(path: string, value: unknown, secure = true) {
-  ensureDirectory(dirname(path));
-  writeFileSync(path, `${JSON.stringify(value, null, 2)}\n`, { encoding: "utf8", mode: secure ? 0o600 : 0o644 });
-  applySecurePermissions(path, secure ? 0o600 : 0o644);
-}
-
-function deepClone<T>(value: T): T {
-  return JSON.parse(JSON.stringify(value)) as T;
-}
-
-function mergeModelConfigs(candidateModels: RouterModelConfig[] | undefined): RouterModelConfig[] {
-  if (!Array.isArray(candidateModels) || candidateModels.length === 0) {
-    return deepClone(DEFAULT_CONFIG.models);
-  }
-
-  const merged = new Map(DEFAULT_CONFIG.models.map((model) => [model.id, deepClone(model)]));
-  for (const model of candidateModels) {
-    const previous = merged.get(model.id) ?? ({} as RouterModelConfig);
-    merged.set(model.id, { ...previous, ...deepClone(model), id: model.id });
-  }
-  return Array.from(merged.values());
-}
-
-function mergeUpstreamConfigs(candidateUpstreams: RouterUpstreamConfig[] | undefined): RouterUpstreamConfig[] {
-  if (!Array.isArray(candidateUpstreams) || candidateUpstreams.length === 0) {
-    return deepClone(DEFAULT_CONFIG.upstreams);
-  }
-
-  const merged = new Map(DEFAULT_CONFIG.upstreams.map((upstream) => [upstream.id, deepClone(upstream)]));
-  for (const upstream of candidateUpstreams) {
-    const previous = merged.get(upstream.id);
-    if (!previous) {
-      merged.set(upstream.id, deepClone(upstream));
-      continue;
-    }
-
-    const modelIds = Array.from(new Set([...(previous.modelIds ?? []), ...(upstream.modelIds ?? [])]));
-    merged.set(upstream.id, { ...previous, ...deepClone(upstream), id: upstream.id, modelIds });
-  }
-  return Array.from(merged.values());
-}
-
-function mergeConfig(candidate: Partial<RouterConfig> | undefined): RouterConfig {
-  return {
-    ...DEFAULT_CONFIG,
-    ...candidate,
-    providerName: "oauth-router",
-    version: 1,
-    models: mergeModelConfigs(candidate?.models),
-    upstreams: mergeUpstreamConfigs(candidate?.upstreams),
-  };
-}
-
-export function loadRouterConfig(): RouterConfig {
-  ensureDirectory(DATA_ROOT);
-
-  if (!existsSync(CONFIG_PATH)) {
-    const initial = deepClone(DEFAULT_CONFIG);
-    writeJsonFile(CONFIG_PATH, initial, false);
-    return initial;
-  }
-
-  try {
-    const parsed = JSON.parse(readFileSync(CONFIG_PATH, "utf8")) as Partial<RouterConfig>;
-    const merged = mergeConfig(parsed);
-    if (JSON.stringify(parsed) !== JSON.stringify(merged)) {
-      writeJsonFile(CONFIG_PATH, merged, false);
-    }
-    return merged;
-  } catch {
-    const fallback = deepClone(DEFAULT_CONFIG);
-    writeJsonFile(CONFIG_PATH, fallback, false);
-    return fallback;
-  }
-}
+import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import type { RouterConfig, RouterModelConfig, RouterUpstreamConfig } from "./types.ts";
+
+export const EXTENSION_ROOT = join(homedir(), ".pi", "agent", "extensions", "oauth-router");
+export const DATA_ROOT = join(homedir(), ".pi", "agent", "oauth-router");
+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 DEFAULT_MODELS: RouterModelConfig[] = [
+  {
+    id: "gpt-4o",
+    name: "GPT-4o",
+    reasoning: false,
+    input: ["text", "image"],
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    contextWindow: 128000,
+    maxTokens: 16384,
+  },
+  {
+    id: "gpt-4.1",
+    name: "GPT-4.1",
+    reasoning: false,
+    input: ["text", "image"],
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    contextWindow: 128000,
+    maxTokens: 16384,
+  },
+  {
+    id: "o4-mini",
+    name: "o4-mini",
+    reasoning: true,
+    input: ["text", "image"],
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    contextWindow: 200000,
+    maxTokens: 100000,
+  },
+  {
+    id: "gpt-5.1",
+    name: "GPT-5.1",
+    reasoning: true,
+    input: ["text", "image"],
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    contextWindow: 272000,
+    maxTokens: 128000,
+  },
+  {
+    id: "gpt-5.4",
+    name: "GPT-5.4",
+    reasoning: true,
+    input: ["text", "image"],
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    contextWindow: 272000,
+    maxTokens: 128000,
+  },
+  {
+    id: "gpt-5.4-mini",
+    name: "GPT-5.4 Mini",
+    reasoning: true,
+    input: ["text", "image"],
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    contextWindow: 272000,
+    maxTokens: 128000,
+  },
+  {
+    id: "gpt-5.5",
+    name: "GPT-5.5",
+    reasoning: true,
+    input: ["text", "image"],
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    contextWindow: 272000,
+    maxTokens: 128000,
+  },
+];
+
+const DEFAULT_UPSTREAMS: RouterUpstreamConfig[] = [
+  {
+    id: "openai-compatible",
+    label: "OpenAI Compatible API",
+    description: "API-key fallback route for standard OpenAI-compatible responses endpoints.",
+    baseUrl: "https://api.openai.com/v1",
+    api: "openai-responses",
+    authMode: "api-key",
+    enabled: true,
+    modelIds: ["gpt-4o", "gpt-4.1", "o4-mini"],
+  },
+  {
+    id: "chatgpt-codex",
+    label: "ChatGPT Codex OAuth",
+    description: "OAuth-backed ChatGPT Plus/Pro Codex route using Pi's OpenAI Codex OAuth implementation.",
+    baseUrl: "https://chatgpt.com/backend-api",
+    api: "openai-codex-responses",
+    authMode: "oauth",
+    oauthProviderId: "openai-codex",
+    enabled: true,
+    modelIds: ["gpt-5.1", "gpt-5.4", "gpt-5.4-mini", "gpt-5.5"],
+  },
+];
+
+export const DEFAULT_CONFIG: RouterConfig = {
+  version: 1,
+  providerName: "oauth-router",
+  policy: "round-robin",
+  tokenRefreshSkewMs: 60_000,
+  rateLimitCooldownMs: 120_000,
+  transientPenaltyMs: 30_000,
+  models: DEFAULT_MODELS,
+  upstreams: DEFAULT_UPSTREAMS,
+};
+
+function applySecurePermissions(path: string, mode: number) {
+  try {
+    chmodSync(path, mode);
+  } catch {
+    // Best effort only. Windows commonly ignores POSIX chmod semantics.
+  }
+}
+
+export function ensureDirectory(path: string) {
+  mkdirSync(path, { recursive: true, mode: 0o700 });
+  applySecurePermissions(path, 0o700);
+}
+
+export function writeJsonFile(path: string, value: unknown, secure = true) {
+  ensureDirectory(dirname(path));
+  writeFileSync(path, `${JSON.stringify(value, null, 2)}\n`, { encoding: "utf8", mode: secure ? 0o600 : 0o644 });
+  applySecurePermissions(path, secure ? 0o600 : 0o644);
+}
+
+function deepClone<T>(value: T): T {
+  return JSON.parse(JSON.stringify(value)) as T;
+}
+
+function mergeModelConfigs(candidateModels: RouterModelConfig[] | undefined): RouterModelConfig[] {
+  if (!Array.isArray(candidateModels) || candidateModels.length === 0) {
+    return deepClone(DEFAULT_CONFIG.models);
+  }
+
+  const merged = new Map(DEFAULT_CONFIG.models.map((model) => [model.id, deepClone(model)]));
+  for (const model of candidateModels) {
+    const previous = merged.get(model.id) ?? ({} as RouterModelConfig);
+    merged.set(model.id, { ...previous, ...deepClone(model), id: model.id });
+  }
+  return Array.from(merged.values());
+}
+
+function mergeUpstreamConfigs(candidateUpstreams: RouterUpstreamConfig[] | undefined): RouterUpstreamConfig[] {
+  if (!Array.isArray(candidateUpstreams) || candidateUpstreams.length === 0) {
+    return deepClone(DEFAULT_CONFIG.upstreams);
+  }
+
+  const merged = new Map(DEFAULT_CONFIG.upstreams.map((upstream) => [upstream.id, deepClone(upstream)]));
+  for (const upstream of candidateUpstreams) {
+    const previous = merged.get(upstream.id);
+    if (!previous) {
+      merged.set(upstream.id, deepClone(upstream));
+      continue;
+    }
+
+    const modelIds = Array.from(new Set([...(previous.modelIds ?? []), ...(upstream.modelIds ?? [])]));
+    merged.set(upstream.id, { ...previous, ...deepClone(upstream), id: upstream.id, modelIds });
+  }
+  return Array.from(merged.values());
+}
+
+function mergeConfig(candidate: Partial<RouterConfig> | undefined): RouterConfig {
+  return {
+    ...DEFAULT_CONFIG,
+    ...candidate,
+    providerName: "oauth-router",
+    version: 1,
+    models: mergeModelConfigs(candidate?.models),
+    upstreams: mergeUpstreamConfigs(candidate?.upstreams),
+  };
+}
+
+export function loadRouterConfig(): RouterConfig {
+  ensureDirectory(DATA_ROOT);
+
+  if (!existsSync(CONFIG_PATH)) {
+    const initial = deepClone(DEFAULT_CONFIG);
+    writeJsonFile(CONFIG_PATH, initial, false);
+    return initial;
+  }
+
+  try {
+    const parsed = JSON.parse(readFileSync(CONFIG_PATH, "utf8")) as Partial<RouterConfig>;
+    const merged = mergeConfig(parsed);
+    if (JSON.stringify(parsed) !== JSON.stringify(merged)) {
+      writeJsonFile(CONFIG_PATH, merged, false);
+    }
+    return merged;
+  } catch {
+    const fallback = deepClone(DEFAULT_CONFIG);
+    writeJsonFile(CONFIG_PATH, fallback, false);
+    return fallback;
+  }
+}

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

@@ -1,41 +1,41 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { registerRouterCommands, formatStatusReport } from "./commands.ts";
-import { registerRouterProvider, RouterRuntime } from "./provider.ts";
-
-function updateFooter(pi: ExtensionAPI, runtime: RouterRuntime, notify = false) {
-  pi.on("session_start", async (_event, ctx) => {
-    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;
-
-    ctx.ui.setStatus("oauth-router", `oauth-router ${healthy}/${rows.length || 0} healthy | ${runtime.getPolicy()}`);
-    if (notify) {
-      ctx.ui.notify("oauth-router loaded", "info");
-    }
-  });
-}
-
-export default function (pi: ExtensionAPI) {
-  const runtime = new RouterRuntime();
-
-  registerRouterProvider(pi, runtime);
-  registerRouterCommands(pi, runtime);
-  updateFooter(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 } from "@mariozechner/pi-coding-agent";
+import { registerRouterCommands, formatStatusReport } from "./commands.ts";
+import { registerRouterProvider, RouterRuntime } from "./provider.ts";
+
+function updateFooter(pi: ExtensionAPI, runtime: RouterRuntime, notify = false) {
+  pi.on("session_start", async (_event, ctx) => {
+    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;
+
+    ctx.ui.setStatus("oauth-router", `oauth-router ${healthy}/${rows.length || 0} healthy | ${runtime.getPolicy()}`);
+    if (notify) {
+      ctx.ui.notify("oauth-router loaded", "info");
+    }
+  });
+}
+
+export default function (pi: ExtensionAPI) {
+  const runtime = new RouterRuntime();
+
+  registerRouterProvider(pi, runtime);
+  registerRouterCommands(pi, runtime);
+  updateFooter(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 },
+      });
+    },
+  });
+}