@juvio15/pi-cliproxyapi-provider 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juvio15/pi-cliproxyapi-provider",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "pi provider for CLIProxyAPI: per-family APIs, model catalog, costs, web search, usage footer",
   "keywords": [
     "cliproxyapi",

package/src/core/catalog.ts

@@ -368,6 +368,13 @@ export const fetchCatalog = async (
   return "models" in payload ? payload.models : payload.data;
 };
 
+/**
+ * Drops models the latest catalog no longer lists. mergeCatalog keeps them so
+ * a session that uses one still resolves, but nobody should pick one anew.
+ */
+export const withoutStale = <T extends object>(models: readonly T[]): T[] =>
+  models.filter((model) => !("stale" in model && model.stale === true));
+
 export const mergeCatalog = (
   previous: readonly CliproxyModel[],
   fresh: readonly CliproxyModel[],

package/src/core/index.ts

@@ -13,6 +13,7 @@
  * matchModelCost(modelId: string, catalog: CostCatalog, fast?: boolean): ModelCost
  * mapCatalog(entries: readonly CatalogModel[], options: MappingOptions): MappedCatalog
  * mergeCatalog(previous: readonly CliproxyModel[], fresh: readonly CliproxyModel[], options?: MergeOptions): CliproxyModel[]
+ * withoutStale<T extends object>(models: readonly T[]): T[]
  * wrapCliproxyStreams(streams: ProviderStreams, settings: PayloadSettings): ProviderStreams
  * createCliproxyProvider(options: CliproxyProviderOptions): Provider<CliproxyApi>
  * quotaResetFromError(message: string, now?: number): number | undefined
@@ -23,13 +24,21 @@
  * resetCooldowns(options: ResetCooldownsOptions): Promise<string[]>
  * unavailableModels(usage: readonly ProviderUsage[], exhausted: Readonly<Record<string, number>>, now?: number): Map<string, number>
  */
-import { anthropicMessagesApi } from "@earendil-works/pi-ai/api/anthropic-messages.lazy";
-import { openAICompletionsApi } from "@earendil-works/pi-ai/api/openai-completions.lazy";
-import { openAIResponsesApi } from "@earendil-works/pi-ai/api/openai-responses.lazy";
+// pi maps only some pi-ai entry points into extensions. compat re-exports the same lazy API factories.
+import {
+  anthropicMessagesApi,
+  openAICompletionsApi,
+  openAIResponsesApi,
+} from "@earendil-works/pi-ai/compat";
 import { createProvider } from "@earendil-works/pi-ai/models";
 import type { Provider } from "@earendil-works/pi-ai/models";
 
-import { fetchCatalog, mapCatalog, mergeCatalog } from "./catalog.ts";
+import {
+  fetchCatalog,
+  mapCatalog,
+  mergeCatalog,
+  withoutStale,
+} from "./catalog.ts";
 import type { CliproxyApi, CliproxyModel, MappingOptions } from "./catalog.ts";
 import { resolveEndpoints } from "./connection.ts";
 import { fetchCosts } from "./costs.ts";
@@ -43,6 +52,7 @@ export {
   mapCatalog,
   mergeCatalog,
   selectModelApi,
+  withoutStale,
   type CatalogFetchOptions,
   type CatalogModel,
   type CliproxyApi,
@@ -177,6 +187,7 @@ export const createCliproxyProvider = (
         staleTtlMs: options.staleTtlMs,
       });
     },
+    filterModels: (models) => withoutStale(models),
     id,
     models: options.models ?? [],
     name: options.providerName ?? "CLIProxyAPI",

package/src/extension/index.ts

@@ -4,7 +4,11 @@ import type {
   ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 
-import { resolveConnectionSources, resolveEndpoints } from "../core/index.ts";
+import {
+  resolveConnectionSources,
+  resolveEndpoints,
+  withoutStale,
+} from "../core/index.ts";
 import type { CliproxyModel } from "../core/index.ts";
 import { completeFrom } from "./completions.ts";
 import {
@@ -140,7 +144,7 @@ const registerCatalogCommands = (
         const models = controller.getModels();
         const stale = models.filter((model) => model.stale).length;
         ctx.ui.notify(
-          `Refreshed ${models.length} CLIProxyAPI models${stale ? ` (${stale} retained from cache)` : ""}.`,
+          `Refreshed ${models.length - stale} CLIProxyAPI models${stale ? `. Hid ${stale} that CLIProxyAPI no longer lists` : ""}.`,
           "info"
         );
       } catch (error) {
@@ -229,7 +233,7 @@ export default async function cliproxyapiProvider(
     configured: connection !== null,
     connection: initialConnection,
     fast,
-    filterAvailable: (models) => tracker.filter(models),
+    filterAvailable: (models) => tracker.filter(withoutStale(models)),
     onModels: (models) => {
       latestModels = models;
 
@@ -370,8 +374,9 @@ export default async function cliproxyapiProvider(
   });
   registerWebSearch(pi, {
     agentDir,
-    getAvailableModels: () => tracker.filter(controller.getModels()),
-    getModels: controller.getModels,
+    getAvailableModels: () =>
+      tracker.filter(withoutStale(controller.getModels())),
+    getModels: () => withoutStale(controller.getModels()),
     getStandardCost: controller.getStandardCost,
     providerId,
   });

package/src/extension/prices.ts

@@ -1,6 +1,5 @@
 import path from "node:path";
 
-import { ModelCostSchema } from "@earendil-works/pi-ai/providers/model-schema";
 import { Type } from "typebox";
 import type { Static } from "typebox";
 
@@ -22,6 +21,21 @@ const MINUTE_MS = 60_000;
 const HOUR_MS = 60 * MINUTE_MS;
 const DAY_MS = 24 * HOUR_MS;
 
+const RateFields = {
+  cacheRead: Type.Number(),
+  cacheWrite: Type.Number(),
+  input: Type.Number(),
+  output: Type.Number(),
+};
+
+/** pi-ai's ModelCost. pi does not expose pi-ai's model-schema module to extensions, and typecheck holds this to ModelCost where the file feeds costCatalogFromPrices. */
+const ModelCostSchema = Type.Object({
+  ...RateFields,
+  tiers: Type.Optional(
+    Type.Array(Type.Object({ ...RateFields, inputTokensAbove: Type.Number() }))
+  ),
+});
+
 const PricesFileSchema = Type.Object({
   etag: Type.Optional(Type.String()),
   fetchedAt: Type.Number(),

package/src/extension/prompt-cache.ts

@@ -1,8 +1,8 @@
 import type { ModelPromptCache } from "@earendil-works/pi-ai";
-import { ANTHROPIC_MODELS } from "@earendil-works/pi-ai/providers/anthropic.models";
+import { getBuiltinModels } from "@earendil-works/pi-ai/providers/all";
 
 const LIFETIMES = new Map<string, ModelPromptCache | undefined>(
-  Object.entries(ANTHROPIC_MODELS).map(([id, model]) => [id, model.promptCache])
+  getBuiltinModels("anthropic").map((model) => [model.id, model.promptCache])
 );
 
 /** pi-ai's own Anthropic lifetimes, matched on the id or its segment after the last "/". */