@oh-my-pi/pi-ai 16.1.13 → 16.1.15

package/src/providers/devin.ts

@@ -42,6 +42,7 @@ import type {
 	Tool,
 	ToolCall,
 } from "../types";
+import { deterministicUuid } from "../utils/deterministic-id";
 import { AssistantMessageEventStream } from "../utils/event-stream";
 import { parseStreamingJson } from "../utils/json-parse";
 import { formatErrorMessageWithRetryAfter } from "../utils/retry-after";
@@ -427,7 +428,7 @@ function buildDevinChatRequest(
 		plannerMode: ConversationalPlannerMode.DEFAULT,
 		toolChoice: create(ChatToolChoiceSchema, { choice: { case: "optionName", value: "auto" } }),
 		systemPromptCacheOptions: create(PromptCacheOptionsSchema, { type: CacheControlType.EPHEMERAL }),
-		disableParallelToolCalls: false,
+		disableParallelToolCalls: true,
 		cascadeId,
 		executionId: crypto.randomUUID(),
 		configuration: create(CompletionConfigurationSchema, {
@@ -455,6 +456,8 @@ function buildDevinChatRequest(
 /** Map omp `Message` history onto Cascade `ChatMessagePrompt`s (USER / SYSTEM / TOOL channels). */
 function buildChatMessagePrompts(messages: Message[], cascadeId: string): ChatMessagePrompt[] {
 	const prompts: ChatMessagePrompt[] = [];
+	// messageId seeds are `cascadeId\0index\0role[...]` — prompt text is excluded
+	// so ids stay stable across content edits / history rebuilds.
 	for (const [index, msg] of messages.entries()) {
 		if (msg.role === "user" || msg.role === "developer") {
 			let promptText = "";
@@ -472,7 +475,7 @@ function buildChatMessagePrompts(messages: Message[], cascadeId: string): ChatMe
 			}
 			prompts.push(
 				create(ChatMessagePromptSchema, {
-					messageId: deterministicMessageId(`${cascadeId}\0${index}\0${msg.role}`),
+					messageId: deterministicUuid(`${cascadeId}\0${index}\0${msg.role}`),
 					source: ChatMessageSource.USER,
 					prompt: promptText,
 					images,
@@ -501,7 +504,7 @@ function buildChatMessagePrompts(messages: Message[], cascadeId: string): ChatMe
 			}
 			prompts.push(
 				create(ChatMessagePromptSchema, {
-					messageId: msg.responseId ?? `bot-${deterministicMessageId(`${cascadeId}\0${index}\0assistant`)}`,
+					messageId: msg.responseId ?? `bot-${deterministicUuid(`${cascadeId}\0${index}\0assistant`)}`,
 					source: ChatMessageSource.SYSTEM,
 					prompt: promptText,
 					thinking: thinkingText,
@@ -522,7 +525,7 @@ function buildChatMessagePrompts(messages: Message[], cascadeId: string): ChatMe
 			}
 			prompts.push(
 				create(ChatMessagePromptSchema, {
-					messageId: deterministicMessageId(`${cascadeId}\0${index}\0tool\0${msg.toolCallId}`),
+					messageId: deterministicUuid(`${cascadeId}\0${index}\0tool\0${msg.toolCallId}`),
 					source: ChatMessageSource.TOOL,
 					toolCallId: msg.toolCallId,
 					toolResultIsError: msg.isError,
@@ -535,16 +538,6 @@ function buildChatMessagePrompts(messages: Message[], cascadeId: string): ChatMe
 	return prompts;
 }
 
-/**
- * Deterministic UUID-shaped message id derived from a stable per-message seed.
- * Seed is `${cascadeId}\0${index}\0${role}[...]` — prompt text is intentionally
- * excluded so ids stay stable across content edits / history rebuilds.
- */
-function deterministicMessageId(seed: string): string {
-	const hex = new Bun.CryptoHasher("sha256").update(seed).digest("hex");
-	return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`;
-}
-
 /**
  * Parse a Connect end-of-stream JSON trailer and return a human-readable error
  * string when it carries `{ error: { code, message } }`, else `null`. The trailer

package/src/providers/openai-responses.ts

@@ -436,7 +436,8 @@ const streamOpenAIResponsesOnce = (
 					? buildOpenAIResponsesChainedParams(params, trailingScaffoldingItems, chainState)
 					: { params };
 			sentPreviousResponseId = chained.previousResponseId;
-			const idleTimeoutMs = options?.streamIdleTimeoutMs ?? getOpenAIStreamIdleTimeoutMs();
+			const idleTimeoutMs =
+				options?.streamIdleTimeoutMs ?? getOpenAIStreamIdleTimeoutMs(model.compat.streamIdleTimeoutMs);
 			const firstEventTimeoutMs =
 				options?.streamFirstEventTimeoutMs ?? getOpenAIStreamFirstEventTimeoutMs(idleTimeoutMs);
 			const requestTimeoutMs =

package/src/providers/openai-shared.ts

@@ -130,6 +130,17 @@ export interface OpenAIRequestSetup {
 	requestHeaders: Record<string, string>;
 }
 
+function normalizeSakanaRequestBaseUrl(baseUrl: string | undefined): string | undefined {
+	const value = baseUrl?.trim();
+	if (!value) return undefined;
+	const normalized = value.replace(/\/+$/, "");
+	return normalized.endsWith("/v1") ? normalized : `${normalized}/v1`;
+}
+
+function resolveSakanaRequestBaseUrl(): string | undefined {
+	return normalizeSakanaRequestBaseUrl($env.SAKANA_BASE_URL) ?? normalizeSakanaRequestBaseUrl($env.FUGU_BASE_URL);
+}
+
 export function resolveOpenAIRequestSetup(
 	model: OpenAIRequestSetupModel,
 	options: OpenAIRequestSetupOptions,
@@ -165,6 +176,12 @@ export function resolveOpenAIRequestSetup(
 			baseUrl = moonshotBaseUrl;
 		}
 	}
+	if (model.provider === "sakana") {
+		const sakanaBaseUrl = resolveSakanaRequestBaseUrl();
+		if (sakanaBaseUrl) {
+			baseUrl = sakanaBaseUrl;
+		}
+	}
 	if (model.provider === "github-copilot") {
 		apiKey = parseGitHubCopilotApiKey(rawApiKey).accessToken;
 		const copilot = buildCopilotDynamicHeaders({
@@ -2384,19 +2401,29 @@ export function populateResponsesUsageFromResponse(
 				input_tokens_details?: {
 					cached_tokens?: number | null;
 					cache_write_tokens?: number | null;
+					orchestration_input_tokens?: number | null;
+					orchestration_input_cached_tokens?: number | null;
+				} | null;
+				output_tokens_details?: {
+					reasoning_tokens?: number | null;
+					orchestration_output_tokens?: number | null;
 				} | null;
-				output_tokens_details?: { reasoning_tokens?: number | null } | null;
 		  }
 		| null
 		| undefined,
 ): void {
 	if (!usage) return;
+	const details = usage.input_tokens_details;
+	const outputDetails = usage.output_tokens_details;
+	const orchestrationInputTokens = details?.orchestration_input_tokens ?? 0;
+	const orchestrationInputCachedTokens = details?.orchestration_input_cached_tokens ?? 0;
+	const orchestrationOutputTokens = outputDetails?.orchestration_output_tokens ?? 0;
 	const accounting = calculateOpenAIUsageAccounting({
-		promptTokens: usage.input_tokens ?? 0,
-		outputTokens: usage.output_tokens ?? 0,
-		cachedTokens: usage.input_tokens_details?.cached_tokens ?? usage.prompt_cache_hit_tokens ?? 0,
-		reasoningTokens: usage.output_tokens_details?.reasoning_tokens ?? 0,
-		cacheWriteOpenRouter: usage.input_tokens_details?.cache_write_tokens ?? undefined,
+		promptTokens: (usage.input_tokens ?? 0) + orchestrationInputTokens,
+		outputTokens: (usage.output_tokens ?? 0) + orchestrationOutputTokens,
+		cachedTokens: (details?.cached_tokens ?? usage.prompt_cache_hit_tokens ?? 0) + orchestrationInputCachedTokens,
+		reasoningTokens: outputDetails?.reasoning_tokens ?? 0,
+		cacheWriteOpenRouter: details?.cache_write_tokens ?? undefined,
 		cacheWriteDeepSeek: usage.prompt_cache_miss_tokens ?? undefined,
 		hasDeepSeekCacheHitAndMiss:
 			usage.prompt_cache_hit_tokens !== undefined && usage.prompt_cache_miss_tokens !== undefined,

package/src/rate-limit-utils.ts

@@ -100,7 +100,55 @@ export function calculateRateLimitBackoffMs(reason: RateLimitReason): number {
 
 /** Detect usage/quota limit errors in error messages (persistent, requires credential switch). */
 const USAGE_LIMIT_PATTERN =
-	/usage.?limit|usage_limit_reached|usage_not_included|limit_reached|quota.?exceeded|quota.?reached|resource.?exhausted|exhausted your capacity|quota will reset|insufficient.?balance/i;
+	/usage.?limit|usage_limit_reached|usage_not_included|limit_reached|quota.?exceeded|quota.?reached|resource.?exhausted|exhausted your capacity|quota will reset|insufficient.?(?:balance|quota)/i;
+
+/**
+ * HTTP status codes that, absent richer body classification, represent an
+ * account-local usage cap rather than a bad credential or a transient blip.
+ * Always combine with {@link isUsageLimitOutcome} when a message is available
+ * — a 429 carrying transient rate-limit wording is NOT a usage cap.
+ */
+export function isUsageLimitStatus(status: number | undefined): boolean {
+	return status === 429;
+}
+
+/**
+ * Returns true for failures that should burn one credential and rotate to a
+ * sibling account. Decision tree:
+ *
+ *  1. Body matches {@link isUsageLimitError} (Codex `usage_limit_reached`,
+ *     Anthropic account rate-limit, Google `resource_exhausted`, OpenAI
+ *     `insufficient_quota`, …) → rotate.
+ *  2. Status is not 429 → backoff (caller's domain).
+ *  3. Body is absent or {@link isOpaqueStatusBody opaque} (just the status,
+ *     empty JSON, HTTP framing only) → rotate conservatively: the server
+ *     gave us nothing else to go on.
+ *  4. Body has content → defer to {@link parseRateLimitReason}. Only
+ *     `QUOTA_EXHAUSTED` rotates; `RATE_LIMIT_EXCEEDED` (`Too many requests`,
+ *     per-minute caps), `MODEL_CAPACITY_EXHAUSTED` (`Service overloaded`),
+ *     `SERVER_ERROR`, and `UNKNOWN` (`Please retry in 5s`) stay in the
+ *     provider's own backoff layer so transient 429s don't burn sibling
+ *     credentials.
+ */
+export function isUsageLimitOutcome(status: number | undefined, message: string | undefined): boolean {
+	if (message && isUsageLimitError(message)) return true;
+	if (!isUsageLimitStatus(status)) return false;
+	if (!message || isOpaqueStatusBody(message)) return true;
+	return parseRateLimitReason(message) === "QUOTA_EXHAUSTED";
+}
+
+/**
+ * A 429 body is opaque when it carries no signal beyond the status itself —
+ * empty, whitespace-only, the status digits with HTTP/JSON framing, or
+ * generic punctuation. Anything else (retry hints, capacity wording, error
+ * descriptions) is informative enough to defer to the classifier.
+ */
+function isOpaqueStatusBody(message: string): boolean {
+	const cleaned = message
+		.replace(/\b429\b/g, "")
+		.replace(/\b(?:http|https|status|error|code|response|message)\b/gi, "");
+	return !/[a-z\d]{3,}/i.test(cleaned);
+}
 
 export function isUsageLimitError(errorMessage: string): boolean {
 	return USAGE_LIMIT_PATTERN.test(errorMessage) || ACCOUNT_RATE_LIMIT_PATTERN.test(errorMessage);

package/src/registry/huggingface.ts

@@ -1,5 +1,5 @@
-import { validateOpenAICompatibleApiKey } from "./api-key-validation";
-import type { OAuthController, OAuthLoginCallbacks } from "./oauth/types";
+import { createApiKeyLogin } from "./api-key-login";
+import type { OAuthLoginCallbacks } from "./oauth/types";
 import type { ProviderDefinition } from "./types";
 
 const AUTH_URL =
@@ -7,42 +7,20 @@ const AUTH_URL =
 const API_BASE_URL = "https://router.huggingface.co/v1";
 const VALIDATION_MODEL = "openai/gpt-oss-120b";
 
-export async function loginHuggingface(options: OAuthController): Promise<string> {
-	if (!options.onPrompt) {
-		throw new Error("Hugging Face login requires onPrompt callback");
-	}
-
-	options.onAuth?.({
-		url: AUTH_URL,
-		instructions:
-			"Create/copy a token with Make calls to Inference Providers permission (usable as HUGGINGFACE_HUB_TOKEN or HF_TOKEN)",
-	});
-
-	const apiKey = await options.onPrompt({
-		message: "Paste your Hugging Face token (HUGGINGFACE_HUB_TOKEN / HF_TOKEN)",
-		placeholder: "hf_...",
-	});
-
-	if (options.signal?.aborted) {
-		throw new Error("Login cancelled");
-	}
-
-	const trimmed = apiKey.trim();
-	if (!trimmed) {
-		throw new Error("API key is required");
-	}
-
-	options.onProgress?.("Validating API key...");
-	await validateOpenAICompatibleApiKey({
+export const loginHuggingface = createApiKeyLogin({
+	providerLabel: "Hugging Face",
+	authUrl: AUTH_URL,
+	instructions:
+		"Create/copy a token with Make calls to Inference Providers permission (usable as HUGGINGFACE_HUB_TOKEN or HF_TOKEN)",
+	promptMessage: "Paste your Hugging Face token (HUGGINGFACE_HUB_TOKEN / HF_TOKEN)",
+	placeholder: "hf_...",
+	validation: {
+		kind: "chat-completions",
 		provider: "Hugging Face",
-		apiKey: trimmed,
 		baseUrl: API_BASE_URL,
 		model: VALIDATION_MODEL,
-		signal: options.signal,
-	});
-
-	return trimmed;
-}
+	},
+});
 
 export const huggingfaceProvider = {
 	id: "huggingface",

package/src/registry/nvidia.ts

@@ -58,5 +58,4 @@ export const nvidiaProvider = {
 	id: "nvidia",
 	name: "NVIDIA",
 	login: (cb: OAuthLoginCallbacks) => loginNvidia(cb),
-	appendApiKeyLogin: true,
 } as const satisfies ProviderDefinition;

package/src/registry/oauth/minimax-code.ts

@@ -13,8 +13,7 @@
  * China: https://api.minimaxi.com/v1
  */
 
-import { validateOpenAICompatibleApiKey } from "../api-key-validation";
-import type { OAuthController } from "./types";
+import { createApiKeyLogin } from "../api-key-login";
 
 const AUTH_URL_INTL = "https://platform.minimax.io/subscribe/token-plan";
 const AUTH_URL_CN = "https://platform.minimaxi.com/subscribe/token-plan";
@@ -22,61 +21,33 @@ const API_BASE_URL_INTL = "https://api.minimax.io/v1";
 const API_BASE_URL_CN = "https://api.minimaxi.com/v1";
 const VALIDATION_MODEL = "MiniMax-M3";
 
+function createMiniMaxLogin(authUrl: string, baseUrl: string, provider: string) {
+	return createApiKeyLogin({
+		providerLabel: "MiniMax Token Plan",
+		authUrl,
+		instructions: "Subscribe to Token Plan and copy your API key",
+		promptMessage: "Paste your MiniMax Token Plan API key",
+		placeholder: "sk-...",
+		validation: {
+			kind: "chat-completions",
+			provider,
+			baseUrl,
+			model: VALIDATION_MODEL,
+		},
+	});
+}
+
 /**
  * Login to MiniMax Token Plan (international).
  *
  * Opens browser to subscription page, prompts user to paste their API key.
  * Returns the API key directly (not OAuthCredentials - this isn't OAuth).
  */
-export async function loginMiniMaxCode(options: OAuthController): Promise<string> {
-	return loginMiniMaxCodeWithBaseUrl(options, AUTH_URL_INTL, API_BASE_URL_INTL, "MiniMax Token Plan");
-}
-
-async function loginMiniMaxCodeWithBaseUrl(
-	options: OAuthController,
-	authUrl: string,
-	baseUrl: string,
-	providerName: string,
-): Promise<string> {
-	const fetchImpl = options.fetch ?? fetch;
-	if (!options.onPrompt) {
-		throw new Error("MiniMax Token Plan login requires onPrompt callback");
-	}
-	// Open browser to subscription page
-	options.onAuth?.({
-		url: authUrl,
-		instructions: "Subscribe to Token Plan and copy your API key",
-	});
-	// Prompt user to paste their API key
-	const apiKey = await options.onPrompt({
-		message: "Paste your MiniMax Token Plan API key",
-		placeholder: "sk-...",
-	});
-	if (options.signal?.aborted) {
-		throw new Error("Login cancelled");
-	}
-	const trimmed = apiKey.trim();
-	if (!trimmed) {
-		throw new Error("API key is required");
-	}
-
-	options.onProgress?.("Validating API key...");
-	await validateOpenAICompatibleApiKey({
-		provider: providerName,
-		apiKey: trimmed,
-		baseUrl,
-		model: VALIDATION_MODEL,
-		signal: options.signal,
-		fetch: fetchImpl,
-	});
-	return trimmed;
-}
+export const loginMiniMaxCode = createMiniMaxLogin(AUTH_URL_INTL, API_BASE_URL_INTL, "MiniMax Token Plan");
 
 /**
  * Login to MiniMax Token Plan (China).
  *
  * Same flow as international but uses China endpoint.
  */
-export async function loginMiniMaxCodeCn(options: OAuthController): Promise<string> {
-	return loginMiniMaxCodeWithBaseUrl(options, AUTH_URL_CN, API_BASE_URL_CN, "MiniMax Token Plan (China)");
-}
+export const loginMiniMaxCodeCn = createMiniMaxLogin(AUTH_URL_CN, API_BASE_URL_CN, "MiniMax Token Plan (China)");

package/src/registry/qianfan.ts

@@ -1,46 +1,24 @@
-import { validateOpenAICompatibleApiKey } from "./api-key-validation";
-import type { OAuthController, OAuthLoginCallbacks } from "./oauth/types";
+import { createApiKeyLogin } from "./api-key-login";
+import type { OAuthLoginCallbacks } from "./oauth/types";
 import type { ProviderDefinition } from "./types";
 
 const AUTH_URL = "https://console.bce.baidu.com/qianfan/ais/console/apiKey";
 const API_BASE_URL = "https://qianfan.baidubce.com/v2";
 const VALIDATION_MODEL = "deepseek-v3.2";
 
-export async function loginQianfan(options: OAuthController): Promise<string> {
-	if (!options.onPrompt) {
-		throw new Error("Qianfan login requires onPrompt callback");
-	}
-
-	options.onAuth?.({
-		url: AUTH_URL,
-		instructions: "Copy your Qianfan API key from the console",
-	});
-
-	const apiKey = await options.onPrompt({
-		message: "Paste your Qianfan API key",
-		placeholder: "bce-v3/ALTAK-...",
-	});
-
-	if (options.signal?.aborted) {
-		throw new Error("Login cancelled");
-	}
-
-	const trimmed = apiKey.trim();
-	if (!trimmed) {
-		throw new Error("API key is required");
-	}
-
-	options.onProgress?.("Validating API key...");
-	await validateOpenAICompatibleApiKey({
+export const loginQianfan = createApiKeyLogin({
+	providerLabel: "Qianfan",
+	authUrl: AUTH_URL,
+	instructions: "Copy your Qianfan API key from the console",
+	promptMessage: "Paste your Qianfan API key",
+	placeholder: "bce-v3/ALTAK-...",
+	validation: {
+		kind: "chat-completions",
 		provider: "qianfan",
-		apiKey: trimmed,
 		baseUrl: API_BASE_URL,
 		model: VALIDATION_MODEL,
-		signal: options.signal,
-	});
-
-	return trimmed;
-}
+	},
+});
 
 export const qianfanProvider = {
 	id: "qianfan",

package/src/registry/registry.ts

@@ -44,6 +44,7 @@ import { parallelProvider } from "./parallel";
 import { perplexityProvider } from "./perplexity";
 import { qianfanProvider } from "./qianfan";
 import { qwenPortalProvider } from "./qwen-portal";
+import { sakanaProvider } from "./sakana";
 import { syntheticProvider } from "./synthetic";
 import { tavilyProvider } from "./tavily";
 import { togetherProvider } from "./together";
@@ -90,6 +91,7 @@ const ALL = [
 	zhipuCodingPlanProvider,
 	umansProvider,
 	qwenPortalProvider,
+	sakanaProvider,
 	minimaxCodeProvider,
 	minimaxCodeCnProvider,
 	xiaomiProvider,

package/src/registry/sakana.ts

@@ -0,0 +1,22 @@
+import { createApiKeyLogin } from "./api-key-login";
+import type { OAuthLoginCallbacks } from "./oauth/types";
+import type { ProviderDefinition } from "./types";
+
+export const loginSakana = createApiKeyLogin({
+	providerLabel: "Sakana AI",
+	authUrl: "https://console.sakana.ai/api-keys",
+	instructions: "Copy your API key from the Sakana AI console",
+	promptMessage: "Paste your Sakana AI API key",
+	placeholder: "sk-...",
+	validation: {
+		kind: "models-endpoint",
+		provider: "Sakana AI",
+		modelsUrl: "https://api.sakana.ai/v1/models",
+	},
+});
+
+export const sakanaProvider = {
+	id: "sakana",
+	name: "Sakana AI",
+	login: (cb: OAuthLoginCallbacks) => loginSakana(cb),
+} as const satisfies ProviderDefinition;

package/src/registry/types.ts

@@ -44,8 +44,6 @@ export interface ProviderDefinition {
 	readonly envKeys?: KeyResolver;
 	// --- interactive login (OAuthProviderInterface-compatible) ---
 	readonly login?: (callbacks: OAuthLoginCallbacks) => Promise<OAuthCredentials | string>;
-	/** String-returning login appends API keys instead of replacing the provider's existing key. */
-	readonly appendApiKeyLogin?: boolean;
 	readonly refreshToken?: (credentials: OAuthCredentials) => Promise<OAuthCredentials>;
 	readonly getApiKey?: (credentials: OAuthCredentials) => string;
 	/** Store OAuth credentials under a different provider id (e.g. `openai-codex-device` ⇒ `openai-codex`). */

package/src/registry/venice.ts

@@ -1,5 +1,5 @@
-import { validateOpenAICompatibleApiKey } from "./api-key-validation";
-import type { OAuthController, OAuthLoginCallbacks } from "./oauth/types";
+import { createApiKeyLogin } from "./api-key-login";
+import type { OAuthLoginCallbacks } from "./oauth/types";
 import type { ProviderDefinition } from "./types";
 
 const AUTH_URL = "https://venice.ai/settings/api";
@@ -12,41 +12,19 @@ const VALIDATION_MODEL = "qwen3-4b";
  * Opens browser to API keys page, prompts user to paste their API key.
  * Returns the API key directly (not OAuthCredentials - this isn't OAuth).
  */
-export async function loginVenice(options: OAuthController): Promise<string> {
-	if (!options.onPrompt) {
-		throw new Error("Venice login requires onPrompt callback");
-	}
-
-	options.onAuth?.({
-		url: AUTH_URL,
-		instructions: "Copy your API key from the Venice dashboard",
-	});
-
-	const apiKey = await options.onPrompt({
-		message: "Paste your Venice API key",
-		placeholder: "vapi_...",
-	});
-
-	if (options.signal?.aborted) {
-		throw new Error("Login cancelled");
-	}
-
-	const trimmed = apiKey.trim();
-	if (!trimmed) {
-		throw new Error("API key is required");
-	}
-
-	options.onProgress?.("Validating API key...");
-	await validateOpenAICompatibleApiKey({
+export const loginVenice = createApiKeyLogin({
+	providerLabel: "Venice",
+	authUrl: AUTH_URL,
+	instructions: "Copy your API key from the Venice dashboard",
+	promptMessage: "Paste your Venice API key",
+	placeholder: "vapi_...",
+	validation: {
+		kind: "chat-completions",
 		provider: "Venice",
-		apiKey: trimmed,
 		baseUrl: API_BASE_URL,
 		model: VALIDATION_MODEL,
-		signal: options.signal,
-	});
-
-	return trimmed;
-}
+	},
+});
 
 export const veniceProvider = {
 	id: "venice",

package/src/registry/zai.ts

@@ -1,45 +1,24 @@
-import { validateOpenAICompatibleApiKey } from "./api-key-validation";
-import type { OAuthController, OAuthLoginCallbacks } from "./oauth/types";
+import { createApiKeyLogin } from "./api-key-login";
+import type { OAuthLoginCallbacks } from "./oauth/types";
 import type { ProviderDefinition } from "./types";
 
 const AUTH_URL = "https://z.ai/manage-apikey/apikey-list";
 const API_BASE_URL = "https://api.z.ai/api/coding/paas/v4";
 const VALIDATION_MODEL = "glm-5.2";
 
-export async function loginZai(options: OAuthController): Promise<string> {
-	if (!options.onPrompt) {
-		throw new Error("Z.AI login requires onPrompt callback");
-	}
-
-	options.onAuth?.({
-		url: AUTH_URL,
-		instructions: "Copy your API key from the dashboard",
-	});
-
-	const apiKey = await options.onPrompt({
-		message: "Paste your Z.AI API key",
-		placeholder: "sk-...",
-	});
-
-	if (options.signal?.aborted) {
-		throw new Error("Login cancelled");
-	}
-
-	const trimmed = apiKey.trim();
-	if (!trimmed) {
-		throw new Error("API key is required");
-	}
-
-	options.onProgress?.("Validating API key...");
-	await validateOpenAICompatibleApiKey({
+export const loginZai = createApiKeyLogin({
+	providerLabel: "Z.AI",
+	authUrl: AUTH_URL,
+	instructions: "Copy your API key from the dashboard",
+	promptMessage: "Paste your Z.AI API key",
+	placeholder: "sk-...",
+	validation: {
+		kind: "chat-completions",
 		provider: "Z.AI",
-		apiKey: trimmed,
 		baseUrl: API_BASE_URL,
 		model: VALIDATION_MODEL,
-		signal: options.signal,
-	});
-	return trimmed;
-}
+	},
+});
 
 export const zaiProvider = {
 	id: "zai",

package/src/registry/zhipu-coding-plan.ts

@@ -1,45 +1,24 @@
-import { validateOpenAICompatibleApiKey } from "./api-key-validation";
-import type { OAuthController, OAuthLoginCallbacks } from "./oauth/types";
+import { createApiKeyLogin } from "./api-key-login";
+import type { OAuthLoginCallbacks } from "./oauth/types";
 import type { ProviderDefinition } from "./types";
 
 const AUTH_URL = "https://bigmodel.cn/coding-plan/personal/overview";
 const API_BASE_URL = "https://open.bigmodel.cn/api/coding/paas/v4";
 const VALIDATION_MODEL = "glm-5.1";
 
-export async function loginZhipuCodingPlan(options: OAuthController): Promise<string> {
-	if (!options.onPrompt) {
-		throw new Error("Zhipu Coding Plan login requires onPrompt callback");
-	}
-
-	options.onAuth?.({
-		url: AUTH_URL,
-		instructions: "Copy your API key from the Coding Plan dashboard",
-	});
-
-	const apiKey = await options.onPrompt({
-		message: "Paste your Zhipu API key",
-		placeholder: "<id>.<secret>",
-	});
-
-	if (options.signal?.aborted) {
-		throw new Error("Login cancelled");
-	}
-
-	const trimmed = apiKey.trim();
-	if (!trimmed) {
-		throw new Error("API key is required");
-	}
-
-	options.onProgress?.("Validating API key...");
-	await validateOpenAICompatibleApiKey({
+export const loginZhipuCodingPlan = createApiKeyLogin({
+	providerLabel: "Zhipu Coding Plan",
+	authUrl: AUTH_URL,
+	instructions: "Copy your API key from the Coding Plan dashboard",
+	promptMessage: "Paste your Zhipu API key",
+	placeholder: "<id>.<secret>",
+	validation: {
+		kind: "chat-completions",
 		provider: "Zhipu",
-		apiKey: trimmed,
 		baseUrl: API_BASE_URL,
 		model: VALIDATION_MODEL,
-		signal: options.signal,
-	});
-	return trimmed;
-}
+	},
+});
 
 export const zhipuCodingPlanProvider = {
 	id: "zhipu-coding-plan",