dsh-coding-subscription-oauth 0.5.7 → 0.6.0

package/src/gateway-backend.ts

@@ -1,274 +1,274 @@
-/**
- * Session-backed model listing and event streaming for the local gateway.
- * @module dsh-coding-subscription-oauth/gateway-backend
- */
-
-import type { Api, Context, Message, Model, ThinkingLevel, Tool } from "@earendil-works/pi-ai";
-import {
-	type GatewayChatMessage,
-	type GatewayCompletionRequest,
-	type GatewayStreamPart,
-	type GatewayTool,
-	isThinkingLevel,
-} from "./gateway-protocol.ts";
-import type { OAuthProviderSession } from "./oauth-session.ts";
-import { safeMessage } from "./redact.ts";
-import type { GrokBuildSession } from "./session.ts";
-
-export interface GatewayListedModel {
-	id: string;
-	owned_by: string;
-}
-
-export interface GatewayBackend {
-	listModels(): Promise<readonly GatewayListedModel[]>;
-	stream(request: GatewayCompletionRequest): AsyncIterable<GatewayStreamPart>;
-	streamText(modelId: string, messages: readonly GatewayChatMessage[]): AsyncIterable<string>;
-}
-
-export class GatewayRequestError extends Error {
-	constructor(
-		readonly status: number,
-		readonly code: string,
-		message: string,
-	) {
-		super(message);
-	}
-}
-
-interface OwnedModel {
-	owned_by: string;
-	model: Model<Api>;
-	stream: (
-		model: Model<Api>,
-		context: Context,
-		options?: { reasoning?: ThinkingLevel },
-	) => AsyncIterable<{
-		type: string;
-		delta?: string;
-		errorMessage?: string;
-		reason?: string;
-		toolCall?: { id: string; name: string; arguments?: unknown };
-		partial?: { content?: readonly { type?: string; id?: string; name?: string }[] };
-	}>;
-}
-
-const EMPTY_USAGE = {
-	input: 0,
-	output: 0,
-	cacheRead: 0,
-	cacheWrite: 0,
-	totalTokens: 0,
-	cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-};
-
-export function createSessionGatewayBackend(
-	grok: GrokBuildSession,
-	subscriptions: readonly OAuthProviderSession[],
-): GatewayBackend {
-	return {
-		async listModels() {
-			const listed: GatewayListedModel[] = [];
-			const seen = new Map<string, string>();
-			for (const owned of await collectOwnedModels(grok, subscriptions)) {
-				const previous = seen.get(owned.model.id);
-				if (previous !== undefined && previous !== owned.owned_by) continue;
-				seen.set(owned.model.id, owned.owned_by);
-				listed.push({ id: owned.model.id, owned_by: owned.owned_by });
-			}
-			return listed;
-		},
-		async *stream(request) {
-			const owned = selectOwnedModel(await collectOwnedModels(grok, subscriptions), request.model);
-			const context = buildGatewayContext(request.messages, request.tools);
-			const reasoning = resolveReasoning(request.reasoning, owned.owned_by);
-			let usedTools = false;
-			for await (const event of owned.stream(
-				owned.model,
-				context,
-				reasoning === undefined ? undefined : { reasoning },
-			)) {
-				if (event.type === "text_delta" && typeof event.delta === "string" && event.delta.length > 0) {
-					yield { type: "text", text: event.delta };
-				}
-				if (event.type === "thinking_delta" && typeof event.delta === "string" && event.delta.length > 0) {
-					yield { type: "thinking", text: event.delta };
-				}
-				if (event.type === "toolcall_end" && event.toolCall !== undefined) {
-					usedTools = true;
-					yield {
-						type: "tool_call",
-						index: 0,
-						id: event.toolCall.id,
-						name: event.toolCall.name,
-						arguments: stringifyToolArguments(event.toolCall.arguments),
-					};
-				}
-				if (event.type === "error") {
-					throw new GatewayRequestError(502, "upstream_error", event.errorMessage ?? "upstream stream error");
-				}
-				if (event.type === "done") {
-					const finish =
-						event.reason === "length" ? "length" : usedTools || event.reason === "toolUse" ? "tool_calls" : "stop";
-					yield { type: "done", finish };
-				}
-			}
-		},
-		async *streamText(modelId, messages) {
-			for await (const part of this.stream({ model: modelId, messages })) {
-				if (part.type === "text") yield part.text;
-			}
-		},
-	};
-}
-
-export function selectOwnedModel(owned: readonly OwnedModel[], modelId: string): OwnedModel {
-	const matches = owned.filter((item) => item.model.id === modelId);
-	if (matches.length === 0) throw new GatewayRequestError(404, "model_not_found", `Unknown model ${modelId}`);
-	const owners = new Set(matches.map((item) => item.owned_by));
-	if (owners.size > 1) {
-		throw new GatewayRequestError(404, "model_not_found", `Model ${modelId} is owned by multiple signed-in providers`);
-	}
-	return matches[0]!;
-}
-
-export function buildGatewayContext(messages: readonly GatewayChatMessage[], tools?: readonly GatewayTool[]): Context {
-	let systemPrompt: string | undefined;
-	const mapped: Message[] = [];
-	for (const message of messages) {
-		if (message.role === "system") {
-			systemPrompt = `${systemPrompt === undefined ? "" : `${systemPrompt}\n`}${message.content}`;
-			continue;
-		}
-		if (message.role === "assistant") {
-			mapped.push(assistantReplay(message));
-			continue;
-		}
-		if (message.role === "tool") {
-			mapped.push({
-				role: "toolResult",
-				toolCallId: message.tool_call_id ?? "",
-				toolName: message.tool_name ?? "tool",
-				content: [{ type: "text", text: message.content }],
-				isError: false,
-				timestamp: Date.now(),
-			});
-			continue;
-		}
-		mapped.push({ role: "user", content: message.content, timestamp: Date.now() });
-	}
-	const context: Context = systemPrompt === undefined ? { messages: mapped } : { systemPrompt, messages: mapped };
-	if (tools !== undefined && tools.length > 0) context.tools = tools.map(toPiTool);
-	return context;
-}
-
-export function assistantReplay(message: GatewayChatMessage): Message {
-	const content: Array<
-		| { type: "text"; text: string }
-		| { type: "thinking"; thinking: string }
-		| { type: "toolCall"; id: string; name: string; arguments: Record<string, unknown> }
-	> = [];
-	const needsPlaceholder = message.tool_calls !== undefined && message.tool_calls.length > 0;
-	const reasoning = message.reasoning_content ?? (needsPlaceholder ? "" : undefined);
-	if (reasoning !== undefined) content.push({ type: "thinking", thinking: reasoning });
-	if (message.content.length > 0) content.push({ type: "text", text: message.content });
-	if (message.tool_calls !== undefined) {
-		for (const call of message.tool_calls) {
-			content.push({
-				type: "toolCall",
-				id: call.id,
-				name: call.name,
-				arguments: parseToolArguments(call.arguments),
-			});
-		}
-	}
-	return {
-		role: "assistant",
-		content: content.length === 0 ? [{ type: "text", text: "" }] : content,
-		api: "openai-responses",
-		provider: "gateway",
-		model: "gateway",
-		usage: EMPTY_USAGE,
-		stopReason: needsPlaceholder ? "toolUse" : "stop",
-		timestamp: Date.now(),
-	};
-}
-
-function toPiTool(tool: GatewayTool): Tool {
-	return {
-		name: tool.name,
-		description: tool.description,
-		parameters: tool.parameters as Tool["parameters"],
-	};
-}
-
-function parseToolArguments(raw: string): Record<string, unknown> {
-	try {
-		const value = JSON.parse(raw) as unknown;
-		return typeof value === "object" && value !== null && !Array.isArray(value)
-			? (value as Record<string, unknown>)
-			: { value };
-	} catch {
-		return { value: raw };
-	}
-}
-
-function stringifyToolArguments(value: unknown): string {
-	if (typeof value === "string") return value;
-	try {
-		return JSON.stringify(value ?? {});
-	} catch {
-		return "{}";
-	}
-}
-
-function resolveReasoning(value: string | undefined, ownedBy: string): ThinkingLevel | undefined {
-	if (value === undefined || !isThinkingLevel(value)) return undefined;
-	if (ownedBy === "kimi-code-oauth" || ownedBy === "claude-code-oauth") return undefined;
-	return value as ThinkingLevel;
-}
-
-async function collectOwnedModels(
-	grok: GrokBuildSession,
-	subscriptions: readonly OAuthProviderSession[],
-): Promise<OwnedModel[]> {
-	const owned: OwnedModel[] = [];
-	const grokAuth = await grok.models.getAuth("xai");
-	if (grokAuth?.auth.apiKey) {
-		for (const model of grok.visibleModels()) {
-			owned.push({
-				owned_by: "grok-build",
-				model,
-				stream: (item, context, options) => grok.models.streamSimple(item, context, options),
-			});
-		}
-	}
-	for (const session of subscriptions) {
-		const status = await session.status();
-		if (!status.authenticated) continue;
-		for (const model of session.visibleModels()) {
-			owned.push({
-				owned_by: session.definition.route,
-				model,
-				stream: (item, context, options) => session.models.streamSimple(item, context, options),
-			});
-		}
-	}
-	return owned;
-}
-
-export function gatewayErrorEnvelope(error: unknown): {
-	status: number;
-	body: { error: { message: string; type: string; code: string } };
-} {
-	if (error instanceof GatewayRequestError) {
-		return {
-			status: error.status,
-			body: { error: { message: error.message.slice(0, 1000), type: "invalid_request_error", code: error.code } },
-		};
-	}
-	return {
-		status: 500,
-		body: { error: { message: safeMessage(error).slice(0, 1000), type: "server_error", code: "internal" } },
-	};
-}
+/**
+ * Session-backed model listing and event streaming for the local gateway.
+ * @module dsh-coding-subscription-oauth/gateway-backend
+ */
+
+import type { Api, Context, Message, Model, ThinkingLevel, Tool } from "@earendil-works/pi-ai";
+import {
+	type GatewayChatMessage,
+	type GatewayCompletionRequest,
+	type GatewayStreamPart,
+	type GatewayTool,
+	isThinkingLevel,
+} from "./gateway-protocol.ts";
+import type { OAuthProviderSession } from "./oauth-session.ts";
+import { safeMessage } from "./redact.ts";
+import type { GrokBuildSession } from "./session.ts";
+
+export interface GatewayListedModel {
+	id: string;
+	owned_by: string;
+}
+
+export interface GatewayBackend {
+	listModels(): Promise<readonly GatewayListedModel[]>;
+	stream(request: GatewayCompletionRequest): AsyncIterable<GatewayStreamPart>;
+	streamText(modelId: string, messages: readonly GatewayChatMessage[]): AsyncIterable<string>;
+}
+
+export class GatewayRequestError extends Error {
+	constructor(
+		readonly status: number,
+		readonly code: string,
+		message: string,
+	) {
+		super(message);
+	}
+}
+
+interface OwnedModel {
+	owned_by: string;
+	model: Model<Api>;
+	stream: (
+		model: Model<Api>,
+		context: Context,
+		options?: { reasoning?: ThinkingLevel },
+	) => AsyncIterable<{
+		type: string;
+		delta?: string;
+		errorMessage?: string;
+		reason?: string;
+		toolCall?: { id: string; name: string; arguments?: unknown };
+		partial?: { content?: readonly { type?: string; id?: string; name?: string }[] };
+	}>;
+}
+
+const EMPTY_USAGE = {
+	input: 0,
+	output: 0,
+	cacheRead: 0,
+	cacheWrite: 0,
+	totalTokens: 0,
+	cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+};
+
+export function createSessionGatewayBackend(
+	grok: GrokBuildSession,
+	subscriptions: readonly OAuthProviderSession[],
+): GatewayBackend {
+	return {
+		async listModels() {
+			const listed: GatewayListedModel[] = [];
+			const seen = new Map<string, string>();
+			for (const owned of await collectOwnedModels(grok, subscriptions)) {
+				const previous = seen.get(owned.model.id);
+				if (previous !== undefined && previous !== owned.owned_by) continue;
+				seen.set(owned.model.id, owned.owned_by);
+				listed.push({ id: owned.model.id, owned_by: owned.owned_by });
+			}
+			return listed;
+		},
+		async *stream(request) {
+			const owned = selectOwnedModel(await collectOwnedModels(grok, subscriptions), request.model);
+			const context = buildGatewayContext(request.messages, request.tools);
+			const reasoning = resolveReasoning(request.reasoning, owned.owned_by);
+			let usedTools = false;
+			for await (const event of owned.stream(
+				owned.model,
+				context,
+				reasoning === undefined ? undefined : { reasoning },
+			)) {
+				if (event.type === "text_delta" && typeof event.delta === "string" && event.delta.length > 0) {
+					yield { type: "text", text: event.delta };
+				}
+				if (event.type === "thinking_delta" && typeof event.delta === "string" && event.delta.length > 0) {
+					yield { type: "thinking", text: event.delta };
+				}
+				if (event.type === "toolcall_end" && event.toolCall !== undefined) {
+					usedTools = true;
+					yield {
+						type: "tool_call",
+						index: 0,
+						id: event.toolCall.id,
+						name: event.toolCall.name,
+						arguments: stringifyToolArguments(event.toolCall.arguments),
+					};
+				}
+				if (event.type === "error") {
+					throw new GatewayRequestError(502, "upstream_error", event.errorMessage ?? "upstream stream error");
+				}
+				if (event.type === "done") {
+					const finish =
+						event.reason === "length" ? "length" : usedTools || event.reason === "toolUse" ? "tool_calls" : "stop";
+					yield { type: "done", finish };
+				}
+			}
+		},
+		async *streamText(modelId, messages) {
+			for await (const part of this.stream({ model: modelId, messages })) {
+				if (part.type === "text") yield part.text;
+			}
+		},
+	};
+}
+
+export function selectOwnedModel(owned: readonly OwnedModel[], modelId: string): OwnedModel {
+	const matches = owned.filter((item) => item.model.id === modelId);
+	if (matches.length === 0) throw new GatewayRequestError(404, "model_not_found", `Unknown model ${modelId}`);
+	const owners = new Set(matches.map((item) => item.owned_by));
+	if (owners.size > 1) {
+		throw new GatewayRequestError(404, "model_not_found", `Model ${modelId} is owned by multiple signed-in providers`);
+	}
+	return matches[0]!;
+}
+
+export function buildGatewayContext(messages: readonly GatewayChatMessage[], tools?: readonly GatewayTool[]): Context {
+	let systemPrompt: string | undefined;
+	const mapped: Message[] = [];
+	for (const message of messages) {
+		if (message.role === "system") {
+			systemPrompt = `${systemPrompt === undefined ? "" : `${systemPrompt}\n`}${message.content}`;
+			continue;
+		}
+		if (message.role === "assistant") {
+			mapped.push(assistantReplay(message));
+			continue;
+		}
+		if (message.role === "tool") {
+			mapped.push({
+				role: "toolResult",
+				toolCallId: message.tool_call_id ?? "",
+				toolName: message.tool_name ?? "tool",
+				content: [{ type: "text", text: message.content }],
+				isError: false,
+				timestamp: Date.now(),
+			});
+			continue;
+		}
+		mapped.push({ role: "user", content: message.content, timestamp: Date.now() });
+	}
+	const context: Context = systemPrompt === undefined ? { messages: mapped } : { systemPrompt, messages: mapped };
+	if (tools !== undefined && tools.length > 0) context.tools = tools.map(toPiTool);
+	return context;
+}
+
+export function assistantReplay(message: GatewayChatMessage): Message {
+	const content: Array<
+		| { type: "text"; text: string }
+		| { type: "thinking"; thinking: string }
+		| { type: "toolCall"; id: string; name: string; arguments: Record<string, unknown> }
+	> = [];
+	const needsPlaceholder = message.tool_calls !== undefined && message.tool_calls.length > 0;
+	const reasoning = message.reasoning_content ?? (needsPlaceholder ? "" : undefined);
+	if (reasoning !== undefined) content.push({ type: "thinking", thinking: reasoning });
+	if (message.content.length > 0) content.push({ type: "text", text: message.content });
+	if (message.tool_calls !== undefined) {
+		for (const call of message.tool_calls) {
+			content.push({
+				type: "toolCall",
+				id: call.id,
+				name: call.name,
+				arguments: parseToolArguments(call.arguments),
+			});
+		}
+	}
+	return {
+		role: "assistant",
+		content: content.length === 0 ? [{ type: "text", text: "" }] : content,
+		api: "openai-responses",
+		provider: "gateway",
+		model: "gateway",
+		usage: EMPTY_USAGE,
+		stopReason: needsPlaceholder ? "toolUse" : "stop",
+		timestamp: Date.now(),
+	};
+}
+
+function toPiTool(tool: GatewayTool): Tool {
+	return {
+		name: tool.name,
+		description: tool.description,
+		parameters: tool.parameters as Tool["parameters"],
+	};
+}
+
+function parseToolArguments(raw: string): Record<string, unknown> {
+	try {
+		const value = JSON.parse(raw) as unknown;
+		return typeof value === "object" && value !== null && !Array.isArray(value)
+			? (value as Record<string, unknown>)
+			: { value };
+	} catch {
+		return { value: raw };
+	}
+}
+
+function stringifyToolArguments(value: unknown): string {
+	if (typeof value === "string") return value;
+	try {
+		return JSON.stringify(value ?? {});
+	} catch {
+		return "{}";
+	}
+}
+
+function resolveReasoning(value: string | undefined, ownedBy: string): ThinkingLevel | undefined {
+	if (value === undefined || !isThinkingLevel(value)) return undefined;
+	if (ownedBy === "kimi-code-oauth" || ownedBy === "claude-code-oauth") return undefined;
+	return value as ThinkingLevel;
+}
+
+async function collectOwnedModels(
+	grok: GrokBuildSession,
+	subscriptions: readonly OAuthProviderSession[],
+): Promise<OwnedModel[]> {
+	const owned: OwnedModel[] = [];
+	const grokAuth = await grok.models.getAuth("xai");
+	if (grokAuth?.auth.apiKey) {
+		for (const model of grok.visibleModels()) {
+			owned.push({
+				owned_by: "grok-build",
+				model,
+				stream: (item, context, options) => grok.models.streamSimple(item, context, options),
+			});
+		}
+	}
+	for (const session of subscriptions) {
+		const status = await session.status();
+		if (!status.authenticated) continue;
+		for (const model of session.visibleModels()) {
+			owned.push({
+				owned_by: session.definition.route,
+				model,
+				stream: (item, context, options) => session.models.streamSimple(item, context, options),
+			});
+		}
+	}
+	return owned;
+}
+
+export function gatewayErrorEnvelope(error: unknown): {
+	status: number;
+	body: { error: { message: string; type: string; code: string } };
+} {
+	if (error instanceof GatewayRequestError) {
+		return {
+			status: error.status,
+			body: { error: { message: error.message.slice(0, 1000), type: "invalid_request_error", code: error.code } },
+		};
+	}
+	return {
+		status: 500,
+		body: { error: { message: safeMessage(error).slice(0, 1000), type: "server_error", code: "internal" } },
+	};
+}

package/src/gateway-body.ts

@@ -1,49 +1,49 @@
-/**
- * Shared JSON body reader for isolated gateway endpoints.
- * @module dsh-coding-subscription-oauth/gateway-body
- */
-
-import type { IncomingMessage } from "node:http";
-import { GatewayRequestError } from "./gateway-backend.ts";
-
-const BODY_LIMIT = 1024 * 1024;
-
-export async function readGatewayJsonBody(req: IncomingMessage): Promise<Record<string, unknown>> {
-	const chunks: Buffer[] = [];
-	let size = 0;
-	for await (const chunk of req) {
-		const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-		size += buffer.byteLength;
-		if (size > BODY_LIMIT) throw new GatewayRequestError(413, "payload_too_large", "request body exceeds 1 MiB");
-		chunks.push(buffer);
-	}
-	if (chunks.length === 0) return {};
-	try {
-		const value = JSON.parse(Buffer.concat(chunks).toString("utf8")) as unknown;
-		if (typeof value !== "object" || value === null || Array.isArray(value)) {
-			throw new GatewayRequestError(400, "invalid_request", "body must be a JSON object");
-		}
-		return value as Record<string, unknown>;
-	} catch (error) {
-		if (error instanceof GatewayRequestError) throw error;
-		throw new GatewayRequestError(400, "invalid_request", "body is not valid JSON");
-	}
-}
-
-export function writeGatewayJson(res: import("node:http").ServerResponse, status: number, value: unknown): void {
-	const body = Buffer.from(`${JSON.stringify(value)}\n`);
-	res.writeHead(status, {
-		"content-type": "application/json; charset=utf-8",
-		"content-length": body.byteLength,
-		"cache-control": "no-store",
-	});
-	res.end(body);
-}
-
-export function beginGatewaySse(res: import("node:http").ServerResponse): void {
-	res.writeHead(200, {
-		"content-type": "text/event-stream; charset=utf-8",
-		"cache-control": "no-store",
-		connection: "close",
-	});
-}
+/**
+ * Shared JSON body reader for isolated gateway endpoints.
+ * @module dsh-coding-subscription-oauth/gateway-body
+ */
+
+import type { IncomingMessage } from "node:http";
+import { GatewayRequestError } from "./gateway-backend.ts";
+
+const BODY_LIMIT = 1024 * 1024;
+
+export async function readGatewayJsonBody(req: IncomingMessage): Promise<Record<string, unknown>> {
+	const chunks: Buffer[] = [];
+	let size = 0;
+	for await (const chunk of req) {
+		const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+		size += buffer.byteLength;
+		if (size > BODY_LIMIT) throw new GatewayRequestError(413, "payload_too_large", "request body exceeds 1 MiB");
+		chunks.push(buffer);
+	}
+	if (chunks.length === 0) return {};
+	try {
+		const value = JSON.parse(Buffer.concat(chunks).toString("utf8")) as unknown;
+		if (typeof value !== "object" || value === null || Array.isArray(value)) {
+			throw new GatewayRequestError(400, "invalid_request", "body must be a JSON object");
+		}
+		return value as Record<string, unknown>;
+	} catch (error) {
+		if (error instanceof GatewayRequestError) throw error;
+		throw new GatewayRequestError(400, "invalid_request", "body is not valid JSON");
+	}
+}
+
+export function writeGatewayJson(res: import("node:http").ServerResponse, status: number, value: unknown): void {
+	const body = Buffer.from(`${JSON.stringify(value)}\n`);
+	res.writeHead(status, {
+		"content-type": "application/json; charset=utf-8",
+		"content-length": body.byteLength,
+		"cache-control": "no-store",
+	});
+	res.end(body);
+}
+
+export function beginGatewaySse(res: import("node:http").ServerResponse): void {
+	res.writeHead(200, {
+		"content-type": "text/event-stream; charset=utf-8",
+		"cache-control": "no-store",
+		connection: "close",
+	});
+}