@linxiraos/pi-catalog 1.4.0 → 1.4.2

package/src/discovery/devin.d.ts

@@ -3,7 +3,7 @@ import type { FetchImpl, ModelSpec } from "../types";
  * Options for fetching dynamic Devin (Codeium Cascade) models from `GetCliModelConfigs`.
  */
 export interface DevinModelDiscoveryOptions {
-    /** Codeium session token carried inside protobuf `Metadata.apiKey`. */
+    /** Stored Devin credential; encoded into protobuf `Metadata.apiKey` by shape. */
     apiKey?: string;
     /** Optional Codeium API base URL override. */
     baseUrl?: string;

package/src/discovery/devin.ts

@@ -11,7 +11,6 @@ import {
 	GetCliModelConfigsRequestSchema,
 	type GetCliModelConfigsResponse,
 	GetCliModelConfigsResponseSchema,
-	type Metadata,
 	MetadataSchema,
 	ModelDimensionKind,
 } from "./devin-proto";
@@ -293,7 +292,7 @@ function devinDynamicFamilies(lanes: Iterable<DevinFamilyLane>): EffortVariantFa
  * Options for fetching dynamic Devin (Codeium Cascade) models from `GetCliModelConfigs`.
  */
 export interface DevinModelDiscoveryOptions {
-	/** Codeium session token carried inside protobuf `Metadata.apiKey`. */
+	/** Stored Devin credential; encoded into protobuf `Metadata.apiKey` by shape. */
 	apiKey?: string;
 	/** Optional Codeium API base URL override. */
 	baseUrl?: string;
@@ -322,77 +321,45 @@ export async function fetchDevinModels(
 	const controller = new AbortController();
 	const timer = setTimeout(() => controller.abort(), timeoutMs);
 	const signal = options.signal ? AbortSignal.any([controller.signal, options.signal]) : controller.signal;
-	const fetchImpl = discoveryFetch(options.fetch);
 
-	const fetchCatalog = async (metadata: Metadata): Promise<ModelSpec<"devin-agent">[] | null> => {
-		try {
-			const request = create(GetCliModelConfigsRequestSchema, { metadata });
-			const body = toBinary(GetCliModelConfigsRequestSchema, request);
-			const response = await fetchImpl(requestUrl, {
-				method: "POST",
-				headers: {
-					"content-type": "application/proto",
-					"connect-protocol-version": "1",
-					accept: "*/*",
-				},
-				body,
-				signal,
-			});
-			if (!response.ok) return null;
-
-			const decoded = decodeDevinUnaryMessage(
-				GetCliModelConfigsResponseSchema,
-				new Uint8Array(await response.arrayBuffer()),
-			);
-			return decoded ? normalizeDevinModels(decoded, options.baseUrl) : null;
-		} catch {
-			return null;
-		}
-	};
-
-	try {
-		const nativeMetadata = create(MetadataSchema, {
+	const request = create(GetCliModelConfigsRequestSchema, {
+		metadata: create(MetadataSchema, {
 			...devinDiscoveryMetadata(options.apiKey),
 			supportedModelDisplays: [...DEVIN_SUPPORTED_MODEL_DISPLAYS],
+		}),
+	});
+	let payload: Uint8Array;
+	try {
+		const response = await discoveryFetch(options.fetch)(requestUrl, {
+			method: "POST",
+			headers: {
+				"content-type": "application/proto",
+				"connect-protocol-version": "1",
+				accept: "*/*",
+			},
+			body: toBinary(GetCliModelConfigsRequestSchema, request),
+			signal,
 		});
-		const nativeModels = await fetchCatalog(nativeMetadata);
-		const nativeIsSeedOnly =
-			nativeModels !== null &&
-			nativeModels.length > 0 &&
-			nativeModels.every(model => model.id === "swe-1-6" || model.id === "swe-1-6-fast");
-		if (nativeModels !== null && nativeModels.length > 0 && !nativeIsSeedOnly) {
-			return nativeModels;
-		}
-
-		// Legacy Windsurf Enterprise seats expose their full credential-scoped
-		// roster only to the editor identity and raw windsurf_api_key. Native
-		// chisel discovery returns the two-row fallback seed for those seats.
-		const legacyMetadata = create(MetadataSchema, {
-			apiKey: options.apiKey ?? "",
-			ideName: "windsurf",
-			ideVersion: "3.2.23",
-			extensionName: "windsurf",
-			extensionVersion: "1.48.2",
-			locale: "en",
-		});
-		const legacyModels = await fetchCatalog(legacyMetadata);
-		const models =
-			legacyModels !== null && (nativeModels === null || legacyModels.length > nativeModels.length)
-				? legacyModels
-				: nativeModels;
-		if (models === null || models.length === 0) {
-			// The backend gates the native catalog on the pinned client identity;
-			// an empty-but-200 response is the failure signature of a stale pin.
-			logger.warn("Devin returned an empty model catalog; the pinned client identities may be stale", {
-				metadata: devinDiscoveryMetadata(undefined),
-			});
-			return null;
-		}
-
-		return models;
+		if (!response.ok) return null;
+		payload = new Uint8Array(await response.arrayBuffer());
+	} catch {
+		return null;
 	} finally {
 		clearTimeout(timer);
 	}
+
+	const decoded = decodeDevinUnaryMessage(GetCliModelConfigsResponseSchema, payload);
+	if (!decoded) return null;
+	const models = normalizeDevinModels(decoded, options.baseUrl);
+	if (models.length === 0) {
+		// The backend gates the native catalog on the pinned client identity;
+		// an empty-but-200 response is the failure signature of a stale pin.
+		logger.warn("Devin returned an empty model catalog; the pinned client identity may be stale", {
+			metadata: devinDiscoveryMetadata(undefined),
+		});
+		return null;
+	}
+	return models;
 }
 
 /**

package/src/hosts.d.ts

@@ -175,11 +175,13 @@ export declare function isAzureDeploymentsUrl(baseUrl: string): boolean;
  * - `anthropic`: the Anthropic Messages API under `/anthropic`.
  * - `openai`: the OpenAI-compatible APIs under `/openai`, plus Mantle's
  *   documented `/v1` base (`https://bedrock-mantle.<region>.api.aws/v1`).
+ * - `runtime`: the bedrock-runtime origin itself, where Converse and
+ *   InvokeModel live under `/model/<id>/…`.
  *
  * Hostnames are parsed strictly so proxies that embed these hosts in a path
  * do not match.
  */
-export declare function isBedrockRouteUrl(baseUrl: string | undefined, route: "openai" | "anthropic"): boolean;
+export declare function isBedrockRouteUrl(baseUrl: string | undefined, route: "openai" | "anthropic" | "runtime"): boolean;
 /** Amazon Bedrock's OpenAI-compatible routes; see {@link isBedrockRouteUrl}. */
 export declare function isBedrockOpenAIUrl(baseUrl: string | undefined): boolean;
 /** Alibaba DashScope consumer `compatible-mode` endpoint (rejects multimodal arrays for some text-only SKUs). */

package/src/hosts.ts

@@ -193,11 +193,13 @@ function hasPathPrefix(pathname: string, prefix: string): boolean {
  * - `anthropic`: the Anthropic Messages API under `/anthropic`.
  * - `openai`: the OpenAI-compatible APIs under `/openai`, plus Mantle's
  *   documented `/v1` base (`https://bedrock-mantle.<region>.api.aws/v1`).
+ * - `runtime`: the bedrock-runtime origin itself, where Converse and
+ *   InvokeModel live under `/model/<id>/…`.
  *
  * Hostnames are parsed strictly so proxies that embed these hosts in a path
  * do not match.
  */
-export function isBedrockRouteUrl(baseUrl: string | undefined, route: "openai" | "anthropic"): boolean {
+export function isBedrockRouteUrl(baseUrl: string | undefined, route: "openai" | "anthropic" | "runtime"): boolean {
 	if (!baseUrl) return false;
 	let url: URL;
 	try {
@@ -208,8 +210,9 @@ export function isBedrockRouteUrl(baseUrl: string | undefined, route: "openai" |
 	if (url.protocol !== "https:") return false;
 	const host = BEDROCK_PUBLIC_HOST.exec(url.hostname) ?? BEDROCK_PRIVATELINK_HOST.exec(url.hostname);
 	if (!host) return false;
-	if (route === "anthropic") return hasPathPrefix(url.pathname, "/anthropic");
 	const isMantle = host.groups?.runtime === undefined;
+	if (route === "runtime") return !isMantle && url.pathname === "/";
+	if (route === "anthropic") return hasPathPrefix(url.pathname, "/anthropic");
 	return hasPathPrefix(url.pathname, "/openai") || (isMantle && hasPathPrefix(url.pathname, "/v1"));
 }