WIP: remove setApiKey, resolveApiKey

packages/ai/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## Breaking Changes
+- **setApiKey, resolveApiKey**: removed. You need to create your own api key storage/resolution
+- **getApiKey**: renamed to `getApiKeyFromEnv`. Given a provider, checks for the known env variable holding the API key.
+
 ## [0.27.7] - 2025-12-24
 
 ### Fixed

packages/ai/src/providers/anthropic.ts

@@ -5,7 +5,7 @@ import type {
 	MessageParam,
 } from "@anthropic-ai/sdk/resources/messages.js";
 import { calculateCost } from "../models.js";
-import { getApiKey } from "../stream.js";
+import { getApiKeyFromEnv } from "../stream.js";
 import type {
 	Api,
 	AssistantMessage,
@@ -114,7 +114,7 @@ export const streamAnthropic: StreamFunction<"anthropic-messages"> = (
 		};
 
 		try {
-			const apiKey = options?.apiKey ?? getApiKey(model.provider) ?? "";
+			const apiKey = options?.apiKey ?? getApiKeyFromEnv(model.provider) ?? "";
 			const { client, isOAuthToken } = createClient(model, apiKey, options?.interleavedThinking ?? true);
 			const params = buildParams(model, context, isOAuthToken, options);
 			const anthropicStream = client.messages.stream({ ...params, stream: true }, { signal: options?.signal });

packages/ai/src/providers/google.ts

@@ -6,6 +6,7 @@ import {
 	type ThinkingLevel,
 } from "@google/genai";
 import { calculateCost } from "../models.js";
+import { getApiKeyFromEnv } from "../stream.js";
 import type {
 	Api,
 	AssistantMessage,
@@ -60,7 +61,8 @@ export const streamGoogle: StreamFunction<"google-generative-ai"> = (
 		};
 
 		try {
-			const client = createClient(model, options?.apiKey);
+			const apiKey = options?.apiKey || getApiKeyFromEnv(model.provider) || "";
+			const client = createClient(model, apiKey);
 			const params = buildParams(model, context, options);
 			const googleStream = await client.models.generateContentStream(params);
 
@@ -248,15 +250,6 @@ export const streamGoogle: StreamFunction<"google-generative-ai"> = (
 };
 
 function createClient(model: Model<"google-generative-ai">, apiKey?: string): GoogleGenAI {
-	if (!apiKey) {
-		if (!process.env.GEMINI_API_KEY) {
-			throw new Error(
-				"Gemini API key is required. Set GEMINI_API_KEY environment variable or pass it as an argument.",
-			);
-		}
-		apiKey = process.env.GEMINI_API_KEY;
-	}
-
 	const httpOptions: { baseUrl?: string; apiVersion?: string; headers?: Record<string, string> } = {};
 	if (model.baseUrl) {
 		httpOptions.baseUrl = model.baseUrl;

packages/ai/src/providers/openai-completions.ts

@@ -9,6 +9,7 @@ import type {
 	ChatCompletionToolMessageParam,
 } from "openai/resources/chat/completions.js";
 import { calculateCost } from "../models.js";
+import { getApiKeyFromEnv } from "../stream.js";
 import type {
 	AssistantMessage,
 	Context,
@@ -98,7 +99,8 @@ export const streamOpenAICompletions: StreamFunction<"openai-completions"> = (
 		};
 
 		try {
-			const client = createClient(model, context, options?.apiKey);
+			const apiKey = options?.apiKey || getApiKeyFromEnv(model.provider) || "";
+			const client = createClient(model, context, apiKey);
 			const params = buildParams(model, context, options);
 			const openaiStream = await client.chat.completions.create(params, { signal: options?.signal });
 			stream.push({ type: "start", partial: output });

packages/ai/src/providers/openai-responses.ts

@@ -11,6 +11,7 @@ import type {
 	ResponseReasoningItem,
 } from "openai/resources/responses/responses.js";
 import { calculateCost } from "../models.js";
+import { getApiKeyFromEnv } from "../stream.js";
 import type {
 	Api,
 	AssistantMessage,
@@ -27,7 +28,6 @@ import type {
 import { AssistantMessageEventStream } from "../utils/event-stream.js";
 import { parseStreamingJson } from "../utils/json-parse.js";
 import { sanitizeSurrogates } from "../utils/sanitize-unicode.js";
-
 import { transformMessages } from "./transorm-messages.js";
 
 /** Fast deterministic hash to shorten long strings */
@@ -82,7 +82,8 @@ export const streamOpenAIResponses: StreamFunction<"openai-responses"> = (
 
 		try {
 			// Create OpenAI client
-			const client = createClient(model, context, options?.apiKey);
+			const apiKey = options?.apiKey || getApiKeyFromEnv(model.provider) || "";
+			const client = createClient(model, context, apiKey);
 			const params = buildParams(model, context, options);
 			const openaiStream = await client.responses.create(params, { signal: options?.signal });
 			stream.push({ type: "start", partial: output });

packages/ai/src/stream.ts

@@ -16,27 +16,14 @@ import type {
 	ReasoningEffort,
 	SimpleStreamOptions,
 } from "./types.js";
-import { getOAuthApiKey, getOAuthProviderForModelProvider } from "./utils/oauth/index.js";
-
-const apiKeys: Map<string, string> = new Map();
-
-export function setApiKey(provider: KnownProvider, key: string): void;
-export function setApiKey(provider: string, key: string): void;
-export function setApiKey(provider: any, key: string): void {
-	apiKeys.set(provider, key);
-}
 
 /**
  * Get API key from environment variables (sync).
  * Does NOT check OAuth credentials - use getApiKeyAsync for that.
  */
-export function getApiKey(provider: KnownProvider): string | undefined;
+export function getApiKeyFromEnv(provider: KnownProvider): string | undefined;
-export function getApiKey(provider: string): string | undefined;
+export function getApiKeyFromEnv(provider: string): string | undefined;
-export function getApiKey(provider: any): string | undefined {
+export function getApiKeyFromEnv(provider: any): string | undefined {
-	// Check explicit keys first
-	const key = apiKeys.get(provider);
-	if (key) return key;
-
 	// Fall back to environment variables
 	if (provider === "github-copilot") {
 		return process.env.COPILOT_GITHUB_TOKEN || process.env.GH_TOKEN || process.env.GITHUB_TOKEN;
@@ -58,39 +45,12 @@ export function getApiKey(provider: any): string | undefined {
 	return envVar ? process.env[envVar] : undefined;
 }
 
-/**
- * Resolve API key from OAuth credentials or environment (async).
- * Automatically refreshes expired OAuth tokens.
- *
- * Priority:
- * 1. Explicitly set keys (via setApiKey)
- * 2. OAuth credentials from ~/.pi/agent/oauth.json
- * 3. Environment variables
- */
-export async function resolveApiKey(provider: KnownProvider): Promise<string | undefined>;
-export async function resolveApiKey(provider: string): Promise<string | undefined>;
-export async function resolveApiKey(provider: any): Promise<string | undefined> {
-	// Check explicit keys first
-	const key = apiKeys.get(provider);
-	if (key) return key;
-
-	// Check OAuth credentials (auto-refresh if expired)
-	const oauthProvider = getOAuthProviderForModelProvider(provider);
-	if (oauthProvider) {
-		const oauthKey = await getOAuthApiKey(oauthProvider);
-		if (oauthKey) return oauthKey;
-	}
-
-	// Fall back to sync getApiKey for env vars
-	return getApiKey(provider);
-}
-
 export function stream<TApi extends Api>(
 	model: Model<TApi>,
 	context: Context,
 	options?: OptionsForApi<TApi>,
 ): AssistantMessageEventStream {
-	const apiKey = options?.apiKey || getApiKey(model.provider);
+	const apiKey = options?.apiKey || getApiKeyFromEnv(model.provider);
 	if (!apiKey) {
 		throw new Error(`No API key for provider: ${model.provider}`);
 	}
@@ -139,7 +99,7 @@ export function streamSimple<TApi extends Api>(
 	context: Context,
 	options?: SimpleStreamOptions,
 ): AssistantMessageEventStream {
-	const apiKey = options?.apiKey || getApiKey(model.provider);
+	const apiKey = options?.apiKey || getApiKeyFromEnv(model.provider);
 	if (!apiKey) {
 		throw new Error(`No API key for provider: ${model.provider}`);
 	}