@narumitw/pi-usage 0.59.0 → 0.60.0

package/package.json

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

package/src/format.ts

@@ -269,6 +269,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 +473,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 +500,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 +641,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

@@ -52,7 +52,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,

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;

package/src/query.ts

@@ -25,7 +25,7 @@ import { normalizeOpenCodeZenPayload } from "./providers/opencode-zen.js";
 import { normalizeOpenRouterKeyPayload } from "./providers/openrouter.js";
 import { normalizeVercelAIGatewayCreditsPayload } from "./providers/vercel-ai-gateway.js";
 import { normalizeXaiBillingPayload } from "./providers/xai.js";
-import { normalizeZaiQuotaPayload } from "./providers/zai.js";
+import { normalizeZaiQuotaPayload, normalizeZaiSubscriptionPayload } from "./providers/zai.js";
 import type {
 	BasetenBillingUsagePayload,
 	CodexBackendPayload,
@@ -46,7 +46,9 @@ import type {
 	VercelAIGatewayCreditsPayload,
 	XaiBillingPayload,
 	XaiUserPayload,
+	ZaiPlanInfo,
 	ZaiQuotaPayload,
+	ZaiSubscriptionPayload,
 } from "./types.js";
 
 const BASETEN_BILLING_USAGE_URL = "https://api.baseten.co/v1/billing/usage_summary";
@@ -295,35 +297,16 @@ export const SUPPORTED_ADAPTERS: readonly UsageProviderAdapter[] = [
 		id: "zai",
 		displayName: "Z.AI",
 		semantics: { kind: "consumer-subscription", label: "GLM Coding Plan usage" },
-		async query(auth, signal, timeoutMs) {
-			const payload = await fetchProviderJson(
-				zaiMonitorUrl(auth.model.baseUrl),
-				zaiMonitorAuth(auth),
-				signal,
-				timeoutMs,
-				"Z.AI quota endpoint",
-			);
-			return normalizeZaiQuotaPayload("zai", "Z.AI", payload as ZaiQuotaPayload, Date.now());
+		async query(auth, signal, timeoutMs, guard) {
+			return queryZaiUsage("zai", "Z.AI", auth, signal, timeoutMs, guard);
 		},
 	},
 	{
 		id: "zai-coding-cn",
 		displayName: "Z.AI Coding CN",
 		semantics: { kind: "consumer-subscription", label: "GLM Coding Plan usage" },
-		async query(auth, signal, timeoutMs) {
-			const payload = await fetchProviderJson(
-				zaiMonitorUrl(auth.model.baseUrl),
-				zaiMonitorAuth(auth),
-				signal,
-				timeoutMs,
-				"Z.AI Coding CN quota endpoint",
-			);
-			return normalizeZaiQuotaPayload(
-				"zai-coding-cn",
-				"Z.AI Coding CN",
-				payload as ZaiQuotaPayload,
-				Date.now(),
-			);
+		async query(auth, signal, timeoutMs, guard) {
+			return queryZaiUsage("zai-coding-cn", "Z.AI Coding CN", auth, signal, timeoutMs, guard);
 		},
 	},
 ];
@@ -1123,10 +1106,14 @@ function fireworksBillingSummaryUrl(accountId: string, startedAt: number): strin
 	return url.toString();
 }
 
-function zaiMonitorUrl(baseUrl: string | undefined): string {
+function zaiOrigin(baseUrl: string | undefined): string {
 	const base = baseUrl?.trim();
 	if (!base) throw new Error("Z.AI model base URL is unavailable.");
-	return `${new URL(base).origin}/api/monitor/usage/quota/limit`;
+	return new URL(base).origin;
+}
+
+function zaiMonitorUrl(baseUrl: string | undefined): string {
+	return `${zaiOrigin(baseUrl)}/api/monitor/usage/quota/limit`;
 }
 
 function zaiMonitorAuth(auth: ResolvedUsageAuth): ResolvedUsageAuth {
@@ -1137,6 +1124,55 @@ function zaiMonitorAuth(auth: ResolvedUsageAuth): ResolvedUsageAuth {
 	return { ...auth, headers: { ...auth.headers, Authorization: token } };
 }
 
+async function queryZaiUsage(
+	providerId: "zai" | "zai-coding-cn",
+	providerName: string,
+	auth: ResolvedUsageAuth,
+	signal: AbortSignal,
+	timeoutMs: number,
+	guard: UsageRequestGuard | undefined,
+): Promise<UsageReport> {
+	if (!guard) throw new Error("Z.AI usage requires request-boundary revalidation.");
+	const startedAt = Date.now();
+	await guard();
+	const payload = (await fetchProviderJson(
+		zaiMonitorUrl(auth.model.baseUrl),
+		zaiMonitorAuth(auth),
+		signal,
+		remainingTimeout(timeoutMs, startedAt, `fetching ${providerName} quota`),
+		`${providerName} quota endpoint`,
+	)) as ZaiQuotaPayload;
+	await guard();
+	const planTimeoutMs = timeoutMs - (Date.now() - startedAt);
+	const plan = await fetchZaiPlan(providerName, auth, signal, planTimeoutMs);
+	return normalizeZaiQuotaPayload(providerId, providerName, payload, Date.now(), plan);
+}
+
+// The subscription endpoint is undocumented and may not exist on every official origin. It only
+// contributes the plan name and renewal date, so any non-abort failure is swallowed instead of
+// blanking the required quota report.
+async function fetchZaiPlan(
+	providerName: string,
+	auth: ResolvedUsageAuth,
+	signal: AbortSignal,
+	timeoutMs: number,
+): Promise<ZaiPlanInfo | undefined> {
+	if (timeoutMs <= 0 || signal.aborted) return undefined;
+	try {
+		const payload = (await fetchProviderJson(
+			`${zaiOrigin(auth.model.baseUrl)}/api/biz/subscription/list`,
+			zaiMonitorAuth(auth),
+			signal,
+			timeoutMs,
+			`${providerName} plan endpoint`,
+		)) as ZaiSubscriptionPayload;
+		return normalizeZaiSubscriptionPayload(payload);
+	} catch (error) {
+		if (isAbortError(error)) throw error;
+		return undefined;
+	}
+}
+
 function isAbortError(error: unknown): boolean {
 	return error instanceof Error && error.name === "AbortError";
 }

package/src/types.ts

@@ -157,6 +157,17 @@ export type ZaiQuotaPayload = {
 	data?: unknown;
 };
 
+export type ZaiSubscriptionPayload = {
+	code?: unknown;
+	success?: unknown;
+	data?: unknown;
+};
+
+export interface ZaiPlanInfo {
+	name: string;
+	renewsAt?: string;
+}
+
 export type KimiCodingUsagePayload = {
 	usage?: unknown;
 	limits?: unknown;

package/src/usage.ts

@@ -285,6 +285,8 @@ export default function usageExtension(
 			"moonshotai-cn",
 			"vercel-ai-gateway",
 			"xai",
+			"zai",
+			"zai-coding-cn",
 		].includes(adapter.id);
 		const requestContextChanged = () =>
 			expectedSessionGeneration !== sessionGeneration ||