@oh-my-pi/pi-ai 6.7.670 → 6.8.1

package/README.md

@@ -10,38 +10,38 @@ Unified LLM API with automatic model discovery, provider configuration, token an
 - [Installation](#installation)
 - [Quick Start](#quick-start)
 - [Tools](#tools)
-  - [Defining Tools](#defining-tools)
-  - [Handling Tool Calls](#handling-tool-calls)
-  - [Streaming Tool Calls with Partial JSON](#streaming-tool-calls-with-partial-json)
-  - [Validating Tool Arguments](#validating-tool-arguments)
-  - [Complete Event Reference](#complete-event-reference)
+   - [Defining Tools](#defining-tools)
+   - [Handling Tool Calls](#handling-tool-calls)
+   - [Streaming Tool Calls with Partial JSON](#streaming-tool-calls-with-partial-json)
+   - [Validating Tool Arguments](#validating-tool-arguments)
+   - [Complete Event Reference](#complete-event-reference)
 - [Image Input](#image-input)
 - [Thinking/Reasoning](#thinkingreasoning)
-  - [Unified Interface](#unified-interface-streamsimplecompletesimple)
-  - [Provider-Specific Options](#provider-specific-options-streamcomplete)
-  - [Streaming Thinking Content](#streaming-thinking-content)
+   - [Unified Interface](#unified-interface-streamsimplecompletesimple)
+   - [Provider-Specific Options](#provider-specific-options-streamcomplete)
+   - [Streaming Thinking Content](#streaming-thinking-content)
 - [Stop Reasons](#stop-reasons)
 - [Error Handling](#error-handling)
-  - [Aborting Requests](#aborting-requests)
-  - [Continuing After Abort](#continuing-after-abort)
+   - [Aborting Requests](#aborting-requests)
+   - [Continuing After Abort](#continuing-after-abort)
 - [APIs, Models, and Providers](#apis-models-and-providers)
-  - [Providers and Models](#providers-and-models)
-  - [Querying Providers and Models](#querying-providers-and-models)
-  - [Custom Models](#custom-models)
-  - [OpenAI Compatibility Settings](#openai-compatibility-settings)
-  - [Type Safety](#type-safety)
+   - [Providers and Models](#providers-and-models)
+   - [Querying Providers and Models](#querying-providers-and-models)
+   - [Custom Models](#custom-models)
+   - [OpenAI Compatibility Settings](#openai-compatibility-settings)
+   - [Type Safety](#type-safety)
 - [Cross-Provider Handoffs](#cross-provider-handoffs)
 - [Context Serialization](#context-serialization)
 - [Browser Usage](#browser-usage)
-  - [Environment Variables](#environment-variables-nodejs-only)
-  - [Checking Environment Variables](#checking-environment-variables)
+   - [Environment Variables](#environment-variables-nodejs-only)
+   - [Checking Environment Variables](#checking-environment-variables)
 - [OAuth Providers](#oauth-providers)
-  - [Vertex AI (ADC)](#vertex-ai-adc)
-  - [CLI Login](#cli-login)
-  - [Programmatic OAuth](#programmatic-oauth)
-  - [Login Flow Example](#login-flow-example)
-  - [Using OAuth Tokens](#using-oauth-tokens)
-  - [Provider Notes](#provider-notes)
+   - [Vertex AI (ADC)](#vertex-ai-adc)
+   - [CLI Login](#cli-login)
+   - [Programmatic OAuth](#programmatic-oauth)
+   - [Login Flow Example](#login-flow-example)
+   - [Using OAuth Tokens](#using-oauth-tokens)
+   - [Provider Notes](#provider-notes)
 - [License](#license)
 
 ## Supported Providers
@@ -156,7 +156,7 @@ for (const call of toolCalls) {
 					timeZone: call.arguments.timezone || "UTC",
 					dateStyle: "full",
 					timeStyle: "long",
-			  })
+				})
 			: "Unknown tool";
 
 	// Add tool result to context (supports text and images)
@@ -443,7 +443,7 @@ const response = await completeSimple(
 	},
 	{
 		reasoning: "medium", // 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' (xhigh maps to high on non-OpenAI providers)
-	}
+	},
 );
 
 // Access thinking and text blocks
@@ -563,7 +563,7 @@ const s = stream(
 	},
 	{
 		signal: controller.signal,
-	}
+	},
 );
 
 for await (const event of s) {
@@ -856,7 +856,7 @@ const response = await complete(
 	},
 	{
 		apiKey: "your-api-key",
-	}
+	},
 );
 ```
 
@@ -957,9 +957,9 @@ Official docs: [Application Default Credentials](https://cloud.google.com/docs/a
 The quickest way to authenticate:
 
 ```bash
-npx @oh-my-pi/pi-ai login              # interactive provider selection
-npx @oh-my-pi/pi-ai login anthropic    # login to specific provider
-npx @oh-my-pi/pi-ai list               # list available providers
+bunx @oh-my-pi/pi-ai login              # interactive provider selection
+bunx @oh-my-pi/pi-ai login anthropic    # login to specific provider
+bunx @oh-my-pi/pi-ai list               # list available providers
 ```
 
 Credentials are saved to `auth.json` in the current directory.
@@ -1035,7 +1035,7 @@ const response = await complete(
 	{
 		messages: [{ role: "user", content: "Hello!" }],
 	},
-	{ apiKey: result.apiKey }
+	{ apiKey: result.apiKey },
 );
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-ai",
-	"version": "6.7.670",
+	"version": "6.8.1",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -17,6 +17,7 @@
 		"test": "bun test"
 	},
 	"dependencies": {
+		"@oh-my-pi/pi-utils": "6.8.1",
 		"@anthropic-ai/sdk": "0.71.2",
 		"@aws-sdk/client-bedrock-runtime": "^3.968.0",
 		"@bufbuild/protobuf": "^2.10.2",

package/src/cli.ts

@@ -1,8 +1,9 @@
 #!/usr/bin/env bun
-import "./utils/migrate-env";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { createInterface } from "readline";
+import { CliAuthStorage } from "./storage";
+import "./utils/migrate-env";
 import { loginAnthropic } from "./utils/oauth/anthropic";
+import { loginCursor } from "./utils/oauth/cursor";
 import { loginGitHubCopilot } from "./utils/oauth/github-copilot";
 import { loginAntigravity } from "./utils/oauth/google-antigravity";
 import { loginGeminiCli } from "./utils/oauth/google-gemini-cli";
@@ -10,105 +11,104 @@ import { getOAuthProviders } from "./utils/oauth/index";
 import { loginOpenAICodex } from "./utils/oauth/openai-codex";
 import type { OAuthCredentials, OAuthProvider } from "./utils/oauth/types";
 
-const AUTH_FILE = "auth.json";
 const PROVIDERS = getOAuthProviders();
 
 function prompt(rl: ReturnType<typeof createInterface>, question: string): Promise<string> {
-	return new Promise((resolve) => rl.question(question, resolve));
-}
-
-function loadAuth(): Record<string, { type: "oauth" } & OAuthCredentials> {
-	if (!existsSync(AUTH_FILE)) return {};
-	try {
-		return JSON.parse(readFileSync(AUTH_FILE, "utf-8"));
-	} catch {
-		return {};
-	}
-}
-
-function saveAuth(auth: Record<string, { type: "oauth" } & OAuthCredentials>): void {
-	writeFileSync(AUTH_FILE, JSON.stringify(auth, null, 2), "utf-8");
+	const { promise, resolve } = Promise.withResolvers<string>();
+	rl.question(question, resolve);
+	return promise;
 }
 
 async function login(provider: OAuthProvider): Promise<void> {
 	const rl = createInterface({ input: process.stdin, output: process.stdout });
 
 	const promptFn = (msg: string) => prompt(rl, `${msg} `);
+	const storage = new CliAuthStorage();
 
 	try {
 		let credentials: OAuthCredentials;
 
 		switch (provider) {
 			case "anthropic":
-				credentials = await loginAnthropic(
-					(url) => {
+				credentials = await loginAnthropic({
+					onAuth(info) {
+						const { url } = info;
 						console.log(`\nOpen this URL in your browser:\n${url}\n`);
 					},
-					async () => {
-						return await promptFn("Paste the authorization code:");
+					onProgress(message) {
+						console.log(message);
 					},
-				);
+				});
 				break;
 
 			case "github-copilot":
 				credentials = await loginGitHubCopilot({
-					onAuth: (url, instructions) => {
+					onAuth(url, instructions) {
 						console.log(`\nOpen this URL in your browser:\n${url}`);
 						if (instructions) console.log(instructions);
 						console.log();
 					},
-					onPrompt: async (p) => {
+					async onPrompt(p) {
 						return await promptFn(`${p.message}${p.placeholder ? ` (${p.placeholder})` : ""}:`);
 					},
-					onProgress: (msg) => console.log(msg),
 				});
 				break;
 
 			case "google-gemini-cli":
-				credentials = await loginGeminiCli(
-					(info) => {
-						console.log(`\nOpen this URL in your browser:\n${info.url}`);
-						if (info.instructions) console.log(info.instructions);
+				credentials = await loginGeminiCli({
+					onAuth(info) {
+						const { url, instructions } = info;
+						console.log(`\nOpen this URL in your browser:\n${url}`);
+						if (instructions) console.log(instructions);
 						console.log();
 					},
-					(msg) => console.log(msg),
-				);
+				});
 				break;
 
 			case "google-antigravity":
-				credentials = await loginAntigravity(
-					(info) => {
-						console.log(`\nOpen this URL in your browser:\n${info.url}`);
-						if (info.instructions) console.log(info.instructions);
+				credentials = await loginAntigravity({
+					onAuth(info) {
+						const { url, instructions } = info;
+						console.log(`\nOpen this URL in your browser:\n${url}`);
+						if (instructions) console.log(instructions);
 						console.log();
 					},
-					(msg) => console.log(msg),
-				);
+				});
 				break;
 			case "openai-codex":
 				credentials = await loginOpenAICodex({
-					onAuth: (info) => {
-						console.log(`\nOpen this URL in your browser:\n${info.url}`);
-						if (info.instructions) console.log(info.instructions);
+					onAuth(info) {
+						const { url, instructions } = info;
+						console.log(`\nOpen this URL in your browser:\n${url}`);
+						if (instructions) console.log(instructions);
 						console.log();
 					},
-					onPrompt: async (p) => {
+					async onPrompt(p) {
 						return await promptFn(`${p.message}${p.placeholder ? ` (${p.placeholder})` : ""}:`);
 					},
-					onProgress: (msg) => console.log(msg),
 				});
 				break;
 
+			case "cursor":
+				credentials = await loginCursor(
+					(url) => {
+						console.log(`\nOpen this URL in your browser:\n${url}\n`);
+					},
+					() => {
+						console.log("Waiting for browser authentication...");
+					},
+				);
+				break;
+
 			default:
 				throw new Error(`Unknown provider: ${provider}`);
 		}
 
-		const auth = loadAuth();
-		auth[provider] = { type: "oauth", ...credentials };
-		saveAuth(auth);
+		storage.saveOAuth(provider, credentials);
 
-		console.log(`\nCredentials saved to ${AUTH_FILE}`);
+		console.log(`\nCredentials saved to ~/.omp/agent/agent.db`);
 	} finally {
+		storage.close();
 		rl.close();
 	}
 }
@@ -118,10 +118,12 @@ async function main(): Promise<void> {
 	const command = args[0];
 
 	if (!command || command === "help" || command === "--help" || command === "-h") {
-		console.log(`Usage: npx @oh-my-pi/pi-ai <command> [provider]
+		console.log(`Usage: bunx @oh-my-pi/pi-ai <command> [provider]
 
 Commands:
   login [provider]  Login to an OAuth provider
+  logout [provider] Logout from an OAuth provider
+  status            Show logged-in providers
   list              List available providers
 
 Providers:
@@ -130,15 +132,43 @@ Providers:
   google-gemini-cli Google Gemini CLI
   google-antigravity Antigravity (Gemini 3, Claude, GPT-OSS)
   openai-codex      OpenAI Codex (ChatGPT Plus/Pro)
+  cursor            Cursor (Claude, GPT, etc.)
 
 Examples:
-  npx @oh-my-pi/pi-ai login              # interactive provider selection
-  npx @oh-my-pi/pi-ai login anthropic    # login to specific provider
-  npx @oh-my-pi/pi-ai list               # list providers
+  bunx @oh-my-pi/pi-ai login              # interactive provider selection
+  bunx @oh-my-pi/pi-ai login anthropic    # login to specific provider
+  bunx @oh-my-pi/pi-ai logout anthropic   # logout from specific provider
+  bunx @oh-my-pi/pi-ai status             # show logged-in providers
+  bunx @oh-my-pi/pi-ai list               # list providers
 `);
 		return;
 	}
 
+	if (command === "status") {
+		const storage = new CliAuthStorage();
+		try {
+			const providers = storage.listProviders();
+			if (providers.length === 0) {
+				console.log("No OAuth credentials stored.");
+				console.log(`Use 'bunx @oh-my-pi/pi-ai login' to authenticate.`);
+			} else {
+				console.log("Logged-in providers:\n");
+				for (const provider of providers) {
+					const oauth = storage.getOAuth(provider);
+					if (oauth) {
+						const expires = new Date(oauth.expires);
+						const expired = Date.now() >= oauth.expires;
+						const status = expired ? "(expired)" : `(expires ${expires.toLocaleString()})`;
+						console.log(`  ${provider.padEnd(20)} ${status}`);
+					}
+				}
+			}
+		} finally {
+			storage.close();
+		}
+		return;
+	}
+
 	if (command === "list") {
 		console.log("Available OAuth providers:\n");
 		for (const p of PROVIDERS) {
@@ -147,6 +177,50 @@ Examples:
 		return;
 	}
 
+	if (command === "logout") {
+		let provider = args[1] as OAuthProvider | undefined;
+		const storage = new CliAuthStorage();
+
+		try {
+			if (!provider) {
+				const providers = storage.listProviders();
+				if (providers.length === 0) {
+					console.log("No OAuth credentials stored.");
+					return;
+				}
+
+				const rl = createInterface({ input: process.stdin, output: process.stdout });
+				console.log("Select a provider to logout:\n");
+				for (let i = 0; i < providers.length; i++) {
+					console.log(`  ${i + 1}. ${providers[i]}`);
+				}
+				console.log();
+
+				const choice = await prompt(rl, `Enter number (1-${providers.length}): `);
+				rl.close();
+
+				const index = parseInt(choice, 10) - 1;
+				if (index < 0 || index >= providers.length) {
+					console.error("Invalid selection");
+					process.exit(1);
+				}
+				provider = providers[index] as OAuthProvider;
+			}
+
+			const oauth = storage.getOAuth(provider);
+			if (!oauth) {
+				console.error(`Not logged in to ${provider}`);
+				process.exit(1);
+			}
+
+			storage.deleteProvider(provider);
+			console.log(`Logged out from ${provider}`);
+		} finally {
+			storage.close();
+		}
+		return;
+	}
+
 	if (command === "login") {
 		let provider = args[1] as OAuthProvider | undefined;
 
@@ -171,7 +245,7 @@ Examples:
 
 		if (!PROVIDERS.some((p) => p.id === provider)) {
 			console.error(`Unknown provider: ${provider}`);
-			console.error(`Use 'npx @oh-my-pi/pi-ai list' to see available providers`);
+			console.error(`Use 'bunx @oh-my-pi/pi-ai list' to see available providers`);
 			process.exit(1);
 		}
 
@@ -181,7 +255,7 @@ Examples:
 	}
 
 	console.error(`Unknown command: ${command}`);
-	console.error(`Use 'npx @oh-my-pi/pi-ai --help' for usage`);
+	console.error(`Use 'bunx @oh-my-pi/pi-ai --help' for usage`);
 	process.exit(1);
 }
 

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

@@ -6,6 +6,7 @@
 
 import { createHash } from "node:crypto";
 import type { Content, ThinkingConfig } from "@google/genai";
+import { abortableSleep } from "@oh-my-pi/pi-utils";
 import { calculateCost } from "../models";
 import type {
 	Api,
@@ -301,23 +302,6 @@ function extractErrorMessage(errorText: string): string {
 	return errorText;
 }
 
-/**
- * Sleep for a given number of milliseconds, respecting abort signal.
- */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-	return new Promise((resolve, reject) => {
-		if (signal?.aborted) {
-			reject(new Error("Request was aborted"));
-			return;
-		}
-		const timeout = setTimeout(resolve, ms);
-		signal?.addEventListener("abort", () => {
-			clearTimeout(timeout);
-			reject(new Error("Request was aborted"));
-		});
-	});
-}
-
 interface CloudCodeAssistRequest {
 	project: string;
 	model: string;
@@ -468,7 +452,7 @@ export const streamGoogleGeminiCli: StreamFunction<"google-gemini-cli"> = (
 						// Use server-provided delay or exponential backoff
 						const serverDelay = extractRetryDelay(errorText, response);
 						const delayMs = serverDelay ?? BASE_DELAY_MS * 2 ** attempt;
-						await sleep(delayMs, options?.signal);
+						await abortableSleep(delayMs, options?.signal);
 						continue;
 					}
 
@@ -489,7 +473,7 @@ export const streamGoogleGeminiCli: StreamFunction<"google-gemini-cli"> = (
 					// Network errors are retryable
 					if (attempt < MAX_RETRIES) {
 						const delayMs = BASE_DELAY_MS * 2 ** attempt;
-						await sleep(delayMs, options?.signal);
+						await abortableSleep(delayMs, options?.signal);
 						continue;
 					}
 					throw lastError;
@@ -769,7 +753,7 @@ export const streamGoogleGeminiCli: StreamFunction<"google-gemini-cli"> = (
 
 				if (emptyAttempt > 0) {
 					const backoffMs = EMPTY_STREAM_BASE_DELAY_MS * 2 ** (emptyAttempt - 1);
-					await sleep(backoffMs, options?.signal);
+					await abortableSleep(backoffMs, options?.signal);
 
 					if (!requestUrl) {
 						throw new Error("Missing request URL");

package/src/providers/openai-codex/response-handler.ts

@@ -1,3 +1,5 @@
+import { readSseData } from "@oh-my-pi/pi-utils";
+
 export type CodexRateLimit = {
 	used_percent?: number;
 	window_minutes?: number;
@@ -74,49 +76,8 @@ export async function* parseCodexSseStream(response: Response): AsyncGenerator<R
 		return;
 	}
 
-	const reader = response.body.getReader();
-	const decoder = new TextDecoder();
-	let buffer = "";
-
-	while (true) {
-		const { done, value } = await reader.read();
-		if (done) break;
-		buffer += decoder.decode(value, { stream: true });
-
-		let index = buffer.indexOf("\n\n");
-		while (index !== -1) {
-			const chunk = buffer.slice(0, index);
-			buffer = buffer.slice(index + 2);
-			const event = parseSseChunk(chunk);
-			if (event) yield event;
-			index = buffer.indexOf("\n\n");
-		}
-	}
-
-	if (buffer.trim()) {
-		const event = parseSseChunk(buffer);
-		if (event) yield event;
-	}
-}
-
-function parseSseChunk(chunk: string): Record<string, unknown> | null {
-	const lines = chunk.split("\n");
-	const dataLines: string[] = [];
-
-	for (const line of lines) {
-		if (line.startsWith("data:")) {
-			dataLines.push(line.slice(5).trim());
-		}
-	}
-
-	if (dataLines.length === 0) return null;
-	const data = dataLines.join("\n").trim();
-	if (!data || data === "[DONE]") return null;
-
-	try {
-		return JSON.parse(data) as Record<string, unknown>;
-	} catch {
-		return null;
+	for await (const data of readSseData<Record<string, unknown>>(response.body)) {
+		yield data;
 	}
 }
 

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

@@ -1,4 +1,5 @@
 import os from "node:os";
+import { abortableSleep } from "@oh-my-pi/pi-utils";
 import type {
 	ResponseFunctionToolCall,
 	ResponseInput,
@@ -440,13 +441,13 @@ async function fetchWithRetry(url: string, init: RequestInit, signal?: AbortSign
 			}
 			if (signal?.aborted) return response;
 			const delay = getRetryDelayMs(response, attempt);
-			await new Promise((resolve) => setTimeout(resolve, delay));
+			await abortableSleep(delay, signal);
 		} catch (error) {
 			if (attempt >= CODEX_MAX_RETRIES || signal?.aborted) {
 				throw error;
 			}
 			const delay = CODEX_RETRY_DELAY_MS * (attempt + 1);
-			await new Promise((resolve) => setTimeout(resolve, delay));
+			await abortableSleep(delay, signal);
 		}
 		attempt += 1;
 	}