@gajae-code/ai 0.15.6 → 0.16.0

package/src/providers/aws-credentials.ts

@@ -22,6 +22,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { $env, getTrustedHomeDir, isEnoent, logger } from "@gajae-code/utils";
+import { assertAwsRegionLabel } from "../adapter-internals/aws-region";
 import {
 	type AwsIniFile,
 	classifyAwsProfileCapability,
@@ -155,6 +156,7 @@ async function readSsoCredentials(
 		}
 	}
 	if (!startUrl || !ssoRegion) return undefined;
+	assertAwsRegionLabel(ssoRegion);
 
 	const token = await loadSsoCachedToken(startUrl, sessionName);
 	if (!token?.accessToken) {
@@ -172,6 +174,7 @@ async function readSsoCredentials(
 	const response = await fetch(url, {
 		method: "GET",
 		headers: { "x-amz-sso_bearer_token": token.accessToken },
+		redirect: "error",
 		signal,
 	});
 	if (!response.ok) {
@@ -411,6 +414,7 @@ async function readImdsCredentials(parentSignal: AbortSignal | undefined): Promi
 		const tokenRes = await fetch(`http://${IMDS_HOST}/latest/api/token`, {
 			method: "PUT",
 			headers: { "x-aws-ec2-metadata-token-ttl-seconds": "21600" },
+			redirect: "error",
 			signal,
 		});
 		if (!tokenRes.ok) return undefined;
@@ -418,6 +422,7 @@ async function readImdsCredentials(parentSignal: AbortSignal | undefined): Promi
 
 		const roleRes = await fetch(`http://${IMDS_HOST}/latest/meta-data/iam/security-credentials/`, {
 			headers: { "x-aws-ec2-metadata-token": token },
+			redirect: "error",
 			signal,
 		});
 		if (!roleRes.ok) return undefined;
@@ -428,6 +433,7 @@ async function readImdsCredentials(parentSignal: AbortSignal | undefined): Promi
 			`http://${IMDS_HOST}/latest/meta-data/iam/security-credentials/${encodeURIComponent(role)}`,
 			{
 				headers: { "x-aws-ec2-metadata-token": token },
+				redirect: "error",
 				signal,
 			},
 		);

package/src/providers/google-gemini-headers.d.ts

@@ -5,7 +5,7 @@
  */
 export declare const GEMINI_CLI_VERSION_ENV = "GJC_AI_GEMINI_CLI_VERSION";
 export declare const LEGACY_GEMINI_CLI_VERSION_ENV = "PI_AI_GEMINI_CLI_VERSION";
-export declare const DEFAULT_GEMINI_CLI_VERSION = "0.52.0";
+export declare const DEFAULT_GEMINI_CLI_VERSION = "0.58.0";
 export declare function getGeminiCliUserAgent(modelId?: string): string;
 export declare const getGeminiCliHeaders: (modelId?: string) => {
     "User-Agent": string;

package/src/providers/google-gemini-headers.ts

@@ -5,7 +5,7 @@
  */
 export const GEMINI_CLI_VERSION_ENV = "GJC_AI_GEMINI_CLI_VERSION";
 export const LEGACY_GEMINI_CLI_VERSION_ENV = "PI_AI_GEMINI_CLI_VERSION";
-export const DEFAULT_GEMINI_CLI_VERSION = "0.52.0";
+export const DEFAULT_GEMINI_CLI_VERSION = "0.58.0";
 
 export function getGeminiCliUserAgent(modelId = "gemini-3.1-pro-preview"): string {
 	const version =

package/src/providers/kiro-api-key.ts

@@ -6,6 +6,7 @@
  * AWS SSO OIDC / CodeWhisperer streaming path used by `gjc auth-broker login kiro`.
  */
 import { $env } from "@gajae-code/utils";
+import { assertAwsRegionLabel } from "../adapter-internals/aws-region";
 import { Effort } from "../model-thinking";
 import type {
 	Api,
@@ -53,19 +54,40 @@ export function isKiroApiKey(value: string | undefined): value is string {
 
 export function kiroApiRegion(options?: { region?: string }): string {
 	return (
-		options?.region ||
-		$env.KIRO_API_REGION ||
-		$env.KIRO_REGION ||
-		$env.AWS_REGION ||
-		$env.AWS_DEFAULT_REGION ||
+		options?.region ??
+		$env.KIRO_API_REGION ??
+		$env.KIRO_REGION ??
+		$env.AWS_REGION ??
+		$env.AWS_DEFAULT_REGION ??
 		DEFAULT_REGION
 	);
 }
 
 export function kiroApiBaseUrl(region: string): string {
+	assertAwsRegionLabel(region);
 	return `https://q.${region}.amazonaws.com/`;
 }
 
+function isRegionDerivedKiroApiBaseUrl(baseUrl: string): boolean {
+	try {
+		const url = new URL(baseUrl);
+		const match = /^q\.([a-z0-9-]+)\.amazonaws\.com$/.exec(url.hostname);
+		if (!match) return false;
+		assertAwsRegionLabel(match[1]);
+		return (
+			url.protocol === "https:" &&
+			url.username === "" &&
+			url.password === "" &&
+			url.port === "" &&
+			url.pathname === "/" &&
+			url.search === "" &&
+			url.hash === ""
+		);
+	} catch {
+		return false;
+	}
+}
+
 export function toKiroModelId(modelId: string): string {
 	return modelId.replace(/(\d)-(\d)/g, "$1.$2");
 }
@@ -279,12 +301,13 @@ export async function fetchKiroApiModels(
 	apiKey: string,
 	region?: string,
 ): Promise<Model<"kiro-codewhisperer-stream">[]> {
-	const resolvedRegion = region || kiroApiRegion();
+	const resolvedRegion = region ?? kiroApiRegion();
 	const baseUrl = kiroApiBaseUrl(resolvedRegion);
 	const response = await fetch(baseUrl, {
 		method: "POST",
 		headers: kiroApiHeaders(apiKey, LIST_TARGET),
 		body: JSON.stringify({ origin: KIRO_ORIGIN }),
+		redirect: "error",
 		signal: AbortSignal.timeout(15_000),
 	});
 	if (!response.ok) {
@@ -585,8 +608,9 @@ export const streamKiroApiKey: StreamFunction<"kiro-codewhisperer-stream"> = (
 					"Kiro API key missing. Set KIRO_API_KEY to a ksk_ key from https://app.kiro.dev/settings/api-keys.",
 				);
 			}
-			const region = kiroApiRegion(options);
-			const endpoint = model.baseUrl || kiroApiBaseUrl(region);
+			const configuredBaseUrl = model.baseUrl;
+			const usesExplicitBaseUrl = Boolean(configuredBaseUrl) && !isRegionDerivedKiroApiBaseUrl(configuredBaseUrl);
+			const endpoint = configuredBaseUrl || kiroApiBaseUrl(kiroApiRegion(options));
 			const request = buildApiKeyRequest(model, context, options);
 			options?.onPayload?.(request, model, options?.attemptScope);
 
@@ -594,6 +618,7 @@ export const streamKiroApiKey: StreamFunction<"kiro-codewhisperer-stream"> = (
 				method: "POST",
 				headers: { ...kiroApiHeaders(apiKey, CHAT_TARGET), ...(options.headers ?? {}) },
 				body: JSON.stringify(request),
+				...(usesExplicitBaseUrl ? {} : { redirect: "error" as const }),
 				signal: options.signal,
 			});
 			if (!response.ok) {

package/src/providers/kiro-codewhisperer.ts

@@ -11,6 +11,7 @@
  * not from any AGPL reference implementation.
  */
 import { $credentialEnv, $env, extractHttpStatusFromError } from "@gajae-code/utils";
+import { assertAwsRegionLabel } from "../adapter-internals/aws-region";
 import type { Effort } from "../model-thinking";
 import type {
 	Api,
@@ -178,9 +179,10 @@ export const streamKiroCodeWhisperer: StreamFunction<"kiro-codewhisperer-stream"
 		};
 
 		const blocks = output.content as Block[];
-		const region = options.region || $env.KIRO_REGION || $env.AWS_REGION || $env.AWS_DEFAULT_REGION || DEFAULT_REGION;
+		const region = options.region ?? $env.KIRO_REGION ?? $env.AWS_REGION ?? $env.AWS_DEFAULT_REGION ?? DEFAULT_REGION;
 
 		try {
+			assertAwsRegionLabel(region);
 			// Resolve bearer token
 			const bearerToken = resolveBearerToken(options.apiKey);
 			if (!bearerToken) {
@@ -222,6 +224,7 @@ export const streamKiroCodeWhisperer: StreamFunction<"kiro-codewhisperer-stream"
 				method: "POST",
 				headers: requestHeaders,
 				body,
+				redirect: "error",
 				signal: options.signal,
 			});
 

package/src/providers/openai-codex-responses.d.ts

@@ -25,6 +25,12 @@ export declare function normalizeCodexToolChoice(choice: ToolChoice | undefined,
 export declare function formatCodexUserAgent(platform: string, release: string, arch: string): string;
 export declare const streamOpenAICodexResponses: StreamFunction<"openai-codex-responses">;
 export declare function prewarmOpenAICodexResponses(model: Model<"openai-codex-responses">, options?: Pick<OpenAICodexResponsesOptions, "apiKey" | "headers" | "sessionId" | "signal" | "preferWebsockets" | "providerSessionState">): Promise<void>;
+/**
+ * Bun 1.4.0's Windows WebSocket client can segfault during TLS handshakes.
+ * Keep the model's websocket preference available on other platforms, while
+ * requiring an explicit opt-in on Windows until the bundled runtime is fixed.
+ */
+export declare function isCodexWebSocketSafeByDefault(platform?: NodeJS.Platform): boolean;
 export interface OpenAICodexTransportDetails {
     websocketPreferred: boolean;
     lastTransport?: CodexTransport;

package/src/providers/openai-codex-responses.ts

@@ -2307,6 +2307,15 @@ function recordCodexWebSocketFailure(state: CodexWebSocketSessionState, activate
 	}
 }
 
+/**
+ * Bun 1.4.0's Windows WebSocket client can segfault during TLS handshakes.
+ * Keep the model's websocket preference available on other platforms, while
+ * requiring an explicit opt-in on Windows until the bundled runtime is fixed.
+ */
+export function isCodexWebSocketSafeByDefault(platform: NodeJS.Platform = process.platform): boolean {
+	return platform !== "win32";
+}
+
 function shouldUseCodexWebSocket(
 	model: Model<"openai-codex-responses">,
 	state: CodexWebSocketSessionState | undefined,
@@ -2314,7 +2323,11 @@ function shouldUseCodexWebSocket(
 ): boolean {
 	if (!state || state.disableWebsocket) return false;
 	if (preferWebsockets === false) return false;
-	return isCodexWebSocketEnvEnabled() || preferWebsockets === true || model.preferWebsockets === true;
+	return (
+		isCodexWebSocketEnvEnabled() ||
+		preferWebsockets === true ||
+		(isCodexWebSocketSafeByDefault() && model.preferWebsockets === true)
+	);
 }
 
 export interface OpenAICodexTransportDetails {
@@ -2372,7 +2385,9 @@ export function getOpenAICodexTransportDetails(
 	const websocketPreferred =
 		options?.preferWebsockets === false
 			? false
-			: isCodexWebSocketEnvEnabled() || options?.preferWebsockets === true || model.preferWebsockets === true;
+			: isCodexWebSocketEnvEnabled() ||
+				options?.preferWebsockets === true ||
+				(isCodexWebSocketSafeByDefault() && model.preferWebsockets === true);
 	const state = getCodexWebSocketStateForPublicSession(model, options);
 
 	return {

package/src/providers/pi-native-client.ts

@@ -49,6 +49,29 @@ const NON_WIRE_KEYS = new Set<keyof SimpleStreamOptions>([
 	"fallbackAttempt",
 ]);
 
+/**
+ * Project the caller's {@link Context} onto the wire schema. Runtime tool
+ * objects routinely carry harness-only state (runners, session managers,
+ * fs-stat BigInts) that must never be serialized: BigInt fields make
+ * `JSON.stringify` throw outright, and the rest is dead weight the gateway
+ * re-derives from its own tool registry. Only the protocol-meaningful,
+ * JSON-safe `Tool` fields cross the wire.
+ */
+function buildWireContext(context: Context): Context {
+	if (!context.tools || context.tools.length === 0) return context;
+	return {
+		...context,
+		tools: context.tools.map(tool => ({
+			name: tool.name,
+			description: tool.description,
+			parameters: tool.parameters,
+			...(tool.strict !== undefined ? { strict: tool.strict } : {}),
+			...(tool.customFormat !== undefined ? { customFormat: tool.customFormat } : {}),
+			...(tool.customWireName !== undefined ? { customWireName: tool.customWireName } : {}),
+		})),
+	};
+}
+
 function buildWireOptions(options: SimpleStreamOptions | undefined): Record<string, unknown> {
 	if (!options) return {};
 	const wire: Record<string, unknown> = {};
@@ -166,7 +189,7 @@ export function streamPiNative<TApi extends Api>(
 			const headers = buildHeaders(model as Model<Api>, options?.apiKey);
 			const body = JSON.stringify({
 				modelId: model.id,
-				context,
+				context: buildWireContext(context),
 				options: buildWireOptions(options),
 				stream: true,
 			});

package/src/utils/oauth/kiro.ts

@@ -8,6 +8,7 @@
  * and AWS public documentation, not from any third-party reference.
  */
 import { scheduler } from "node:timers/promises";
+import { assertAwsRegionLabel } from "../../adapter-internals/aws-region";
 import type { OAuthCredentials } from "./types";
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -72,23 +73,38 @@ interface CreateTokenError {
 	error_uri?: string;
 }
 
+interface CreateTokenResult {
+	response: Response;
+	status: number;
+	data: CreateTokenSuccess | CreateTokenError;
+}
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Typed SSO OIDC error names from the published service model
 // ─────────────────────────────────────────────────────────────────────────────
 
 const SSO_OIDC_FATAL_ERRORS = new Set([
 	"access_denied_exception",
+	"access_denied",
 	"expired_token_exception",
+	"expired_token",
 	"internal_server_exception",
+	"server_error",
 	"invalid_client_exception",
+	"invalid_client",
 	"invalid_client_metadata_exception",
 	"invalid_grant_exception",
+	"invalid_grant",
 	"invalid_redirect_uri_exception",
 	"invalid_request_exception",
+	"invalid_request",
 	"invalid_request_region_exception",
 	"invalid_scope_exception",
+	"invalid_scope",
 	"unauthorized_client_exception",
+	"unauthorized_client",
 	"unsupported_grant_type_exception",
+	"unsupported_grant_type",
 ]);
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -133,6 +149,7 @@ export async function registerClient(
 		method: "POST",
 		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify(body),
+		redirect: "error",
 		signal,
 	});
 
@@ -180,6 +197,7 @@ export async function startDeviceAuthorization(
 		method: "POST",
 		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify(body),
+		redirect: "error",
 		signal,
 	});
 
@@ -227,33 +245,54 @@ export async function pollForToken(
 			deviceCode,
 		};
 
-		const response = await fetchOidc(url, {
-			method: "POST",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify(body),
-			signal,
-		});
-
-		const data = (await response.json()) as CreateTokenSuccess | CreateTokenError;
+		const requestSignal = AbortSignal.any([
+			...(signal ? [signal] : []),
+			AbortSignal.timeout(Math.max(1, deadline - Date.now())),
+		]);
+		let result: CreateTokenResult;
+		try {
+			result = await createTokenOnce(url, {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify(body),
+				signal: requestSignal,
+			});
+		} catch (error) {
+			if (signal?.aborted) throw new Error("Login cancelled");
+			if (Date.now() >= deadline) break;
+			throw error;
+		}
 
-		if ("accessToken" in data && typeof data.accessToken === "string") {
+		if (Date.now() >= deadline) break;
+		const { status, data } = result;
+
+		if ("accessToken" in data) {
+			if (
+				status < 200 ||
+				status >= 300 ||
+				"error" in data ||
+				data.accessToken.length === 0 ||
+				!Number.isFinite(data.expiresIn) ||
+				data.expiresIn <= 0
+			) {
+				throw new Error("SSO OIDC CreateToken: invalid success response");
+			}
 			return data;
 		}
 
 		if ("error" in data) {
+			if (status !== 400) throw new Error(oidcRequestFailure(url, result.response));
 			const errorCode = data.error;
 			if (errorCode === "authorization_pending") continue;
 			if (errorCode === "slow_down") {
-				currentInterval = Math.ceil(currentInterval * 1.5);
+				currentInterval += 5_000;
 				continue;
 			}
 			if (SSO_OIDC_FATAL_ERRORS.has(errorCode)) {
-				const desc = data.error_description ? `: ${data.error_description}` : "";
-				throw new Error(`SSO OIDC token error: ${errorCode}${desc}`);
+				throw new Error(`SSO OIDC token error: ${errorCode}`);
 			}
 			// Unknown error — fail closed
-			const desc = data.error_description ? `: ${data.error_description}` : "";
-			throw new Error(`SSO OIDC unrecognized token error: ${errorCode}${desc}`);
+			throw new Error(`SSO OIDC unrecognized token error: ${errorCode}`);
 		}
 
 		throw new Error("SSO OIDC CreateToken: unrecognized response shape");
@@ -292,6 +331,7 @@ export async function refreshKiroToken(credentials: OAuthCredentials): Promise<O
 		method: "POST",
 		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify(body),
+		redirect: "error",
 	});
 
 	const data = (await response.json()) as CreateTokenSuccess | CreateTokenError;
@@ -430,19 +470,48 @@ export function importSsoCacheToken(): OAuthCredentials | undefined {
 // ─────────────────────────────────────────────────────────────────────────────
 
 function ssoOidcEndpoint(region: string, pathSuffix: string): string {
+	assertAwsRegionLabel(region);
 	return `https://oidc.${region}.amazonaws.com${pathSuffix}`;
 }
 
 async function fetchOidc(url: string, init: RequestInit & { signal?: AbortSignal }): Promise<Response> {
-	const response = await fetch(url, init);
+	const response = await fetch(url, { ...init, redirect: "error" });
 	if (!response.ok) {
-		let errorBody = "";
-		try {
-			errorBody = await response.text();
-		} catch {}
-		throw new Error(
-			`SSO OIDC request to ${url} failed: ${response.status} ${response.statusText}: ${errorBody.slice(0, 500)}`,
-		);
+		throw new Error(oidcRequestFailure(url, response));
 	}
 	return response;
 }
+
+function oidcRequestFailure(url: string, response: Response): string {
+	return `SSO OIDC request to ${url} failed: ${response.status} ${response.statusText}`;
+}
+
+/**
+ * `CreateToken` reports the in-progress device-code states (`authorization_pending`,
+ * `slow_down`) as HTTP 400 responses whose body carries the error code, so the poll
+ * loop must read the payload instead of treating a non-2xx status as fatal.
+ * Non-2xx responses without an `error` field still fail closed.
+ */
+async function createTokenOnce(url: string, init: RequestInit & { signal?: AbortSignal }): Promise<CreateTokenResult> {
+	const response = await fetch(url, { ...init, redirect: "error" });
+	const rawBody = await response.text();
+	let data: CreateTokenSuccess | CreateTokenError;
+	try {
+		data = JSON.parse(rawBody) as CreateTokenSuccess | CreateTokenError;
+	} catch {
+		throw new Error(oidcRequestFailure(url, response));
+	}
+	if (data === null || typeof data !== "object") {
+		throw new Error(oidcRequestFailure(url, response));
+	}
+	if (!response.ok && !("error" in data)) {
+		throw new Error(oidcRequestFailure(url, response));
+	}
+	if ("error" in data && typeof data.error !== "string") {
+		throw new Error(oidcRequestFailure(url, response));
+	}
+	if ("accessToken" in data && typeof data.accessToken !== "string") {
+		throw new Error(oidcRequestFailure(url, response));
+	}
+	return { response, status: response.status, data };
+}