@monotykamary/pi-better-openai 0.1.40 → 0.1.41

package/README.md

@@ -26,6 +26,7 @@ Usage display, image generation, and live voice require pi's `openai-codex` OAut
 2. Verify subscription usage with `/openai-usage`, or open `/openai-settings` and check **Diagnostics**.
 3. The extension reads auth from pi's agent auth store, normally `~/.pi/agent/auth.json`. Do not copy, paste, or commit values from this file.
 4. If `PI_CODING_AGENT_DIR` is set, the auth store, global extension config, and global generated-image directory use that agent directory instead of `~/.pi/agent`. A leading `~/` is expanded to your home directory.
+5. When [pi-multiprovider](https://github.com/monotykamary/pi-multiprovider) 0.4.0+ pools several `openai-codex` accounts, the session's active account (chosen with `/switch-account`) is resolved first for usage display, image generation, web search, and live voice; the usage widget refreshes on every switch. Without that extension, credential resolution is unchanged.
 
 ## Features
 

package/index.ts

@@ -14,6 +14,13 @@ import {
 } from "@earendil-works/pi-tui";
 import { registerOpenAICodexModels } from "./src/codex-models.ts";
 import { CONFIG_BASENAME, STATUS_KEY } from "./src/identity.ts";
+import {
+  CODEX_PROVIDER_ID,
+  isMultiproviderService,
+  MULTIPROVIDER_SERVICE_EVENT,
+  setActiveMultiproviderService,
+  type MultiproviderService,
+} from "./src/multiprovider.ts";
 import {
   formatTokens,
   redactDiagnosticValue,
@@ -227,6 +234,32 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
   let cachedSessionName: string | undefined;
   const usageController = new UsageController(config, updateFooter);
   const petController = new PetFooterController(config, updateFooter, () => footerInstalled);
+  let multiproviderService: MultiproviderService | undefined;
+  let unsubscribeMultiprovider: (() => void) | undefined;
+  let multiproviderRefreshCtx: ExtensionContext | undefined;
+
+  // Follow pi-multiprovider's active pooled account for openai-codex. The
+  // event re-fires with the same stable object at load and session start; the
+  // identity check keeps the change subscription attached exactly once. When
+  // the extension is absent, nothing here activates and credential resolution
+  // keeps its standalone behavior.
+  if (typeof pi.events?.on === "function") {
+    pi.events.on(MULTIPROVIDER_SERVICE_EVENT, (value) => {
+      if (!isMultiproviderService(value) || value === multiproviderService) return;
+      unsubscribeMultiprovider?.();
+      multiproviderService = value;
+      setActiveMultiproviderService(value);
+      unsubscribeMultiprovider = value.onActiveAccountChanged(CODEX_PROVIDER_ID, (event) => {
+        void usageController.refresh(event.ctx, undefined, { force: true });
+        updateFooter(event.ctx);
+      });
+      const ctx = multiproviderRefreshCtx;
+      if (ctx) {
+        void usageController.refresh(ctx, undefined, { force: true });
+        updateFooter(ctx);
+      }
+    });
+  }
 
   function refresh(ctx: ExtensionContext): ResolvedConfig {
     cachedConfig = resolveConfig(ctx.cwd || process.cwd());
@@ -1261,6 +1294,7 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
   pi.on("session_start", (_event, ctx) => {
     invalidateContextUsage();
     invalidateSessionName();
+    multiproviderRefreshCtx = ctx;
     const nextConfig = refresh(ctx);
     fastController.initializeForSession(ctx, nextConfig, pi.getFlag(FLAG) === true);
     if (
@@ -1347,6 +1381,7 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
   pi.on("session_shutdown", () => {
     invalidateContextUsage();
     invalidateSessionName();
+    multiproviderRefreshCtx = undefined;
     usageController.shutdown();
     petController.shutdown();
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monotykamary/pi-better-openai",
-  "version": "0.1.40",
+  "version": "0.1.41",
   "description": "Improve OpenAI in pi with fast mode, usage stats, realtime voice, image generation, and footer polish.",
   "keywords": [
     "fast",

package/src/codex-auth.ts

@@ -1,6 +1,7 @@
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { CODEX_PROVIDER_ID, getActiveMultiproviderService } from "./multiprovider.ts";
 import { piAgentDir } from "./paths.ts";
 
 export const AUTH_FILE = join(piAgentDir(), "auth.json");
@@ -10,8 +11,13 @@ export type CodexCredentials = {
   accountId: string;
 };
 
+export type CodexCredentialsContext = Pick<
+  ExtensionContext,
+  "modelRegistry" | "model" | "sessionManager"
+>;
+
 export type CodexCredentialsWithSource = CodexCredentials & {
-  source: "modelRegistry" | "authFile";
+  source: "multiprovider" | "modelRegistry" | "authFile";
 };
 
 function waitForSignal<T>(operation: Promise<T>, signal?: AbortSignal): Promise<T> {
@@ -118,11 +124,28 @@ export function readCodexAuth(): CodexCredentials | undefined {
 }
 
 export async function getCodexCredentials(
-  ctx?: Pick<ExtensionContext, "modelRegistry">,
+  ctx?: CodexCredentialsContext,
   signal?: AbortSignal,
 ): Promise<CodexCredentialsWithSource | undefined> {
   if (signal?.aborted) throw signal.reason ?? new Error("Operation was aborted.");
-  const registryRequest = ctx?.modelRegistry?.getApiKeyForProvider("openai-codex");
+  // A pooled account pinned for this session (pi-multiprovider /switch-account)
+  // wins over pi's own credential: subscription usage is per-account.
+  const multiprovider = getActiveMultiproviderService();
+  if (multiprovider && ctx) {
+    try {
+      const resolved = await waitForSignal(
+        multiprovider.resolveActiveAccountAuth(CODEX_PROVIDER_ID, ctx, signal),
+        signal,
+      );
+      const accountId = resolved ? extractAccountIdFromJwt(resolved.accessToken) : undefined;
+      if (resolved && accountId) {
+        return { accessToken: resolved.accessToken, accountId, source: "multiprovider" };
+      }
+    } catch {
+      // Fall back to pi-owned credential resolution.
+    }
+  }
+  const registryRequest = ctx?.modelRegistry?.getApiKeyForProvider(CODEX_PROVIDER_ID);
   const registryToken = registryRequest
     ? await waitForSignal(
         registryRequest.catch(() => undefined),

package/src/multiprovider.ts

@@ -0,0 +1,66 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+
+// Soft bridge to pi-multiprovider. When that extension is installed it emits
+// this event with a service object; without it everything here stays inert and
+// credential resolution keeps its standalone behavior.
+export const MULTIPROVIDER_SERVICE_EVENT = "pi-multiprovider:service";
+export const CODEX_PROVIDER_ID = "openai-codex";
+
+export type MultiproviderActiveAccount = {
+  id: string;
+  label: string;
+  authKind: string;
+};
+
+export type MultiproviderAccountAuth = {
+  accessToken: string;
+  label: string;
+  source?: string;
+};
+
+export type MultiproviderAccountChangedEvent = {
+  providerId: string;
+  account: MultiproviderActiveAccount | undefined;
+  ctx: ExtensionContext;
+};
+
+export type MultiproviderServiceContext = Pick<
+  ExtensionContext,
+  "modelRegistry" | "model" | "sessionManager"
+>;
+
+export type MultiproviderService = {
+  getActiveAccount(
+    providerId: string,
+    ctx: MultiproviderServiceContext,
+  ): Promise<MultiproviderActiveAccount | undefined>;
+  resolveActiveAccountAuth(
+    providerId: string,
+    ctx: MultiproviderServiceContext,
+    signal?: AbortSignal,
+  ): Promise<MultiproviderAccountAuth | undefined>;
+  onActiveAccountChanged(
+    providerId: string,
+    callback: (event: MultiproviderAccountChangedEvent) => void,
+  ): () => void;
+};
+
+export function isMultiproviderService(value: unknown): value is MultiproviderService {
+  if (typeof value !== "object" || value === null) return false;
+  const candidate = value as Partial<MultiproviderService>;
+  return (
+    typeof candidate.getActiveAccount === "function" &&
+    typeof candidate.resolveActiveAccountAuth === "function" &&
+    typeof candidate.onActiveAccountChanged === "function"
+  );
+}
+
+let activeService: MultiproviderService | undefined;
+
+export function setActiveMultiproviderService(service: MultiproviderService | undefined): void {
+  activeService = service;
+}
+
+export function getActiveMultiproviderService(): MultiproviderService | undefined {
+  return activeService;
+}