@oh-my-pi/pi-ai 18.9.0 → 18.9.2

package/src/registry/cloudflare-ai-gateway.ts

@@ -1,11 +1,11 @@
 import { buildModel } from "@oh-my-pi/pi-catalog/build";
 import { apiRouteFor } from "@oh-my-pi/pi-catalog/compat/behavior";
+import { parseCloudflareCredential } from "@oh-my-pi/pi-catalog/wire/cloudflare";
 import {
 	CLOUDFLARE_AI_GATEWAY_ANTHROPIC_BASE_URL,
 	CLOUDFLARE_AI_GATEWAY_BASE_URL,
 	CLOUDFLARE_AI_GATEWAY_COMPAT_BASE_URL,
 	CLOUDFLARE_AI_GATEWAY_OPENAI_BASE_URL,
-	parseCloudflareAiGatewayCredential,
 } from "@oh-my-pi/pi-catalog/wire/cloudflare-ai-gateway";
 import { $env } from "@oh-my-pi/pi-utils";
 import { NO_AUTH_SENTINEL } from "../auth-retry";
@@ -83,7 +83,7 @@ export const cloudflareAiGatewayTransport: ProviderTransport = {
 		return model;
 	},
 	prepareRequest: (model, options) => {
-		const credential = parseCloudflareAiGatewayCredential(options.apiKey ?? $env.CLOUDFLARE_AI_GATEWAY_API_KEY ?? "");
+		const credential = parseCloudflareCredential(options.apiKey ?? $env.CLOUDFLARE_AI_GATEWAY_API_KEY ?? "");
 		if (!credential) return { model, options };
 		const accountId = credential.accountId ?? $env.CLOUDFLARE_ACCOUNT_ID;
 		const gatewayId = credential.gatewayId ?? $env.CLOUDFLARE_GATEWAY_ID;

package/src/registry/hooks/api-key.ts

@@ -14,6 +14,7 @@ export const API_KEY_LOGIN_HOOKS: Record<string, Lazy<LoginHook>> = {
 	"alibaba-coding-plan": () => import("../oauth/alibaba-coding-plan").then(m => m.loginAlibabaCodingPlan),
 	"alibaba-token-plan": () => import("../oauth/alibaba-token-plan").then(m => m.loginAlibabaTokenPlan),
 	"cloudflare-ai-gateway": () => import("../oauth/cloudflare-ai-gateway").then(m => m.loginCloudflareAiGateway),
+	"cloudflare-workers-ai": () => import("../oauth/cloudflare-workers-ai").then(m => m.loginCloudflareWorkersAi),
 	kilo: () => import("../oauth/kilo").then(m => m.loginKilo),
 	xiaomi: () => import("../oauth/xiaomi").then(m => m.loginXiaomi),
 };

package/src/registry/oauth/cloudflare-ai-gateway.ts

@@ -1,4 +1,4 @@
-import { serializeCloudflareAiGatewayCredential } from "@oh-my-pi/pi-catalog/wire/cloudflare-ai-gateway";
+import { serializeCloudflareCredential } from "@oh-my-pi/pi-catalog/wire/cloudflare";
 import * as AIError from "../../error";
 import type { OAuthController } from "./types";
 
@@ -35,5 +35,5 @@ export async function loginCloudflareAiGateway(options: OAuthController): Promis
 	if (options.signal?.aborted) throw new AIError.LoginCancelledError();
 	if (!gatewayId.trim()) throw new AIError.ConfigurationError("Cloudflare AI Gateway ID is required");
 
-	return serializeCloudflareAiGatewayCredential(apiKey, accountId, gatewayId);
+	return serializeCloudflareCredential({ token: apiKey, accountId, gatewayId });
 }

package/src/registry/oauth/cloudflare-workers-ai.ts

@@ -0,0 +1,32 @@
+import { serializeCloudflareCredential } from "@oh-my-pi/pi-catalog/wire/cloudflare";
+import * as AIError from "../../error";
+import type { OAuthController } from "./types";
+
+const AUTH_URL = "https://dash.cloudflare.com/profile/api-tokens";
+
+/** Collect the Workers AI API token and account id used by CLI, setup-wizard, and TUI login callers. */
+export async function loginCloudflareWorkersAi(options: OAuthController): Promise<string> {
+	if (!options.onPrompt) {
+		throw new AIError.OnPromptRequiredError("Cloudflare Workers AI");
+	}
+	options.onAuth?.({
+		url: AUTH_URL,
+		instructions: "Create an API token with Workers AI Read and Edit permissions, then copy it here.",
+	});
+
+	const token = await options.onPrompt({
+		message: "Paste your Cloudflare API token",
+		placeholder: "Workers AI API token",
+	});
+	if (options.signal?.aborted) throw new AIError.LoginCancelledError();
+	if (!token.trim()) throw new AIError.ApiKeyRequiredError();
+
+	const accountId = await options.onPrompt({
+		message: "Enter your Cloudflare account ID",
+		placeholder: "32-character account ID",
+	});
+	if (options.signal?.aborted) throw new AIError.LoginCancelledError();
+	if (!accountId.trim()) throw new AIError.ConfigurationError("Cloudflare account ID is required");
+
+	return serializeCloudflareCredential({ token, accountId });
+}

package/src/usage/claude.ts

@@ -1,4 +1,3 @@
-import { scheduler } from "node:timers/promises";
 import { classifyModel } from "@oh-my-pi/pi-catalog/compat/taxonomy";
 import { isAnthropicOAuthToken, toNumber } from "@oh-my-pi/pi-catalog/utils";
 import * as AIError from "../error";
@@ -16,6 +15,7 @@ import {
 	type UsageWindow,
 } from "../usage";
 import { isRecord } from "../utils";
+import { waitForRetry } from "../utils/retry-wait";
 import { buildClaudeOAuthHeaders, claudeOAuthBaseUrls } from "./claude-api";
 import { listClaudeResetCredits, parseClaudeResetCreditsFromUsagePayload } from "./claude-reset";
 import { HOUR_MS, parseIsoTimestamp, usageStatus, WEEK_MS } from "./shared";
@@ -240,11 +240,7 @@ async function waitBeforeRetry(
 	if (attempt >= MAX_ATTEMPTS - 1) return false;
 	try {
 		const delayMs = retryDelayMs(attempt, retryAfter);
-		if (retryWait) {
-			await retryWait(delayMs, signal);
-		} else {
-			await scheduler.wait(delayMs, { signal });
-		}
+		await waitForRetry(retryWait, delayMs, signal);
 		return !signal?.aborted;
 	} catch (error) {
 		if (isAbortError(error, signal)) return false;

package/src/utils/empty-completion-retry.ts

@@ -13,10 +13,10 @@
  * valid provider result. Transient-error retries use the shared provider error
  * classifier and are separately bounded by the caller's policy.
  */
-import { scheduler } from "node:timers/promises";
 import * as AIError from "../error";
 import type { AssistantMessage, AssistantMessageEvent, Context } from "../types";
 import { AssistantMessageEventStream } from "./event-stream";
+import { waitForRetry } from "./retry-wait";
 
 export const MAX_EMPTY_COMPLETION_RETRIES = 2;
 export const EMPTY_COMPLETION_BASE_DELAY_MS = 500;
@@ -169,8 +169,7 @@ export function withReplaySafeStreamRetry<M, O extends StreamRetryOptions>(
 
 			if (delayMs !== undefined && !signal?.aborted) {
 				try {
-					if (options?.providerRetryWait) await options.providerRetryWait(delayMs, signal);
-					else await scheduler.wait(delayMs, { signal });
+					await waitForRetry(options?.providerRetryWait, delayMs, signal);
 				} catch (waitError) {
 					flush();
 					if (signal?.aborted) {

package/src/utils/retry-wait.ts

@@ -0,0 +1,19 @@
+import { scheduler } from "node:timers/promises";
+
+/** Injected retry sleep: `StreamOptions.providerRetryWait` / `UsageFetchContext.retryWait`. */
+export type RetryWaitHook = (delayMs: number, signal?: AbortSignal) => Promise<void>;
+
+/**
+ * Waits `delayMs` between retry attempts. Honors the caller's retry-wait hook
+ * when one is set (tests and custom transports inject it to avoid real sleeps)
+ * and otherwise sleeps on `signal`, so an abort rejects instead of the retry
+ * proceeding.
+ */
+export async function waitForRetry(
+	retryWait: RetryWaitHook | undefined,
+	delayMs: number,
+	signal?: AbortSignal,
+): Promise<void> {
+	if (retryWait) await retryWait(delayMs, signal);
+	else await scheduler.wait(delayMs, { signal });
+}

package/dist/types/judgment/typesafe.d.ts

@@ -1,49 +0,0 @@
-import type { Api, FetchImpl } from "@oh-my-pi/pi-catalog/types";
-import { type ApiKey } from "../auth-retry.js";
-import * as AIError from "../error/index.js";
-import { type Judge, type JudgeOptions, type JudgmentRequest, type JudgmentResult, type Questions } from "./types.js";
-export declare const TYPESAFE_PROVIDER = "typesafe";
-export declare const TYPESAFE_DEFAULT_MODEL = "jev-latest";
-/** Judgment `POST` path under a model's base URL, per System One–compatible API. */
-export declare const JUDGMENT_ROUTES: {
-    readonly typesafe: "/v1/systemone";
-    readonly "openrouter-decisions": "/decisions";
-};
-/** APIs {@link TypeSafeJudge} can serve. */
-export type JudgmentApi = keyof typeof JUDGMENT_ROUTES;
-/** Whether a catalog API answers System One judgments natively. */
-export declare function isJudgmentApi(api: Api): api is JudgmentApi;
-/** `TYPESAFE_BASE_URL` when set, else the public API root; trailing slashes stripped. */
-export declare function typesafeBaseUrl(): string;
-/** `TYPESAFE_DEFAULT_MODEL` when set, else {@link TYPESAFE_DEFAULT_MODEL}. */
-export declare function typesafeModel(): string;
-export interface TypeSafeJudgeOptions {
-    apiKey: ApiKey;
-    /** Wire route; defaults to TypeSafe's own API. */
-    api?: JudgmentApi;
-    /** Catalog provider reported on results; defaults to {@link TYPESAFE_PROVIDER}. */
-    provider?: string;
-    /** Defaults to {@link typesafeBaseUrl}. */
-    baseUrl?: string;
-    /** Defaults to {@link typesafeModel}. */
-    model?: string;
-    /** Static headers attached to judgment requests (e.g. proxy routing, gateway auth). */
-    headers?: Record<string, string>;
-    fetch?: FetchImpl;
-    /** Per-attempt timeout; defaults to {@link DEFAULT_TIMEOUT_MS}. */
-    timeoutMs?: number;
-}
-/** Non-2xx response from the TypeSafe API. */
-export declare class TypeSafeApiError extends AIError.ProviderHttpError {
-    readonly name = "TypeSafeApiError";
-}
-export declare class TypeSafeJudge implements Judge {
-    #private;
-    readonly label: string;
-    readonly api: JudgmentApi;
-    readonly provider: string;
-    readonly model: string;
-    readonly baseUrl: string;
-    constructor(options: TypeSafeJudgeOptions);
-    judge<Q extends Questions>(request: JudgmentRequest<Q>, options?: JudgeOptions): Promise<JudgmentResult<Q>>;
-}

package/src/judgment/typesafe.ts

@@ -1,183 +0,0 @@
-/**
- * TypeSafe System One client: the native {@link Judge} backend.
- *
- * Forwards a {@link JudgmentRequest} verbatim to the judgment route of its
- * API ({@link JUDGMENT_ROUTES}) and maps the typed answers back. TypeSafe's
- * own `POST /v1/systemone` and OpenRouter's `POST /api/alpha/decisions` share
- * the request and answer wire shape, so one client serves both. Credentials
- * flow through {@link withAuth}, so a stored key rotates on 401/403 exactly
- * like chat providers; transient 429/5xx responses retry with bounded,
- * `retry-after`-aware backoff.
- *
- * Environment (mirrors the official SDK): `TYPESAFE_API_KEY` is resolved by
- * the auth registry (`rules/auth/typesafe.kdl`), `TYPESAFE_BASE_URL`
- * overrides the API root, `TYPESAFE_DEFAULT_MODEL` the model.
- */
-import { TYPESAFE_DEFAULT_BASE_URL } from "@oh-my-pi/pi-catalog/discovery";
-import type { Api, FetchImpl } from "@oh-my-pi/pi-catalog/types";
-import { $env } from "@oh-my-pi/pi-utils";
-import { type ApiKey, withAuth } from "../auth-retry";
-import * as AIError from "../error";
-import { getRetryAfterMsFromHeaders } from "../utils/retry-after";
-import {
-	type Answer,
-	type Judge,
-	type JudgeOptions,
-	type JudgmentRequest,
-	type JudgmentResult,
-	type Questions,
-	tokenUsage,
-} from "./types";
-
-export const TYPESAFE_PROVIDER = "typesafe";
-export const TYPESAFE_DEFAULT_MODEL = "jev-latest";
-
-/** Judgment `POST` path under a model's base URL, per System One–compatible API. */
-export const JUDGMENT_ROUTES = {
-	typesafe: "/v1/systemone",
-	"openrouter-decisions": "/decisions",
-} as const satisfies Partial<Record<Api, string>>;
-
-/** APIs {@link TypeSafeJudge} can serve. */
-export type JudgmentApi = keyof typeof JUDGMENT_ROUTES;
-
-/** Whether a catalog API answers System One judgments natively. */
-export function isJudgmentApi(api: Api): api is JudgmentApi {
-	return Object.hasOwn(JUDGMENT_ROUTES, api);
-}
-
-/** `TYPESAFE_BASE_URL` when set, else the public API root; trailing slashes stripped. */
-export function typesafeBaseUrl(): string {
-	return ($env.TYPESAFE_BASE_URL?.trim() || TYPESAFE_DEFAULT_BASE_URL).replace(/\/+$/, "");
-}
-
-/** `TYPESAFE_DEFAULT_MODEL` when set, else {@link TYPESAFE_DEFAULT_MODEL}. */
-export function typesafeModel(): string {
-	return $env.TYPESAFE_DEFAULT_MODEL?.trim() || TYPESAFE_DEFAULT_MODEL;
-}
-
-export interface TypeSafeJudgeOptions {
-	apiKey: ApiKey;
-	/** Wire route; defaults to TypeSafe's own API. */
-	api?: JudgmentApi;
-	/** Catalog provider reported on results; defaults to {@link TYPESAFE_PROVIDER}. */
-	provider?: string;
-	/** Defaults to {@link typesafeBaseUrl}. */
-	baseUrl?: string;
-	/** Defaults to {@link typesafeModel}. */
-	model?: string;
-	/** Static headers attached to judgment requests (e.g. proxy routing, gateway auth). */
-	headers?: Record<string, string>;
-	fetch?: FetchImpl;
-	/** Per-attempt timeout; defaults to {@link DEFAULT_TIMEOUT_MS}. */
-	timeoutMs?: number;
-}
-
-/** Non-2xx response from the TypeSafe API. */
-export class TypeSafeApiError extends AIError.ProviderHttpError {
-	override readonly name = "TypeSafeApiError";
-}
-
-const DEFAULT_TIMEOUT_MS = 10_000;
-const MAX_ATTEMPTS = 3;
-const BACKOFF_BASE_MS = 500;
-const BACKOFF_MAX_MS = 5_000;
-
-interface SystemOneResponse {
-	model: string;
-	answers: Record<string, Answer>;
-	/** OpenRouter adds the billed `cost` in USD; some routes omit token counts. */
-	usage: { input_tokens?: number; output_tokens?: number; cost?: number };
-}
-
-/** Server hint wins (capped); otherwise exponential backoff from {@link BACKOFF_BASE_MS}. */
-function backoffMs(attempt: number, headers: Headers | undefined): number {
-	const hinted = headers === undefined ? undefined : getRetryAfterMsFromHeaders(headers);
-	if (hinted !== undefined) return Math.min(hinted, BACKOFF_MAX_MS);
-	return Math.min(BACKOFF_BASE_MS * 2 ** attempt, BACKOFF_MAX_MS);
-}
-
-export class TypeSafeJudge implements Judge {
-	readonly label: string;
-	readonly api: JudgmentApi;
-	readonly provider: string;
-	readonly model: string;
-	readonly baseUrl: string;
-	readonly #apiKey: ApiKey;
-	readonly #headers: Record<string, string> | undefined;
-	readonly #fetch: FetchImpl;
-	readonly #timeoutMs: number;
-
-	constructor(options: TypeSafeJudgeOptions) {
-		this.#apiKey = options.apiKey;
-		this.api = options.api ?? TYPESAFE_PROVIDER;
-		this.provider = options.provider ?? TYPESAFE_PROVIDER;
-		this.baseUrl = (options.baseUrl ?? typesafeBaseUrl()).replace(/\/+$/, "");
-		this.model = options.model ?? typesafeModel();
-		this.#headers = options.headers;
-		this.#fetch = options.fetch ?? fetch;
-		this.#timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-		this.label = `${this.provider}/${this.model}`;
-	}
-
-	async judge<Q extends Questions>(request: JudgmentRequest<Q>, options?: JudgeOptions): Promise<JudgmentResult<Q>> {
-		const body = JSON.stringify({ state: request.state, model: this.model, questions: request.questions });
-		const signal = options?.signal;
-		const response = await withAuth(
-			this.#apiKey,
-			key => this.#attempt<SystemOneResponse>(JUDGMENT_ROUTES[this.api], body, key, signal),
-			{ signal },
-		);
-		for (const id in request.questions) {
-			const answer = response.answers[id];
-			if (answer === undefined || answer.type !== request.questions[id].type) {
-				throw new AIError.ProviderResponseError(
-					`${this.label} response is missing a "${request.questions[id].type}" answer for question "${id}"`,
-					{ provider: this.provider, kind: "envelope" },
-				);
-			}
-		}
-		return {
-			api: this.api,
-			provider: this.provider,
-			model: response.model,
-			answers: response.answers as JudgmentResult<Q>["answers"],
-			usage: tokenUsage(response.usage.input_tokens, response.usage.output_tokens, response.usage.cost),
-		};
-	}
-
-	async #attempt<T>(path: string, body: string, key: string, signal: AbortSignal | undefined): Promise<T> {
-		const url = `${this.baseUrl}${path}`;
-		const headers: Record<string, string> = {
-			...this.#headers,
-			Authorization: `Bearer ${key}`,
-			Accept: "application/json",
-			"Content-Type": "application/json",
-		};
-		for (let attempt = 0; ; attempt++) {
-			signal?.throwIfAborted();
-			const timeout = AbortSignal.timeout(this.#timeoutMs);
-			let response: Response;
-			try {
-				response = await this.#fetch(url, {
-					method: "POST",
-					headers,
-					body,
-					signal: signal ? AbortSignal.any([signal, timeout]) : timeout,
-				});
-			} catch (error) {
-				if (signal?.aborted || attempt + 1 >= MAX_ATTEMPTS) throw error;
-				await Bun.sleep(backoffMs(attempt, undefined));
-				continue;
-			}
-			if (response.ok) return (await response.json()) as T;
-			const text = await response.text();
-			const error = new TypeSafeApiError(`${this.label} API error (${response.status}): ${text}`, response.status, {
-				headers: response.headers,
-			});
-			const transient = response.status === 408 || response.status === 429 || response.status >= 500;
-			if (!transient || attempt + 1 >= MAX_ATTEMPTS) throw error;
-			await Bun.sleep(backoffMs(attempt, response.headers));
-		}
-	}
-}