@oh-my-pi/pi-ai 8.11.14 → 8.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-ai",
-	"version": "8.11.14",
+	"version": "8.12.2",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -63,7 +63,7 @@
 		"@connectrpc/connect-node": "^2.1.1",
 		"@google/genai": "^1.38.0",
 		"@mistralai/mistralai": "^1.13.0",
-		"@oh-my-pi/pi-utils": "8.11.14",
+		"@oh-my-pi/pi-utils": "8.12.2",
 		"@sinclair/typebox": "^0.34.48",
 		"@smithy/node-http-handler": "^4.4.8",
 		"ajv": "^8.17.1",

package/src/usage/claude.ts

@@ -15,6 +15,7 @@ const FIVE_HOURS_MS = 5 * 60 * 60 * 1000;
 const SEVEN_DAYS_MS = 7 * 24 * 60 * 60 * 1000;
 const MAX_RETRIES = 3;
 const BASE_RETRY_DELAY_MS = 500;
+const PROFILE_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
 
 const CLAUDE_HEADERS = {
 	accept: "application/json, text/plain, */*",
@@ -160,6 +161,64 @@ async function fetchUsagePayload(
 	return lastPayload ? { payload: lastPayload, orgId: lastOrgId } : null;
 }
 
+interface ClaudeProfile {
+	account?: {
+		uuid?: string;
+		email?: string;
+	};
+}
+
+async function fetchProfile(
+	baseUrl: string,
+	headers: Record<string, string>,
+	ctx: UsageFetchContext,
+	signal?: AbortSignal,
+): Promise<ClaudeProfile | null> {
+	const url = `${baseUrl}/profile`;
+	try {
+		const response = await ctx.fetch(url, { headers, signal });
+		if (!response.ok) return null;
+		return (await response.json()) as ClaudeProfile;
+	} catch {
+		return null;
+	}
+}
+
+function buildProfileCacheKey(params: UsageFetchParams): string {
+	const credential = params.credential;
+	const token = credential.accessToken ?? credential.refreshToken;
+	const fingerprint = token && typeof token === "string" ? Bun.hash(token).toString(16) : "anonymous";
+	const baseUrl = params.baseUrl ?? DEFAULT_ENDPOINT;
+	return `profile:${params.provider}:${fingerprint}:${baseUrl}`;
+}
+
+async function resolveEmail(
+	params: UsageFetchParams,
+	ctx: UsageFetchContext,
+	baseUrl: string,
+	headers: Record<string, string>,
+): Promise<string | undefined> {
+	if (params.credential.email) return params.credential.email;
+
+	const cacheKey = buildProfileCacheKey(params);
+	const cached = await ctx.cache.get(cacheKey);
+	const now = ctx.now();
+	if (cached && cached.expiresAt > now && cached.value?.metadata?.email) {
+		return cached.value.metadata.email as string;
+	}
+
+	const profile = await fetchProfile(baseUrl, headers, ctx, params.signal);
+	const email = profile?.account?.email;
+	if (email) {
+		const entry = {
+			value: { provider: params.provider, fetchedAt: now, limits: [], metadata: { email } },
+			expiresAt: now + PROFILE_CACHE_TTL_MS,
+		};
+		await ctx.cache.set(cacheKey, entry);
+	}
+	return email;
+}
+
 function buildUsageAmount(utilization: number | undefined): UsageAmount | undefined {
 	if (utilization === undefined) return undefined;
 	const clamped = Math.min(Math.max(utilization, 0), 100);
@@ -329,7 +388,7 @@ async function fetchClaudeUsage(params: UsageFetchParams, ctx: UsageFetchContext
 	if (limits.length === 0) return cachedValue;
 	const identity = extractUsageIdentity(payload, orgId);
 	const accountId = identity.accountId ?? credential.accountId;
-	const email = identity.email ?? credential.email;
+	const email = identity.email ?? (await resolveEmail(params, ctx, baseUrl, headers));
 
 	const report: UsageReport = {
 		provider: params.provider,

package/src/usage/kimi.ts

@@ -9,7 +9,7 @@ import type {
 	UsageStatus,
 	UsageWindow,
 } from "../usage";
-import { getKimiCommonHeaders } from "../utils/oauth/kimi";
+import { getKimiCommonHeaders, refreshKimiToken } from "../utils/oauth/kimi";
 
 const DEFAULT_BASE_URL = "https://api.kimi.com/coding/v1";
 const USAGE_PATH = "usages";
@@ -259,13 +259,23 @@ export const kimiUsageProvider: UsageProvider = {
 		const { credential } = params;
 		if (credential.type !== "oauth") return null;
 
-		const accessToken = credential.accessToken;
+		let accessToken = credential.accessToken;
 		if (!accessToken) return null;
 
 		const nowMs = ctx.now();
 		if (credential.expiresAt !== undefined && credential.expiresAt <= nowMs) {
-			ctx.logger?.warn("Kimi usage token expired", { provider: params.provider });
-			return null;
+			if (!credential.refreshToken) {
+				ctx.logger?.warn("Kimi usage token expired, no refresh token", { provider: params.provider });
+				return null;
+			}
+			try {
+				ctx.logger?.debug("Kimi usage token expired, refreshing", { provider: params.provider });
+				const refreshed = await refreshKimiToken(credential.refreshToken);
+				accessToken = refreshed.access;
+			} catch (error) {
+				ctx.logger?.warn("Kimi usage token refresh failed", { provider: params.provider, error: String(error) });
+				return null;
+			}
 		}
 
 		const baseUrl = normalizeBaseUrl(params.baseUrl);