pi-better-openai 0.1.19 → 0.1.21

package/README.md

@@ -23,7 +23,7 @@ Usage display and image generation require pi's `openai-codex` OAuth credentials
 1. In pi, run `/login openai-codex`.
 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 and global generated-image directory use that agent directory instead of `~/.pi/agent`.
+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.
 
 ## Features
 
@@ -45,7 +45,7 @@ Usage display and image generation require pi's `openai-codex` OAuth credentials
 The extension reads JSON config from two locations:
 
 - Project config: `.pi/extensions/pi-better-openai.json`
-- Global config: `~/.pi/agent/extensions/pi-better-openai.json`
+- Global config: `$PI_CODING_AGENT_DIR/extensions/pi-better-openai.json`, defaulting to `~/.pi/agent/extensions/pi-better-openai.json`
 
 Project overrides global. Global values fill fields omitted by the project file. Invalid enum values are ignored, and numeric settings are clamped to safe ranges.
 
@@ -105,7 +105,7 @@ Agents can call the `openai_image` tool directly. Supported parameters:
 
 - `prompt` (required): pass the user's image wording verbatim.
 - `action`: `auto`, `generate`, or `edit`.
-- `images`: project-local reference/edit image paths. Paths must stay inside the current workspace and point to readable PNG, JPEG, WebP, or GIF files.
+- `images`: up to five distinct project-local reference/edit image paths. Paths must stay inside the current workspace and point to readable PNG, JPEG, WebP, or GIF files; each file is limited to 20 MB and the combined input to 50 MB.
 - `model`: Codex image model override, for example `openai-codex/gpt-5.5`.
 - `outputFormat`: `png`, `jpeg`, or `webp`.
 - `save`: `project`, `global`, `custom`, or `none`.
@@ -115,7 +115,7 @@ Save modes:
 
 - `project` writes to `.pi/generated-images/` in the current project.
 - `global` writes to the agent `generated-images` directory, normally `~/.pi/agent/generated-images/` or `$PI_CODING_AGENT_DIR/generated-images/`.
-- `custom` writes to `saveDir` or `PI_IMAGE_SAVE_DIR`.
+- `custom` writes to `saveDir` or `PI_IMAGE_SAVE_DIR`; relative paths are resolved from the current project.
 - `none` returns the image without saving it.
 
 The repository ignores `.pi/`, so generated images and local config should not be committed.

package/index.ts

@@ -9,10 +9,16 @@ import {
   getSettingsListTheme,
   type ExtensionAPI,
   type ExtensionContext,
-} from "@mariozechner/pi-coding-agent";
-import { Container, Key, matchesKey, SettingsList } from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-coding-agent";
+import { Container, Key, matchesKey, SettingsList } from "@earendil-works/pi-tui";
 import { CONFIG_BASENAME, STATUS_KEY } from "./src/identity.ts";
-import { formatTokens, sanitizeStatusText, truncateToWidth, visibleWidth } from "./src/format.ts";
+import {
+  formatTokens,
+  redactDiagnosticValue,
+  sanitizeStatusText,
+  truncateToWidth,
+  visibleWidth,
+} from "./src/format.ts";
 import {
   DEFAULT_CONFIG,
   DEFAULT_IMAGE_CONFIG,
@@ -49,6 +55,7 @@ import {
   type CodexPetPackage,
   codexHome,
   describeCodexPetSelectionIssue,
+  findCodexPet,
   findReadyCodexPet,
   formatNoReadyCodexPetsMessage,
   listCodexPets,
@@ -91,6 +98,10 @@ function isInlinePetPlacement(placement: PetPlacement): boolean {
   return placement === "inline-left" || placement === "inline-right" || placement === "badge";
 }
 
+function hasTerminalUI(ctx: ExtensionContext): boolean {
+  return ctx.mode === "tui" || (ctx.mode === undefined && ctx.hasUI);
+}
+
 function petSizeCellsForPlacement(placement: PetPlacement, sizeCells: number): number {
   return placement === "badge" ? Math.min(6, sizeCells) : sizeCells;
 }
@@ -108,19 +119,10 @@ function petSlugFromPickerValue(value: string): string {
   return value === PET_EMPTY_VALUE ? "" : value;
 }
 
-function petPickerLookupKey(value: string): string {
-  return value.toLowerCase().replace(/[^a-z0-9]+/g, "");
-}
-
 function findPickerPet(value: string, pets: CodexPetPackage[]): CodexPetPackage | undefined {
-  const requested = petPickerLookupKey(value.trim());
-  if (!requested) return undefined;
-  return pets.find(
-    (pet) =>
-      pet.hasSpritesheet &&
-      (petPickerLookupKey(pet.slug) === requested ||
-        petPickerLookupKey(pet.name) === requested ||
-        (pet.id !== undefined && petPickerLookupKey(pet.id) === requested)),
+  return findCodexPet(
+    pets.filter((pet) => pet.hasSpritesheet),
+    value,
   );
 }
 
@@ -245,12 +247,32 @@ function combineInlinePetFooter(
   return lines;
 }
 
+function textPanel(title: string, lines: string[], done: () => void) {
+  return {
+    render(width: number) {
+      const clipped = lines.map((line) => truncateToWidth(line, width, "..."));
+      return [title, "", ...clipped, "", "Esc/q to go back"];
+    },
+    invalidate() {},
+    handleInput(data: string) {
+      if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl("c")) || data === "q") done();
+    },
+  };
+}
+
 export default function betterOpenAI(pi: ExtensionAPI): void {
   const fastController = new FastController(SERVICE_TIER);
   let cachedConfig: ResolvedConfig | undefined;
   let footerTotals = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
   let footerInstalled = false;
   let statusInstalled = false;
+  let contextUsageCached = false;
+  let cachedContextUsage: ReturnType<ExtensionContext["getContextUsage"]>;
+  let cachedContextLeafId: string | null | undefined;
+  let cachedContextModel: ExtensionContext["model"];
+  let sessionNameCached = false;
+  let cachedSessionNameLeafId: string | null | undefined;
+  let cachedSessionName: string | undefined;
   const usageController = new UsageController(config, updateFooter);
   const petController = new PetFooterController(config, updateFooter, () => footerInstalled);
 
@@ -310,6 +332,41 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
     }
   }
 
+  function invalidateContextUsage(): void {
+    contextUsageCached = false;
+    cachedContextUsage = undefined;
+    cachedContextLeafId = undefined;
+    cachedContextModel = undefined;
+  }
+
+  function contextUsage(ctx: ExtensionContext): ReturnType<ExtensionContext["getContextUsage"]> {
+    const leafId = ctx.sessionManager.getLeafId();
+    const model = ctx.model;
+    if (!contextUsageCached || leafId !== cachedContextLeafId || model !== cachedContextModel) {
+      cachedContextUsage = ctx.getContextUsage();
+      contextUsageCached = true;
+      cachedContextLeafId = leafId;
+      cachedContextModel = model;
+    }
+    return cachedContextUsage;
+  }
+
+  function sessionName(ctx: ExtensionContext): string | undefined {
+    const leafId = ctx.sessionManager.getLeafId();
+    if (!sessionNameCached || leafId !== cachedSessionNameLeafId) {
+      cachedSessionName = ctx.sessionManager.getSessionName();
+      cachedSessionNameLeafId = leafId;
+      sessionNameCached = true;
+    }
+    return cachedSessionName;
+  }
+
+  function invalidateSessionName(): void {
+    sessionNameCached = false;
+    cachedSessionNameLeafId = undefined;
+    cachedSessionName = undefined;
+  }
+
   pi.registerFlag(FLAG, {
     description: "Start with OpenAI fast mode enabled (service_tier=priority)",
     type: "boolean",
@@ -353,19 +410,6 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
     },
   });
 
-  function textPanel(title: string, lines: string[], done: () => void) {
-    return {
-      render(width: number) {
-        const clipped = lines.map((line) => truncateToWidth(line, width, "..."));
-        return [title, "", ...clipped, "", "Esc/q to go back"];
-      },
-      invalidate() {},
-      handleInput(data: string) {
-        if (data.includes("\x1b") || data === "escape" || data === "q" || data === "\x03") done();
-      },
-    };
-  }
-
   function buildPetSettingsItems(cfg: ResolvedConfig): SettingsPickerItem[] {
     return settingsItemsFromDescriptors(PET_SETTING_DESCRIPTORS, cfg, {
       "pets.slug": {
@@ -608,10 +652,7 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
     });
   }
 
-  function buildFastSettingsItems(
-    ctx: ExtensionContext,
-    cfg: ResolvedConfig,
-  ): SettingsPickerItem[] {
+  function buildFastSettingsItems(cfg: ResolvedConfig): SettingsPickerItem[] {
     return [
       {
         id: "fast.enabled",
@@ -659,11 +700,13 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
         id: "config.print",
         label: "Print config",
         currentValue: "open",
-        description: "Show the selected raw config JSON.",
+        description: "Show the selected config JSON with sensitive fields redacted.",
         submenu: (_value, done) =>
           textPanel(
             "Config",
-            JSON.stringify(readRawConfig(cfg.configPath), null, 2).split("\n"),
+            JSON.stringify(redactDiagnosticValue(readRawConfig(cfg.configPath)), null, 2).split(
+              "\n",
+            ),
             () => done(),
           ),
       },
@@ -680,7 +723,7 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
         submenu: (_value, done) =>
           settingsSubmenu(
             "Fast mode settings",
-            () => buildFastSettingsItems(ctx, config(ctx)),
+            () => buildFastSettingsItems(config(ctx)),
             ctx,
             () => done(fastSettingsSummary(ctx, config(ctx))),
           ),
@@ -803,6 +846,10 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
   }
 
   async function showSettingsPicker(ctx: ExtensionContext): Promise<void> {
+    if (!hasTerminalUI(ctx)) {
+      ctx.ui.notify("Better OpenAI settings require interactive TUI mode.", "warning");
+      return;
+    }
     try {
       petController.settingsPets = await listCodexPets();
     } catch {
@@ -887,7 +934,12 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
         slug: selectedPet.slug,
       });
       updateFooter(ctx);
-      await petController.refresh(ctx, next, true);
+      if (hasTerminalUI(ctx)) await petController.refresh(ctx, next, true);
+      else
+        ctx.ui.notify(
+          `Enabled ${selectedPet.name} (${selectedPet.slug}); footer pets render in interactive TUI mode.`,
+          "info",
+        );
     },
     tuck: (ctx) => {
       writePetConfig(ctx, { enabled: false });
@@ -912,8 +964,14 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
 
       const next = writePetConfig(ctx, { slug: selectedPet.slug });
       updateFooter(ctx);
-      if (petController.shouldLoadForConfig(next)) await petController.refresh(ctx, next, true);
-      else {
+      if (petController.shouldLoadForConfig(next)) {
+        if (hasTerminalUI(ctx)) await petController.refresh(ctx, next, true);
+        else
+          ctx.ui.notify(
+            `Selected ${selectedPet.name} (${selectedPet.slug}); footer pets render in interactive TUI mode.`,
+            "info",
+          );
+      } else {
         ctx.ui.notify(
           `Selected ${selectedPet.name} (${selectedPet.slug}) for the footer pet. Use /pets wake to show it.`,
           "info",
@@ -966,8 +1024,8 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
           const branch = footerData.getGitBranch?.();
           if (branch) pwd = `${pwd} (${branch})`;
 
-          const sessionName = ctx.sessionManager.getSessionName();
-          if (sessionName) pwd = `${pwd} • ${sessionName}`;
+          const currentSessionName = sessionName(ctx);
+          if (currentSessionName) pwd = `${pwd} • ${currentSessionName}`;
 
           const parts: string[] = [];
           if (totalInput) parts.push(`↑${formatTokens(totalInput)}`);
@@ -979,11 +1037,11 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
           if (totalCost || usingSubscription)
             parts.push(`$${totalCost.toFixed(3)}${usingSubscription ? " (sub)" : ""}`);
 
-          const contextUsage = ctx.getContextUsage();
-          const contextWindow = contextUsage?.contextWindow ?? ctx.model?.contextWindow ?? 0;
-          const contextPercentValue = contextUsage?.percent ?? 0;
+          const currentContextUsage = contextUsage(ctx);
+          const contextWindow = currentContextUsage?.contextWindow ?? ctx.model?.contextWindow ?? 0;
+          const contextPercentValue = currentContextUsage?.percent ?? 0;
           const contextPercent =
-            contextUsage?.percent !== null ? contextPercentValue.toFixed(1) : "?";
+            currentContextUsage?.percent !== null ? contextPercentValue.toFixed(1) : "?";
           const contextDisplay =
             contextPercent === "?"
               ? `?/${formatTokens(contextWindow)} (auto)`
@@ -997,12 +1055,11 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
           parts.push(contextText);
 
           const cfg = config(ctx);
-          const cfgForPets = cfg;
-          const shouldRenderPet = petController.shouldRenderInFooter(cfgForPets);
-          const requestedPetPlacement = cfgForPets.pets.placement;
+          const shouldRenderPet = petController.shouldRenderInFooter(cfg);
+          const requestedPetPlacement = cfg.pets.placement;
           const requestedPetSizeCells = petSizeCellsForPlacement(
             requestedPetPlacement,
-            cfgForPets.pets.sizeCells,
+            cfg.pets.sizeCells,
           );
           const inlinePet = Boolean(
             shouldRenderPet &&
@@ -1010,11 +1067,11 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
             isInlinePetPlacement(requestedPetPlacement) &&
             width >= requestedPetSizeCells + 32,
           );
-          const petRenderSizeCells = inlinePet ? requestedPetSizeCells : cfgForPets.pets.sizeCells;
+          const petRenderSizeCells = inlinePet ? requestedPetSizeCells : cfg.pets.sizeCells;
           const petColumnWidth = Math.min(petRenderSizeCells, Math.max(1, width - 1));
           const footerTextWidth = inlinePet ? Math.max(1, width - petColumnWidth - 2) : width;
 
-          const usageStatusLine = usageController.statusLine(ctx, cfg);
+          const usageStatusLine = usageController.statusLine(ctx, cfg, usingSubscription);
           const usageLine = usageStatusLine ? theme.fg("dim", usageStatusLine) : undefined;
 
           let statsLeft = parts.join(" ");
@@ -1027,7 +1084,7 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
           const modelName = ctx.model?.id || "no-model";
           const thinkingLevel = pi.getThinkingLevel();
           const fastSuffix =
-            fastController.active && supportsFast(ctx, config(ctx).supportedModels) ? " fast" : "";
+            fastController.active && supportsFast(ctx, cfg.supportedModels) ? " fast" : "";
           let rightWithoutProvider = modelName;
           if (ctx.model?.reasoning) {
             rightWithoutProvider =
@@ -1084,7 +1141,7 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
             textLines.push(truncateToWidth(statusLine, footerTextWidth, theme.fg("dim", "...")));
           }
 
-          const petLines = petController.renderPetLines(ctx, cfgForPets, {
+          const petLines = petController.renderPetLines(ctx, cfg, {
             shouldRenderPet,
             freezePetFrame,
             requestedPetPlacement,
@@ -1140,6 +1197,18 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
 
   function updateFooter(ctx: ExtensionContext): void {
     const cfg = config(ctx);
+
+    if (!hasTerminalUI(ctx)) {
+      if (cfg.footer.mode === "off") {
+        setStatus(ctx, undefined);
+        return;
+      }
+      const fast = fastController.statusSegment(ctx, cfg);
+      const usage = usageController.statusLine(ctx, cfg);
+      setStatus(ctx, [fast, usage].filter(Boolean).join(" | ") || undefined);
+      return;
+    }
+
     petController.updateActivity(ctx, cfg);
     const shouldRenderPet = petController.shouldRenderInFooter(cfg);
 
@@ -1162,6 +1231,8 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
   }
 
   pi.on("session_start", (_event, ctx) => {
+    invalidateContextUsage();
+    invalidateSessionName();
     const nextConfig = refresh(ctx);
     fastController.initializeForSession(ctx, nextConfig, pi.getFlag(FLAG) === true);
     if (
@@ -1172,15 +1243,16 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
     if (fastController.desiredActive && !fastController.active) {
       ctx.ui.notify(fastController.unsupportedRequestMessage(ctx, nextConfig), "warning");
     }
-    petController.installResizeGuard(ctx);
+    if (hasTerminalUI(ctx)) petController.installResizeGuard(ctx);
     refreshFooterTotals(ctx);
     updateFooter(ctx);
-    if (nextConfig.pets.enabled) void petController.refresh(ctx, nextConfig);
+    if (hasTerminalUI(ctx) && nextConfig.pets.enabled) void petController.refresh(ctx, nextConfig);
     usageController.start(ctx);
     if (fastController.active) ctx.ui.notify(fastController.stateText(ctx, nextConfig), "info");
   });
 
   pi.on("agent_start", (_event, ctx) => {
+    invalidateContextUsage();
     petController.agentStart(ctx);
     updateFooter(ctx);
   });
@@ -1200,13 +1272,21 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
     updateFooter(ctx);
   });
 
-  pi.on("turn_end", (_event, ctx) => {
-    refreshFooterTotals(ctx);
+  pi.on("turn_end", (event, ctx) => {
+    invalidateContextUsage();
+    if (event.message?.role === "assistant") {
+      footerTotals.input += event.message.usage.input;
+      footerTotals.output += event.message.usage.output;
+      footerTotals.cacheRead += event.message.usage.cacheRead;
+      footerTotals.cacheWrite += event.message.usage.cacheWrite;
+      footerTotals.cost += event.message.usage.cost.total;
+    } else refreshFooterTotals(ctx);
     updateFooter(ctx);
     void usageController.refresh(ctx);
   });
 
   pi.on("session_compact", (_event, ctx) => {
+    invalidateContextUsage();
     refreshFooterTotals(ctx);
     petController.queueKittyCleanup();
     petController.resetRenderCache();
@@ -1214,6 +1294,7 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
   });
 
   pi.on("session_tree", (_event, ctx) => {
+    invalidateContextUsage();
     refreshFooterTotals(ctx);
     petController.queueKittyCleanup();
     petController.resetRenderCache();
@@ -1221,6 +1302,7 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
   });
 
   pi.on("model_select", (event, ctx) => {
+    invalidateContextUsage();
     const cfg = config(ctx);
     const wasActive = fastController.active;
     fastController.applyDesiredState(ctx, cfg);
@@ -1238,6 +1320,8 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
   });
 
   pi.on("session_shutdown", () => {
+    invalidateContextUsage();
+    invalidateSessionName();
     usageController.shutdown();
     petController.shutdown();
   });
@@ -1245,6 +1329,10 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
   pi.on("before_provider_request", (event, ctx) => {
     return fastController.injectProviderPayload(event, ctx, config(ctx));
   });
+
+  pi.on("message_start", invalidateContextUsage);
+  pi.on("message_update", invalidateContextUsage);
+  pi.on("message_end", invalidateContextUsage);
 }
 
 export const _test = {
@@ -1273,6 +1361,7 @@ export const _test = {
   formatPercent,
   formatUsageSnapshot,
   readCodexAuth,
+  textPanel,
   imageTest: _imageTest,
   petsTest: _petsTest,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-openai",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "Personal pi extension that improves OpenAI with fast mode, usage stats, and footer polish.",
   "keywords": [
     "fast",
@@ -41,6 +41,8 @@
     "sharp": "^0.34.5"
   },
   "devDependencies": {
+    "@earendil-works/pi-coding-agent": "0.80.6",
+    "@earendil-works/pi-tui": "0.80.6",
     "@types/node": "^24.13.2",
     "oxfmt": "^0.47.0",
     "oxlint": "^1.62.0",
@@ -48,11 +50,11 @@
     "vitest": "^4.1.5"
   },
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": ">=0.57.0",
-    "@mariozechner/pi-tui": "*"
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*"
   },
   "engines": {
-    "node": ">=20.6.0"
+    "node": ">=22.19.0"
   },
   "pi": {
     "extensions": [

package/src/codex-auth.ts

@@ -1,10 +1,9 @@
 import { readFileSync } from "node:fs";
-import { homedir } from "node:os";
 import { join } from "node:path";
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { piAgentDir } from "./paths.ts";
 
-const AGENT_DIR = process.env.PI_CODING_AGENT_DIR?.trim() || join(homedir(), ".pi", "agent");
-export const AUTH_FILE = join(AGENT_DIR, "auth.json");
+export const AUTH_FILE = join(piAgentDir(), "auth.json");
 
 export type CodexCredentials = {
   accessToken: string;
@@ -15,6 +14,30 @@ export type CodexCredentialsWithSource = CodexCredentials & {
   source: "modelRegistry" | "authFile";
 };
 
+function waitForSignal<T>(operation: Promise<T>, signal?: AbortSignal): Promise<T> {
+  if (!signal) return operation;
+  if (signal.aborted) return Promise.reject(signal.reason ?? new Error("Operation was aborted."));
+
+  return new Promise<T>((resolve, reject) => {
+    const onAbort = () => {
+      cleanup();
+      reject(signal.reason ?? new Error("Operation was aborted."));
+    };
+    const cleanup = () => signal.removeEventListener("abort", onAbort);
+    signal.addEventListener("abort", onAbort, { once: true });
+    void operation.then(
+      (value) => {
+        cleanup();
+        resolve(value);
+      },
+      (error: unknown) => {
+        cleanup();
+        reject(error);
+      },
+    );
+  });
+}
+
 function decodeBase64Url(value: string): string {
   const normalized = value.replace(/-/g, "+").replace(/_/g, "/");
   const padded = normalized + "=".repeat((4 - (normalized.length % 4)) % 4);
@@ -79,11 +102,13 @@ export function readCodexAuth(): CodexCredentials | undefined {
           access?: string | null;
           accountId?: string | null;
           account_id?: string | null;
+          expires?: number | null;
         }
       | undefined
     >;
     const entry = auth["openai-codex"];
     if (entry?.type !== "oauth") return undefined;
+    if (typeof entry.expires === "number" && Date.now() >= entry.expires) return undefined;
     const accessToken = entry.access?.trim();
     const accountId = (entry.accountId ?? entry.account_id)?.trim();
     return accessToken && accountId ? { accessToken, accountId } : undefined;
@@ -94,10 +119,16 @@ export function readCodexAuth(): CodexCredentials | undefined {
 
 export async function getCodexCredentials(
   ctx?: Pick<ExtensionContext, "modelRegistry">,
+  signal?: AbortSignal,
 ): Promise<CodexCredentialsWithSource | undefined> {
-  const registryToken = await ctx?.modelRegistry
-    ?.getApiKeyForProvider("openai-codex")
-    .catch(() => undefined);
+  if (signal?.aborted) throw signal.reason ?? new Error("Operation was aborted.");
+  const registryRequest = ctx?.modelRegistry?.getApiKeyForProvider("openai-codex");
+  const registryToken = registryRequest
+    ? await waitForSignal(
+        registryRequest.catch(() => undefined),
+        signal,
+      )
+    : undefined;
   const registryCredentials = parseCodexRegistryCredentials(registryToken);
   if (registryCredentials) return { ...registryCredentials, source: "modelRegistry" };
   const auth = readCodexAuth();

package/src/config.ts

@@ -2,6 +2,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { CONFIG_BASENAME, logPrefix } from "./identity.ts";
+import { piAgentDir } from "./paths.ts";
 
 export const FOOTER_MODES = ["replace", "status", "off"] as const;
 export const IMAGE_SAVE_MODES = ["none", "project", "global", "custom"] as const;
@@ -409,10 +410,10 @@ export function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-export function configPaths(cwd: string, home = homedir()) {
+export function configPaths(cwd: string, home = homedir(), env = process.env) {
   return {
     project: join(cwd, ".pi", "extensions", CONFIG_BASENAME),
-    global: join(home, ".pi", "agent", "extensions", CONFIG_BASENAME),
+    global: join(piAgentDir(env, home), "extensions", CONFIG_BASENAME),
   };
 }
 

package/src/fast-controller.ts

@@ -1,4 +1,4 @@
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { ResolvedConfig, SupportedModel } from "./config.ts";
 import { isRecord } from "./config.ts";