@narumitw/pi-usage 0.60.7 → 0.60.9

package/src/providers/xai.ts

@@ -4,183 +4,176 @@ import type { UsageBucket, UsageMetric, UsageReport, XaiBillingPayload } from ".
 const MAX_SAFE_CENTS = Number.MAX_SAFE_INTEGER;
 
 export function normalizeXaiBillingPayload(
-	payload: XaiBillingPayload,
-	subscriptionTier: unknown,
-	capturedAt: number,
+  payload: XaiBillingPayload,
+  subscriptionTier: unknown,
+  capturedAt: number,
 ): UsageReport {
-	const configValue = payload.config;
-	if (configValue !== null && configValue !== undefined && !isRecord(configValue)) {
-		throw new Error("xAI billing response config was not an object or null.");
-	}
-	const config = isRecord(configValue) ? configValue : undefined;
-	const buckets: UsageBucket[] = [];
-	const metrics: UsageMetric[] = [];
-	const notes: string[] = [];
+  const configValue = payload.config;
+  if (configValue !== null && configValue !== undefined && !isRecord(configValue)) {
+    throw new Error("xAI billing response config was not an object or null.");
+  }
+  const config = isRecord(configValue) ? configValue : undefined;
+  const buckets: UsageBucket[] = [];
+  const metrics: UsageMetric[] = [];
+  const notes: string[] = [];
 
-	if (config) {
-		const period = normalizePeriod(
-			config.currentPeriod,
-			config.billingPeriodStart,
-			config.billingPeriodEnd,
-		);
-		const preferredPercent = optionalPercent(config.creditUsagePercent, "creditUsagePercent");
-		if (preferredPercent !== undefined) {
-			buckets.push({
-				id: "included-allowance",
-				label: "Included allowance",
-				used: preferredPercent,
-				remaining: 100 - preferredPercent,
-				unit: "percent",
-				...period,
-			});
-		} else {
-			const limit = optionalUsd(config.monthlyLimit, "monthlyLimit");
-			const used = optionalUsd(config.used, "used");
-			if (limit !== undefined || used !== undefined) {
-				buckets.push({
-					id: "included-allowance",
-					label: "Included allowance",
-					...(limit !== undefined ? { limit } : {}),
-					...(used !== undefined ? { used } : {}),
-					...(limit !== undefined && used !== undefined ? { remaining: limit - used } : {}),
-					unit: "usd",
-					...period,
-				});
-			} else if (period.period || period.resetsAt !== undefined) {
-				buckets.push({
-					id: "included-allowance",
-					label: "Included allowance",
-					unit: "percent",
-					...period,
-				});
-			}
-		}
+  if (config) {
+    const period = normalizePeriod(config.currentPeriod, config.billingPeriodStart, config.billingPeriodEnd);
+    const preferredPercent = optionalPercent(config.creditUsagePercent, "creditUsagePercent");
+    if (preferredPercent !== undefined) {
+      buckets.push({
+        id: "included-allowance",
+        label: "Included allowance",
+        used: preferredPercent,
+        remaining: 100 - preferredPercent,
+        unit: "percent",
+        ...period,
+      });
+    } else {
+      const limit = optionalUsd(config.monthlyLimit, "monthlyLimit");
+      const used = optionalUsd(config.used, "used");
+      if (limit !== undefined || used !== undefined) {
+        buckets.push({
+          id: "included-allowance",
+          label: "Included allowance",
+          ...(limit !== undefined ? { limit } : {}),
+          ...(used !== undefined ? { used } : {}),
+          ...(limit !== undefined && used !== undefined ? { remaining: limit - used } : {}),
+          unit: "usd",
+          ...period,
+        });
+      } else if (period.period || period.resetsAt !== undefined) {
+        buckets.push({
+          id: "included-allowance",
+          label: "Included allowance",
+          unit: "percent",
+          ...period,
+        });
+      }
+    }
 
-		const onDemandCap = optionalUsd(config.onDemandCap, "onDemandCap");
-		const onDemandUsed = optionalUsd(config.onDemandUsed, "onDemandUsed");
-		if (onDemandCap !== undefined || onDemandUsed !== undefined) {
-			buckets.push({
-				id: "on-demand",
-				label: "On-demand usage",
-				...(onDemandCap !== undefined ? { limit: onDemandCap } : {}),
-				...(onDemandUsed !== undefined ? { used: onDemandUsed } : {}),
-				...(onDemandCap !== undefined && onDemandUsed !== undefined
-					? { remaining: onDemandCap - onDemandUsed }
-					: {}),
-				unit: "usd",
-			});
-		}
+    const onDemandCap = optionalUsd(config.onDemandCap, "onDemandCap");
+    const onDemandUsed = optionalUsd(config.onDemandUsed, "onDemandUsed");
+    if (onDemandCap !== undefined || onDemandUsed !== undefined) {
+      buckets.push({
+        id: "on-demand",
+        label: "On-demand usage",
+        ...(onDemandCap !== undefined ? { limit: onDemandCap } : {}),
+        ...(onDemandUsed !== undefined ? { used: onDemandUsed } : {}),
+        ...(onDemandCap !== undefined && onDemandUsed !== undefined ? { remaining: onDemandCap - onDemandUsed } : {}),
+        unit: "usd",
+      });
+    }
 
-		const prepaidBalance = optionalUsd(config.prepaidBalance, "prepaidBalance");
-		if (prepaidBalance !== undefined) {
-			metrics.push({
-				id: "prepaid-balance",
-				label: "Prepaid balance",
-				value: prepaidBalance,
-				unit: "usd",
-			});
-		}
-	}
+    const prepaidBalance = optionalUsd(config.prepaidBalance, "prepaidBalance");
+    if (prepaidBalance !== undefined) {
+      metrics.push({
+        id: "prepaid-balance",
+        label: "Prepaid balance",
+        value: prepaidBalance,
+        unit: "usd",
+      });
+    }
+  }
 
-	const tier = optionalTier(subscriptionTier);
-	if (tier) metrics.push({ id: "subscription-tier", label: "Plan tier", value: tier });
-	if (!config) notes.push("No xAI consumer billing configuration is available for this account.");
-	else if (buckets.length === 0 && metrics.length === 0) {
-		notes.push("The xAI consumer billing response contained no displayable usage fields.");
-	}
+  const tier = optionalTier(subscriptionTier);
+  if (tier) metrics.push({ id: "subscription-tier", label: "Plan tier", value: tier });
+  if (!config) notes.push("No xAI consumer billing configuration is available for this account.");
+  else if (buckets.length === 0 && metrics.length === 0) {
+    notes.push("The xAI consumer billing response contained no displayable usage fields.");
+  }
 
-	return {
-		providerId: "xai",
-		providerName: "xAI",
-		capturedAt,
-		source: "cli-chat-proxy.grok.com consumer billing",
-		semantics: {
-			kind: "consumer-subscription",
-			label: "xAI consumer subscription usage",
-		},
-		buckets,
-		metrics,
-		...(notes.length > 0 ? { notes } : {}),
-	};
+  return {
+    providerId: "xai",
+    providerName: "xAI",
+    capturedAt,
+    source: "cli-chat-proxy.grok.com consumer billing",
+    semantics: {
+      kind: "consumer-subscription",
+      label: "xAI consumer subscription usage",
+    },
+    buckets,
+    metrics,
+    ...(notes.length > 0 ? { notes } : {}),
+  };
 }
 
 function normalizePeriod(
-	currentPeriod: unknown,
-	legacyStart: unknown,
-	legacyEnd: unknown,
+  currentPeriod: unknown,
+  legacyStart: unknown,
+  legacyEnd: unknown,
 ): Pick<UsageBucket, "period" | "resetsAt"> {
-	if (currentPeriod !== undefined && currentPeriod !== null && !isRecord(currentPeriod)) {
-		throw new Error("xAI billing currentPeriod was not an object or null.");
-	}
-	if (isRecord(currentPeriod)) {
-		const type = optionalString(currentPeriod.type, "currentPeriod.type");
-		const start = optionalTimestamp(currentPeriod.start, "currentPeriod.start");
-		const end = optionalTimestamp(currentPeriod.end, "currentPeriod.end");
-		return {
-			...(periodLabel(type, start) ? { period: periodLabel(type, start) } : {}),
-			...(end !== undefined ? { resetsAt: end } : {}),
-		};
-	}
-	const start = optionalTimestamp(legacyStart, "billingPeriodStart");
-	const end = optionalTimestamp(legacyEnd, "billingPeriodEnd");
-	return {
-		...(start !== undefined ? { period: "Monthly" } : {}),
-		...(end !== undefined ? { resetsAt: end } : {}),
-	};
+  if (currentPeriod !== undefined && currentPeriod !== null && !isRecord(currentPeriod)) {
+    throw new Error("xAI billing currentPeriod was not an object or null.");
+  }
+  if (isRecord(currentPeriod)) {
+    const type = optionalString(currentPeriod.type, "currentPeriod.type");
+    const start = optionalTimestamp(currentPeriod.start, "currentPeriod.start");
+    const end = optionalTimestamp(currentPeriod.end, "currentPeriod.end");
+    return {
+      ...(periodLabel(type, start) ? { period: periodLabel(type, start) } : {}),
+      ...(end !== undefined ? { resetsAt: end } : {}),
+    };
+  }
+  const start = optionalTimestamp(legacyStart, "billingPeriodStart");
+  const end = optionalTimestamp(legacyEnd, "billingPeriodEnd");
+  return {
+    ...(start !== undefined ? { period: "Monthly" } : {}),
+    ...(end !== undefined ? { resetsAt: end } : {}),
+  };
 }
 
 function periodLabel(type: string | undefined, start: number | undefined): string | undefined {
-	if (type === "USAGE_PERIOD_TYPE_WEEKLY") return "Weekly";
-	if (type === "USAGE_PERIOD_TYPE_MONTHLY") return "Monthly";
-	if (type)
-		return sanitizeDisplayText(type.replace(/^USAGE_PERIOD_TYPE_/u, "").replaceAll("_", " "), 40);
-	return start === undefined ? undefined : "Current period";
+  if (type === "USAGE_PERIOD_TYPE_WEEKLY") return "Weekly";
+  if (type === "USAGE_PERIOD_TYPE_MONTHLY") return "Monthly";
+  if (type) return sanitizeDisplayText(type.replace(/^USAGE_PERIOD_TYPE_/u, "").replaceAll("_", " "), 40);
+  return start === undefined ? undefined : "Current period";
 }
 
 function optionalUsd(value: unknown, field: string): number | undefined {
-	if (value === undefined || value === null) return undefined;
-	if (!isRecord(value)) throw new Error(`xAI billing ${field} was not a cent wrapper.`);
-	const cents = value.val === undefined ? 0 : value.val;
-	if (!Number.isSafeInteger(cents) || Math.abs(cents as number) > MAX_SAFE_CENTS) {
-		throw new Error(`xAI billing ${field}.val was not a safe signed integer.`);
-	}
-	return (cents as number) / 100;
+  if (value === undefined || value === null) return undefined;
+  if (!isRecord(value)) throw new Error(`xAI billing ${field} was not a cent wrapper.`);
+  const cents = value.val === undefined ? 0 : value.val;
+  if (!Number.isSafeInteger(cents) || Math.abs(cents as number) > MAX_SAFE_CENTS) {
+    throw new Error(`xAI billing ${field}.val was not a safe signed integer.`);
+  }
+  return (cents as number) / 100;
 }
 
 function optionalPercent(value: unknown, field: string): number | undefined {
-	if (value === undefined || value === null) return undefined;
-	if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 100) {
-		throw new Error(`xAI billing ${field} was outside 0–100.`);
-	}
-	return value;
+  if (value === undefined || value === null) return undefined;
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 100) {
+    throw new Error(`xAI billing ${field} was outside 0–100.`);
+  }
+  return value;
 }
 
 function optionalTimestamp(value: unknown, field: string): number | undefined {
-	if (value === undefined || value === null) return undefined;
-	if (typeof value !== "string" || value.length > 80) {
-		throw new Error(`xAI billing ${field} was not a bounded timestamp.`);
-	}
-	const milliseconds = Date.parse(value);
-	if (!Number.isFinite(milliseconds)) throw new Error(`xAI billing ${field} was invalid.`);
-	return Math.floor(milliseconds / 1000);
+  if (value === undefined || value === null) return undefined;
+  if (typeof value !== "string" || value.length > 80) {
+    throw new Error(`xAI billing ${field} was not a bounded timestamp.`);
+  }
+  const milliseconds = Date.parse(value);
+  if (!Number.isFinite(milliseconds)) throw new Error(`xAI billing ${field} was invalid.`);
+  return Math.floor(milliseconds / 1000);
 }
 
 function optionalString(value: unknown, field: string): string | undefined {
-	if (value === undefined || value === null) return undefined;
-	if (typeof value !== "string" || value.length > 80) {
-		throw new Error(`xAI billing ${field} was not a bounded string.`);
-	}
-	return value;
+  if (value === undefined || value === null) return undefined;
+  if (typeof value !== "string" || value.length > 80) {
+    throw new Error(`xAI billing ${field} was not a bounded string.`);
+  }
+  return value;
 }
 
 function optionalTier(value: unknown): string | undefined {
-	if (value === undefined || value === null) return undefined;
-	if (typeof value !== "string" || value.length > 160) {
-		throw new Error("xAI subscription tier was not a bounded string or null.");
-	}
-	return sanitizeDisplayText(value, 80) || undefined;
+  if (value === undefined || value === null) return undefined;
+  if (typeof value !== "string" || value.length > 160) {
+    throw new Error("xAI subscription tier was not a bounded string or null.");
+  }
+  return sanitizeDisplayText(value, 80) || undefined;
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
+  return typeof value === "object" && value !== null && !Array.isArray(value);
 }

package/src/providers/zai-errors.ts

@@ -1,94 +1,94 @@
 // Fixed messages from https://docs.z.ai/api-reference/api-code. Never interpolate provider text:
 // error messages and their template parameters can contain credentials or terminal controls.
 const ERROR_MESSAGES: Readonly<Record<string, string>> = {
-	"1000": "Authentication failed. Check your API key.",
-	"1001": "Authentication header missing. Check your API key.",
-	"1003": "Authentication token expired. Obtain a new token.",
-	"1005": "Two-factor authentication required.",
-	"1113": "Insufficient balance or no resource package. Recharge your account.",
-	"1200": "API call error. Try again later.",
-	"1210": "Invalid API parameter. Check the API documentation.",
-	"1211": "Unknown model. Check the model ID.",
-	"1212": "This model does not support the requested method.",
-	"1213": "A required parameter is missing.",
-	"1214": "Invalid parameter. Check the API documentation.",
-	"1215": "Conflicting parameters. Check the API documentation.",
-	"1220": "Access denied. Check your permissions.",
-	"1221": "This API has been taken offline.",
-	"1222": "This API does not exist.",
-	"1230": "API processing error. Try again later.",
-	"1234": "Network error. Try again later.",
-	"1261": "Prompt too long. Reduce the input length.",
-	"1301": "Content rejected by the safety policy.",
-	"1302": "Request rate limit reached. Try again later.",
-	"1305": "Service overloaded. Try again later.",
-	"1308": "Usage limit reached. Wait for the quota reset.",
-	"1309": "GLM Coding Plan expired. Renew your subscription.",
-	"1310": "Weekly or monthly limit exhausted. Wait for the quota reset.",
-	"1311": "Your subscription does not include this model.",
-	"1313": "Request frequency restricted by the Fair Usage Policy. Contact support.",
-	"1314": "Enterprise package expired. Contact your administrator.",
-	"1315": "This API key requires an enterprise coding package scenario. Replace the key.",
-	"1316": "5-hour limit reached; insufficient balance for extra usage. Wait for reset.",
-	"1317": "7-day limit reached; insufficient balance for extra usage. Wait for reset.",
-	"1318": "5-hour limit reached; extra usage blocked by monthly spend limit.",
-	"1319": "7-day limit reached; extra usage blocked by monthly spend limit.",
-	"1320": "5-hour limit reached; extra usage blocked by monthly spend limit.",
-	"1321": "7-day limit reached; extra usage blocked by monthly spend limit.",
+  "1000": "Authentication failed. Check your API key.",
+  "1001": "Authentication header missing. Check your API key.",
+  "1003": "Authentication token expired. Obtain a new token.",
+  "1005": "Two-factor authentication required.",
+  "1113": "Insufficient balance or no resource package. Recharge your account.",
+  "1200": "API call error. Try again later.",
+  "1210": "Invalid API parameter. Check the API documentation.",
+  "1211": "Unknown model. Check the model ID.",
+  "1212": "This model does not support the requested method.",
+  "1213": "A required parameter is missing.",
+  "1214": "Invalid parameter. Check the API documentation.",
+  "1215": "Conflicting parameters. Check the API documentation.",
+  "1220": "Access denied. Check your permissions.",
+  "1221": "This API has been taken offline.",
+  "1222": "This API does not exist.",
+  "1230": "API processing error. Try again later.",
+  "1234": "Network error. Try again later.",
+  "1261": "Prompt too long. Reduce the input length.",
+  "1301": "Content rejected by the safety policy.",
+  "1302": "Request rate limit reached. Try again later.",
+  "1305": "Service overloaded. Try again later.",
+  "1308": "Usage limit reached. Wait for the quota reset.",
+  "1309": "GLM Coding Plan expired. Renew your subscription.",
+  "1310": "Weekly or monthly limit exhausted. Wait for the quota reset.",
+  "1311": "Your subscription does not include this model.",
+  "1313": "Request frequency restricted by the Fair Usage Policy. Contact support.",
+  "1314": "Enterprise package expired. Contact your administrator.",
+  "1315": "This API key requires an enterprise coding package scenario. Replace the key.",
+  "1316": "5-hour limit reached; insufficient balance for extra usage. Wait for reset.",
+  "1317": "7-day limit reached; insufficient balance for extra usage. Wait for reset.",
+  "1318": "5-hour limit reached; extra usage blocked by monthly spend limit.",
+  "1319": "7-day limit reached; extra usage blocked by monthly spend limit.",
+  "1320": "5-hour limit reached; extra usage blocked by monthly spend limit.",
+  "1321": "7-day limit reached; extra usage blocked by monthly spend limit.",
 };
 
 const HTTP_MESSAGES: Readonly<Record<number, string>> = {
-	400: "Invalid request. Check the API documentation.",
-	401: "Authentication failed. Check your API key.",
-	403: "Access denied. Check your permissions.",
-	429: "Request or usage limit reached. Try again later.",
-	500: "Internal error. Try again later.",
+  400: "Invalid request. Check the API documentation.",
+  401: "Authentication failed. Check your API key.",
+  403: "Access denied. Check your permissions.",
+  429: "Request or usage limit reached. Try again later.",
+  500: "Internal error. Try again later.",
 };
 
 export function zaiPayloadError(payload: unknown): string | undefined {
-	const object = asObject(payload);
-	if (!object) return undefined;
-	const nested = asObject(object.error);
-	// Missing nested metadata must not hide a top-level code; explicit nested values retain priority.
-	const rawCode = nested?.code === undefined ? object.code : nested.code;
-	const code = errorCode(rawCode);
-	if (
-		object.error === undefined &&
-		object.success !== false &&
-		(rawCode === undefined || code === "0" || code === "200")
-	) {
-		return undefined;
-	}
-	return code && code !== "0" && code !== "200"
-		? `Z.AI ${code}: ${ERROR_MESSAGES[code] ?? "API request failed."}`
-		: "Z.AI: API request failed.";
+  const object = asObject(payload);
+  if (!object) return undefined;
+  const nested = asObject(object.error);
+  // Missing nested metadata must not hide a top-level code; explicit nested values retain priority.
+  const rawCode = nested?.code === undefined ? object.code : nested.code;
+  const code = errorCode(rawCode);
+  if (
+    object.error === undefined &&
+    object.success !== false &&
+    (rawCode === undefined || code === "0" || code === "200")
+  ) {
+    return undefined;
+  }
+  return code && code !== "0" && code !== "200"
+    ? `Z.AI ${code}: ${ERROR_MESSAGES[code] ?? "API request failed."}`
+    : "Z.AI: API request failed.";
 }
 
 export function zaiResponseError(status: number, text: string): string | undefined {
-	let payload: unknown;
-	try {
-		payload = JSON.parse(text) as unknown;
-	} catch {
-		// Do not expose JSON parser excerpts, response bodies, or statusText.
-		if (status >= 200 && status < 300) return "Z.AI: Invalid JSON response.";
-	}
-	const error = zaiPayloadError(payload);
-	if (error) return error;
-	if (status < 200 || status >= 300) {
-		return `Z.AI HTTP ${status}: ${HTTP_MESSAGES[status] ?? "API request failed."}`;
-	}
-	return undefined;
+  let payload: unknown;
+  try {
+    payload = JSON.parse(text) as unknown;
+  } catch {
+    // Do not expose JSON parser excerpts, response bodies, or statusText.
+    if (status >= 200 && status < 300) return "Z.AI: Invalid JSON response.";
+  }
+  const error = zaiPayloadError(payload);
+  if (error) return error;
+  if (status < 200 || status >= 300) {
+    return `Z.AI HTTP ${status}: ${HTTP_MESSAGES[status] ?? "API request failed."}`;
+  }
+  return undefined;
 }
 
 function errorCode(value: unknown): string | undefined {
-	if (typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 9999) {
-		return String(value);
-	}
-	return typeof value === "string" && /^(?:0|[1-9]\d{0,3})$/u.test(value) ? value : undefined;
+  if (typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 9999) {
+    return String(value);
+  }
+  return typeof value === "string" && /^(?:0|[1-9]\d{0,3})$/u.test(value) ? value : undefined;
 }
 
 function asObject(value: unknown): Record<string, unknown> | undefined {
-	return value !== null && typeof value === "object" && !Array.isArray(value)
-		? (value as Record<string, unknown>)
-		: undefined;
+  return value !== null && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : undefined;
 }