@narumitw/pi-usage 0.59.0 → 0.60.1

package/package.json

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

package/src/core.ts

@@ -54,13 +54,39 @@ export class UsageCache {
 }
 
 export function fingerprintResolvedAuth(
-	auth: { apiKey?: string; headers?: Record<string, string> },
+	auth: {
+		apiKey?: string;
+		headers?: Record<string, string | null>;
+		baseUrl?: string;
+		env?: Record<string, string>;
+		source?: string;
+		providerAuth?: {
+			apiKey?: string;
+			headers?: Record<string, string | null>;
+			baseUrl?: string;
+		};
+	},
 	salt: Uint8Array,
 ): string {
 	const headers = Object.entries(auth.headers ?? {})
 		.map(([name, value]) => [name.toLowerCase(), value] as const)
 		.sort(([left], [right]) => left.localeCompare(right));
-	const canonical = JSON.stringify({ apiKey: auth.apiKey ?? "", headers });
+	const env = Object.entries(auth.env ?? {}).sort(([left], [right]) => left.localeCompare(right));
+	const providerHeaders = Object.entries(auth.providerAuth?.headers ?? {})
+		.map(([name, value]) => [name.toLowerCase(), value] as const)
+		.sort(([left], [right]) => left.localeCompare(right));
+	const canonical = JSON.stringify({
+		apiKey: auth.apiKey ?? "",
+		headers,
+		baseUrl: auth.baseUrl ?? "",
+		env,
+		source: auth.source ?? "",
+		providerAuth: {
+			apiKey: auth.providerAuth?.apiKey ?? "",
+			headers: providerHeaders,
+			baseUrl: auth.providerAuth?.baseUrl ?? "",
+		},
+	});
 	return createHmac("sha256", salt).update(canonical).digest("hex");
 }
 

package/src/format.ts

@@ -94,6 +94,9 @@ export function formatProviderStates(states: readonly ProviderUsageState[]): str
 		.map((state) => {
 			if (state.status === "ready") return formatUsageReport(state.report, state.displayState);
 			const label = state.displayState === "current" ? "Current" : "Configured";
+			if (state.status === "selection-required") {
+				return `${state.providerName} · ${label}\nSelection required: choose this provider's ${state.singularLabel} by viewing it individually.`;
+			}
 			const status =
 				state.status === "auth-unavailable"
 					? "Authentication unavailable"
@@ -269,6 +272,10 @@ function formatOpenRouterReport(lines: string[], report: UsageReport): void {
 
 function formatOpenCodeZenReport(lines: string[], report: UsageReport): void {
 	for (const bucket of report.buckets) {
+		if (bucket.unit === "percent" && bucket.used !== undefined) {
+			lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${formatPercentBucket(bucket)}`);
+			continue;
+		}
 		const reset = bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : "";
 		const used = bucket.used ?? "unavailable";
 		lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${used}% used${reset}`);
@@ -469,8 +476,7 @@ function formatXaiReport(lines: string[], report: UsageReport): void {
 	if (included) {
 		let value = "unavailable";
 		if (included.unit === "percent" && included.used !== undefined) {
-			value = `${included.used}% used`;
-			if (included.remaining !== undefined) value += ` · ${included.remaining}% left`;
+			value = formatPercentBar(included);
 		} else if (included.used !== undefined) {
 			value = `${formatUsd(included.used)} used`;
 			if (included.limit !== undefined) value += ` of ${formatUsd(included.limit)}`;
@@ -497,12 +503,13 @@ function formatXaiReport(lines: string[], report: UsageReport): void {
 
 function formatZaiReport(lines: string[], report: UsageReport): void {
 	for (const bucket of report.buckets) {
+		if (bucket.unit === "percent" && bucket.used !== undefined) {
+			lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${formatPercentBucket(bucket)}`);
+			continue;
+		}
 		const reset = bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : "";
 		let value = "unavailable";
-		if (bucket.unit === "percent" && bucket.used !== undefined) {
-			value = `${bucket.used}% used`;
-			if (bucket.remaining !== undefined) value += ` · ${bucket.remaining}% left`;
-		} else if (bucket.used !== undefined && bucket.limit !== undefined) {
+		if (bucket.used !== undefined && bucket.limit !== undefined) {
 			value = `${bucket.used} of ${bucket.limit} used`;
 			if (bucket.remaining !== undefined) value += ` · ${bucket.remaining} left`;
 		} else if (bucket.used !== undefined) {
@@ -637,10 +644,13 @@ function compactLimitLabel(label: string): string {
 }
 
 function formatPercentBucket(bucket: UsageBucket): string {
+	return `${formatPercentBar(bucket)}${bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : ""}`;
+}
+
+function formatPercentBar(bucket: UsageBucket): string {
 	const remaining = clampPercent(bucket.remaining ?? 0);
 	const filled = Math.round((remaining / 100) * BAR_SEGMENTS);
-	const reset = bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : "";
-	return `[${"█".repeat(filled)}${"░".repeat(BAR_SEGMENTS - filled)}] ${remaining.toFixed(0)}% left${reset}`;
+	return `[${"█".repeat(filled)}${"░".repeat(BAR_SEGMENTS - filled)}] ${remaining.toFixed(0)}% left`;
 }
 
 function formatWindowLabel(

package/src/index.ts

@@ -36,6 +36,7 @@ export { normalizeBasetenBillingUsagePayload } from "./providers/baseten.js";
 export { normalizeCodexBackendPayload } from "./providers/codex.js";
 export { normalizeDeepSeekBalancePayload } from "./providers/deepseek.js";
 export {
+	createFireworksAdapter,
 	normalizeFireworksAccountsPayload,
 	normalizeFireworksBillingSummaryPayload,
 } from "./providers/fireworks.js";
@@ -52,7 +53,7 @@ export { normalizeOpenCodeZenPayload } from "./providers/opencode-zen.js";
 export { normalizeOpenRouterKeyPayload } from "./providers/openrouter.js";
 export { normalizeVercelAIGatewayCreditsPayload } from "./providers/vercel-ai-gateway.js";
 export { normalizeXaiBillingPayload } from "./providers/xai.js";
-export { normalizeZaiQuotaPayload } from "./providers/zai.js";
+export { normalizeZaiQuotaPayload, normalizeZaiSubscriptionPayload } from "./providers/zai.js";
 export {
 	adapterForProvider,
 	isStaleExtensionContextError,
@@ -67,6 +68,7 @@ export type {
 	UsageSettings,
 	UsageSettingsRuntime,
 	UsageSettingsState,
+	UsageTargetPublicationCheck,
 } from "./settings.js";
 export {
 	createUsageSettingsRuntime,
@@ -90,13 +92,24 @@ export type {
 	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,
+} from "./usage-targets.js";

package/src/providers/fireworks.ts

@@ -2,7 +2,9 @@ import { sanitizeDisplayText } from "../core.js";
 import type {
 	FireworksAccountsPayload,
 	FireworksBillingSummaryPayload,
+	ResolvedUsageAuth,
 	UsageMetric,
+	UsageProviderAdapter,
 	UsageReport,
 } from "../types.js";
 
@@ -14,6 +16,9 @@ const INT64_MIN = -(2n ** 63n);
 const INT64_MAX = 2n ** 63n - 1n;
 const MAX_UNITS_CHARS = 20;
 const MAX_NANOS_CHARS = 11;
+const FIREWORKS_BILLING_SUMMARY_ORIGIN = "https://api.fireworks.ai";
+const FIREWORKS_SPEND_WINDOW_DAYS = 30;
+const FIREWORKS_MAX_ACCOUNT_PAGES = 5;
 
 const SERIES_KEYS = ["serverless", "dedicated", "training", "other"] as const;
 type SeriesKey = (typeof SERIES_KEYS)[number];
@@ -53,6 +58,77 @@ export function normalizeFireworksAccountsPayload(payload: FireworksAccountsPayl
 	return accounts;
 }
 
+type FetchProviderJson = (
+	url: string,
+	auth: ResolvedUsageAuth,
+	signal: AbortSignal,
+	timeoutMs: number,
+	description: string,
+	request?: { redirect?: RequestRedirect },
+) => Promise<Record<string, unknown>>;
+
+export function createFireworksAdapter(fetchProviderJson: FetchProviderJson): UsageProviderAdapter {
+	return {
+		id: "fireworks",
+		displayName: "Fireworks",
+		semantics: { kind: "api-key", label: "Fireworks API spend" },
+		targets: {
+			singularLabel: "account",
+			pluralLabel: "accounts",
+			async list(auth, signal, timeoutMs, guard) {
+				const startedAt = Date.now();
+				const accounts: string[] = [];
+				let pageToken: string | undefined;
+				for (let page = 0; page < FIREWORKS_MAX_ACCOUNT_PAGES; page += 1) {
+					await guard();
+					const payload = (await fetchProviderJson(
+						fireworksAccountsUrl(pageToken),
+						auth,
+						signal,
+						remainingTimeout(timeoutMs, startedAt, "fetching Fireworks accounts"),
+						"Fireworks accounts endpoint",
+						{ redirect: "error" },
+					)) as FireworksAccountsPayload;
+					await guard();
+					for (const accountId of normalizeFireworksAccountsPayload(payload)) {
+						if (accounts.includes(accountId)) {
+							throw new Error(`Fireworks accounts listing repeated ${accountId}.`);
+						}
+						accounts.push(accountId);
+					}
+					pageToken = fireworksNextPageToken(payload.nextPageToken);
+					if (!pageToken) break;
+				}
+				if (pageToken) {
+					throw new Error(
+						`Fireworks account listing exceeded ${FIREWORKS_MAX_ACCOUNT_PAGES} pages.`,
+					);
+				}
+				return accounts.map((id) => ({ id, label: id }));
+			},
+		},
+		async query(auth, signal, timeoutMs, guard, targetId) {
+			if (!guard) throw new Error("Fireworks API spend requires request-boundary revalidation.");
+			if (!isFireworksAccountId(targetId)) {
+				throw new Error("Fireworks billing requires a safe selected account slug.");
+			}
+			const startedAt = Date.now();
+			await guard();
+			const billingWindowAt = Date.now();
+			const payload = (await fetchProviderJson(
+				fireworksBillingSummaryUrl(targetId, billingWindowAt),
+				auth,
+				signal,
+				remainingTimeout(timeoutMs, startedAt, "fetching Fireworks rated spend"),
+				"Fireworks billing summary endpoint",
+				{ redirect: "error" },
+			)) as FireworksBillingSummaryPayload;
+			await guard();
+			return normalizeFireworksBillingSummaryPayload(payload, targetId, Date.now());
+		},
+	};
+}
+
 export function normalizeFireworksBillingSummaryPayload(
 	payload: FireworksBillingSummaryPayload,
 	accountId: string,
@@ -192,6 +268,42 @@ function formatMoneyAmount(amount: bigint): string {
 	return `${negative ? "-" : ""}${units.toString()}${nanos ? `.${nanos}` : ""}`;
 }
 
+function fireworksAccountsUrl(pageToken: string | undefined): string {
+	const url = new URL("/v1/accounts", FIREWORKS_BILLING_SUMMARY_ORIGIN);
+	url.searchParams.set("pageSize", "200");
+	if (pageToken !== undefined) url.searchParams.set("pageToken", pageToken);
+	return url.toString();
+}
+
+function fireworksNextPageToken(value: unknown): string | undefined {
+	if (value === undefined || value === null) return undefined;
+	if (typeof value !== "string" || !value || value.length > 512) {
+		throw new Error("Fireworks accounts listing returned an invalid page token.");
+	}
+	return value;
+}
+
+function fireworksBillingSummaryUrl(accountId: string, startedAt: number): string {
+	const dayMs = 24 * 60 * 60 * 1000;
+	const dayFloor = (time: number) => `${new Date(time).toISOString().slice(0, 10)}T00:00:00Z`;
+	const url = new URL(
+		`/v1/accounts/${accountId}/billing/summary`,
+		FIREWORKS_BILLING_SUMMARY_ORIGIN,
+	);
+	url.searchParams.set(
+		"startTime",
+		dayFloor(startedAt - (FIREWORKS_SPEND_WINDOW_DAYS - 1) * dayMs),
+	);
+	url.searchParams.set("endTime", dayFloor(startedAt + dayMs));
+	return url.toString();
+}
+
+function remainingTimeout(timeoutMs: number, startedAt: number, description: string): number {
+	const remaining = timeoutMs - (Date.now() - startedAt);
+	if (remaining <= 0) throw new Error(`Timed out while ${description}.`);
+	return remaining;
+}
+
 function asObject(value: unknown): Record<string, unknown> | undefined {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
 	return value as Record<string, unknown>;

package/src/providers/zai.ts

@@ -1,5 +1,12 @@
 import { sanitizeDisplayText } from "../core.js";
-import type { UsageBucket, UsageMetric, UsageReport, ZaiQuotaPayload } from "../types.js";
+import type {
+	UsageBucket,
+	UsageMetric,
+	UsageReport,
+	ZaiPlanInfo,
+	ZaiQuotaPayload,
+	ZaiSubscriptionPayload,
+} from "../types.js";
 
 const FIVE_HOUR_WINDOW_MINUTES = 300;
 const WEEKLY_WINDOW_MINUTES = 10_080;
@@ -9,6 +16,7 @@ export function normalizeZaiQuotaPayload(
 	providerName: string,
 	payload: ZaiQuotaPayload,
 	capturedAt: number,
+	plan?: ZaiPlanInfo,
 ): UsageReport {
 	const data = asObject(payload.data);
 	if (!data) throw new Error("Z.AI quota response data was not an object.");
@@ -26,14 +34,20 @@ export function normalizeZaiQuotaPayload(
 			addCountBucket(buckets, limit, "mcp-monthly", "MCP monthly allowance");
 			addUsageDetailMetrics(metrics, limit.usageDetails);
 		} else if (isPlanUsage && unit === 3) {
-			addPercentBucket(buckets, limit, "five-hour", "5h window", FIVE_HOUR_WINDOW_MINUTES);
+			addPercentBucket(
+				buckets,
+				limit,
+				"five-hour",
+				sessionWindowLabel(limit),
+				sessionWindowMinutes(limit),
+			);
 		} else if (isPlanUsage && unit === 6) {
 			const used = asNonnegativeNumber(limit.currentValue);
 			const quota = asNonnegativeNumber(limit.usage);
 			if (used !== undefined && quota !== undefined) {
-				addCountBucket(buckets, limit, "weekly", "Weekly window", WEEKLY_WINDOW_MINUTES);
+				addCountBucket(buckets, limit, "weekly", "Weekly window", weeklyWindowMinutes(limit));
 			} else {
-				addPercentBucket(buckets, limit, "weekly", "Weekly window", WEEKLY_WINDOW_MINUTES);
+				addPercentBucket(buckets, limit, "weekly", "Weekly window", weeklyWindowMinutes(limit));
 			}
 		}
 	}
@@ -43,7 +57,12 @@ export function normalizeZaiQuotaPayload(
 
 	const notes: string[] = [];
 	const level = asString(data.level);
-	if (level) notes.push(`Plan: ${level}`);
+	const planLabel = plan?.name ?? level;
+	if (planLabel) {
+		notes.push(
+			plan?.renewsAt ? `Plan: ${planLabel} · renews ${plan.renewsAt}` : `Plan: ${planLabel}`,
+		);
+	}
 
 	return {
 		providerId,
@@ -57,6 +76,79 @@ export function normalizeZaiQuotaPayload(
 	};
 }
 
+// The undocumented subscription endpoint can include historical products. Prefer the current,
+// valid product and fail closed to the quota plan level when only explicitly inactive products exist.
+export function normalizeZaiSubscriptionPayload(
+	payload: ZaiSubscriptionPayload,
+): ZaiPlanInfo | undefined {
+	if (payload.success === false) return undefined;
+	if (typeof payload.code === "number" && payload.code !== 0 && payload.code !== 200) {
+		return undefined;
+	}
+	if (!Array.isArray(payload.data)) return undefined;
+
+	const candidates: Array<{
+		plan: ZaiPlanInfo;
+		status?: string;
+		inCurrentPeriod?: boolean;
+	}> = [];
+	for (const raw of payload.data) {
+		const entry = asObject(raw);
+		if (!entry) continue;
+		const name = asString(entry.productName);
+		if (!name) continue;
+		const renewsAt = planRenewalDate(entry.nextRenewTime);
+		const status = asString(entry.status)?.toUpperCase();
+		const inCurrentPeriod = asBoolean(entry.inCurrentPeriod);
+		candidates.push({
+			plan: { name, ...(renewsAt !== undefined ? { renewsAt } : {}) },
+			...(status !== undefined ? { status } : {}),
+			...(inCurrentPeriod !== undefined ? { inCurrentPeriod } : {}),
+		});
+	}
+
+	const hasStateMetadata = candidates.some(
+		(candidate) => candidate.status !== undefined || candidate.inCurrentPeriod !== undefined,
+	);
+	if (!hasStateMetadata) return candidates[0]?.plan;
+	return (
+		candidates.find(
+			(candidate) => candidate.inCurrentPeriod === true && candidate.status === "VALID",
+		)?.plan ??
+		candidates.find(
+			(candidate) => candidate.inCurrentPeriod === true && candidate.status === undefined,
+		)?.plan ??
+		candidates.find(
+			(candidate) => candidate.status === "VALID" && candidate.inCurrentPeriod === undefined,
+		)?.plan
+	);
+}
+
+function planRenewalDate(value: unknown): string | undefined {
+	if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}/u.test(value)) return value.slice(0, 10);
+	const millis = asNonnegativeNumber(value);
+	if (millis === undefined || millis === 0) return undefined;
+	return new Date(millis).toISOString().slice(0, 10);
+}
+
+// Z.AI encodes each window as a (unit, number) pair — unit 3 counts hours and unit 6 counts
+// weeks — so the payload's number drives the window length and session label; the established
+// 5-hour and weekly constants remain the fallback when the payload omits it.
+function sessionWindowMinutes(limit: Record<string, unknown>): number {
+	const hours = asPositiveNumber(limit.number);
+	return hours === undefined ? FIVE_HOUR_WINDOW_MINUTES : Math.round(hours * 60);
+}
+
+function sessionWindowLabel(limit: Record<string, unknown>): string {
+	const minutes = sessionWindowMinutes(limit);
+	return minutes === FIVE_HOUR_WINDOW_MINUTES ? "5h window" : `${Math.round(minutes / 60)}h window`;
+}
+
+function weeklyWindowMinutes(limit: Record<string, unknown>): number {
+	const weeks = asPositiveNumber(limit.number);
+	return weeks === undefined ? WEEKLY_WINDOW_MINUTES : Math.round(weeks * WEEKLY_WINDOW_MINUTES);
+}
+
 function addPercentBucket(
 	buckets: UsageBucket[],
 	limit: Record<string, unknown>,
@@ -130,6 +222,18 @@ function asNonnegativeNumber(value: unknown): number | undefined {
 	return value;
 }
 
+function asPositiveNumber(value: unknown): number | undefined {
+	const number = asNonnegativeNumber(value);
+	return number !== undefined && number > 0 ? number : undefined;
+}
+
+function asBoolean(value: unknown): boolean | undefined {
+	if (typeof value === "boolean") return value;
+	if (value === 1) return true;
+	if (value === 0) return false;
+	return undefined;
+}
+
 function asEpochSeconds(value: unknown): number | undefined {
 	const millis = asNonnegativeNumber(value);
 	if (millis === undefined) return undefined;