@gajae-code/ai 0.18.10 → 0.18.12

package/src/utils/idle-iterator.d.ts

@@ -23,11 +23,12 @@ export declare function getStreamIdleTimeoutRemediationMs(): number;
  * Returns the idle timeout used for OpenAI-family streaming transports.
  *
  * Honors `GJC_OPENAI_STREAM_IDLE_TIMEOUT_MS` first (`PI_OPENAI_STREAM_IDLE_TIMEOUT_MS` is the legacy alias). Set `=0` to disable.
+ * A configured model timeout takes precedence over the built-in provider/model floors; environment overrides win over it.
  * When `provider` is given, long-reasoning hosts (xAI Grok and Grok Build) use that floor instead of the 120s default.
  * Grok models reached through other OpenAI-compatible hosts (`openrouter/x-ai/grok-*`, kilo, litellm, …) get the
  * same floor keyed on the model id, because long-reasoning silence is a property of the model (#4797).
  */
-export declare function getOpenAIStreamIdleTimeoutMs(provider?: string, modelId?: string): number | undefined;
+export declare function getOpenAIStreamIdleTimeoutMs(provider?: string, modelId?: string, configuredTimeoutMs?: number): number | undefined;
 /**
  * Returns the timeout used while waiting for the first stream event.
  * The first token can legitimately take longer than later inter-event gaps,
@@ -57,7 +58,7 @@ export declare function getStreamFirstEventTimeoutMs(idleTimeoutMs?: number, fal
  *   window so a short post-connect first-event budget cannot kill legitimate
  *   slow setup.
  */
-export declare function resolveOpenAISdkRequestTimeoutMs(provider: string, streamFirstEventTimeoutOverride?: number, modelId?: string): number | undefined;
+export declare function resolveOpenAISdkRequestTimeoutMs(provider: string, streamFirstEventTimeoutOverride?: number, modelId?: string, configuredIdleTimeoutMs?: number, effectiveIdleTimeoutOverride?: number): number | undefined;
 /**
  * Resolves the Anthropic SDK client `timeout` so stalled-before-headers requests
  * are bounded. The Anthropic first-event watchdog deliberately arms only once

package/src/utils/idle-iterator.ts

@@ -46,7 +46,7 @@ export function getProviderFirstEventTimeoutFallbackMs(provider: string): number
 	return provider === "kimi-code" ? KIMI_CODE_FIRST_EVENT_TIMEOUT_MS : undefined;
 }
 
-function normalizeIdleTimeoutMs(value: string | undefined, fallback: number): number | undefined {
+function normalizeIdleTimeoutMs(value: string | undefined, fallback: number | undefined): number | undefined {
 	if (value === undefined) return fallback;
 	const parsed = Number(value);
 	if (!Number.isFinite(parsed)) return fallback;
@@ -86,16 +86,29 @@ export function getStreamIdleTimeoutRemediationMs(): number {
  * Returns the idle timeout used for OpenAI-family streaming transports.
  *
  * Honors `GJC_OPENAI_STREAM_IDLE_TIMEOUT_MS` first (`PI_OPENAI_STREAM_IDLE_TIMEOUT_MS` is the legacy alias). Set `=0` to disable.
+ * A configured model timeout takes precedence over the built-in provider/model floors; environment overrides win over it.
  * When `provider` is given, long-reasoning hosts (xAI Grok and Grok Build) use that floor instead of the 120s default.
  * Grok models reached through other OpenAI-compatible hosts (`openrouter/x-ai/grok-*`, kilo, litellm, …) get the
  * same floor keyed on the model id, because long-reasoning silence is a property of the model (#4797).
  */
-export function getOpenAIStreamIdleTimeoutMs(provider?: string, modelId?: string): number | undefined {
+export function getOpenAIStreamIdleTimeoutMs(
+	provider?: string,
+	modelId?: string,
+	configuredTimeoutMs?: number,
+): number | undefined {
+	const builtInFallback =
+		getProviderStreamIdleTimeoutFallbackMs(provider ?? "") ??
+		(isGrokModelId(modelId) ? LONG_REASONING_STREAM_IDLE_TIMEOUT_MS : undefined) ??
+		DEFAULT_STREAM_IDLE_TIMEOUT_MS;
+	let configuredFallback: number | undefined = builtInFallback;
+	if (configuredTimeoutMs === 0) {
+		configuredFallback = undefined;
+	} else if (configuredTimeoutMs !== undefined && Number.isFinite(configuredTimeoutMs) && configuredTimeoutMs > 0) {
+		configuredFallback = Math.max(1, Math.trunc(configuredTimeoutMs));
+	}
 	return normalizeIdleTimeoutMs(
 		$env.GJC_OPENAI_STREAM_IDLE_TIMEOUT_MS ?? $env.PI_STREAM_IDLE_TIMEOUT_MS ?? $env.PI_OPENAI_STREAM_IDLE_TIMEOUT_MS,
-		getProviderStreamIdleTimeoutFallbackMs(provider ?? "") ??
-			(isGrokModelId(modelId) ? LONG_REASONING_STREAM_IDLE_TIMEOUT_MS : undefined) ??
-			DEFAULT_STREAM_IDLE_TIMEOUT_MS,
+		configuredFallback,
 	);
 }
 
@@ -139,19 +152,26 @@ export function resolveOpenAISdkRequestTimeoutMs(
 	provider: string,
 	streamFirstEventTimeoutOverride?: number,
 	modelId?: string,
+	configuredIdleTimeoutMs?: number,
+	effectiveIdleTimeoutOverride?: number,
 ): number | undefined {
 	const providerFirstEventFallbackMs = getProviderFirstEventTimeoutFallbackMs(provider);
 	const envSdkTimeoutMs = getStreamFirstEventTimeoutMs(
-		getOpenAIStreamIdleTimeoutMs(provider, modelId),
+		effectiveIdleTimeoutOverride ?? getOpenAIStreamIdleTimeoutMs(provider, modelId, configuredIdleTimeoutMs),
 		providerFirstEventFallbackMs,
 	);
 	if (streamFirstEventTimeoutOverride === 0) return undefined;
+	let sdkTimeoutMs: number | undefined;
 	if (streamFirstEventTimeoutOverride !== undefined) {
-		return providerFirstEventFallbackMs !== undefined
-			? streamFirstEventTimeoutOverride
-			: Math.max(envSdkTimeoutMs ?? 0, streamFirstEventTimeoutOverride);
+		sdkTimeoutMs =
+			providerFirstEventFallbackMs !== undefined
+				? streamFirstEventTimeoutOverride
+				: Math.max(envSdkTimeoutMs ?? 0, streamFirstEventTimeoutOverride);
+	} else {
+		sdkTimeoutMs = envSdkTimeoutMs;
 	}
-	return envSdkTimeoutMs;
+	if (sdkTimeoutMs === undefined || !Number.isFinite(sdkTimeoutMs) || sdkTimeoutMs <= 0) return undefined;
+	return Math.min(Math.trunc(sdkTimeoutMs), MAX_TIMER_DELAY_MS);
 }
 
 /**

package/src/utils/oauth/anthropic.ts

@@ -62,15 +62,16 @@ async function postJson(url: string, body: Record<string, string | number>): Pro
 /**
  * Decoded shape of Anthropic's `/v1/oauth/token` response (both
  * `authorization_code` exchange and `refresh_token` refresh return the same
- * envelope). The `account` block is inlined alongside the tokens, so we can
- * surface `accountId` / `email` on {@link OAuthCredentials} without a separate
- * `/api/oauth/profile` round-trip.
+ * envelope). The `account` and `organization` blocks are inlined alongside the
+ * tokens, so we can surface `accountId` / `email` / `organizationId` on
+ * {@link OAuthCredentials} without a separate `/api/oauth/profile` round-trip.
  */
 interface AnthropicTokenResponse {
 	access_token: string;
 	refresh_token: string;
 	expires_in: number;
 	account?: { uuid?: string; email_address?: string };
+	organization?: { uuid?: string; name?: string };
 }
 
 function parseOAuthTokenResponse(responseBody: string, operation: string): AnthropicTokenResponse {
@@ -83,22 +84,26 @@ function parseOAuthTokenResponse(responseBody: string, operation: string): Anthr
 	}
 }
 
+function nonEmptyString(value: unknown): string | undefined {
+	return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
+}
+
 /**
- * Lift the OAuth response's `account: { uuid, email_address }` block onto
- * {@link OAuthCredentials} so downstream identity propagation (e.g.
- * `metadata.user_id.account_uuid`, usage tracking) works without a separate
- * `/api/oauth/profile` round-trip. Returns `undefined` for either field when
- * the response omits it or carries a non-string / empty value.
+ * Lift the OAuth response's `account: { uuid, email_address }` and
+ * `organization: { uuid, name }` blocks onto {@link OAuthCredentials} so
+ * downstream identity propagation (e.g. `metadata.user_id.account_uuid`, usage
+ * tracking, one stored credential per organization) works without a separate
+ * `/api/oauth/profile` round-trip. Returns `undefined` for any field the
+ * response omits or carries as a non-string / empty value.
  */
-function extractAccountFromTokenResponse(data: AnthropicTokenResponse): {
-	accountId?: string;
-	email?: string;
-} {
-	const accountUuid = data.account?.uuid;
-	const emailAddress = data.account?.email_address;
+function extractIdentityFromTokenResponse(
+	data: AnthropicTokenResponse,
+): Pick<OAuthCredentials, "accountId" | "email" | "organizationId" | "organizationName"> {
 	return {
-		accountId: typeof accountUuid === "string" && accountUuid.length > 0 ? accountUuid : undefined,
-		email: typeof emailAddress === "string" && emailAddress.length > 0 ? emailAddress : undefined,
+		accountId: nonEmptyString(data.account?.uuid),
+		email: nonEmptyString(data.account?.email_address),
+		organizationId: nonEmptyString(data.organization?.uuid),
+		organizationName: nonEmptyString(data.organization?.name),
 	};
 }
 
@@ -182,14 +187,12 @@ export class AnthropicOAuthFlow extends OAuthCallbackFlow {
 		}
 
 		const tokenData = parseOAuthTokenResponse(responseBody, "token exchange");
-		const { accountId, email } = extractAccountFromTokenResponse(tokenData);
 
 		return {
 			refresh: tokenData.refresh_token,
 			access: tokenData.access_token,
 			expires: Date.now() + tokenData.expires_in * 1000 - 5 * 60 * 1000,
-			accountId,
-			email,
+			...extractIdentityFromTokenResponse(tokenData),
 		};
 	}
 }
@@ -221,13 +224,11 @@ export async function refreshAnthropicToken(refreshToken: string): Promise<OAuth
 	}
 
 	const data = parseOAuthTokenResponse(responseBody, "token refresh");
-	const { accountId, email } = extractAccountFromTokenResponse(data);
 
 	return {
 		refresh: data.refresh_token || refreshToken,
 		access: data.access_token,
 		expires: Date.now() + data.expires_in * 1000 - 5 * 60 * 1000,
-		accountId,
-		email,
+		...extractIdentityFromTokenResponse(data),
 	};
 }

package/src/utils/oauth/api-key-validation.ts

@@ -193,19 +193,42 @@ export async function validateOpenAICompatibleApiKey(options: OpenAICompatibleVa
 				typeof parsed === "object" && parsed !== null && "choices" in parsed
 					? (parsed as { choices?: unknown }).choices
 					: undefined;
-			const firstChoice = Array.isArray(choices) ? choices[0] : undefined;
-			const message =
-				typeof firstChoice === "object" &&
-				firstChoice !== null &&
-				"message" in firstChoice &&
-				typeof (firstChoice as { message?: unknown }).message === "object" &&
-				!Array.isArray((firstChoice as { message?: unknown }).message)
-					? (firstChoice as { message: Record<string, unknown> }).message
-					: undefined;
-			const content = message?.content;
-			if (!(typeof content === "string" && content.trim().length > 0)) {
+			if (!Array.isArray(choices) || choices.length === 0) {
 				throw validationFailure(options.provider, options.apiKey, "the inference probe returned no choices");
 			}
+			const firstChoice: unknown = choices[0];
+			if (
+				typeof firstChoice !== "object" ||
+				firstChoice === null ||
+				Array.isArray(firstChoice) ||
+				!("message" in firstChoice)
+			) {
+				throw validationFailure(
+					options.provider,
+					options.apiKey,
+					"the inference probe returned choices without a valid message",
+				);
+			}
+			const choice = firstChoice as Record<string, unknown>;
+			const rawMessage = choice.message;
+			if (typeof rawMessage !== "object" || rawMessage === null || Array.isArray(rawMessage)) {
+				throw validationFailure(
+					options.provider,
+					options.apiKey,
+					"the inference probe returned choices without a valid message",
+				);
+			}
+			const message = rawMessage as Record<string, unknown>;
+			const hasContent = typeof message.content === "string" && message.content.trim().length > 0;
+			const hasReasoningContent =
+				typeof message.reasoning_content === "string" && message.reasoning_content.trim().length > 0;
+			if (!hasContent && !hasReasoningContent && choice.finish_reason !== "length") {
+				throw validationFailure(
+					options.provider,
+					options.apiKey,
+					"the inference probe returned choices with empty content",
+				);
+			}
 		}
 		return;
 	}

package/src/utils/oauth/types.d.ts

@@ -7,6 +7,15 @@ export type OAuthCredentials = {
     email?: string;
     accountId?: string;
     profileArn?: string;
+    /**
+     * Organization the token is scoped to. One Anthropic account can belong to
+     * several organizations (e.g. a Team workspace and a personal Max plan); each
+     * login is bound to exactly one of them, so the organization is part of the
+     * credential's identity.
+     */
+    organizationId?: string;
+    /** Display name of {@link organizationId}. */
+    organizationName?: string;
 };
 export type OAuthProvider = "kiro" | "alibaba-token-plan" | "anthropic" | "bizrouter" | "mara" | "cerebras" | "cloudflare-ai-gateway" | "cursor" | "deepseek" | "deepinfra" | "fireworks" | "firepass" | "fugu" | "github-copilot" | "google-gemini-cli" | "google-antigravity" | "gitlab-duo" | "huggingface" | "kimi-code" | "kilo" | "kagi" | "litellm" | "lm-studio" | "minimax-code" | "minimax-code-cn" | "moonshot" | "nvidia" | "nanogpt" | "ollama" | "ollama-cloud" | "openai-codex" | "openai-codex-device" | "opencode-go" | "opencode-zen" | "commandcode-goat" | "opengateway" | "openrouter" | "parallel" | "perplexity" | "qianfan" | "qwen-portal" | "sglang" | "synthetic" | "tavily" | "together" | "venice" | "vercel-ai-gateway" | "vllm" | "xai" | "glm-zcode" | "xiaomi" | "xiaomi-token-plan-sgp" | "xiaomi-token-plan-ams" | "xiaomi-token-plan-cn" | "zenmux" | "opencodex" | "zai";
 export type OAuthProviderId = OAuthProvider | (string & {});

package/src/utils/oauth/types.ts

@@ -7,6 +7,15 @@ export type OAuthCredentials = {
 	email?: string;
 	accountId?: string;
 	profileArn?: string;
+	/**
+	 * Organization the token is scoped to. One Anthropic account can belong to
+	 * several organizations (e.g. a Team workspace and a personal Max plan); each
+	 * login is bound to exactly one of them, so the organization is part of the
+	 * credential's identity.
+	 */
+	organizationId?: string;
+	/** Display name of {@link organizationId}. */
+	organizationName?: string;
 };
 
 export type OAuthProvider =

package/src/utils/parse-bind.d.ts

@@ -0,0 +1,35 @@
+export interface ParsedBind {
+    hostname: string;
+    port: number;
+}
+/**
+ * Parse a `host:port` (or bare `port`, which assumes loopback) string.
+ *
+ * Accepts:
+ *   - `"4000"`            → `127.0.0.1:4000`
+ *   - `"0.0.0.0:4000"`    → as written
+ *   - `"[::1]:4000"`      → as written (brackets retained, Bun handles them)
+ *
+ * Rejects:
+ *   - empty input
+ *   - empty hostname (`":4000"`)
+ *   - non-integer / out-of-range port
+ */
+export declare function parseBind(raw: string): ParsedBind;
+/** True for loopback-only hostnames the auth servers may bind without credentials. */
+export declare function isLoopbackHostname(hostname: string): boolean;
+/**
+ * Fail closed when an unauthenticated auth server (empty bearer token set)
+ * would bind a non-loopback address: that exposes credential operations to the
+ * network with no proof of possession.
+ */
+export declare function assertAuthenticatedOrLoopback(bind: ParsedBind, bearerTokenCount: number, serverName: string): void;
+/**
+ * Tokenless loopback servers accept a request only when its Host header is the
+ * bound hostname and effective port. Default-port forms that stay allowed:
+ * a Host with no port, or an explicit :80, on an HTTP listener on port 80;
+ * an explicit :443 on a listener on port 443. Any other omitted port is
+ * rejected. A DNS-rebound same-origin GET sends the attacker's name and no
+ * Origin header.
+ */
+export declare function hostHeaderMatchesBind(hostHeader: string | null, bind: ParsedBind): boolean;