feat(models): refactor model id and add model names

.github/workflows/claude-code-review.yml

@@ -30,18 +30,16 @@ jobs:
 
           # Check if this is a comment event with @claude mention
           if [[ "${{ github.event_name }}" == "issue_comment" ]]; then
-            COMMENT_BODY="${{ github.event.comment.body }}"
-            if [[ "$COMMENT_BODY" == *"@claude"* ]] || [[ "$COMMENT_BODY" == *"@Claude"* ]]; then
+            # Use environment variable to safely handle multiline content with quotes
+            if echo "$COMMENT_BODY" | grep -i "@claude" > /dev/null; then
               CLAUDE_REQUESTED=true
               echo "Claude was mentioned in comment"
             fi
           fi
 
           # Check if PR title or description contains request for Claude
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            PR_TITLE="${{ github.event.pull_request.title }}"
-            PR_BODY="${{ github.event.pull_request.body }}"
-            if [[ "$PR_TITLE" == *"@claude"* ]] || [[ "$PR_TITLE" == *"@Claude"* ]] || [[ "$PR_BODY" == *"@claude"* ]] || [[ "$PR_BODY" == *"@Claude"* ]]; then
+            if echo "$PR_TITLE" | grep -i "@claude" > /dev/null || echo "$PR_BODY" | grep -i "@claude" > /dev/null; then
               CLAUDE_REQUESTED=true
               echo "Claude was mentioned in PR title or description"
             fi
@@ -54,6 +52,10 @@ jobs:
             echo "claude_requested=false" >> $GITHUB_OUTPUT
             echo "Claude review not requested - skipping"
           fi
+        env:
+          COMMENT_BODY: ${{ github.event.comment.body }}
+          PR_TITLE: ${{ github.event.pull_request.title }}
+          PR_BODY: ${{ github.event.pull_request.body }}
 
       - name: Check if most recent commit is from Claude
         id: check-author

apps/api/src/routes/activity.spec.ts

@@ -203,7 +203,7 @@ describe("activity endpoint", () => {
 
 		// Check model breakdown
 		const modelData = firstDay.modelBreakdown[0];
-		expect(modelData).toHaveProperty("model");
+		expect(modelData).toHaveProperty("id");
 		expect(modelData).toHaveProperty("provider");
 		expect(modelData).toHaveProperty("requestCount");
 		expect(modelData).toHaveProperty("inputTokens");

apps/api/src/routes/activity.ts

@@ -9,7 +9,7 @@ export const activity = new OpenAPIHono<ServerTypes>();
 
 // Define the response schema for model-specific usage
 const modelUsageSchema = z.object({
-	model: z.string(),
+	id: z.string(),
 	provider: z.string(),
 	requestCount: z.number(),
 	inputTokens: z.number(),
@@ -208,7 +208,7 @@ activity.openapi(getActivity, async (c) => {
 
 		if (!dayModelMap.has(modelKey)) {
 			dayModelMap.set(modelKey, {
-				model,
+				id: model,
 				provider,
 				requestCount: 0,
 				inputTokens: 0,

apps/gateway/src/api.e2e.ts

@@ -44,7 +44,7 @@ if (hasOnlyModels) {
 
 const filteredModels = models
 	// Filter out auto/custom models
-	.filter((model) => !["custom", "auto"].includes(model.model))
+	.filter((model) => !["custom", "auto"].includes(model.id))
 	// Filter out deactivated models
 	.filter((model) => !model.deactivatedAt || new Date() <= model.deactivatedAt);
 
@@ -64,7 +64,7 @@ const testModels = filteredModels
 		if (fullMode) {
 			// test root model without a specific provider
 			testCases.push({
-				model: model.model,
+				model: model.id,
 				providers: model.providers.filter(
 					(provider: ProviderModelMapping) => provider.test !== "skip",
 				),
@@ -84,9 +84,9 @@ const testModels = filteredModels
 			}
 
 			testCases.push({
-				model: `${provider.providerId}/${model.model}`,
+				model: `${provider.providerId}/${model.id}`,
 				providers: [provider],
-				originalModel: model.model, // Keep track of the original model for reference
+				originalModel: model.id, // Keep track of the original model for reference
 			});
 		}
 
@@ -118,9 +118,9 @@ const providerModels = filteredModels
 			}
 
 			testCases.push({
-				model: `${provider.providerId}/${model.model}`,
+				model: `${provider.providerId}/${model.id}`,
 				provider,
-				originalModel: model.model, // Keep track of the original model for reference
+				originalModel: model.id, // Keep track of the original model for reference
 			});
 		}
 
@@ -465,7 +465,7 @@ describe("e2e", () => {
 
 	test.each(
 		testModels.filter((m) => {
-			const modelDef = models.find((def) => def.model === m.model);
+			const modelDef = models.find((def) => def.id === m.model);
 			return (modelDef as any)?.jsonOutput === true;
 		}),
 	)("JSON output $model", getTestOptions(), async ({ model }) => {
@@ -791,7 +791,7 @@ describe("e2e", () => {
 				Authorization: `Bearer real-token`,
 			},
 			body: JSON.stringify({
-				model: multiProviderModel.model,
+				model: multiProviderModel.id,
 				messages: [
 					{
 						role: "user",

apps/gateway/src/chat/chat.ts

@@ -944,7 +944,7 @@ chat.openapi(completions, async (c) => {
 			requestedModel = modelName as Model;
 		} else {
 			// First try to find by base model name
-			let modelDef = models.find((m) => m.model === modelName);
+			let modelDef = models.find((m) => m.id === modelName);
 
 			if (!modelDef) {
 				modelDef = models.find((m) =>
@@ -977,7 +977,7 @@ chat.openapi(completions, async (c) => {
 				requestedModel = modelName as Model;
 			}
 		}
-	} else if (models.find((m) => m.model === modelInput)) {
+	} else if (models.find((m) => m.id === modelInput)) {
 		requestedModel = modelInput as Model;
 	} else if (
 		models.find((m) => m.providers.find((p) => p.modelName === modelInput))
@@ -988,7 +988,7 @@ chat.openapi(completions, async (c) => {
 		const provider = model?.providers.find((p) => p.modelName === modelInput);
 
 		throw new HTTPException(400, {
-			message: `Model ${modelInput} must be requested with a provider prefix. Use the format: ${provider?.providerId}/${model?.model}`,
+			message: `Model ${modelInput} must be requested with a provider prefix. Use the format: ${provider?.providerId}/${model?.id}`,
 		});
 	} else {
 		throw new HTTPException(400, {
@@ -1028,7 +1028,7 @@ chat.openapi(completions, async (c) => {
 		};
 	} else {
 		modelInfo =
-			models.find((m) => m.model === requestedModel) ||
+			models.find((m) => m.id === requestedModel) ||
 			models.find((m) =>
 				m.providers.find((p) => p.modelName === requestedModel),
 			);
@@ -1190,7 +1190,7 @@ chat.openapi(completions, async (c) => {
 		}
 
 		for (const modelDef of models) {
-			if (modelDef.model === "auto" || modelDef.model === "custom") {
+			if (modelDef.id === "auto" || modelDef.id === "custom") {
 				continue;
 			}
 
@@ -1263,7 +1263,7 @@ chat.openapi(completions, async (c) => {
 				});
 			}
 
-			const modelWithPricing = models.find((m) => m.model === usedModel);
+			const modelWithPricing = models.find((m) => m.id === usedModel);
 
 			if (modelWithPricing) {
 				const cheapestResult = getCheapestFromAvailableProviders(
@@ -1313,12 +1313,12 @@ chat.openapi(completions, async (c) => {
 	} else {
 		finalModelInfo = models.find(
 			(m) =>
-				m.model === usedModel ||
+				m.id === usedModel ||
 				m.providers.some((p) => p.modelName === usedModel),
 		);
 	}
 
-	const baseModelName = finalModelInfo?.model || usedModel;
+	const baseModelName = finalModelInfo?.id || usedModel;
 
 	let url: string | undefined;
 

apps/gateway/src/lib/costs.ts

@@ -28,7 +28,7 @@ export function calculateCosts(
 	},
 ) {
 	// Find the model info - try both base model name and provider model name
-	let modelInfo = models.find((m) => m.model === model) as ModelDefinition;
+	let modelInfo = models.find((m) => m.id === model) as ModelDefinition;
 
 	if (!modelInfo) {
 		modelInfo = models.find((m) =>

apps/gateway/src/models/models.ts

@@ -107,10 +107,10 @@ modelsApi.openapi(listModels, async (c) => {
 				firstProviderWithPricing?.imageInputPrice?.toString() || "0";
 
 			return {
-				id: model.model,
-				name: model.model,
+				id: model.id,
+				name: model.name || model.id,
 				created: Math.floor(Date.now() / 1000), // Current timestamp in seconds
-				description: `${model.model} provided by ${model.providers.map((p) => p.providerId).join(", ")}`,
+				description: `${model.id} provided by ${model.providers.map((p) => p.providerId).join(", ")}`,
 				architecture: {
 					input_modalities: inputModalities,
 					output_modalities: ["text"] as ["text"],
@@ -159,7 +159,7 @@ modelsApi.openapi(listModels, async (c) => {
 					Math.max(...model.providers.map((p) => p.contextSize || 0)) ||
 					undefined,
 				// TODO: supported_parameters should come from model definitions when available
-				supported_parameters: getSupportedParameters(model.model),
+				supported_parameters: getSupportedParameters(model.id),
 				// Add model-level capabilities
 				json_output: model.jsonOutput || false,
 				deprecated_at: model.deprecatedAt?.toISOString(),

apps/next/src/app/providers/[id]/page.tsx

@@ -45,12 +45,12 @@ export default async function ProviderPage({ params }: ProviderPageProps) {
 						<h2 className="text-3xl font-bold mb-8">Available Models</h2>
 						<div className="grid gap-6 md:grid-cols-3">
 							{providerModels.map((model) => (
-								<Card key={model.model}>
+								<Card key={model.id}>
 									<CardHeader className="pb-2">
 										<div className="flex items-start justify-between gap-2">
 											<div className="flex-1 min-w-0">
 												<CardTitle className="text-base leading-tight line-clamp-1">
-													{model.model}
+													{model.id}
 												</CardTitle>
 												<CardDescription className="text-xs">
 													{model.providers[0].modelName}

apps/next/src/components/activity/recent-logs.tsx

@@ -266,8 +266,8 @@ export function RecentLogs({ initialData }: RecentLogsProps) {
 					<SelectContent>
 						<SelectItem value="all">All models</SelectItem>
 						{models.map((m) => (
-							<SelectItem key={m.model} value={m.model}>
-								{m.model}
+							<SelectItem key={m.id} value={m.id}>
+								{m.id}
 							</SelectItem>
 						))}
 					</SelectContent>

apps/next/src/components/dashboard/activity-chart.tsx

@@ -36,7 +36,7 @@ import type { TooltipProps } from "recharts";
 
 // Helper function to get all unique models from the data
 function getUniqueModels(
-	data: { modelBreakdown: { model: string }[] }[],
+	data: { modelBreakdown: { id: string }[] }[],
 ): string[] {
 	if (!data || data.length === 0) {
 		return [];
@@ -46,7 +46,7 @@ function getUniqueModels(
 	data.forEach((day) => {
 		if (day.modelBreakdown && day.modelBreakdown.length > 0) {
 			day.modelBreakdown.forEach((model) => {
-				allModels.add(model.model);
+				allModels.add(model.id);
 			});
 		}
 	});
@@ -84,7 +84,7 @@ interface TooltipPayload {
 		totalTokens: number;
 		cost: number;
 		modelBreakdown: {
-			model: string;
+			id: string;
 			requestCount: number;
 			cost: number;
 			totalTokens: number;
@@ -309,7 +309,7 @@ export function ActivityChart({ initialData }: ActivityChartProps) {
 				| string
 				| number
 				| {
-						model: string;
+						id: string;
 						requestCount: number;
 						cost: number;
 						totalTokens: number;
@@ -323,14 +323,14 @@ export function ActivityChart({ initialData }: ActivityChartProps) {
 			dayData.modelBreakdown.forEach((model) => {
 				switch (breakdownField) {
 					case "cost":
-						result[model.model] = model.cost;
+						result[model.id] = model.cost;
 						break;
 					case "tokens":
-						result[model.model] = model.totalTokens;
+						result[model.id] = model.totalTokens;
 						break;
 					case "requests":
 					default:
-						result[model.model] = model.requestCount;
+						result[model.id] = model.requestCount;
 						break;
 				}
 			});

apps/next/src/components/models-supported.tsx

@@ -36,7 +36,7 @@ import { useAppConfig } from "@/lib/config";
 import { cn, formatContextSize } from "@/lib/utils";
 
 interface ProviderModel {
-	model: string;
+	id: string;
 	providerId: ProviderId;
 	providerName: string;
 	inputPrice?: number;
@@ -84,7 +84,7 @@ const groupedProviders = modelDefinitions.reduce<
 			acc[provider.name] = [];
 		}
 		acc[provider.name].push({
-			model: def.model,
+			id: def.id,
 			providerId: map.providerId,
 			providerName: provider.name,
 			inputPrice: map.inputPrice,
@@ -100,7 +100,7 @@ const sortedProviderEntries = Object.entries(groupedProviders)
 	.sort(([a], [b]) => a.localeCompare(b))
 	.map(([providerName, models]) => [
 		providerName,
-		[...models].sort((a, b) => a.model.localeCompare(b.model)),
+		[...models].sort((a, b) => a.id.localeCompare(b.id)),
 	]) as [string, ProviderModel[]][];
 
 const totalModels = modelDefinitions.length;
@@ -316,14 +316,14 @@ export const ModelsSupported = ({ isDashboard }: { isDashboard?: boolean }) => {
 							<div className="grid gap-4 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-3">
 								{models.map((model) => (
 									<Card
-										key={`${model.providerId}-${model.model}`}
+										key={`${model.providerId}-${model.id}`}
 										className="flex flex-col h-full hover:shadow-md transition-shadow"
 									>
 										<CardHeader className="pb-2">
 											<div className="flex items-start justify-between gap-2">
 												<div className="flex-1 min-w-0">
 													<CardTitle className="text-base leading-tight line-clamp-1">
-														{model.model}
+														{model.id}
 													</CardTitle>
 													<CardDescription className="text-xs">
 														{model.providerName}
@@ -333,10 +333,10 @@ export const ModelsSupported = ({ isDashboard }: { isDashboard?: boolean }) => {
 													variant="ghost"
 													size="sm"
 													className="h-6 w-6 p-0 shrink-0"
-													onClick={() => copyModelName(model.model)}
+													onClick={() => copyModelName(model.id)}
 													title="Copy model name"
 												>
-													{copiedModel === model.model ? (
+													{copiedModel === model.id ? (
 														<Check className="h-3 w-3 text-green-600" />
 													) : (
 														<Copy className="h-3 w-3" />

apps/next/src/components/models/models-list.tsx

@@ -12,8 +12,8 @@ export function ModelsList() {
 	return (
 		<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
 			{(models as readonly ModelDefinition[]).map((model) => (
-				<Card key={model.model} className="p-4">
-					<div className="text-lg font-semibold">{model.model}</div>
+				<Card key={model.id} className="p-4">
+					<div className="text-lg font-semibold">{model.name || model.id}</div>
 					<div className="text-sm text-muted-foreground mb-2">Providers:</div>
 					<div className="flex flex-wrap gap-2 mb-2">
 						{model.providers.map((provider) => (