@narumitw/pi-usage 0.60.7 → 0.60.8

package/src/index.ts

@@ -1,51 +1,51 @@
 export {
-	CODEX_FAST_MODEL_IDS,
-	CODEX_FAST_SERVICE_TIER,
-	CODEX_STANDARD_SERVICE_TIER,
-	codexFastAvailability,
-	codexFastIsEffective,
-	codexFastRequestTier,
-	codexFastStatusLabel,
-	correctCodexFastMessageCost,
-	rewriteCodexFastPayload,
+  CODEX_FAST_MODEL_IDS,
+  CODEX_FAST_SERVICE_TIER,
+  CODEX_STANDARD_SERVICE_TIER,
+  codexFastAvailability,
+  codexFastIsEffective,
+  codexFastRequestTier,
+  codexFastStatusLabel,
+  correctCodexFastMessageCost,
+  rewriteCodexFastPayload,
 } from "./codex-fast.js";
 export type {
-	CodexResetAvailability,
-	CodexResetOption,
-	CodexResetOutcome,
-	CodexResetOutcomeCode,
+  CodexResetAvailability,
+  CodexResetOption,
+  CodexResetOutcome,
+  CodexResetOutcomeCode,
 } from "./codex-resets.js";
 export {
-	consumeCodexResetCredit,
-	listCodexResetCredits,
-	normalizeCodexResetCreditsPayload,
-	resolveCodexResetAuth,
+  consumeCodexResetCredit,
+  listCodexResetCredits,
+  normalizeCodexResetCreditsPayload,
+  resolveCodexResetAuth,
 } from "./codex-resets.js";
 export {
-	abortError,
-	awaitWithDeadline,
-	errorMessage,
-	fingerprintResolvedAuth,
-	redactUsageError,
-	runWithConcurrency,
-	sanitizeDisplayText,
-	UsageCache,
+  abortError,
+  awaitWithDeadline,
+  errorMessage,
+  fingerprintResolvedAuth,
+  redactUsageError,
+  runWithConcurrency,
+  sanitizeDisplayText,
+  UsageCache,
 } from "./core.js";
 export { formatProviderStates, formatUsageReport, formatUsageStatusline } from "./format.js";
 export { normalizeBasetenBillingUsagePayload } from "./providers/baseten.js";
 export { normalizeCodexBackendPayload } from "./providers/codex.js";
 export { normalizeDeepSeekBalancePayload } from "./providers/deepseek.js";
 export {
-	createFireworksAdapter,
-	normalizeFireworksAccountsPayload,
-	normalizeFireworksBillingSummaryPayload,
+  createFireworksAdapter,
+  normalizeFireworksAccountsPayload,
+  normalizeFireworksBillingSummaryPayload,
 } from "./providers/fireworks.js";
 export { normalizeGitHubCopilotUsagePayload } from "./providers/github-copilot.js";
 export { normalizeKimiCodingUsagePayload } from "./providers/kimi-coding.js";
 export type { MiniMaxProviderId, MiniMaxUsageKind } from "./providers/minimax.js";
 export {
-	miniMaxUsageKind,
-	normalizeMiniMaxUsagePayload,
+  miniMaxUsageKind,
+  normalizeMiniMaxUsagePayload,
 } from "./providers/minimax.js";
 export type { MoonshotProviderId } from "./providers/moonshot.js";
 export { normalizeMoonshotBalancePayload } from "./providers/moonshot.js";
@@ -55,61 +55,61 @@ export { normalizeVercelAIGatewayCreditsPayload } from "./providers/vercel-ai-ga
 export { normalizeXaiBillingPayload } from "./providers/xai.js";
 export { normalizeZaiQuotaPayload, normalizeZaiSubscriptionPayload } from "./providers/zai.js";
 export {
-	adapterForProvider,
-	isStaleExtensionContextError,
-	providerIsConfigured,
-	queryProviderUsage,
-	resolveUsageAuth,
-	SUPPORTED_ADAPTERS,
-	usageAdapters,
-	XAI_ADAPTER,
+  adapterForProvider,
+  isStaleExtensionContextError,
+  providerIsConfigured,
+  queryProviderUsage,
+  resolveUsageAuth,
+  SUPPORTED_ADAPTERS,
+  usageAdapters,
+  XAI_ADAPTER,
 } from "./query.js";
 export type {
-	UsageSettings,
-	UsageSettingsRuntime,
-	UsageSettingsState,
-	UsageTargetPublicationCheck,
+  UsageSettings,
+  UsageSettingsRuntime,
+  UsageSettingsState,
+  UsageTargetPublicationCheck,
 } from "./settings.js";
 export {
-	createUsageSettingsRuntime,
-	DEFAULT_USAGE_SETTINGS,
-	loadUsageSettings,
-	normalizeUsageSettings,
-	usageSettingsPath,
+  createUsageSettingsRuntime,
+  DEFAULT_USAGE_SETTINGS,
+  loadUsageSettings,
+  normalizeUsageSettings,
+  usageSettingsPath,
 } from "./settings.js";
 export type {
-	BasetenBillingUsagePayload,
-	DeepSeekBalancePayload,
-	FireworksAccountsPayload,
-	FireworksBillingSummaryPayload,
-	KimiCodingUsagePayload,
-	MiniMaxUsagePayload,
-	MoonshotBalancePayload,
-	ProviderUsageState,
-	ResolvedUsageAuth,
-	UsageBucket,
-	UsageDisplayState,
-	UsageMetric,
-	UsageModel,
-	UsageProviderAdapter,
-	UsageProviderTarget,
-	UsageQuerySettings,
-	UsageReport,
-	UsageRequestGuard,
-	UsageSemantics,
-	UsageSemanticsKind,
-	UsageTargetResolver,
-	UsageUnit,
-	VercelAIGatewayCreditsPayload,
-	XaiBillingPayload,
-	XaiUserPayload,
+  BasetenBillingUsagePayload,
+  DeepSeekBalancePayload,
+  FireworksAccountsPayload,
+  FireworksBillingSummaryPayload,
+  KimiCodingUsagePayload,
+  MiniMaxUsagePayload,
+  MoonshotBalancePayload,
+  ProviderUsageState,
+  ResolvedUsageAuth,
+  UsageBucket,
+  UsageDisplayState,
+  UsageMetric,
+  UsageModel,
+  UsageProviderAdapter,
+  UsageProviderTarget,
+  UsageQuerySettings,
+  UsageReport,
+  UsageRequestGuard,
+  UsageSemantics,
+  UsageSemanticsKind,
+  UsageTargetResolver,
+  UsageUnit,
+  VercelAIGatewayCreditsPayload,
+  XaiBillingPayload,
+  XaiUserPayload,
 } from "./types.js";
 export { default } from "./usage.js";
 export type { UsageTargetResolution, UsageTargetSelectOptions } from "./usage-targets.js";
 export {
-	createUsageTargetSelectOptions,
-	isBoundedTargetId,
-	listUsageTargets,
-	normalizeUsageTargets,
-	resolveUsageTarget,
+  createUsageTargetSelectOptions,
+  isBoundedTargetId,
+  listUsageTargets,
+  normalizeUsageTargets,
+  resolveUsageTarget,
 } from "./usage-targets.js";

package/src/oauth-credential-source.ts

@@ -1,88 +1,80 @@
 import type { OAuthCredential } from "@earendil-works/pi-ai";
-import {
-	type ExtensionAPI,
-	type ExtensionContext,
-	readStoredCredential,
-} from "@earendil-works/pi-coding-agent";
+import { type ExtensionAPI, type ExtensionContext, readStoredCredential } from "@earendil-works/pi-coding-agent";
 
 export const OAUTH_CREDENTIAL_SOURCE_CHANNEL = "oauth:credential-source:v1";
 
 export type StoredCredentialReader = (providerId: string) => unknown;
 
 export type OAuthCredentialCandidates =
-	| { ok: true; candidates: readonly OAuthCredential[]; offeredCount?: number }
-	| { ok: false };
+  | { 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;
 
 export function createOAuthCredentialCandidateReader(
-	pi: ExtensionAPI,
-	credentialReader: StoredCredentialReader = readStoredCredential,
+  pi: ExtensionAPI,
+  credentialReader: StoredCredentialReader = readStoredCredential,
 ): OAuthCredentialCandidateReader {
-	return (ctx, providerId) =>
-		collectOAuthCredentialCandidates(pi, ctx, providerId, credentialReader);
+  return (ctx, providerId) => collectOAuthCredentialCandidates(pi, ctx, providerId, credentialReader);
 }
 
 export function collectOAuthCredentialCandidates(
-	pi: Pick<ExtensionAPI, "events">,
-	ctx: ExtensionContext,
-	providerId: string,
-	credentialReader: StoredCredentialReader = readStoredCredential,
+  pi: Pick<ExtensionAPI, "events">,
+  ctx: ExtensionContext,
+  providerId: string,
+  credentialReader: StoredCredentialReader = readStoredCredential,
 ): OAuthCredentialCandidates {
-	const candidates: OAuthCredential[] = [];
-	let collecting = true;
-	const request = Object.freeze({
-		session: ctx.sessionManager,
-		provider: providerId,
-		offer(candidate: unknown) {
-			if (!collecting) return;
-			const clone = cloneOAuthCredential(candidate);
-			if (clone) candidates.push(clone);
-		},
-	});
-	try {
-		pi.events.emit(OAUTH_CREDENTIAL_SOURCE_CHANNEL, request);
-	} catch {
-		return { ok: false };
-	} finally {
-		collecting = false;
-	}
-	const offeredCount = candidates.length;
-	try {
-		const fallback = cloneOAuthCredential(credentialReader(providerId));
-		if (fallback) candidates.push(fallback);
-	} catch {
-		// A malformed or unavailable standalone credential is equivalent to no fallback.
-	}
-	return { ok: true, candidates, offeredCount };
+  const candidates: OAuthCredential[] = [];
+  let collecting = true;
+  const request = Object.freeze({
+    session: ctx.sessionManager,
+    provider: providerId,
+    offer(candidate: unknown) {
+      if (!collecting) return;
+      const clone = cloneOAuthCredential(candidate);
+      if (clone) candidates.push(clone);
+    },
+  });
+  try {
+    pi.events.emit(OAUTH_CREDENTIAL_SOURCE_CHANNEL, request);
+  } catch {
+    return { ok: false };
+  } finally {
+    collecting = false;
+  }
+  const offeredCount = candidates.length;
+  try {
+    const fallback = cloneOAuthCredential(credentialReader(providerId));
+    if (fallback) candidates.push(fallback);
+  } catch {
+    // A malformed or unavailable standalone credential is equivalent to no fallback.
+  }
+  return { ok: true, candidates, offeredCount };
 }
 
 export function fallbackOAuthCredentialCandidates(
-	providerId: string,
-	credentialReader: StoredCredentialReader,
+  providerId: string,
+  credentialReader: StoredCredentialReader,
 ): OAuthCredentialCandidates {
-	try {
-		const credential = cloneOAuthCredential(credentialReader(providerId));
-		return { ok: true, candidates: credential ? [credential] : [], offeredCount: 0 };
-	} catch {
-		return { ok: true, candidates: [], offeredCount: 0 };
-	}
+  try {
+    const credential = cloneOAuthCredential(credentialReader(providerId));
+    return { ok: true, candidates: credential ? [credential] : [], offeredCount: 0 };
+  } catch {
+    return { ok: true, candidates: [], offeredCount: 0 };
+  }
 }
 
 function cloneOAuthCredential(value: unknown): OAuthCredential | undefined {
-	try {
-		if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
-		const clone = structuredClone(value) as OAuthCredential;
-		if (!clone || typeof clone !== "object" || Array.isArray(clone)) return undefined;
-		if (clone.type !== "oauth") return undefined;
-		if (typeof clone.access !== "string" || !clone.access) return undefined;
-		if (typeof clone.refresh !== "string" || !clone.refresh) return undefined;
-		if (typeof clone.expires !== "number" || !Number.isFinite(clone.expires)) return undefined;
-		return clone;
-	} catch {
-		return undefined;
-	}
+  try {
+    if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
+    const clone = structuredClone(value) as OAuthCredential;
+    if (!clone || typeof clone !== "object" || Array.isArray(clone)) return undefined;
+    if (clone.type !== "oauth") return undefined;
+    if (typeof clone.access !== "string" || !clone.access) return undefined;
+    if (typeof clone.refresh !== "string" || !clone.refresh) return undefined;
+    if (typeof clone.expires !== "number" || !Number.isFinite(clone.expires)) return undefined;
+    return clone;
+  } catch {
+    return undefined;
+  }
 }

package/src/providers/baseten.ts

@@ -3,53 +3,49 @@ import type { BasetenBillingUsagePayload, UsageMetric, UsageReport } from "../ty
 const DECIMAL_AMOUNT = /^(?:0|[1-9]\d*)(?:\.\d+)?$/u;
 
 export function normalizeBasetenBillingUsagePayload(
-	payload: BasetenBillingUsagePayload,
-	capturedAt: number,
+  payload: BasetenBillingUsagePayload,
+  capturedAt: number,
 ): UsageReport {
-	if (payload.model_apis_usage === undefined || payload.model_apis_usage === null) {
-		return report(capturedAt, [], ["Baseten returned no Model APIs usage for the last 30 days."]);
-	}
-	const usage = asObject(payload.model_apis_usage);
-	if (!usage) throw new Error("Baseten Model APIs usage was not an object.");
-	const metrics: UsageMetric[] = [
-		metric("gross-usage", "Gross usage", usage.total),
-		metric("credits-used", "Credits used", usage.credits_used),
-		metric("net-subtotal", "Net subtotal", usage.subtotal),
-	];
-	return report(capturedAt, metrics);
+  if (payload.model_apis_usage === undefined || payload.model_apis_usage === null) {
+    return report(capturedAt, [], ["Baseten returned no Model APIs usage for the last 30 days."]);
+  }
+  const usage = asObject(payload.model_apis_usage);
+  if (!usage) throw new Error("Baseten Model APIs usage was not an object.");
+  const metrics: UsageMetric[] = [
+    metric("gross-usage", "Gross usage", usage.total),
+    metric("credits-used", "Credits used", usage.credits_used),
+    metric("net-subtotal", "Net subtotal", usage.subtotal),
+  ];
+  return report(capturedAt, metrics);
 }
 
 function report(capturedAt: number, metrics: UsageMetric[], notes?: string[]): UsageReport {
-	return {
-		providerId: "baseten",
-		providerName: "Baseten",
-		capturedAt,
-		source: "baseten-billing-usage-summary",
-		semantics: { kind: "api-key", label: "Organization Model APIs spend" },
-		buckets: [],
-		metrics,
-		...(notes ? { notes } : {}),
-	};
+  return {
+    providerId: "baseten",
+    providerName: "Baseten",
+    capturedAt,
+    source: "baseten-billing-usage-summary",
+    semantics: { kind: "api-key", label: "Organization Model APIs spend" },
+    buckets: [],
+    metrics,
+    ...(notes ? { notes } : {}),
+  };
 }
 
 function metric(id: string, label: string, value: unknown): UsageMetric {
-	const amount = decimalAmount(value, label);
-	return { id, label, value: amount, unit: "currency", currency: "USD" };
+  const amount = decimalAmount(value, label);
+  return { id, label, value: amount, unit: "currency", currency: "USD" };
 }
 
 function decimalAmount(value: unknown, label: string): string {
-	const normalized = typeof value === "number" && Number.isFinite(value) ? String(value) : value;
-	if (
-		typeof normalized !== "string" ||
-		normalized.length > 64 ||
-		!DECIMAL_AMOUNT.test(normalized)
-	) {
-		throw new Error(`Baseten ${label.toLowerCase()} was not a valid nonnegative amount.`);
-	}
-	return normalized;
+  const normalized = typeof value === "number" && Number.isFinite(value) ? String(value) : value;
+  if (typeof normalized !== "string" || normalized.length > 64 || !DECIMAL_AMOUNT.test(normalized)) {
+    throw new Error(`Baseten ${label.toLowerCase()} was not a valid nonnegative amount.`);
+  }
+  return normalized;
 }
 
 function asObject(value: unknown): Record<string, unknown> | undefined {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
-	return value as Record<string, unknown>;
+  if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
+  return value as Record<string, unknown>;
 }