dsh-coding-subscription-oauth 0.5.8 → 0.6.0

package/src/gateway.ts

@@ -1,242 +1,258 @@
-/**
- * Start, stop, and rotate the opt-in local coding-subscription API gateway.
- * @module dsh-coding-subscription-oauth/gateway
- */
-
-import type { Server } from "node:http";
-import {
-	gatewayKeyPath,
-	generateGatewayApiKey,
-	loadGatewayKeyDocument,
-	loadOrCreateGatewayApiKey,
-	maskGatewayApiKey,
-	persistGatewayKeyDocument,
-} from "./gateway-auth.ts";
-import { createSessionGatewayBackend, type GatewayBackend } from "./gateway-backend.ts";
-import { assertGatewayPort, type GatewayConfig, resolveGatewayConfig } from "./gateway-config.ts";
-import { closeGateway, createGatewayHttpServer, listenGateway } from "./gateway-http.ts";
-import type { OAuthProviderSession } from "./oauth-session.ts";
-import type { GrokBuildSession } from "./session.ts";
-
-export const GATEWAY_TOS_WARNING =
-	"local API gateway is enabled; exposing a subscription as a local API can violate provider ToS and consumes your quota";
-
-export interface StartGatewayOptions {
-	config?: Partial<GatewayConfig>;
-	dshHome?: string;
-	backend?: GatewayBackend;
-	grok?: GrokBuildSession;
-	subscriptions?: readonly OAuthProviderSession[];
-	onError?: (error: unknown) => void;
-}
-
-export interface StartedGateway {
-	close(): Promise<void>;
-	readonly bind: string;
-	readonly port: number;
-}
-
-export interface GatewayPublicStatus {
-	enabled: boolean;
-	running: boolean;
-	bind: string;
-	port: number;
-	keyHint: string;
-	warning: string;
-}
-
-export interface CodingOAuthGatewayController {
-	status(): Promise<GatewayPublicStatus>;
-	startIfEnabled(): Promise<StartedGateway | undefined>;
-	setEnabled(enabled: boolean): Promise<GatewayPublicStatus>;
-	setPort(port: number): Promise<GatewayPublicStatus>;
-	revealKey(): Promise<{ apiKey: string; keyHint: string }>;
-	rotateKey(): Promise<{ apiKey: string; keyHint: string }>;
-	stop(): Promise<void>;
-}
-
-export async function startCodingOAuthGateway(options: StartGatewayOptions): Promise<StartedGateway | undefined> {
-	const controller = createCodingOAuthGatewayController(options);
-	return controller.startIfEnabled();
-}
-
-export function createCodingOAuthGatewayController(options: StartGatewayOptions): CodingOAuthGatewayController {
-	const yaml = resolveGatewayConfig(options.config);
-	const path = gatewayKeyPath(options.dshHome);
-	const backend = (): GatewayBackend => {
-		if (options.backend !== undefined) return options.backend;
-		if (options.grok === undefined) throw new Error("gateway requires a backend or Grok session");
-		return createSessionGatewayBackend(options.grok, options.subscriptions ?? []);
-	};
-	let server: Server | undefined;
-	let apiKey = yaml.apiKey ?? "";
-	let port = yaml.port;
-	let lock: Promise<void> = Promise.resolve();
-
-	const withLock = async <T>(work: () => Promise<T>): Promise<T> => {
-		const previous = lock;
-		let release: () => void = () => undefined;
-		lock = new Promise<void>((resolve) => {
-			release = resolve;
-		});
-		await previous;
-		try {
-			return await work();
-		} finally {
-			release();
-		}
-	};
-
-	const closeServer = async (): Promise<void> => {
-		if (server === undefined) return;
-		const current = server;
-		server = undefined;
-		await closeGateway(current).catch(() => undefined);
-	};
-
-	const activeConfig = (): GatewayConfig => ({ ...yaml, port });
-
-	const snapshot = async (enabled?: boolean): Promise<GatewayPublicStatus> => ({
-		enabled: enabled ?? (await desiredEnabled()),
-		running: server !== undefined,
-		bind: yaml.bind,
-		port,
-		keyHint: apiKey.length === 0 ? "" : maskGatewayApiKey(apiKey),
-		warning: GATEWAY_TOS_WARNING,
-	});
-
-	const persistState = async (next: { enabled?: boolean; port?: number; apiKey?: string }): Promise<void> => {
-		const document = await loadGatewayKeyDocument(path);
-		const nextKey = next.apiKey ?? (apiKey.length === 0 ? document?.apiKey : apiKey);
-		if (nextKey === undefined || nextKey.length === 0) throw new Error("gateway api key is missing");
-		apiKey = nextKey;
-		const nextEnabled = next.enabled ?? document?.enabled;
-		const nextPort = next.port ?? document?.port ?? port;
-		port = nextPort;
-		await persistGatewayKeyDocument(path, {
-			version: 1,
-			apiKey: nextKey,
-			...(nextEnabled === undefined ? {} : { enabled: nextEnabled }),
-			port: nextPort,
-		});
-	};
-
-	const listen = async (): Promise<StartedGateway> => {
-		if (apiKey.length === 0) apiKey = await loadOrCreateGatewayApiKey(path, yaml.apiKey);
-		const config = activeConfig();
-		const http = createGatewayHttpServer({ config, apiKey, backend: backend() });
-		try {
-			await listenGateway(http, config);
-		} catch (error) {
-			await closeGateway(http).catch(() => undefined);
-			options.onError?.(error);
-			throw error;
-		}
-		server = http;
-		return { bind: config.bind, port: config.port, close: () => closeServer() };
-	};
-
-	const desiredEnabled = async (): Promise<boolean> => {
-		const document = await loadGatewayKeyDocument(path);
-		return document?.enabled ?? yaml.enabled;
-	};
-
-	const hydratePort = async (): Promise<void> => {
-		const document = await loadGatewayKeyDocument(path);
-		if (document?.port !== undefined) port = document.port;
-	};
-
-	return {
-		async status() {
-			await hydratePort();
-			if (apiKey.length === 0) {
-				const document = await loadGatewayKeyDocument(path);
-				apiKey = document?.apiKey ?? "";
-			}
-			return snapshot();
-		},
-		startIfEnabled() {
-			return withLock(async () => {
-				await hydratePort();
-				if (!(await desiredEnabled())) return undefined;
-				if (server !== undefined) return { bind: yaml.bind, port, close: () => closeServer() };
-				try {
-					return await listen();
-				} catch {
-					return undefined;
-				}
-			});
-		},
-		setEnabled(enabled) {
-			return withLock(async () => {
-				await hydratePort();
-				if (apiKey.length === 0) apiKey = await loadOrCreateGatewayApiKey(path, yaml.apiKey);
-				await persistState({ enabled });
-				if (enabled && server === undefined) {
-					try {
-						await listen();
-					} catch {
-						// status.running stays false; caller sees the public snapshot.
-					}
-				}
-				if (!enabled) await closeServer();
-				return snapshot(enabled);
-			});
-		},
-		setPort(nextPort) {
-			return withLock(async () => {
-				await hydratePort();
-				const wanted = assertGatewayPort(nextPort);
-				if (apiKey.length === 0) apiKey = await loadOrCreateGatewayApiKey(path, yaml.apiKey);
-				const previous = port;
-				const shouldRun = server !== undefined;
-				await persistState({ port: wanted });
-				if (!shouldRun) return snapshot();
-				await closeServer();
-				try {
-					await listen();
-					return snapshot();
-				} catch (error) {
-					port = previous;
-					await persistState({ port: previous });
-					try {
-						await listen();
-					} catch {
-						// previous port may also fail; status.running reflects reality
-					}
-					throw error;
-				}
-			});
-		},
-		revealKey() {
-			return withLock(async () => {
-				if (apiKey.length === 0) apiKey = await loadOrCreateGatewayApiKey(path, yaml.apiKey);
-				return { apiKey, keyHint: maskGatewayApiKey(apiKey) };
-			});
-		},
-		rotateKey() {
-			return withLock(async () => {
-				await hydratePort();
-				const next = generateGatewayApiKey();
-				const document = await loadGatewayKeyDocument(path);
-				await persistState({
-					apiKey: next,
-					...(document?.enabled === undefined ? {} : { enabled: document.enabled }),
-				});
-				const shouldRun = server !== undefined;
-				await closeServer();
-				if (shouldRun) {
-					try {
-						await listen();
-					} catch {
-						// rotated key is persisted even if listen fails
-					}
-				}
-				return { apiKey: next, keyHint: maskGatewayApiKey(next) };
-			});
-		},
-		stop() {
-			return withLock(() => closeServer());
-		},
-	};
-}
+/**
+ * Start, stop, and rotate the opt-in local coding-subscription API gateway.
+ * @module dsh-coding-subscription-oauth/gateway
+ */
+
+import type { Server } from "node:http";
+import {
+	gatewayKeyPath,
+	generateGatewayApiKey,
+	loadGatewayKeyDocument,
+	loadOrCreateGatewayApiKey,
+	maskGatewayApiKey,
+	persistGatewayKeyDocument,
+} from "./gateway-auth.ts";
+import { createSessionGatewayBackend, type GatewayBackend } from "./gateway-backend.ts";
+import { assertGatewayPort, type GatewayConfig, resolveGatewayConfig } from "./gateway-config.ts";
+import { closeGateway, createGatewayHttpServer, listenGateway } from "./gateway-http.ts";
+import type { OAuthProviderSession } from "./oauth-session.ts";
+import type { GrokBuildSession } from "./session.ts";
+
+export const GATEWAY_TOS_WARNING =
+	"local API gateway is enabled; exposing a subscription as a local API can violate provider ToS and consumes your quota";
+
+export interface StartGatewayOptions {
+	config?: Partial<GatewayConfig>;
+	dshHome?: string;
+	backend?: GatewayBackend;
+	grok?: GrokBuildSession;
+	subscriptions?: readonly OAuthProviderSession[];
+	onError?: (error: unknown) => void;
+}
+
+export interface StartedGateway {
+	close(): Promise<void>;
+	readonly bind: string;
+	readonly port: number;
+}
+
+export interface GatewayPublicStatus {
+	enabled: boolean;
+	running: boolean;
+	bind: string;
+	port: number;
+	model: string | null;
+	keyConfigured: boolean;
+	keyAvailable: boolean;
+	keyHint: string;
+	models: string[];
+	warning: string;
+}
+
+export interface CodingOAuthGatewayController {
+	status(): Promise<GatewayPublicStatus>;
+	startIfEnabled(): Promise<StartedGateway | undefined>;
+	setEnabled(enabled: boolean): Promise<GatewayPublicStatus>;
+	setPort(port: number): Promise<GatewayPublicStatus>;
+	revealKey(): Promise<{ apiKey: string; keyHint: string }>;
+	rotateKey(): Promise<{ apiKey: string; keyHint: string }>;
+	stop(): Promise<void>;
+}
+
+export async function startCodingOAuthGateway(options: StartGatewayOptions): Promise<StartedGateway | undefined> {
+	const controller = createCodingOAuthGatewayController(options);
+	return controller.startIfEnabled();
+}
+
+export function createCodingOAuthGatewayController(options: StartGatewayOptions): CodingOAuthGatewayController {
+	const yaml = resolveGatewayConfig(options.config);
+	const path = gatewayKeyPath(options.dshHome);
+	const backend = (): GatewayBackend => {
+		if (options.backend !== undefined) return options.backend;
+		if (options.grok === undefined) throw new Error("gateway requires a backend or Grok session");
+		return createSessionGatewayBackend(options.grok, options.subscriptions ?? []);
+	};
+	let server: Server | undefined;
+	let apiKey = yaml.apiKey ?? "";
+	let port = yaml.port;
+	let lock: Promise<void> = Promise.resolve();
+
+	const withLock = async <T>(work: () => Promise<T>): Promise<T> => {
+		const previous = lock;
+		let release: () => void = () => undefined;
+		lock = new Promise<void>((resolve) => {
+			release = resolve;
+		});
+		await previous;
+		try {
+			return await work();
+		} finally {
+			release();
+		}
+	};
+
+	const closeServer = async (): Promise<void> => {
+		if (server === undefined) return;
+		const current = server;
+		server = undefined;
+		await closeGateway(current).catch(() => undefined);
+	};
+
+	const activeConfig = (): GatewayConfig => ({ ...yaml, port });
+
+	const snapshot = async (enabled?: boolean): Promise<GatewayPublicStatus> => {
+		let models: string[] = [];
+		try {
+			models = (await backend().listModels()).map((model) => model.id);
+		} catch {
+			// Status stays usable when no provider credential can currently list models.
+		}
+		return {
+			enabled: enabled ?? (await desiredEnabled()),
+			running: server !== undefined,
+			bind: yaml.bind,
+			port,
+			model: models[0] ?? null,
+			keyConfigured: apiKey.length > 0,
+			keyAvailable: apiKey.length > 0,
+			keyHint: apiKey.length === 0 ? "" : maskGatewayApiKey(apiKey),
+			models,
+			warning: GATEWAY_TOS_WARNING,
+		};
+	};
+
+	const persistState = async (next: { enabled?: boolean; port?: number; apiKey?: string }): Promise<void> => {
+		const document = await loadGatewayKeyDocument(path);
+		const nextKey = next.apiKey ?? (apiKey.length === 0 ? document?.apiKey : apiKey);
+		if (nextKey === undefined || nextKey.length === 0) throw new Error("gateway api key is missing");
+		apiKey = nextKey;
+		const nextEnabled = next.enabled ?? document?.enabled;
+		const nextPort = next.port ?? document?.port ?? port;
+		port = nextPort;
+		await persistGatewayKeyDocument(path, {
+			version: 1,
+			apiKey: nextKey,
+			...(nextEnabled === undefined ? {} : { enabled: nextEnabled }),
+			port: nextPort,
+		});
+	};
+
+	const listen = async (): Promise<StartedGateway> => {
+		if (apiKey.length === 0) apiKey = await loadOrCreateGatewayApiKey(path, yaml.apiKey);
+		const config = activeConfig();
+		const http = createGatewayHttpServer({ config, apiKey, backend: backend() });
+		try {
+			await listenGateway(http, config);
+		} catch (error) {
+			await closeGateway(http).catch(() => undefined);
+			options.onError?.(error);
+			throw error;
+		}
+		server = http;
+		return { bind: config.bind, port: config.port, close: () => closeServer() };
+	};
+
+	const desiredEnabled = async (): Promise<boolean> => {
+		const document = await loadGatewayKeyDocument(path);
+		return document?.enabled ?? yaml.enabled;
+	};
+
+	const hydratePort = async (): Promise<void> => {
+		const document = await loadGatewayKeyDocument(path);
+		if (document?.port !== undefined) port = document.port;
+	};
+
+	return {
+		async status() {
+			await hydratePort();
+			if (apiKey.length === 0) {
+				const document = await loadGatewayKeyDocument(path);
+				apiKey = document?.apiKey ?? "";
+			}
+			return snapshot();
+		},
+		startIfEnabled() {
+			return withLock(async () => {
+				await hydratePort();
+				if (!(await desiredEnabled())) return undefined;
+				if (server !== undefined) return { bind: yaml.bind, port, close: () => closeServer() };
+				try {
+					return await listen();
+				} catch {
+					return undefined;
+				}
+			});
+		},
+		setEnabled(enabled) {
+			return withLock(async () => {
+				await hydratePort();
+				if (apiKey.length === 0) apiKey = await loadOrCreateGatewayApiKey(path, yaml.apiKey);
+				await persistState({ enabled });
+				if (enabled && server === undefined) {
+					try {
+						await listen();
+					} catch {
+						// status.running stays false; caller sees the public snapshot.
+					}
+				}
+				if (!enabled) await closeServer();
+				return snapshot(enabled);
+			});
+		},
+		setPort(nextPort) {
+			return withLock(async () => {
+				await hydratePort();
+				const wanted = assertGatewayPort(nextPort);
+				if (apiKey.length === 0) apiKey = await loadOrCreateGatewayApiKey(path, yaml.apiKey);
+				const previous = port;
+				const shouldRun = server !== undefined;
+				await persistState({ port: wanted });
+				if (!shouldRun) return snapshot();
+				await closeServer();
+				try {
+					await listen();
+					return snapshot();
+				} catch (error) {
+					port = previous;
+					await persistState({ port: previous });
+					try {
+						await listen();
+					} catch {
+						// previous port may also fail; status.running reflects reality
+					}
+					throw error;
+				}
+			});
+		},
+		revealKey() {
+			return withLock(async () => {
+				if (apiKey.length === 0) apiKey = await loadOrCreateGatewayApiKey(path, yaml.apiKey);
+				return { apiKey, keyHint: maskGatewayApiKey(apiKey) };
+			});
+		},
+		rotateKey() {
+			return withLock(async () => {
+				await hydratePort();
+				const next = generateGatewayApiKey();
+				const document = await loadGatewayKeyDocument(path);
+				await persistState({
+					apiKey: next,
+					...(document?.enabled === undefined ? {} : { enabled: document.enabled }),
+				});
+				const shouldRun = server !== undefined;
+				await closeServer();
+				if (shouldRun) {
+					try {
+						await listen();
+					} catch {
+						// rotated key is persisted even if listen fails
+					}
+				}
+				return { apiKey: next, keyHint: maskGatewayApiKey(next) };
+			});
+		},
+		stop() {
+			return withLock(() => closeServer());
+		},
+	};
+}

package/src/grok-errors.ts

@@ -1,24 +1,24 @@
-/**
- * xAI / Grok Build error remapping.
- * @module dsh-coding-subscription-oauth/grok-errors
- */
-
-/**
- * xAI returns capacity / overload messages that pi-ai classifies as
- * `PI_AI_ERROR` (or occasionally mislabels as AUTH) because the payload has
- * `error.code: null` and no HTTP 429 / rate-limit wording. Without a remap the
- * harness retry policy never runs.
- */
-const XAI_CAPACITY = /\b(?:at\s+capacity|high\s+demand|priority\s+processing|overloaded)\b/i;
-
-export function isXaiCapacityError(detail: string): boolean {
-	return XAI_CAPACITY.test(detail);
-}
-
-export function remapXaiCapacityFailure(failure: { message: string; code: string }): {
-	message: string;
-	code: string;
-} {
-	if (!isXaiCapacityError(failure.message)) return failure;
-	return { ...failure, code: "RATE_LIMIT" };
-}
+/**
+ * xAI / Grok Build error remapping.
+ * @module dsh-coding-subscription-oauth/grok-errors
+ */
+
+/**
+ * xAI returns capacity / overload messages that pi-ai classifies as
+ * `PI_AI_ERROR` (or occasionally mislabels as AUTH) because the payload has
+ * `error.code: null` and no HTTP 429 / rate-limit wording. Without a remap the
+ * harness retry policy never runs.
+ */
+const XAI_CAPACITY = /\b(?:at\s+capacity|high\s+demand|priority\s+processing|overloaded)\b/i;
+
+export function isXaiCapacityError(detail: string): boolean {
+	return XAI_CAPACITY.test(detail);
+}
+
+export function remapXaiCapacityFailure(failure: { message: string; code: string }): {
+	message: string;
+	code: string;
+} {
+	if (!isXaiCapacityError(failure.message)) return failure;
+	return { ...failure, code: "RATE_LIMIT" };
+}