gsd-pi 2.74.0-dev.16f2f3b → 2.74.0-dev.20f79a8

package/packages/pi-ai/scripts/generate-models.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env tsx
 
-import { writeFileSync } from "fs";
+import { existsSync, mkdirSync, rmSync, writeFileSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { Api, KnownProvider, Model } from "../src/types.js";
@@ -1470,61 +1470,95 @@ async function generateModels() {
 		}
 	}
 
-	// Generate TypeScript file
-	let output = `// This file is auto-generated by scripts/generate-models.ts
-// Do not edit manually - run 'npm run generate-models' to update
-
-import type { Model } from "./types.js";
-
-export const MODELS = {
-`;
-
-	// Generate provider sections (sorted for deterministic output)
-	const sortedProviderIds = Object.keys(providers).sort();
-	for (const providerId of sortedProviderIds) {
-		const models = providers[providerId];
-		output += `\t${JSON.stringify(providerId)}: {\n`;
+	const toConstName = (providerId: string): string => {
+		const normalized = providerId
+			.replace(/[^a-zA-Z0-9]+/g, "_")
+			.replace(/_+/g, "_")
+			.replace(/^_|_$/g, "")
+			.toUpperCase();
+		const safePrefix = /^[0-9]/.test(normalized) ? `_${normalized}` : normalized;
+		return `${safePrefix}_MODELS`;
+	};
 
+	const renderModelEntries = (models: Record<string, Model<any>>): string => {
+		let output = "{\n";
 		const sortedModelIds = Object.keys(models).sort();
 		for (const modelId of sortedModelIds) {
 			const model = models[modelId];
-			output += `\t\t"${model.id}": {\n`;
-			output += `\t\t\tid: "${model.id}",\n`;
-			output += `\t\t\tname: "${model.name}",\n`;
-			output += `\t\t\tapi: "${model.api}",\n`;
-			output += `\t\t\tprovider: "${model.provider}",\n`;
+			output += `\t"${model.id}": {\n`;
+			output += `\t\tid: "${model.id}",\n`;
+			output += `\t\tname: "${model.name}",\n`;
+			output += `\t\tapi: "${model.api}",\n`;
+			output += `\t\tprovider: "${model.provider}",\n`;
 			if (model.baseUrl !== undefined) {
-				output += `\t\t\tbaseUrl: "${model.baseUrl}",\n`;
+				output += `\t\tbaseUrl: "${model.baseUrl}",\n`;
 			}
 			if (model.headers) {
-				output += `\t\t\theaders: ${JSON.stringify(model.headers)},\n`;
+				output += `\t\theaders: ${JSON.stringify(model.headers)},\n`;
 			}
 			if (model.compat) {
-				output += `			compat: ${JSON.stringify(model.compat)},
-`;
+				output += `\t\tcompat: ${JSON.stringify(model.compat)},\n`;
 			}
-			output += `\t\t\treasoning: ${model.reasoning},\n`;
-			output += `\t\t\tinput: [${model.input.map(i => `"${i}"`).join(", ")}],\n`;
-			output += `\t\t\tcost: {\n`;
-			output += `\t\t\t\tinput: ${model.cost.input},\n`;
-			output += `\t\t\t\toutput: ${model.cost.output},\n`;
-			output += `\t\t\t\tcacheRead: ${model.cost.cacheRead},\n`;
-			output += `\t\t\t\tcacheWrite: ${model.cost.cacheWrite},\n`;
-			output += `\t\t\t},\n`;
-			output += `\t\t\tcontextWindow: ${model.contextWindow},\n`;
-			output += `\t\t\tmaxTokens: ${model.maxTokens},\n`;
-			output += `\t\t} satisfies Model<"${model.api}">,\n`;
+			output += `\t\treasoning: ${model.reasoning},\n`;
+			output += `\t\tinput: [${model.input.map(i => `"${i}"`).join(", ")}],\n`;
+			output += `\t\tcost: {\n`;
+			output += `\t\t\tinput: ${model.cost.input},\n`;
+			output += `\t\t\toutput: ${model.cost.output},\n`;
+			output += `\t\t\tcacheRead: ${model.cost.cacheRead},\n`;
+			output += `\t\t\tcacheWrite: ${model.cost.cacheWrite},\n`;
+			output += `\t\t},\n`;
+			output += `\t\tcontextWindow: ${model.contextWindow},\n`;
+			output += `\t\tmaxTokens: ${model.maxTokens},\n`;
+			output += `\t} satisfies Model<"${model.api}">,\n`;
 		}
+		output += "}";
+		return output;
+	};
 
-		output += `\t},\n`;
+	const sortedProviderIds = Object.keys(providers).sort();
+	const generatedDir = join(packageRoot, "src/models/generated");
+	rmSync(generatedDir, { recursive: true, force: true });
+	mkdirSync(generatedDir, { recursive: true });
+
+	for (const providerId of sortedProviderIds) {
+		const providerModels = providers[providerId];
+		const constName = toConstName(providerId);
+		const providerOutput = `// This file is auto-generated by scripts/generate-models.ts
+// Do not edit manually - run 'npm run generate-models' to update
+
+import type { Model } from "../../types.js";
+
+export const ${constName} = ${renderModelEntries(providerModels)} as const satisfies Record<string, Model<any>>;
+`;
+		writeFileSync(join(generatedDir, `${providerId}.ts`), providerOutput);
+		console.log(`Generated src/models/generated/${providerId}.ts`);
 	}
 
-	output += `} as const;
+	let indexOutput = `// This file is auto-generated by scripts/generate-models.ts
+// Do not edit manually - run 'npm run generate-models' to update
+
 `;
 
-	// Write file
-	writeFileSync(join(packageRoot, "src/models.generated.ts"), output);
-	console.log("Generated src/models.generated.ts");
+	for (const providerId of sortedProviderIds) {
+		const constName = toConstName(providerId);
+		indexOutput += `import { ${constName} } from "./${providerId}.js";\n`;
+	}
+
+	indexOutput += `\nexport const MODELS = {\n`;
+	for (const providerId of sortedProviderIds) {
+		const constName = toConstName(providerId);
+		indexOutput += `\t${JSON.stringify(providerId)}: ${constName},\n`;
+	}
+	indexOutput += `} as const;\n`;
+
+	writeFileSync(join(generatedDir, "index.ts"), indexOutput);
+	console.log("Generated src/models/generated/index.ts");
+
+	const legacyGeneratedPath = join(packageRoot, "src/models.generated.ts");
+	if (existsSync(legacyGeneratedPath)) {
+		rmSync(legacyGeneratedPath);
+		console.log("Removed legacy src/models.generated.ts");
+	}
 
 	// Print statistics
 	const totalModels = allModels.length;

package/packages/pi-ai/src/index.ts

@@ -3,19 +3,11 @@ export { Type } from "@sinclair/typebox";
 
 export * from "./api-registry.js";
 export * from "./env-api-keys.js";
-export * from "./models.js";
-export * from "./providers/anthropic.js";
+export * from "./models/index.js";
 export {
 	mapThinkingLevelToEffort,
 	supportsAdaptiveThinking,
 } from "./providers/anthropic-shared.js";
-export * from "./providers/azure-openai-responses.js";
-export * from "./providers/google.js";
-export * from "./providers/google-gemini-cli.js";
-export * from "./providers/google-vertex.js";
-export * from "./providers/mistral.js";
-export * from "./providers/openai-completions.js";
-export * from "./providers/openai-responses.js";
 export * from "./providers/provider-capabilities.js";
 export * from "./providers/register-builtins.js";
 export type { ProviderSwitchReport } from "./providers/transform-messages.js";

package/packages/pi-ai/src/models/capability-patches.ts

@@ -0,0 +1,40 @@
+import type { Api, Model, ModelCapabilities } from "../types.js";
+
+type CapabilityPatch = { match: (m: Model<Api>) => boolean; caps: ModelCapabilities };
+
+export const CAPABILITY_PATCHES: CapabilityPatch[] = [
+	// GPT-5.x supports xhigh thinking and OpenAI service tiers
+	{
+		match: (m) => m.id.includes("gpt-5.2") || m.id.includes("gpt-5.3") || m.id.includes("gpt-5.4"),
+		caps: { supportsXhigh: true, supportsServiceTier: true },
+	},
+	// Anthropic Opus 4.6 supports xhigh thinking
+	{
+		match: (m) => m.api === "anthropic-messages" && (m.id.includes("opus-4-6") || m.id.includes("opus-4.6")),
+		caps: { supportsXhigh: true },
+	},
+];
+
+/**
+ * Apply capability patches to a list of models.
+ *
+ * Models constructed outside the static pi-ai registry (custom models from
+ * models.json, extension-registered models, discovered models) do not pass
+ * through the module-init patch loop. Call this function after assembling
+ * any model list to ensure capabilities are set correctly.
+ *
+ * Explicit `capabilities` already set on a model take precedence over patches.
+ */
+export function applyCapabilityPatches(models: Model<Api>[]): Model<Api>[] {
+	return models.map((model) => {
+		for (const patch of CAPABILITY_PATCHES) {
+			if (patch.match(model)) {
+				return {
+					...model,
+					capabilities: { ...patch.caps, ...model.capabilities },
+				};
+			}
+		}
+		return model;
+	});
+}

package/packages/pi-ai/src/{models.custom.ts → models/custom.ts}

@@ -1,8 +1,8 @@
 // Manually-maintained model definitions for providers NOT tracked by models.dev.
 //
-// The auto-generated file (models.generated.ts) is rebuilt from the models.dev
-// third-party catalog. Providers that use proprietary endpoints and are not
-// listed on models.dev must be defined here so they survive regeneration.
+// The auto-generated files under models/generated/*.ts are rebuilt from the
+// models.dev third-party catalog. Providers that use proprietary endpoints and
+// are not listed on models.dev must be defined here so they survive regeneration.
 //
 // See: https://github.com/gsd-build/gsd-2/issues/2339
 //
@@ -11,7 +11,7 @@
 //   2. Add its API key mapping to env-api-keys.ts.
 //   3. Add its provider name to KnownProvider in types.ts (if not already there).
 
-import type { Model } from "./types.js";
+import type { Model } from "../types.js";
 
 export const CUSTOM_MODELS = {
 	// ─── Alibaba Coding Plan ─────────────────────────────────────────────