@oh-my-pi/pi-ai 17.2.3 → 17.2.5

package/src/providers/transform-messages.ts

@@ -300,7 +300,7 @@ function normalizeAnthropicTargetToolCallId<TApi extends Api>(
  * credential redaction is enabled. Exported so hosts can route the same shapes
  * through reversible obfuscation (keyed placeholders restored before local tool
  * execution) instead of the irreversible `[*_token_redacted]` rewrite below —
- * an irreversible placeholder echoed back in edit-tool `old_text` can never
+ * an irreversible placeholder echoed back in edit-tool `old_string` can never
  * match the real bytes on disk.
  */
 export const SENSITIVE_TOKEN_RE =

package/src/stream.ts

@@ -15,7 +15,7 @@ import {
 } from "@oh-my-pi/pi-catalog/model-thinking";
 import { CATALOG_PROVIDERS, type ProviderCatalogEntry } from "@oh-my-pi/pi-catalog/provider-models";
 import { CODEX_BASE_URL } from "@oh-my-pi/pi-catalog/wire/codex";
-import { $env, $pickenv, getConfigRootDir, isEnoent, logger, withExtraCaFetch } from "@oh-my-pi/pi-utils";
+import { $env, $pickenv, getProviderInFlightRoot, isEnoent, logger, withExtraCaFetch } from "@oh-my-pi/pi-utils";
 import { getCustomApi } from "./api-registry";
 import { createAuthRetryKeyState, isApiKeyResolver, resolveNextAuthRetryKey } from "./auth-retry";
 import * as AIError from "./error";
@@ -189,7 +189,7 @@ function resolveProviderInFlightLimit(
 
 function providerInFlightRoot(): string {
 	if (providerInFlightRootOverride) return providerInFlightRootOverride;
-	return path.join(getConfigRootDir(), "run", "provider-inflight");
+	return getProviderInFlightRoot();
 }
 
 function providerInFlightSegment(provider: string): string {

package/src/types.ts

@@ -214,10 +214,10 @@ export function resolveModelServiceTier(
 
 /**
  * True when the tier should be sent on the wire as the provider's service-tier
- * request field. OpenAI / OpenAI-Codex accept `flex`/`scale`/`priority`; Google
- * (Gemini API + Vertex) and OpenRouter accept `flex`/`priority`; Fireworks
- * Serverless realizes only its Priority serving path. Anthropic is absent — it
- * realizes `priority` via `speed: "fast"`, not a service-tier field.
+ * request field. OpenAI / OpenAI-Codex accept every {@link ServiceTier};
+ * Google (Gemini API + Vertex) and OpenRouter accept `flex`/`priority`;
+ * Fireworks Serverless realizes only its Priority serving path. Anthropic is
+ * absent because it realizes `priority` via `speed: "fast"`.
  */
 export function shouldSendServiceTier(
 	serviceTier: ServiceTier | null | undefined,
@@ -225,12 +225,11 @@ export function shouldSendServiceTier(
 ): boolean {
 	if (!serviceTier) return false;
 	const provider = typeof target === "string" ? target : target?.provider;
-	if (provider === "openai" || provider === "openai-codex" || provider === "openrouter") {
-		return serviceTier === "flex" || serviceTier === "scale" || serviceTier === "priority";
-	}
-	if (typeof target !== "string" && target && isOpenAIServiceTierModel(target)) {
+	if (provider === "openai" || provider === "openai-codex") return true;
+	if (provider === "openrouter") {
 		return serviceTier === "flex" || serviceTier === "scale" || serviceTier === "priority";
 	}
+	if (typeof target !== "string" && target && isOpenAIServiceTierModel(target)) return true;
 	if (provider === "google") {
 		return serviceTier === "flex" || serviceTier === "priority";
 	}
@@ -844,6 +843,8 @@ export interface AssistantRetryRecovery {
 export interface ContextSnapshot {
 	promptTokens: number; // authoritative provider prompt/input tokens
 	nonMessageTokens: number; // estimated non-message total at send time
+	/** Estimated prompt tokens removed by local history rewrites after this provider snapshot was recorded. */
+	historyRewriteTokensRemoved?: number;
 	lastMessageTimestamp?: number;
 }
 

package/src/utils/harmony-leak.ts

@@ -35,6 +35,18 @@ export function escapeHarmonyControlTokens(text: string): string {
 	return text.replace(HARMONY_CONTROL_TOKEN_ESCAPE_RE, "<\\|$1\\|>");
 }
 
+/**
+ * Escape reserved Harmony control tokens inside a JSON document string (e.g.
+ * `function_call.arguments`). Doubles the backslash so the document remains
+ * valid JSON whose *decoded* strings carry the inert `<\|token\|>` spelling.
+ * `<|` cannot occur outside a string literal in valid JSON, so the blanket
+ * replace never corrupts structure; malformed documents are escaped
+ * best-effort.
+ */
+export function escapeHarmonyControlTokensInJson(text: string): string {
+	return text.replace(HARMONY_CONTROL_TOKEN_ESCAPE_RE, "<\\\\|$1\\\\|>");
+}
+
 /**
  * Whether requests to `model` are served by a Harmony-dialect backend
  * (gpt-5.x / gpt-oss), which rejects reserved control-token spellings appearing

package/src/utils/schema/typescript.ts

@@ -12,15 +12,22 @@
 import { isJsonObject } from "./types";
 
 export interface JsonSchemaToTsOptions {
-	/** Indentation unit for nested object bodies. Default two spaces. */
+	/** Indentation unit for nested object bodies. Default two spaces (none in `harmony` style). */
 	readonly indent?: string;
-	/** Emit `description` keywords as JSDoc comments on object properties. Default true. */
+	/** Emit `description` keywords as comments on object properties. Default true. */
 	readonly comments?: boolean;
+	/**
+	 * Output flavor. `default` renders JSDoc comments, `;` delimiters, and
+	 * indented bodies; `harmony` renders the flat OpenAI-Harmony convention —
+	 * `//` line comments, `,` delimiters, no indentation.
+	 */
+	readonly style?: "default" | "harmony";
 }
 
 interface Ctx {
 	readonly indent: string;
 	readonly comments: boolean;
+	readonly harmony: boolean;
 	readonly defs: Record<string, unknown> | undefined;
 	readonly seen: Set<unknown>;
 }
@@ -48,7 +55,11 @@ function joinUnion(parts: readonly string[]): string {
 	return unique.length > 0 ? unique.join(" | ") : "never";
 }
 
-function emitJsDoc(lines: string[], description: string, pad: string): void {
+function emitDescription(lines: string[], description: string, ctx: Ctx, pad: string): void {
+	if (ctx.harmony) {
+		for (const line of description.split("\n")) lines.push(`${pad}// ${line}`.trimEnd());
+		return;
+	}
 	// `* /` keeps a stray closing token inside the description from ending the comment.
 	const safe = description.replace(/\*\//g, "* /");
 	if (!safe.includes("\n")) {
@@ -85,6 +96,7 @@ function convertObject(node: Record<string, unknown>, ctx: Ctx, pad: string): st
 		const required = new Set(
 			Array.isArray(node.required) ? node.required.filter((key): key is string => typeof key === "string") : [],
 		);
+		const delimiter = ctx.harmony ? "," : ";";
 		for (const key in properties) {
 			const value = properties[key];
 			if (
@@ -93,11 +105,11 @@ function convertObject(node: Record<string, unknown>, ctx: Ctx, pad: string): st
 				typeof value.description === "string" &&
 				value.description.length > 0
 			) {
-				emitJsDoc(body, value.description, childPad);
+				emitDescription(body, value.description, ctx, childPad);
 			}
 			const optional = required.has(key) ? "" : "?";
 			const name = SAFE_KEY.test(key) ? key : JSON.stringify(key);
-			body.push(`${childPad}${name}${optional}: ${convert(value, ctx, childPad)};`);
+			body.push(`${childPad}${name}${optional}: ${convert(value, ctx, childPad)}${delimiter}`);
 		}
 	}
 
@@ -110,7 +122,7 @@ function convertObject(node: Record<string, unknown>, ctx: Ctx, pad: string): st
 
 	// Named properties alongside a free-form value schema → index signature.
 	if (isJsonObject(additional)) {
-		body.push(`${childPad}[key: string]: ${convert(additional, ctx, childPad)};`);
+		body.push(`${childPad}[key: string]: ${convert(additional, ctx, childPad)}${ctx.harmony ? "," : ";"}`);
 	}
 	return `{\n${body.join("\n")}\n${pad}}`;
 }
@@ -188,9 +200,11 @@ export function jsonSchemaToTypeScript(schema: unknown, options?: JsonSchemaToTs
 			}
 		}
 	}
+	const harmony = options?.style === "harmony";
 	const ctx: Ctx = {
-		indent: options?.indent ?? "  ",
+		indent: options?.indent ?? (harmony ? "" : "  "),
 		comments: options?.comments ?? true,
+		harmony,
 		defs,
 		seen: new Set(),
 	};

package/src/utils.ts

@@ -403,7 +403,7 @@ function sanitizeOpenAIResponsesReasoningItemForReplay(
 function sanitizeOpenAIResponsesImageGenerationCallForReplay(
 	item: Record<string, unknown>,
 ): ResponseInputItem.ImageGenerationCall | undefined {
-	if (typeof item.id !== "string" || item.status !== "completed" || typeof item.result !== "string") {
+	if (typeof item.id !== "string" || typeof item.result !== "string" || item.result.length === 0) {
 		return undefined;
 	}
 	return {