pi-cliproxyapi-native 0.1.4 → 0.1.6

package/README.md

@@ -6,15 +6,15 @@ Chat uses Pi's native API adapters and model metadata, with availability from yo
 
 ## Install
 
-This release targets Pi 0.99.2 and CLIProxyAPI 8.0.7, with Node.js 22.19 or newer. Run CLIProxyAPI with your upstream accounts configured before connecting Pi. The extension uses Pi's host-provided packages, adds no runtime dependencies, and needs no compilation.
+This release targets Pi 1.0.4 and CLIProxyAPI 8.0.18, with Node.js 22.19 or newer. Run CLIProxyAPI with your upstream accounts configured before connecting Pi. The extension uses Pi's host-provided packages, adds no runtime dependencies, and needs no compilation.
 
 If you installed `pi-cliproxy-native`, remove it before installing the renamed package. Both register the same `cliproxyapi` provider.
 
 ```sh
-pi install npm:pi-cliproxyapi-native@0.1.4
+pi install npm:pi-cliproxyapi-native@0.1.6
 ```
 
-For Git installation, use `pi install git:github.com/hawkff/pi-cliproxyapi-native@v0.1.4`. For a local checkout, use `pi install /path/to/pi-cliproxyapi-native`.
+For Git installation, use `pi install git:github.com/hawkff/pi-cliproxyapi-native@v0.1.6`. For a local checkout, use `pi install /path/to/pi-cliproxyapi-native`.
 
 The default proxy address is `http://localhost:8317`. For another address, set the [connection](#connection) before logging in. Restart Pi, then run:
 
@@ -194,6 +194,8 @@ Replace `<canonical-model-id>` with an ID from Pi's Anthropic catalog. Reference
 
 A `vertex/` or `antigravity/` route can reuse its unprefixed ID's alias if that reference resolves to one metadata entry. An alias for the full prefixed ID takes precedence. Custom prefixes need an explicit chat alias. Arbitrary aliases may lack ID-specific adapter behavior; canonical Gemini IDs and the two recognized prefixes retain native thinking and tool-turn handling.
 
+For Antigravity IDs `claude-opus-5-5-high` and `claude-sonnet-5-5-high`, the extension falls back to `anthropic/claude-opus-5-5` and `anthropic/claude-sonnet-5-5` metadata. This applies to bare IDs and recognized `antigravity/` or `vertex/` routes. Explicit aliases take precedence, followed by exact native metadata. The fallback requires the corresponding canonical entry in Pi and names the model like a configured alias, for example `claude-opus-5-5-high (Claude Opus 5.5)`; requests keep the advertised `-high` ID.
+
 Use Pi's `models.json` `modelOverrides` for limits, prices, or compatibility changes. Use its `models` array for IDs with no built-in metadata. Updating Pi supplies newer metadata. Catalog prices are estimates, not the proxy's bill; check upstream limits before increasing them.
 
 ## Backend routes
@@ -213,6 +215,8 @@ Set the CLIProxyAPI auth record's top-level `prefix` to `vertex` or `antigravity
 
 Use a reference such as `cliproxyapi/<model-id>:high` in Pi or pi-subagents. Pi separates the thinking suffix from the request ID. Supported levels come from model metadata; `xhigh` and `max` require explicit support. Pi clamps unsupported levels, and models that require thinking cannot use `off`. Keep thinking suffixes out of alias references.
 
+The `-high` in Antigravity model IDs belongs to the request ID. Pi's `:high` suffix sets thinking effort. For example, `cliproxyapi/antigravity/claude-opus-5-5-high:high` sends `antigravity/claude-opus-5-5-high` with high effort.
+
 Child loading depends on the [pi-subagents extension settings](https://github.com/nicobailon/pi-subagents/blob/main/docs/agents.md#tool-and-extension-selection). Local foreground children can inherit providers from the parent. Background children load extensions through discovery or an allowlist. A saved catalog alone does not register this provider.
 
 For native roles that need explicit loading, add this extension to `subagentOnlyExtensions`. Merge this example into `~/.pi/agent/settings.json`, replacing the path and role name while preserving existing entries:
@@ -237,7 +241,7 @@ Claude uses the legacy fine-grained tool-streaming header in place of eager tool
 
 OpenAI images POST `model`, `prompt`, and `n=1` to `/v1/images/generations`, without `response_format`. xAI uses the same route with `response_format: "b64_json"`. Gemini uses `/v1beta/models/{id}:generateContent`. Media generation sends the prompt and generation options without chat history, system instructions, or tools.
 
-OpenAI image POSTs use a dedicated HTTP connection so shorter transport timeouts do not interrupt the ten-minute deadline. They request identity encoding and reject compressed responses.
+OpenAI image POSTs use a dedicated HTTP connection and preserve Node's configured proxy routing. They disable socket timeouts so the ten-minute deadline controls the request, request identity encoding, and reject compressed responses.
 
 The implementation follows CLIProxyAPI v7.3.1's [OpenAI image handler](https://github.com/router-for-me/CLIProxyAPI/blob/v7.3.1/sdk/api/handlers/openai/openai_images_handlers.go) and [Codex image executor](https://github.com/router-for-me/CLIProxyAPI/blob/v7.3.1/internal/runtime/executor/codex_openai_images.go). The xAI and Google routes follow v7.2.158's [video handler](https://github.com/router-for-me/CLIProxyAPI/blob/v7.2.158/sdk/api/handlers/openai/openai_videos_handlers.go), [Gemini handler](https://github.com/router-for-me/CLIProxyAPI/blob/v7.2.158/sdk/api/handlers/gemini/gemini_handlers.go), and [Vertex executor](https://github.com/router-for-me/CLIProxyAPI/blob/v7.2.158/internal/runtime/executor/gemini_vertex_executor.go). See [xAI's video documentation](https://docs.x.ai/developers/model-capabilities/video/generation) for duration and status semantics.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cliproxyapi-native",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "CLIProxyAPI chat discovery and image/video generation with Pi's native adapters",
   "publishConfig": {
     "access": "public"
@@ -39,9 +39,9 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.5.13",
-    "@earendil-works/pi-ai": "^0.99.2",
-    "@earendil-works/pi-coding-agent": "^0.99.2",
-    "@earendil-works/pi-tui": "^0.99.2",
+    "@earendil-works/pi-ai": "^1.0.4",
+    "@earendil-works/pi-coding-agent": "^1.0.4",
+    "@earendil-works/pi-tui": "^1.0.4",
     "@types/node": "^24.13.4",
     "typescript": "5.9.3"
   },

package/src/catalog.ts

@@ -171,9 +171,17 @@ const owners: Readonly<Record<string, string>> = {
   "gemini-cli": "google",
 };
 
+// Built-in aliases for advertised IDs without native metadata; exact metadata still wins.
+const metadataFallbacks = new Map([
+  ["claude-opus-5-5-high", "anthropic/claude-opus-5-5"],
+  ["claude-sonnet-5-5-high", "anthropic/claude-sonnet-5-5"],
+]);
+
 export function mapCatalog(value: unknown, config: Config, known: readonly Model<Api>[]) {
   const models = new Map<string, Model<CpaApi>>();
   const skipped = new Set<string>();
+  const byId = Map.groupBy(known, (model) => model.id);
+  const byReference = Map.groupBy(known, (model) => `${model.provider}/${model.id}`);
   for (const entry of parseCatalog(value)) {
     if (entry.hidden || models.has(entry.id)) continue;
     if (mediaPurpose(entry.id)) {
@@ -181,16 +189,15 @@ export function mapCatalog(value: unknown, config: Config, known: readonly Model
       continue;
     }
     const { metadataId, backend } = modelRoute(entry.id);
+    const routed = !entry.id.includes("/") || backend;
     const alias = Object.hasOwn(config.aliases, entry.id)
       ? config.aliases[entry.id]
       : backend && Object.hasOwn(config.aliases, metadataId)
         ? config.aliases[metadataId]
-        : undefined;
-    const candidates = known.filter((model) =>
-      alias
-        ? `${model.provider}/${model.id}` === alias
-        : (!entry.id.includes("/") || backend) && model.id === metadataId,
-    );
+        : routed && !byId.has(metadataId)
+          ? metadataFallbacks.get(metadataId)
+          : undefined;
+    const candidates = (alias ? byReference.get(alias) : routed ? byId.get(metadataId) : undefined) ?? [];
     const families = new Set(
       candidates.map((model) => (model.provider === "openai-codex" ? "openai" : model.provider)),
     );

package/src/media.ts

@@ -1,6 +1,6 @@
 import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
-import { request as httpRequest } from "node:http";
-import { request as httpsRequest } from "node:https";
+import * as http from "node:http";
+import * as https from "node:https";
 import { join } from "node:path";
 import { addAbortSignal, Readable } from "node:stream";
 import { type ImageContent, type Static, type TextContent, Type } from "@earendil-works/pi-ai";
@@ -8,7 +8,7 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 import { mapMediaCatalog, mediaCapability, mediaControls } from "./catalog.ts";
 import { type Config, isRecord, PROVIDER_ID } from "./config.ts";
 import { type DefaultsContext, effectiveMediaDefaults, resolveMediaModel } from "./media-defaults.ts";
-import { fetchCatalog, validateKey } from "./provider.ts";
+import { deadline, fetchCatalog, validateKey } from "./provider.ts";
 
 type MediaContext = Pick<ExtensionContext, "cwd" | "model"> &
   DefaultsContext & {
@@ -102,10 +102,6 @@ function mediaOutputOptions(
   return options;
 }
 
-function deadline(signal: AbortSignal | undefined, milliseconds: number) {
-  return AbortSignal.any([...(signal ? [signal] : []), AbortSignal.timeout(milliseconds)]);
-}
-
 export async function mediaKey(ctx: Pick<MediaContext, "modelRegistry">, signal: AbortSignal) {
   signal.throwIfAborted();
   const cancelled = Promise.withResolvers<never>();
@@ -133,12 +129,25 @@ function openaiImageResponse(config: Config, key: string, body: object, signal:
   return new Promise<{ ok: boolean; status: number; body: ReturnType<typeof Readable.toWeb> | null }>(
     (resolve, reject) => {
       const url = new URL(`${config.baseUrl}/v1/images/generations`);
-      // A private agent and no socket timeout leave the overall signal in control of long image waits.
-      const request = (url.protocol === "https:" ? httpsRequest : httpRequest)(
+      const transport = url.protocol === "https:" ? https : http;
+      const options = "options" in transport.globalAgent ? transport.globalAgent.options : undefined;
+      // Preserve configured proxies without inheriting the global agent's socket timeout.
+      const agent = new transport.Agent({
+        ...(isRecord(options) ? options : {}),
+        keepAlive: false,
+        timeout: 0,
+      });
+      const connect = agent.createConnection.bind(agent);
+      agent.createConnection = (connectionOptions, callback) => {
+        // Node assigns HTTPS proxy sockets to the request only after CONNECT completes.
+        const socket = connect(connectionOptions, callback);
+        return socket ? addAbortSignal(signal, socket) : socket;
+      };
+      const request = transport.request(
         url,
         {
           method: "POST",
-          agent: false,
+          agent,
           timeout: 0,
           signal,
           headers: {

package/src/picker.ts

@@ -16,7 +16,7 @@ import {
   type MediaDefaults,
   readMediaDefaults,
 } from "./media-defaults.ts";
-import { fetchCatalog } from "./provider.ts";
+import { deadline, fetchCatalog } from "./provider.ts";
 
 export function pickerCatalog(value: unknown) {
   const rows = new Map<
@@ -58,6 +58,10 @@ export function searchPickerItems(items: readonly PickerItem[], query: string) {
   );
 }
 
+function clearedPurpose(choice: string) {
+  return choice === "clear image" ? "image" : choice === "clear video" ? "video" : undefined;
+}
+
 function defaultsLabel(defaults: MediaDefaults, automatic?: string) {
   const label = (id?: string | null) => (id === null ? "invalid / disabled" : id ? routedName(id) : "none");
   return `Image: ${label(defaults.image)}${automatic ? " (automatic default)" : ""} | Video: ${label(defaults.video)}`;
@@ -207,6 +211,8 @@ export class ModelPicker extends Container implements Focusable {
 }
 
 export function registerModelPicker(pi: ExtensionAPI, config: Config) {
+  let commandSequence = 0;
+  const savedSequence = { image: 0, video: 0 };
   pi.registerCommand("cli:model", {
     description: "Search CLIProxyAPI image/video models and select a session media default",
     getArgumentCompletions: (prefix) =>
@@ -214,6 +220,7 @@ export function registerModelPicker(pi: ExtensionAPI, config: Config) {
         .filter((value) => value.startsWith(prefix))
         .map((value) => ({ value, label: value })),
     async handler(args, ctx) {
+      const sequence = ++commandSequence;
       const report = (content: string, error = false) => {
         if (ctx.hasUI) ctx.ui.notify(content, error ? "error" : "info");
         else if (ctx.mode === "print") console.error(content);
@@ -225,39 +232,41 @@ export function registerModelPicker(pi: ExtensionAPI, config: Config) {
       };
       try {
         const input = args.trim();
-        const clear = input === "clear image" ? "image" : input === "clear video" ? "video" : undefined;
         const save = (choice: string) => {
-          const defaults = readMediaDefaults(config, ctx);
-          if (choice === "clear image") delete defaults.image;
-          else if (choice === "clear video") delete defaults.video;
-          else {
-            const capability = mediaCapability(choice);
-            if (!capability || capability.disabledReason)
-              throw new Error("Unsupported CLIProxyAPI media selection.");
-            defaults[capability.purpose] = choice;
+          const clearing = clearedPurpose(choice);
+          const capability = clearing ? undefined : mediaCapability(choice);
+          const purpose = clearing ?? capability?.purpose;
+          if (!purpose || capability?.disabledReason)
+            throw new Error("Unsupported CLIProxyAPI media selection.");
+          ctx.signal?.throwIfAborted();
+          if (sequence < savedSequence[purpose]) {
+            report(`CLIProxyAPI ${purpose} choice superseded by a newer command; no change saved.`);
+            return;
           }
+          const defaults = readMediaDefaults(config, ctx);
+          if (clearing) delete defaults[purpose];
+          else defaults[purpose] = choice;
           pi.appendEntry(MEDIA_DEFAULTS_ENTRY, { version: 1, endpoint: config.baseUrl, defaults });
+          savedSequence[purpose] = sequence;
           const effective = effectiveMediaDefaults(config, ctx);
           report(defaultsLabel(effective.defaults, effective.automatic));
         };
-        if (clear) {
-          save(`clear ${clear}`);
+        if (clearedPurpose(input)) {
+          save(input);
           return;
         }
         if (input.startsWith("clear")) throw new Error("Usage: /cli:model clear image|video");
-        const disabledReason = input.startsWith("select ")
-          ? mediaCapability(input.slice(7).trim())?.disabledReason
-          : undefined;
+        const explicit = input.startsWith("select ") ? input.slice(7).trim() : undefined;
+        const disabledReason = explicit === undefined ? undefined : mediaCapability(explicit)?.disabledReason;
         if (disabledReason) {
           report(disabledReason, true);
           return;
         }
-        const signal = AbortSignal.any([...(ctx.signal ? [ctx.signal] : []), AbortSignal.timeout(15000)]);
+        const signal = deadline(ctx.signal, 15000);
         const key = await mediaKey(ctx, signal);
         const rows = pickerCatalog(await fetchCatalog(config, key, signal));
         const { defaults, automatic } = effectiveMediaDefaults(config, ctx);
         const items = pickerItems(rows, defaults);
-        const explicit = input.startsWith("select ") ? input.slice(7).trim() : undefined;
         const query = input === "list" ? "" : input.startsWith("search ") ? input.slice(7) : input;
         let choice = explicit;
         if (choice === undefined) {
@@ -291,14 +300,9 @@ export function registerModelPicker(pi: ExtensionAPI, config: Config) {
           }
         }
         if (choice === undefined) return;
-        if (choice === "clear image" || choice === "clear video") {
-          save(choice);
-          return;
-        }
-        const row = rows.find((row) => row.id === choice);
-        if (!row?.supported)
+        if (!clearedPurpose(choice) && !rows.find((row) => row.id === choice)?.supported)
           throw new Error("Model unavailable or unsupported. Use /cli:model to list supported IDs.");
-        save(row.id);
+        save(choice);
       } catch {
         report(
           "CLIProxyAPI model selection failed: unavailable/unsupported model, invalid command, authentication, or connection error. Check /login cliproxyapi. Use /cli:model list, select <exact ID>, or clear image|video.",

package/src/provider.ts

@@ -36,9 +36,13 @@ export function validateKey(key: string) {
   return key;
 }
 
+export function deadline(signal: AbortSignal | undefined, milliseconds: number) {
+  return AbortSignal.any([...(signal ? [signal] : []), AbortSignal.timeout(milliseconds)]);
+}
+
 export async function fetchCatalog(config: Config, key: string, signal: AbortSignal) {
   validateKey(key);
-  const boundedSignal = AbortSignal.any([signal, AbortSignal.timeout(10000)]);
+  const boundedSignal = deadline(signal, 10000);
   let response: Response;
   try {
     response = await fetch(`${config.baseUrl}/v1/models`, {
@@ -150,7 +154,7 @@ function route(streams: ProviderStreams, baseUrl: string): ProviderStreams {
             ? (event) => options.onProviderStreamEvent?.(event, model)
             : undefined,
         });
-      if (!backend) return run();
+      if (!google) return run();
       return lazyStream(model, async () => ({
         async *[Symbol.asyncIterator]() {
           for await (const event of run()) {