@oh-my-pi/pi-catalog 18.2.7 → 18.2.9

package/src/compat/tools.ts

@@ -0,0 +1,12 @@
+import type { Model } from "../types";
+import { resolveCatalogPolicy } from "./catalog-policy";
+
+/** Whether the transport exposes native tools that an empty caller catalog cannot disable. */
+export function requiresNativeTools(model: Model): boolean {
+	return resolveCatalogPolicy(model).requiresNativeTools === true;
+}
+
+/** Whether disabling tools requires a history without prior tool calls or results. */
+export function requiresToolFreeHistoryForToolOptOut(model: Model): boolean {
+	return resolveCatalogPolicy(model).requiresToolFreeHistoryForToolOptOut === true;
+}

package/src/compat/types.ts

@@ -5,7 +5,7 @@
  * `behavior.ts`, `resolve.ts`) exposes to consumers.
  */
 import type { Effort } from "../effort";
-import type { Api, ThinkingControlMode, TokenCost } from "../types";
+import type { Api, KindApiKind, ThinkingControlMode, TokenCost } from "../types";
 import type { RevisionOp } from "./revision";
 
 /** Class-membership matcher kinds, most to least specific. */
@@ -648,7 +648,7 @@ export interface CompiledProvider {
 	/** Present only for providers enrolled in `generate-models.ts` discovery. */
 	discovery?: CompiledProviderDiscovery;
 	/** Non-chat model kinds mapped to their runtime transport APIs. */
-	kindApis?: Partial<Record<"image" | "tts" | "stt", Api>>;
+	kindApis?: Partial<Record<KindApiKind, Api>>;
 	/** Authored bundled rows, when the provider cannot be discovered at generation time. */
 	seed?: CompiledSeed;
 }

package/src/discovery/devin.ts

@@ -10,6 +10,7 @@ import {
 	DisplayOption,
 	GetCliModelConfigsRequestSchema,
 	GetCliModelConfigsResponseSchema,
+	type Metadata,
 	MetadataSchema,
 	ModelDimensionKind,
 } from "./devin-proto";
@@ -323,52 +324,76 @@ 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);
 
-	try {
-		const request = create(GetCliModelConfigsRequestSchema, {
-			metadata: create(MetadataSchema, {
-				...devinDiscoveryMetadata(options.apiKey),
-				supportedModelDisplays: [...DEVIN_SUPPORTED_MODEL_DISPLAYS],
-			}),
-		});
-		const body = toBinary(GetCliModelConfigsRequestSchema, request);
-
-		const headers: Record<string, string> = {
-			"content-type": "application/proto",
-			"connect-protocol-version": "1",
-			accept: "*/*",
-		};
+	const fetchCatalog = async (metadata: Metadata): Promise<ModelSpec<"devin-agent">[] | null> => {
+		try {
+			const request = create(GetCliModelConfigsRequestSchema, { metadata });
+			// `toBinary` always allocates a fresh ArrayBuffer-backed view; the DOM
+			// `BodyInit` typing just cannot see that through its ArrayBufferLike signature.
+			const body = toBinary(GetCliModelConfigsRequestSchema, request) as Uint8Array<ArrayBuffer>;
+			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 fetchImpl = discoveryFetch(options.fetch);
-		const response = await fetchImpl(requestUrl, { method: "POST", headers, body, signal });
-		if (!response.ok) {
+			const decoded = decodeDevinUnaryMessage(
+				GetCliModelConfigsResponseSchema,
+				new Uint8Array(await response.arrayBuffer()),
+			);
+			return decoded ? normalizeDevinModels(decoded.clientModelConfigs, options.baseUrl) : null;
+		} catch {
 			return null;
 		}
+	};
 
-		const decoded = decodeDevinUnaryMessage(
-			GetCliModelConfigsResponseSchema,
-			new Uint8Array(await response.arrayBuffer()),
-		);
-		if (!decoded) {
-			return null;
+	try {
+		const nativeMetadata = create(MetadataSchema, {
+			...devinDiscoveryMetadata(options.apiKey),
+			supportedModelDisplays: [...DEVIN_SUPPORTED_MODEL_DISPLAYS],
+		});
+		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;
 		}
-		const models = normalizeDevinModels(decoded.clientModelConfigs, options.baseUrl);
-		if (models.length === 0) {
-			// The backend gates the native catalog on the pinned CLI identity; an
-			// empty-but-200 response is the failure signature of a stale version
-			// pin (there is no explicit error). Treat it as failed discovery so
-			// the static seed survives, and leave a trail for diagnosis. Apply
-			// this after filtering because a response containing only disabled or
-			// internal configs is equally unusable.
-			logger.warn("Devin returned an empty native model catalog; the pinned CLI identity may be stale", {
+
+		// 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;
-	} catch {
-		return null;
 	} finally {
 		clearTimeout(timer);
 	}