@oh-my-pi/pi-ai 10.6.2 → 11.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-ai",
-	"version": "10.6.2",
+	"version": "11.0.0",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -63,7 +63,7 @@
 		"@connectrpc/connect-node": "^2.1.1",
 		"@google/genai": "^1.39.0",
 		"@mistralai/mistralai": "^1.13.0",
-		"@oh-my-pi/pi-utils": "10.6.2",
+		"@oh-my-pi/pi-utils": "11.0.0",
 		"@sinclair/typebox": "^0.34.48",
 		"@smithy/node-http-handler": "^4.4.9",
 		"ajv": "^8.17.1",

package/src/cli.ts

@@ -1,7 +1,6 @@
 #!/usr/bin/env bun
 import { createInterface } from "readline";
 import { CliAuthStorage } from "./storage";
-import "./utils/migrate-env";
 import { getOAuthProviders } from "./utils/oauth";
 import { loginAnthropic } from "./utils/oauth/anthropic";
 import { loginCursor } from "./utils/oauth/cursor";

package/src/index.ts

@@ -1,5 +1,3 @@
-import "./utils/migrate-env";
-
 export * from "./models";
 export * from "./providers/anthropic";
 export * from "./providers/azure-openai-responses";

package/src/providers/amazon-bedrock.ts

@@ -18,6 +18,7 @@ import {
 	type ToolConfiguration,
 	ToolResultStatus,
 } from "@aws-sdk/client-bedrock-runtime";
+import { $env } from "@oh-my-pi/pi-utils";
 import { calculateCost } from "../models";
 import type {
 	Api,
@@ -97,7 +98,7 @@ export const streamBedrock: StreamFunction<"bedrock-converse-stream"> = (
 
 		// in Node.js/Bun environment only
 		if (typeof process !== "undefined" && (process.versions?.node || process.versions?.bun)) {
-			config.region = config.region || process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
+			config.region = config.region || $env.AWS_REGION || $env.AWS_DEFAULT_REGION;
 		}
 
 		config.region = config.region || "us-east-1";

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

@@ -1,3 +1,4 @@
+import { $env } from "@oh-my-pi/pi-utils";
 import type OpenAI from "openai";
 import { AzureOpenAI } from "openai";
 import type {
@@ -54,8 +55,8 @@ function resolveDeploymentName(model: Model<"azure-openai-responses">, options?:
 	if (options?.azureDeploymentName) {
 		return options.azureDeploymentName;
 	}
-	const mappedDeployment = parseDeploymentNameMap(process.env.AZURE_OPENAI_DEPLOYMENT_NAME_MAP).get(model.id);
-	return mappedDeployment || model.id;
+	const mappedDeployment = parseDeploymentNameMap($env.AZURE_OPENAI_DEPLOYMENT_NAME_MAP).get(model.id);
+	return mappedDeployment ?? model.id;
 }
 
 // Azure OpenAI Responses-specific options
@@ -373,10 +374,10 @@ function resolveAzureConfig(
 	model: Model<"azure-openai-responses">,
 	options?: AzureOpenAIResponsesOptions,
 ): { baseUrl: string; apiVersion: string } {
-	const apiVersion = options?.azureApiVersion || process.env.AZURE_OPENAI_API_VERSION || DEFAULT_AZURE_API_VERSION;
+	const apiVersion = options?.azureApiVersion || $env.AZURE_OPENAI_API_VERSION || DEFAULT_AZURE_API_VERSION;
 
-	const baseUrl = options?.azureBaseUrl?.trim() || process.env.AZURE_OPENAI_BASE_URL?.trim() || undefined;
-	const resourceName = options?.azureResourceName || process.env.AZURE_OPENAI_RESOURCE_NAME;
+	const baseUrl = options?.azureBaseUrl?.trim() || $env.AZURE_OPENAI_BASE_URL?.trim() || undefined;
+	const resourceName = options?.azureResourceName || $env.AZURE_OPENAI_RESOURCE_NAME;
 
 	let resolvedBaseUrl = baseUrl;
 
@@ -402,12 +403,13 @@ function resolveAzureConfig(
 
 function createClient(model: Model<"azure-openai-responses">, apiKey: string, options?: AzureOpenAIResponsesOptions) {
 	if (!apiKey) {
-		if (!process.env.AZURE_OPENAI_API_KEY) {
+		const envKey = $env.AZURE_OPENAI_API_KEY;
+		if (!envKey) {
 			throw new Error(
 				"Azure OpenAI API key is required. Set AZURE_OPENAI_API_KEY environment variable or pass it as an argument.",
 			);
 		}
-		apiKey = process.env.AZURE_OPENAI_API_KEY;
+		apiKey = envKey;
 	}
 
 	const headers = { ...(model.headers ?? {}) };

package/src/providers/cursor.ts

@@ -3,6 +3,7 @@ import * as fs from "node:fs/promises";
 import http2 from "node:http2";
 import { create, fromBinary, fromJson, type JsonValue, toBinary, toJson } from "@bufbuild/protobuf";
 import { ValueSchema } from "@bufbuild/protobuf/wkt";
+import { $env } from "@oh-my-pi/pi-utils";
 import { calculateCost } from "../models";
 import type {
 	Api,
@@ -138,7 +139,7 @@ interface CursorLogEntry {
 }
 
 async function appendCursorDebugLog(entry: CursorLogEntry): Promise<void> {
-	const logPath = process.env.DEBUG_CURSOR_LOG;
+	const logPath = $env.DEBUG_CURSOR_LOG;
 	if (!logPath) return;
 	try {
 		await fs.appendFile(logPath, `${JSON.stringify(entry, debugReplacer)}\n`);
@@ -148,10 +149,10 @@ async function appendCursorDebugLog(entry: CursorLogEntry): Promise<void> {
 }
 
 function log(type: string, subtype?: string, data?: unknown): void {
-	if (!process.env.DEBUG_CURSOR) return;
+	if (!$env.DEBUG_CURSOR) return;
 	const normalizedData = data ? decodeLogData(data) : data;
 	const entry: CursorLogEntry = { ts: Date.now(), type, subtype, data: normalizedData };
-	const verbose = process.env.DEBUG_CURSOR === "2" || process.env.DEBUG_CURSOR === "verbose";
+	const verbose = $env.DEBUG_CURSOR === "2" || $env.DEBUG_CURSOR === "verbose";
 	const dataStr = verbose && normalizedData ? ` ${JSON.stringify(normalizedData, debugReplacer)?.slice(0, 500)}` : "";
 	console.error(`[CURSOR] ${type}${subtype ? `: ${subtype}` : ""}${dataStr}`);
 	void appendCursorDebugLog(entry);
@@ -2065,7 +2066,7 @@ function buildGrpcRequest(
 
 	const toolNames = context.tools?.map(tool => tool.name) ?? [];
 	const detail =
-		process.env.DEBUG_CURSOR === "2"
+		$env.DEBUG_CURSOR === "2"
 			? ` ${JSON.stringify(clientMessage.message.value, debugReplacer, 2)?.slice(0, 2000)}`
 			: "";
 	log("info", "builtRunRequest", {

package/src/providers/google-vertex.ts

@@ -5,6 +5,7 @@ import {
 	type ThinkingConfig,
 	ThinkingLevel,
 } from "@google/genai";
+import { $env } from "@oh-my-pi/pi-utils";
 import { calculateCost } from "../models";
 import type {
 	Api,
@@ -304,7 +305,7 @@ function createClient(model: Model<"google-vertex">, project: string, location:
 }
 
 function resolveProject(options?: GoogleVertexOptions): string {
-	const project = options?.project || process.env.GOOGLE_CLOUD_PROJECT || process.env.GCLOUD_PROJECT;
+	const project = options?.project || $env.GOOGLE_CLOUD_PROJECT || $env.GCLOUD_PROJECT;
 	if (!project) {
 		throw new Error(
 			"Vertex AI requires a project ID. Set GOOGLE_CLOUD_PROJECT/GCLOUD_PROJECT or pass project in options.",
@@ -314,7 +315,7 @@ function resolveProject(options?: GoogleVertexOptions): string {
 }
 
 function resolveLocation(options?: GoogleVertexOptions): string {
-	const location = options?.location || process.env.GOOGLE_CLOUD_LOCATION;
+	const location = options?.location || $env.GOOGLE_CLOUD_LOCATION;
 	if (!location) {
 		throw new Error("Vertex AI requires a location. Set GOOGLE_CLOUD_LOCATION or pass location in options.");
 	}

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

@@ -1,5 +1,5 @@
 import * as os from "node:os";
-import { abortableSleep } from "@oh-my-pi/pi-utils";
+import { $env, abortableSleep } from "@oh-my-pi/pi-utils";
 import type {
 	ResponseFunctionToolCall,
 	ResponseInput,
@@ -71,7 +71,7 @@ export function buildCodexSystemPrompt(args: { userSystemPrompt?: string }): Cod
 	};
 }
 
-const CODEX_DEBUG = process.env.OMP_CODEX_DEBUG === "1" || process.env.OMP_CODEX_DEBUG === "true";
+const CODEX_DEBUG = $env.PI_CODEX_DEBUG === "1" || $env.PI_CODEX_DEBUG === "true";
 const CODEX_MAX_RETRIES = 2;
 const CODEX_RETRYABLE_STATUS = new Set([408, 429, 500, 502, 503, 504]);
 const CODEX_RETRY_DELAY_MS = 500;

package/src/providers/openai-completions.ts

@@ -1,3 +1,4 @@
+import { $env } from "@oh-my-pi/pi-utils";
 import OpenAI from "openai";
 import type {
 	ChatCompletionAssistantMessageParam,
@@ -348,12 +349,12 @@ async function createClient(
 	extraHeaders?: Record<string, string>,
 ) {
 	if (!apiKey) {
-		if (!process.env.OPENAI_API_KEY) {
+		if (!$env.OPENAI_API_KEY) {
 			throw new Error(
 				"OpenAI API key is required. Set OPENAI_API_KEY environment variable or pass it as an argument.",
 			);
 		}
-		apiKey = process.env.OPENAI_API_KEY;
+		apiKey = $env.OPENAI_API_KEY;
 	}
 
 	let headers = { ...(model.headers ?? {}), ...(extraHeaders ?? {}) };

package/src/providers/openai-responses.ts

@@ -1,3 +1,4 @@
+import { $env } from "@oh-my-pi/pi-utils";
 import OpenAI from "openai";
 import type {
 	Tool as OpenAITool,
@@ -39,11 +40,7 @@ import { transformMessages } from "./transform-messages";
  * Returns '24h' for long retention, undefined for default (in-memory).
  */
 function getPromptCacheRetention(baseUrl: string): "24h" | undefined {
-	if (
-		typeof process !== "undefined" &&
-		process.env.PI_CACHE_RETENTION === "long" &&
-		baseUrl.includes("api.openai.com")
-	) {
+	if ($env.PI_CACHE_RETENTION === "long" && baseUrl.includes("api.openai.com")) {
 		return "24h";
 	}
 	return undefined;
@@ -360,12 +357,12 @@ function createClient(
 	extraHeaders?: Record<string, string>,
 ) {
 	if (!apiKey) {
-		if (!process.env.OPENAI_API_KEY) {
+		if (!$env.OPENAI_API_KEY) {
 			throw new Error(
 				"OpenAI API key is required. Set OPENAI_API_KEY environment variable or pass it as an argument.",
 			);
 		}
-		apiKey = process.env.OPENAI_API_KEY;
+		apiKey = $env.OPENAI_API_KEY;
 	}
 
 	const headers = { ...(model.headers ?? {}), ...(extraHeaders ?? {}) };

package/src/storage.ts

@@ -7,6 +7,7 @@ import { Database } from "bun:sqlite";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
+import { $env } from "@oh-my-pi/pi-utils";
 import type { OAuthCredentials } from "./utils/oauth/types";
 
 type AuthCredential = { type: "api_key"; key: string } | ({ type: "oauth" } & OAuthCredentials);
@@ -24,7 +25,7 @@ type AuthRow = {
  * Get the agent config directory (e.g., ~/.omp/agent/)
  */
 function getAgentDir(): string {
-	const configDir = process.env.OMP_CODING_AGENT_DIR || path.join(os.homedir(), ".omp", "agent");
+	const configDir = $env.PI_CODING_AGENT_DIR || path.join(os.homedir(), ".omp", "agent");
 	return configDir;
 }
 

package/src/stream.ts

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
+import { $env } from "@oh-my-pi/pi-utils";
 import { supportsXhigh } from "./models";
 import { type BedrockOptions, streamBedrock } from "./providers/amazon-bedrock";
 import { type AnthropicOptions, streamAnthropic } from "./providers/anthropic";
@@ -32,69 +33,9 @@ import type {
 
 let cachedVertexAdcCredentialsExists: boolean | null = null;
 
-// Cached .env file contents (parsed once per process)
-let cachedEnvMap: Record<string, string> | null = null;
-
-/**
- * Parses a .env file synchronously and extracts key-value pairs.
- */
-function parseEnvFile(filePath: string): Record<string, string> {
-	const result: Record<string, string> = {};
-	try {
-		const content = fs.readFileSync(filePath, "utf-8");
-		for (const line of content.split("\n")) {
-			const trimmed = line.trim();
-			if (!trimmed || trimmed.startsWith("#")) continue;
-
-			const eqIndex = trimmed.indexOf("=");
-			if (eqIndex === -1) continue;
-
-			const key = trimmed.slice(0, eqIndex).trim();
-			let value = trimmed.slice(eqIndex + 1).trim();
-
-			// Remove surrounding quotes
-			if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
-				value = value.slice(1, -1);
-			}
-
-			result[key] = value;
-		}
-	} catch {
-		// File doesn't exist or can't be read - return empty
-	}
-	return result;
-}
-
-function getEnvMap(): Record<string, string> {
-	if (cachedEnvMap) return cachedEnvMap;
-
-	const pruneEmpty = (env: any) =>
-		Object.fromEntries(
-			Object.entries(env).filter(([k, v]) => typeof k === "string" && typeof v === "string" && v) as [
-				string,
-				string,
-			][],
-		);
-
-	cachedEnvMap = {
-		...pruneEmpty(parseEnvFile(path.join(os.homedir(), ".env"))),
-		...pruneEmpty(parseEnvFile(path.join(process.cwd(), ".env"))),
-		...pruneEmpty(process.env),
-	};
-	return cachedEnvMap;
-}
-
-/**
- * Gets an environment variable from process.env or .env files.
- * Checks: process.env → cwd/.env → ~/.env
- */
-export function getEnv(key: string): string | undefined {
-	return getEnvMap()[key];
-}
-
-function hasVertexAdcCredentials(env: Record<string, string>): boolean {
+function hasVertexAdcCredentials(): boolean {
 	if (cachedVertexAdcCredentialsExists === null) {
-		const gacPath = env.GOOGLE_APPLICATION_CREDENTIALS;
+		const gacPath = $env.GOOGLE_APPLICATION_CREDENTIALS;
 		if (gacPath) {
 			cachedVertexAdcCredentialsExists = fs.existsSync(gacPath);
 		} else {
@@ -106,7 +47,7 @@ function hasVertexAdcCredentials(env: Record<string, string>): boolean {
 	return cachedVertexAdcCredentialsExists;
 }
 
-type KeyResolver = string | ((env: Record<string, string>) => string | undefined);
+type KeyResolver = string | (() => string | undefined);
 
 const serviceProviderMap: Record<string, KeyResolver> = {
 	openai: "OPENAI_API_KEY",
@@ -125,15 +66,15 @@ const serviceProviderMap: Record<string, KeyResolver> = {
 	exa: "EXA_API_KEY",
 	perplexity: "PERPLEXITY_API_KEY",
 	// GitHub Copilot uses GitHub personal access token
-	"github-copilot": env => env.COPILOT_GITHUB_TOKEN || env.GH_TOKEN || env.GITHUB_TOKEN,
+	"github-copilot": () => $env.COPILOT_GITHUB_TOKEN || $env.GH_TOKEN || $env.GITHUB_TOKEN,
 	// ANTHROPIC_OAUTH_TOKEN takes precedence over ANTHROPIC_API_KEY
-	anthropic: env => env.ANTHROPIC_OAUTH_TOKEN || env.ANTHROPIC_API_KEY,
+	anthropic: () => $env.ANTHROPIC_OAUTH_TOKEN || $env.ANTHROPIC_API_KEY,
 	// Vertex AI uses Application Default Credentials, not API keys.
 	// Auth is configured via `gcloud auth application-default login`.
-	"google-vertex": env => {
-		const hasCredentials = hasVertexAdcCredentials(env);
-		const hasProject = !!(env.GOOGLE_CLOUD_PROJECT || env.GCLOUD_PROJECT);
-		const hasLocation = !!env.GOOGLE_CLOUD_LOCATION;
+	"google-vertex": () => {
+		const hasCredentials = hasVertexAdcCredentials();
+		const hasProject = !!($env.GOOGLE_CLOUD_PROJECT || $env.GCLOUD_PROJECT);
+		const hasLocation = !!$env.GOOGLE_CLOUD_LOCATION;
 		if (hasCredentials && hasProject && hasLocation) {
 			return "<authenticated>";
 		}
@@ -144,14 +85,14 @@ const serviceProviderMap: Record<string, KeyResolver> = {
 	// 3. AWS_BEARER_TOKEN_BEDROCK - Bedrock API keys (bearer token)
 	// 4. AWS_CONTAINER_CREDENTIALS_* - ECS/Task IAM role credentials
 	// 5. AWS_WEB_IDENTITY_TOKEN_FILE + AWS_ROLE_ARN - IRSA (EKS) web identity
-	"amazon-bedrock": env => {
+	"amazon-bedrock": () => {
 		const hasEcsCredentials =
-			!!env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI || !!env.AWS_CONTAINER_CREDENTIALS_FULL_URI;
-		const hasWebIdentity = !!env.AWS_WEB_IDENTITY_TOKEN_FILE && !!env.AWS_ROLE_ARN;
+			!!$env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI || !!$env.AWS_CONTAINER_CREDENTIALS_FULL_URI;
+		const hasWebIdentity = !!$env.AWS_WEB_IDENTITY_TOKEN_FILE && !!$env.AWS_ROLE_ARN;
 		if (
-			env.AWS_PROFILE ||
-			(env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY) ||
-			env.AWS_BEARER_TOKEN_BEDROCK ||
+			$env.AWS_PROFILE ||
+			($env.AWS_ACCESS_KEY_ID && $env.AWS_SECRET_ACCESS_KEY) ||
+			$env.AWS_BEARER_TOKEN_BEDROCK ||
 			hasEcsCredentials ||
 			hasWebIdentity
 		) {
@@ -167,12 +108,11 @@ const serviceProviderMap: Record<string, KeyResolver> = {
  * Checks process.env, then cwd/.env, then ~/.env.
  */
 export function getEnvApiKey(provider: string): string | undefined {
-	const env = getEnvMap();
 	const resolver = serviceProviderMap[provider];
 	if (typeof resolver === "string") {
-		return env[resolver];
+		return $env[resolver];
 	}
-	return resolver?.(env);
+	return resolver?.();
 }
 
 export function stream<TApi extends Api>(

package/src/usage/kimi.ts

@@ -1,3 +1,4 @@
+import { $env } from "@oh-my-pi/pi-utils";
 import type {
 	UsageAmount,
 	UsageCache,
@@ -45,7 +46,7 @@ const toNumber = (value: unknown): number | undefined => {
 };
 
 function normalizeBaseUrl(baseUrl?: string): string {
-	const envBase = process.env.KIMI_CODE_BASE_URL?.trim();
+	const envBase = $env.KIMI_CODE_BASE_URL?.trim();
 	const candidate = baseUrl?.trim() || envBase || DEFAULT_BASE_URL;
 	return candidate.replace(/\/+$/, "");
 }

package/src/utils/oauth/google-gemini-cli.ts

@@ -2,6 +2,8 @@
  * Gemini CLI OAuth flow (Google Cloud Code Assist)
  * Standard Gemini models only (gemini-2.0-flash, gemini-2.5-*)
  */
+
+import { $env } from "@oh-my-pi/pi-utils";
 import { OAuthCallbackFlow } from "./callback-server";
 import { generatePKCE } from "./pkce";
 import type { OAuthController, OAuthCredentials } from "./types";
@@ -91,7 +93,7 @@ async function pollOperation(
 }
 
 async function discoverProject(accessToken: string, onProgress?: (message: string) => void): Promise<string> {
-	const envProjectId = process.env.GOOGLE_CLOUD_PROJECT || process.env.GOOGLE_CLOUD_PROJECT_ID;
+	const envProjectId = $env.GOOGLE_CLOUD_PROJECT || $env.GOOGLE_CLOUD_PROJECT_ID;
 
 	const headers = {
 		Authorization: `Bearer ${accessToken}`,

package/src/utils/oauth/kimi.ts

@@ -6,7 +6,7 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
-import { abortableSleep, isEnoent } from "@oh-my-pi/pi-utils";
+import { $env, abortableSleep, isEnoent } from "@oh-my-pi/pi-utils";
 import packageJson from "../../../package.json" with { type: "json" };
 import type { OAuthController, OAuthCredentials } from "./types";
 
@@ -37,12 +37,12 @@ interface TokenResponse {
 }
 
 function getAgentDir(): string {
-	const configDir = process.env.OMP_CODING_AGENT_DIR || path.join(os.homedir(), ".omp", "agent");
+	const configDir = $env.PI_CODING_AGENT_DIR || path.join(os.homedir(), ".omp", "agent");
 	return configDir;
 }
 
 function resolveOAuthHost(): string {
-	return process.env.KIMI_CODE_OAUTH_HOST || process.env.KIMI_OAUTH_HOST || DEFAULT_OAUTH_HOST;
+	return $env.KIMI_CODE_OAUTH_HOST || $env.KIMI_OAUTH_HOST || DEFAULT_OAUTH_HOST;
 }
 
 function formatDeviceModel(system: string, release: string, arch: string): string {

package/src/utils/migrate-env.ts

@@ -1,8 +0,0 @@
-for (const [key, value] of Object.entries(process.env)) {
-	if (key.startsWith("PI_") && value !== undefined) {
-		const ompKey = `OMP_${key.slice(3)}`; // PI_FOO -> OMP_FOO
-		if (process.env[ompKey] === undefined) {
-			process.env[ompKey] = value;
-		}
-	}
-}