@linxiraos/pi-catalog 1.1.26 → 1.2.0

package/src/compat/taxonomy.d.ts

@@ -1,13 +1,3 @@
-/**
- * Runtime model-identity taxonomy: classifies wire model ids into
- * `(class, family, revision)` ranks, applies reviewed identity overrides, and
- * exposes the collapse/discovery vocabularies.
- *
- * Faithful port of the o2 reference (`taxonomy.rs` / `classify.rs`):
- * matchers rank `exact(4) > bounded(3) > namespace(2) > prefix(1) > glob(0)`
- * with token byte length as tiebreak; equal cross-class or cross-family ranks
- * throw unless classification is `lenient` (discovery normalization).
- */
 import type { Effort } from "../effort";
 import type { ModelIdentity } from "./types";
 /** Two classes, families, or reviewed override patterns tie for one model id. */

package/src/compat/taxonomy.ts

@@ -8,6 +8,7 @@
  * with token byte length as tiebreak; equal cross-class or cross-family ranks
  * throw unless classification is `lenient` (discovery normalization).
  */
+import { LRUCache } from "@linxiraos/pi-utils/lru";
 import type { Effort } from "../effort";
 import { globMatch } from "./cascade";
 import { formatRevision, parseRevisionPrefix } from "./revision";
@@ -433,8 +434,8 @@ export function stripThinkingVariantSuffix(model: string): string | undefined {
  * @throws AmbiguousIdentityError on equal-rank cross-class, cross-family, or
  * reviewed-pattern matches unless `opts.lenient`.
  */
-const classifyMemo = new Map<string, ModelIdentity>();
-const CLASSIFY_MEMO_MAX = 4096;
+// LRU sized above the bundled catalog so catalog-wide passes stay hot (a full `clear()` thrashed them).
+const classifyMemo = new LRUCache<string, ModelIdentity>({ max: 16384 });
 
 function classifyMemoKey(provider: string, modelId: string, lenient: boolean): string {
 	return `${provider.length}:${provider}${modelId.length}:${modelId}${lenient ? 1 : 0}`;
@@ -446,7 +447,6 @@ export function classifyModel(provider: string, modelId: string, opts?: Classify
 		const cached = classifyMemo.get(key);
 		if (cached !== undefined) return { ...cached };
 		const identity = classifyModelUncached(provider, modelId, opts);
-		if (classifyMemo.size >= CLASSIFY_MEMO_MAX) classifyMemo.clear();
 		classifyMemo.set(key, Object.freeze(identity));
 		return { ...identity };
 	}

package/src/compat/types.d.ts

@@ -593,6 +593,8 @@ export interface CompiledSeedModel {
     baseUrl: string;
     reasoning: boolean;
     input: ("text" | "image")[];
+    /** Wire model id sent upstream when it differs from the row id (`request-model-id`). */
+    requestModelId?: string;
     supportsTools?: boolean;
     cost: TokenCost;
     contextWindow: number | null;
@@ -622,6 +624,8 @@ export interface CompiledProvider {
     id: string;
     /** Preferred model id when no explicit selection is made. */
     defaultModel: string;
+    /** Whether the provider participates in automatic default selection (defaults to true). */
+    automaticDefault?: boolean;
     /** Env vars consulted, in order, for the runtime API-key fallback. */
     envVars?: string[];
     /** The runtime creates a model manager even without a valid API key. */

package/src/compat/types.ts

@@ -625,6 +625,8 @@ export interface CompiledSeedModel {
 	baseUrl: string;
 	reasoning: boolean;
 	input: ("text" | "image")[];
+	/** Wire model id sent upstream when it differs from the row id (`request-model-id`). */
+	requestModelId?: string;
 	supportsTools?: boolean;
 	cost: TokenCost;
 	contextWindow: number | null;
@@ -656,6 +658,8 @@ export interface CompiledProvider {
 	id: string;
 	/** Preferred model id when no explicit selection is made. */
 	defaultModel: string;
+	/** Whether the provider participates in automatic default selection (defaults to true). */
+	automaticDefault?: boolean;
 	/** Env vars consulted, in order, for the runtime API-key fallback. */
 	envVars?: string[];
 	/** The runtime creates a model manager even without a valid API key. */

package/src/discovery/antigravity.d.ts

@@ -63,13 +63,23 @@ export interface FetchAntigravityDiscoveryModelsOptions {
      */
     collapseTable?: VariantCollapseTable;
 }
+/**
+ * A complete account roster, or a definitive 401/403 credential rejection.
+ * `null` from {@link fetchAntigravityDiscoveryModels} instead means a transient
+ * failure or invalid response, which must not replace an authoritative catalog.
+ */
+export interface AntigravityModelDiscoveryResult {
+    models: ModelSpec<"google-gemini-cli">[];
+    rejectedStatus?: 401 | 403;
+}
 /**
  * Fetches discoverable Antigravity models and normalizes them into canonical model entries.
  *
- * Returns `null` on network/payload/auth failures.
- * Returns `[]` only when the endpoint responds successfully with no usable models.
+ * Returns `null` on network, server, or payload failures; a 401/403 is reported
+ * separately so multi-account discovery can skip a rejected credential.
+ * A successful empty roster has `models: []` without `rejectedStatus`.
  */
-export declare function fetchAntigravityDiscoveryModels(options: FetchAntigravityDiscoveryModelsOptions): Promise<ModelSpec<"google-gemini-cli">[] | null>;
+export declare function fetchAntigravityDiscoveryModels(options: FetchAntigravityDiscoveryModelsOptions): Promise<AntigravityModelDiscoveryResult | null>;
 /** Advertised image model and serving endpoint for one Antigravity account. */
 export interface AntigravityImageModel {
     id: string;

package/src/discovery/antigravity.ts

@@ -153,19 +153,29 @@ export interface FetchAntigravityDiscoveryModelsOptions {
 	collapseTable?: VariantCollapseTable;
 }
 
+/**
+ * A complete account roster, or a definitive 401/403 credential rejection.
+ * `null` from {@link fetchAntigravityDiscoveryModels} instead means a transient
+ * failure or invalid response, which must not replace an authoritative catalog.
+ */
+export interface AntigravityModelDiscoveryResult {
+	models: ModelSpec<"google-gemini-cli">[];
+	rejectedStatus?: 401 | 403;
+}
+
 /**
  * Fetches discoverable Antigravity models and normalizes them into canonical model entries.
  *
- * Returns `null` on network/payload/auth failures.
- * Returns `[]` only when the endpoint responds successfully with no usable models.
+ * Returns `null` on network, server, or payload failures; a 401/403 is reported
+ * separately so multi-account discovery can skip a rejected credential.
+ * A successful empty roster has `models: []` without `rejectedStatus`.
  */
 export async function fetchAntigravityDiscoveryModels(
 	options: FetchAntigravityDiscoveryModelsOptions,
-): Promise<ModelSpec<"google-gemini-cli">[] | null> {
+): Promise<AntigravityModelDiscoveryResult | null> {
 	const discovered = await fetchAntigravityDiscoveryResponse(options);
-	if (!discovered) {
-		return null;
-	}
+	if (!discovered) return null;
+	if ("rejectedStatus" in discovered) return { models: [], rejectedStatus: discovered.rejectedStatus };
 
 	const models: ModelSpec<"google-gemini-cli">[] = [];
 	const apiModels = discovered.payload.models;
@@ -208,7 +218,7 @@ export async function fetchAntigravityDiscoveryModels(
 		options.collapseTable === undefined ? undefined : { table: options.collapseTable },
 	);
 	collapsed.sort((a, b) => a.name.localeCompare(b.name) || a.id.localeCompare(b.id));
-	return collapsed;
+	return { models: collapsed };
 }
 
 /** Advertised image model and serving endpoint for one Antigravity account. */
@@ -222,14 +232,14 @@ export async function fetchAntigravityImageModel(
 	options: FetchAntigravityDiscoveryModelsOptions,
 ): Promise<AntigravityImageModel | null> {
 	const discovered = await fetchAntigravityDiscoveryResponse(options);
-	const id = discovered?.payload.imageGenerationModelIds?.find(modelId => modelId.length > 0);
-	return id && discovered ? { id, endpoint: discovered.endpoint } : null;
+	if (!discovered || "rejectedStatus" in discovered) return null;
+	const id = discovered.payload.imageGenerationModelIds?.find(modelId => modelId.length > 0);
+	return id ? { id, endpoint: discovered.endpoint } : null;
 }
 
-interface AntigravityDiscoveryResponse {
-	payload: AntigravityDiscoveryApiResponse;
-	endpoint: string;
-}
+type AntigravityDiscoveryResponse =
+	| { payload: AntigravityDiscoveryApiResponse; endpoint: string }
+	| { rejectedStatus: 401 | 403 };
 
 async function fetchAntigravityDiscoveryResponse(
 	options: FetchAntigravityDiscoveryModelsOptions,
@@ -243,6 +253,8 @@ async function fetchAntigravityDiscoveryResponse(
 		? [trimTrailingSlashes(options.endpoint)]
 		: DEFAULT_ANTIGRAVITY_DISCOVERY_ENDPOINTS.map(trimTrailingSlashes);
 
+	let rejectedStatus: 401 | 403 | undefined;
+	let transientFailure = false;
 	for (const endpoint of endpoints) {
 		let response: Response;
 		try {
@@ -257,10 +269,14 @@ async function fetchAntigravityDiscoveryResponse(
 				signal: options.signal,
 			});
 		} catch {
+			transientFailure = true;
 			continue;
 		}
 
 		if (!response.ok) {
+			if (response.status === 401) rejectedStatus = 401;
+			else if (response.status === 403) rejectedStatus = 403;
+			else transientFailure = true;
 			continue;
 		}
 
@@ -268,16 +284,16 @@ async function fetchAntigravityDiscoveryResponse(
 		try {
 			payload = await response.json();
 		} catch {
+			transientFailure = true;
 			continue;
 		}
 
 		const parsed = parseAntigravityDiscoveryResponse(payload);
-		if (parsed) {
-			return { payload: parsed, endpoint };
-		}
+		if (parsed) return { payload: parsed, endpoint };
+		transientFailure = true;
 	}
 
-	return null;
+	return rejectedStatus !== undefined && !transientFailure ? { rejectedStatus } : null;
 }
 
 function parseAntigravityDiscoveryResponse(value: unknown): AntigravityDiscoveryApiResponse | null {

package/src/discovery/cursor.ts

@@ -1,6 +1,6 @@
 import * as http2 from "node:http2";
 import { type } from "@linxiraos/pi-omptype";
-import { collapseVariants, type EffortVariantFamily } from "../compat/collapse";
+import { collapseVariants, type EffortVariantFamily, reviewedVariantFamilyId } from "../compat/collapse";
 import { compareRevision, parseRevision } from "../compat/revision";
 import { resolveCatalogAxes, resolveModelPolicy } from "../compat/resolve";
 import { classifyModel } from "../compat/taxonomy";
@@ -577,14 +577,15 @@ function normalizeRichCursorModels(
 			const first = entries[0];
 			if (!first) continue;
 			const dimensions = cursorLaneParameters(first.parameters);
-			const laneId = cursorLaneId(
+			const richLaneId = cursorLaneId(
 				baseId,
 				dimensions,
 				parameterDefaults,
 				first.variant?.isMaxMode === true,
 				claimedLaneIds,
 			);
-			const laneName = cursorLaneName(details, laneId, baseId);
+			const laneName = cursorLaneName(details, richLaneId, baseId);
+			const laneId = reviewedCursorLaneId(entries, claimedLaneIds) ?? richLaneId;
 			normalized.push(
 				...buildRichCursorLane(
 					details,
@@ -706,6 +707,28 @@ function cursorLaneId(
 	return candidate;
 }
 
+/**
+ * The reviewed collapse family owning a lane's legacy slugs, when exactly one
+ * family claims any of them (slugs no family lists, e.g. a newly added tier,
+ * stay in the lane). `AvailableModels` names Grok 4.5/4.6 `grok-4.6` while its
+ * slugs are `cursor-grok-4.6-*`; reusing the family id keeps the lane id equal
+ * to the `GetUsableModels`-only fallback and the bundled catalog, so a selector
+ * survives whichever RPC answered.
+ */
+function reviewedCursorLaneId(entries: readonly NormalizedRichVariant[], claimed: Set<string>): string | undefined {
+	let familyId: string | undefined;
+	for (const entry of entries) {
+		const slug = entry.variant?.legacySlug?.trim();
+		const owner = slug ? reviewedVariantFamilyId("cursor", slug) : undefined;
+		if (owner === undefined) continue;
+		if (familyId !== undefined && owner !== familyId) return undefined;
+		familyId = owner;
+	}
+	if (familyId === undefined || claimed.has(familyId)) return undefined;
+	claimed.add(familyId);
+	return familyId;
+}
+
 function sanitizeCursorLanePart(value: string): string {
 	return value
 		.toLowerCase()
@@ -859,7 +882,8 @@ function buildRichCursorLane(
 			cursorRequiresDataRetention: details.requiresDataRetention,
 			cursorSupportsAgent: details.supportsAgent,
 			cursorSupportsSandboxing: details.supportsSandboxing,
-			isProviderDefault,
+			// Not marked `isProviderDefault`: Cursor keeps its bundled startup default, so
+			// the account default only picks the lane's default wire id and the badge.
 			isRecommended: isProviderDefault || details.defaultOn,
 			description:
 				variant?.tagline ??

package/src/discovery/devin.ts

@@ -9,6 +9,7 @@ import {
 	type ClientModelConfig,
 	DisplayOption,
 	GetCliModelConfigsRequestSchema,
+	type GetCliModelConfigsResponse,
 	GetCliModelConfigsResponseSchema,
 	type Metadata,
 	MetadataSchema,
@@ -346,7 +347,7 @@ export async function fetchDevinModels(
 				GetCliModelConfigsResponseSchema,
 				new Uint8Array(await response.arrayBuffer()),
 			);
-			return decoded ? normalizeDevinModels(decoded.clientModelConfigs, options.baseUrl) : null;
+			return decoded ? normalizeDevinModels(decoded, options.baseUrl) : null;
 		} catch {
 			return null;
 		}
@@ -497,9 +498,12 @@ function routeDevinFusionLead(spec: ModelSpec<"devin-agent">, lead: ModelSpec<"d
 }
 
 function normalizeDevinModels(
-	configs: readonly ClientModelConfig[],
+	response: GetCliModelConfigsResponse,
 	baseUrlOverride: string | undefined,
 ): ModelSpec<"devin-agent">[] {
+	const configs = response.clientModelConfigs;
+	// The model the native client starts this account on (plan-dependent).
+	const accountDefaultUid = response.defaultOverrideModelConfig?.modelUid.trim();
 	const baseUrl = baseUrlOverride ?? DEVIN_DEFAULT_BASE_URL;
 	const specs: ModelSpec<"devin-agent">[] = [];
 	const seen = new Set<string>();
@@ -539,6 +543,7 @@ function normalizeDevinModels(
 		if (lead === null) continue;
 		const spec = devinModelSpec(config, uid, baseUrl, isAssignModelRouter);
 		if (lead !== undefined) routeDevinFusionLead(spec, devinModelSpec(liveConfigs.get(lead)!, lead, baseUrl, false));
+		if (uid === accountDefaultUid) spec.isProviderDefault = true;
 		specs.push(spec);
 		// A router is a server-side dispatcher, not an effort tier: it stays a
 		// standalone model even when upstream files it under a family.
@@ -554,5 +559,18 @@ function normalizeDevinModels(
 	const families = devinDynamicFamilies(lanes.values());
 	const dynamic = families.length > 0 ? collapseVariants(specs, { table: { families } }) : specs;
 	const collapsed = collapseVariants(dynamic);
+	// The account default outranks its family's own default lane when an effort
+	// routes to it, from server metadata or the static table: the family starts
+	// on that wire uid and effort. Other lanes (a no-thinking `off` default) keep
+	// the family's own default.
+	const accountFamily = collapsed.find(spec => spec.isProviderDefault && spec.thinking?.effortRouting);
+	const accountEffort = THINKING_EFFORTS.find(
+		effort => accountFamily?.thinking?.effortRouting?.[effort] === accountDefaultUid,
+	);
+	if (accountFamily?.thinking && accountEffort !== undefined) {
+		accountFamily.thinking = { ...accountFamily.thinking, defaultLevel: accountEffort };
+		if (accountFamily.id === accountDefaultUid) delete accountFamily.requestModelId;
+		else accountFamily.requestModelId = accountDefaultUid;
+	}
 	return collapsed.sort((a, b) => a.id.localeCompare(b.id));
 }

package/src/hosts.d.ts

@@ -15,6 +15,10 @@ export declare const KNOWN_HOSTS: {
         readonly providers: readonly ["openai"];
         readonly urlMarkers: readonly ["api.openai.com"];
     };
+    /** URL-only: a Codex provider rerouted through a proxy does not imply the subscription backend's capabilities. */
+    readonly openaiCodex: {
+        readonly urlMarkers: readonly ["chatgpt.com/backend-api", "chat.openai.com/backend-api"];
+    };
     readonly azureOpenAI: {
         readonly providers: readonly ["azure"];
         readonly urlMarkers: readonly [".openai.azure.com", "azure.com/openai", "models.inference.ai.azure.com"];

package/src/hosts.ts

@@ -25,6 +25,8 @@ interface HostClassSpec {
 
 export const KNOWN_HOSTS = {
 	openai: { providers: ["openai"], urlMarkers: ["api.openai.com"] },
+	/** URL-only: a Codex provider rerouted through a proxy does not imply the subscription backend's capabilities. */
+	openaiCodex: { urlMarkers: ["chatgpt.com/backend-api", "chat.openai.com/backend-api"] },
 	azureOpenAI: {
 		providers: ["azure"],
 		urlMarkers: [".openai.azure.com", "azure.com/openai", "models.inference.ai.azure.com"],

package/src/model-cache.d.ts

@@ -35,6 +35,12 @@ export interface CacheEntry<TApi extends Api = Api> {
      */
     staticFingerprint: string;
 }
+/**
+ * Closes the shared handle to the default `<agent-dir>/models.db`; the next
+ * default-path access reopens it. Call before deleting an agent directory the
+ * cache was opened under — Windows cannot remove a database that is still open.
+ */
+export declare function closeModelCache(): void;
 export declare function readModelCache<TApi extends Api>(providerId: string, ttlMs: number, now: () => number, dbPath?: string): CacheEntry<TApi> | null;
 /**
  * Persist a provider snapshot.