pi-free 2.2.6 → 2.2.8

package/providers/kilo/kilo-auth.ts

@@ -1,155 +1,152 @@
-/**
- * Kilo device authorization flow and token management.
- */
-
-import type {
-	OAuthCredentials,
-	OAuthLoginCallbacks,
-} from "@earendil-works/pi-ai";
-import {
-	KILO_POLL_INTERVAL_MS,
-	KILO_TOKEN_EXPIRATION_MS,
-} from "../../constants.ts";
-import { createLogger } from "../../lib/logger.ts";
-import { openBrowser } from "../../lib/open-browser.ts";
-
-const _logger = createLogger("kilo-auth");
-
-const KILO_API_BASE = process.env.KILO_API_URL || "https://api.kilo.ai";
-const DEVICE_AUTH_ENDPOINT = `${KILO_API_BASE}/api/device-auth/codes`;
-const PROFILE_ENDPOINT = `${KILO_API_BASE}/api/profile`;
-
-// =============================================================================
-// Balance & Rate Limit
-// =============================================================================
-
-export async function fetchKiloBalance(token: string): Promise<number | null> {
-	try {
-		const response = await fetch(`${PROFILE_ENDPOINT}/balance`, {
-			headers: {
-				Authorization: `Bearer ${token}`,
-				"Content-Type": "application/json",
-			},
-		});
-		if (!response.ok) return null;
-		const data = (await response.json()) as { balance?: number };
-		return data.balance ?? null;
-	} catch {
-		return null;
-	}
-}
-
-export function formatCredits(balance: number): string {
-	return balance >= 1000
-		? `$${(balance / 1000).toFixed(1)}k`
-		: `$${balance.toFixed(2)}`;
-}
-
-// =============================================================================
-// Device auth
-// =============================================================================
-
-interface DeviceAuthResponse {
-	code: string;
-	verificationUrl: string;
-	expiresIn: number;
-}
-
-interface DeviceAuthPollResponse {
-	status: "pending" | "approved" | "denied" | "expired";
-	token?: string;
-}
-
-function abortableSleep(ms: number, signal?: AbortSignal): Promise<void> {
-	return new Promise((resolve, reject) => {
-		if (signal?.aborted) {
-			reject(new Error("Login cancelled"));
-			return;
-		}
-		const timeout = setTimeout(resolve, ms);
-		signal?.addEventListener(
-			"abort",
-			() => {
-				clearTimeout(timeout);
-				reject(new Error("Login cancelled"));
-			},
-			{ once: true },
-		);
-	});
-}
-
-async function initiateDeviceAuth(): Promise<DeviceAuthResponse> {
-	const response = await fetch(DEVICE_AUTH_ENDPOINT, {
-		method: "POST",
-		headers: { "Content-Type": "application/json" },
-	});
-	if (!response.ok) {
-		throw new Error(
-			response.status === 429
-				? "Too many pending authorization requests. Please try again later."
-				: `Failed to initiate device authorization: ${response.status}`,
-		);
-	}
-	return (await response.json()) as DeviceAuthResponse;
-}
-
-async function pollDeviceAuth(code: string): Promise<DeviceAuthPollResponse> {
-	const response = await fetch(`${DEVICE_AUTH_ENDPOINT}/${code}`);
-	if (response.status === 202) return { status: "pending" };
-	if (response.status === 403) return { status: "denied" };
-	if (response.status === 410) return { status: "expired" };
-	if (!response.ok)
-		throw new Error(`Failed to poll device authorization: ${response.status}`);
-	return (await response.json()) as DeviceAuthPollResponse;
-}
-
-export async function loginKilo(
-	callbacks: OAuthLoginCallbacks,
-): Promise<OAuthCredentials> {
-	callbacks.onProgress?.("Initiating device authorization...");
-	const { code, verificationUrl, expiresIn } = await initiateDeviceAuth();
-
-	callbacks.onAuth({
-		url: verificationUrl,
-		instructions: `Enter code: ${code}`,
-	});
-	openBrowser(verificationUrl);
-	callbacks.onProgress?.("Waiting for browser authorization...");
-
-	const deadline = Date.now() + expiresIn * 1000;
-	while (Date.now() < deadline) {
-		if (callbacks.signal?.aborted) throw new Error("Login cancelled");
-		await abortableSleep(KILO_POLL_INTERVAL_MS, callbacks.signal);
-
-		const result = await pollDeviceAuth(code);
-		if (result.status === "approved") {
-			if (!result.token)
-				throw new Error("Authorization approved but no token received");
-			callbacks.onProgress?.("Login successful!");
-			return {
-				refresh: result.token,
-				access: result.token,
-				expires: Date.now() + KILO_TOKEN_EXPIRATION_MS,
-			};
-		}
-		if (result.status === "denied")
-			throw new Error("Authorization denied by user.");
-		if (result.status === "expired")
-			throw new Error("Authorization code expired. Please try again.");
-
-		const remaining = Math.ceil((deadline - Date.now()) / 1000);
-		callbacks.onProgress?.(
-			`Waiting for browser authorization... (${remaining}s remaining)`,
-		);
-	}
-	throw new Error("Authentication timed out. Please try again.");
-}
-
-export async function refreshKiloToken(
-	credentials: OAuthCredentials,
-): Promise<OAuthCredentials> {
-	if (credentials.expires > Date.now()) return credentials;
-	throw new Error(
-		"Kilo token expired. Please run /login kilo to re-authenticate.",
-	);
-}
+/**
+ * Kilo device authorization flow and token management.
+ */
+
+import type {
+	OAuthCredentials,
+	OAuthLoginCallbacks,
+} from "@earendil-works/pi-ai/compat";
+import {
+	KILO_POLL_INTERVAL_MS,
+	KILO_TOKEN_EXPIRATION_MS,
+} from "../../constants.ts";
+import { openBrowser } from "../../lib/open-browser.ts";
+
+const KILO_API_BASE = process.env.KILO_API_URL || "https://api.kilo.ai";
+const DEVICE_AUTH_ENDPOINT = `${KILO_API_BASE}/api/device-auth/codes`;
+const PROFILE_ENDPOINT = `${KILO_API_BASE}/api/profile`;
+
+// =============================================================================
+// Balance & Rate Limit
+// =============================================================================
+
+export async function fetchKiloBalance(token: string): Promise<number | null> {
+	try {
+		const response = await fetch(`${PROFILE_ENDPOINT}/balance`, {
+			headers: {
+				Authorization: `Bearer ${token}`,
+				"Content-Type": "application/json",
+			},
+		});
+		if (!response.ok) return null;
+		const data = (await response.json()) as { balance?: number };
+		return data.balance ?? null;
+	} catch {
+		return null;
+	}
+}
+
+export function formatCredits(balance: number): string {
+	return balance >= 1000
+		? `$${(balance / 1000).toFixed(1)}k`
+		: `$${balance.toFixed(2)}`;
+}
+
+// =============================================================================
+// Device auth
+// =============================================================================
+
+interface DeviceAuthResponse {
+	code: string;
+	verificationUrl: string;
+	expiresIn: number;
+}
+
+interface DeviceAuthPollResponse {
+	status: "pending" | "approved" | "denied" | "expired";
+	token?: string;
+}
+
+function abortableSleep(ms: number, signal?: AbortSignal): Promise<void> {
+	return new Promise((resolve, reject) => {
+		if (signal?.aborted) {
+			reject(new Error("Login cancelled"));
+			return;
+		}
+		const timeout = setTimeout(resolve, ms);
+		signal?.addEventListener(
+			"abort",
+			() => {
+				clearTimeout(timeout);
+				reject(new Error("Login cancelled"));
+			},
+			{ once: true },
+		);
+	});
+}
+
+async function initiateDeviceAuth(): Promise<DeviceAuthResponse> {
+	const response = await fetch(DEVICE_AUTH_ENDPOINT, {
+		method: "POST",
+		headers: { "Content-Type": "application/json" },
+	});
+	if (!response.ok) {
+		throw new Error(
+			response.status === 429
+				? "Too many pending authorization requests. Please try again later."
+				: `Failed to initiate device authorization: ${response.status}`,
+		);
+	}
+	return (await response.json()) as DeviceAuthResponse;
+}
+
+async function pollDeviceAuth(code: string): Promise<DeviceAuthPollResponse> {
+	const response = await fetch(`${DEVICE_AUTH_ENDPOINT}/${code}`);
+	if (response.status === 202) return { status: "pending" };
+	if (response.status === 403) return { status: "denied" };
+	if (response.status === 410) return { status: "expired" };
+	if (!response.ok)
+		throw new Error(`Failed to poll device authorization: ${response.status}`);
+	return (await response.json()) as DeviceAuthPollResponse;
+}
+
+export async function loginKilo(
+	callbacks: OAuthLoginCallbacks,
+): Promise<OAuthCredentials> {
+	callbacks.onProgress?.("Initiating device authorization...");
+	const { code, verificationUrl, expiresIn } = await initiateDeviceAuth();
+
+	callbacks.onAuth({
+		url: verificationUrl,
+		instructions: `Enter code: ${code}`,
+	});
+	openBrowser(verificationUrl);
+	callbacks.onProgress?.("Waiting for browser authorization...");
+
+	const deadline = Date.now() + expiresIn * 1000;
+	while (Date.now() < deadline) {
+		if (callbacks.signal?.aborted) throw new Error("Login cancelled");
+		await abortableSleep(KILO_POLL_INTERVAL_MS, callbacks.signal);
+
+		const result = await pollDeviceAuth(code);
+		if (result.status === "approved") {
+			if (!result.token)
+				throw new Error("Authorization approved but no token received");
+			callbacks.onProgress?.("Login successful!");
+			return {
+				refresh: result.token,
+				access: result.token,
+				expires: Date.now() + KILO_TOKEN_EXPIRATION_MS,
+			};
+		}
+		if (result.status === "denied")
+			throw new Error("Authorization denied by user.");
+		if (result.status === "expired")
+			throw new Error("Authorization code expired. Please try again.");
+
+		const remaining = Math.ceil((deadline - Date.now()) / 1000);
+		callbacks.onProgress?.(
+			`Waiting for browser authorization... (${remaining}s remaining)`,
+		);
+	}
+	throw new Error("Authentication timed out. Please try again.");
+}
+
+export async function refreshKiloToken(
+	credentials: OAuthCredentials,
+): Promise<OAuthCredentials> {
+	if (credentials.expires > Date.now()) return credentials;
+	throw new Error(
+		"Kilo token expired. Please run /login kilo to re-authenticate.",
+	);
+}

package/providers/kilo/kilo.ts

@@ -12,10 +12,15 @@
  *   # Free models visible immediately; /login kilo for paid access
  */
 
-import type { Api, Model, OAuthCredentials } from "@earendil-works/pi-ai";
 import type {
-	ExtensionAPI,
-	ProviderModelConfig,
+	Api,
+	Model,
+	OAuthCredentials,
+} from "@earendil-works/pi-ai/compat";
+import {
+	readStoredCredential,
+	type ExtensionAPI,
+	type ProviderModelConfig,
 } from "@earendil-works/pi-coding-agent";
 import {
 	getKiloApiKey,
@@ -33,6 +38,7 @@ import {
 	createCtxReRegister,
 	createReRegister,
 	enhanceWithCI,
+	isOAuthCredential,
 	loadCachedOrFetchModels,
 	type StoredModels,
 } from "../../provider-helper.ts";
@@ -226,12 +232,7 @@ export default async function kiloProvider(pi: ExtensionAPI) {
 
 	// Register with global toggle system
 	const hasKiloKey = !!kiloApiKey;
-	registerWithGlobalToggle(
-		PROVIDER_KILO,
-		stored,
-		reRegister,
-		hasKiloKey,
-	);
+	registerWithGlobalToggle(PROVIDER_KILO, stored, reRegister, hasKiloKey);
 
 	// OAuth config for Kilo
 	const oauthConfig = {
@@ -349,8 +350,8 @@ export default async function kiloProvider(pi: ExtensionAPI) {
 		// ToS notice (once)
 		if (tosShown) return;
 		tosShown = true;
-		const cred = ctx.modelRegistry.authStorage.get(PROVIDER_KILO);
-		if (cred?.type === "oauth") return;
+		const cred = readStoredCredential(PROVIDER_KILO);
+		if (isOAuthCredential(cred)) return;
 		const paidCount = allModels.length - freeModels.length;
 		if (paidCount > 0) {
 			ctx.ui.notify(
@@ -447,8 +448,8 @@ export default async function kiloProvider(pi: ExtensionAPI) {
 	pi.on(
 		"session_start",
 		wrapSessionStartHandler("kilo", (_event, ctx) => {
-			const cred = ctx.modelRegistry.authStorage.get(PROVIDER_KILO);
-			if (cred?.type !== "oauth" || refreshInFlight) return Promise.resolve();
+			const cred = readStoredCredential(PROVIDER_KILO);
+			if (!isOAuthCredential(cred) || refreshInFlight) return Promise.resolve();
 
 			refreshInFlight = fetchKiloModels({ token: cred.access, freeOnly: false })
 				.then((newModels) => {