@narumitw/pi-usage 0.60.10 → 0.60.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@narumitw/pi-usage",
-  "version": "0.60.10",
+  "version": "0.60.11",
   "description": "Pi extension that shows current-account usage and DeepSeek API balance for supported providers.",
   "type": "module",
   "license": "MIT",

package/src/codex-resets.ts

@@ -101,11 +101,18 @@ export async function resolveCodexResetAuth(
   const expectedModel = `${model.provider}/${model.id}`;
   const adapter = adapterForProvider("openai-codex");
   if (!adapter) throw new Error("OpenAI Codex usage support is unavailable.");
+  if (candidateReader?.waitUntilReady && !(await candidateReader.waitUntilReady(ctx, "openai-codex"))) {
+    throw new Error("OpenAI Codex OAuth credential readiness failed closed.");
+  }
   const auth = await resolveUsageAuth(ctx, adapter, salt, credentialReader);
   if (`${ctx.model?.provider}/${ctx.model?.id}` !== expectedModel) {
     throw new Error("The current model changed while resolving Codex reset authentication.");
   }
   if (!auth) throw new Error("No runtime credential is configured for OpenAI Codex.");
+  const offered = candidateReader
+    ? await candidateReader(ctx, "openai-codex")
+    : fallbackOAuthCredentialCandidates("openai-codex", credentialReader);
+  if (!offered.ok) throw new Error("OpenAI Codex OAuth credential discovery failed closed.");
 
   const resolvedAccess = bearerToken(headerValue(auth.headers, "Authorization")) ?? auth.apiKey;
   if (!resolvedAccess) throw new Error("OpenAI Codex OAuth credentials were incomplete.");
@@ -113,10 +120,6 @@ export async function resolveCodexResetAuth(
   if (!resolvedAccountId) {
     throw new Error("The active OpenAI Codex access token did not contain a valid account ID.");
   }
-  const offered = candidateReader
-    ? candidateReader(ctx, "openai-codex")
-    : fallbackOAuthCredentialCandidates("openai-codex", credentialReader);
-  if (!offered.ok) throw new Error("OpenAI Codex OAuth credential discovery failed closed.");
   const { accountId, storedAccess } = selectCodexResetCredential(
     offered.candidates,
     resolvedAccess,

package/src/oauth-credential-source.ts

@@ -2,6 +2,7 @@ import type { OAuthCredential } from "@earendil-works/pi-ai";
 import { type ExtensionAPI, type ExtensionContext, readStoredCredential } from "@earendil-works/pi-coding-agent";
 
 export const OAUTH_CREDENTIAL_SOURCE_CHANNEL = "oauth:credential-source:v1";
+export const OAUTH_CREDENTIAL_READINESS_CHANNEL = "oauth:credential-readiness:v1";
 
 export type StoredCredentialReader = (providerId: string) => unknown;
 
@@ -9,13 +10,19 @@ export type OAuthCredentialCandidates =
   | { ok: true; candidates: readonly OAuthCredential[]; offeredCount?: number }
   | { ok: false };
 
-export type OAuthCredentialCandidateReader = (ctx: ExtensionContext, providerId: string) => OAuthCredentialCandidates;
+export type OAuthCredentialCandidateReader = {
+  (ctx: ExtensionContext, providerId: string): OAuthCredentialCandidates | Promise<OAuthCredentialCandidates>;
+  waitUntilReady?(ctx: ExtensionContext, providerId: string): Promise<boolean>;
+};
 
 export function createOAuthCredentialCandidateReader(
   pi: ExtensionAPI,
   credentialReader: StoredCredentialReader = readStoredCredential,
 ): OAuthCredentialCandidateReader {
-  return (ctx, providerId) => collectOAuthCredentialCandidates(pi, ctx, providerId, credentialReader);
+  const reader: OAuthCredentialCandidateReader = (ctx, providerId) =>
+    collectOAuthCredentialCandidates(pi, ctx, providerId, credentialReader);
+  reader.waitUntilReady = (ctx, providerId) => waitForOAuthCredentialSources(pi, ctx, providerId);
+  return reader;
 }
 
 export function collectOAuthCredentialCandidates(
@@ -52,6 +59,36 @@ export function collectOAuthCredentialCandidates(
   return { ok: true, candidates, offeredCount };
 }
 
+async function waitForOAuthCredentialSources(
+  pi: Pick<ExtensionAPI, "events">,
+  ctx: ExtensionContext,
+  providerId: string,
+): Promise<boolean> {
+  const pending: Promise<unknown>[] = [];
+  let collecting = true;
+  const request = Object.freeze({
+    session: ctx.sessionManager,
+    provider: providerId,
+    waitUntil(value: unknown) {
+      if (!collecting || !(value instanceof Promise)) return;
+      pending.push(value);
+    },
+  });
+  try {
+    pi.events.emit(OAUTH_CREDENTIAL_READINESS_CHANNEL, request);
+  } catch {
+    return false;
+  } finally {
+    collecting = false;
+  }
+  try {
+    await Promise.all(pending);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export function fallbackOAuthCredentialCandidates(
   providerId: string,
   credentialReader: StoredCredentialReader,

package/src/query.ts

@@ -343,6 +343,13 @@ export async function resolveUsageAuth(
 
   const model = candidateModels(ctx, adapter.id).find((candidate) => hasOfficialOrigin(candidate, adapter.id));
   if (!model) return undefined;
+  if (
+    ["github-copilot", "xai"].includes(adapter.id) &&
+    candidateReader?.waitUntilReady &&
+    !(await candidateReader.waitUntilReady(ctx, adapter.id))
+  ) {
+    throw new Error(`${adapter.displayName} OAuth credential readiness failed closed.`);
+  }
   // SAFETY: Pi exposes the required auth methods at runtime, and checks below narrow them before use.
   const registry = ctx.modelRegistry as unknown as UsageAuthRegistry;
   const provider = registry.getProvider?.(adapter.id);
@@ -416,7 +423,7 @@ export async function resolveUsageAuth(
   };
   if (adapter.id === "github-copilot") {
     const offered = candidateReader
-      ? candidateReader(ctx, adapter.id)
+      ? await candidateReader(ctx, adapter.id)
       : fallbackOAuthCredentialCandidates(adapter.id, credentialReader);
     if (!offered.ok) {
       throw new Error("GitHub Copilot OAuth credential discovery failed closed.");
@@ -425,7 +432,7 @@ export async function resolveUsageAuth(
   }
   if (adapter.id === "xai") {
     const offered = candidateReader
-      ? candidateReader(ctx, adapter.id)
+      ? await candidateReader(ctx, adapter.id)
       : fallbackOAuthCredentialCandidates(adapter.id, credentialReader);
     if (!offered.ok) throw new Error("xAI OAuth credential discovery failed closed.");
     return finalize(resolveXaiUsageAuth(auth, model, salt, offered.candidates));