Merge remote-tracking branch 'upstream/main'

app/utils/model.ts

@@ -6,23 +6,27 @@ export function collectModelTable(
 ) {
   const modelTable: Record<
     string,
-    { available: boolean; name: string; displayName: string }
+    {
+      available: boolean;
+      name: string;
+      displayName: string;
+      provider?: LLMModel["provider"]; // Marked as optional
+    }
   > = {};
 
   // default models
-  models.forEach(
-    (m) =>
-      (modelTable[m.name] = {
-        ...m,
-        displayName: m.name,
-      }),
-  );
+  models.forEach((m) => {
+    modelTable[m.name] = {
+      ...m,
+      displayName: m.name, // 'provider' is copied over if it exists
+    };
+  });
 
   // server custom models
   customModels
     .split(",")
     .filter((v) => !!v && v.length > 0)
-    .map((m) => {
+    .forEach((m) => {
       const available = !m.startsWith("-");
       const nameConfig =
         m.startsWith("+") || m.startsWith("-") ? m.slice(1) : m;
@@ -30,14 +34,17 @@ export function collectModelTable(
 
       // enable or disable all models
       if (name === "all") {
-        Object.values(modelTable).forEach((m) => (m.available = available));
+        Object.values(modelTable).forEach(
+          (model) => (model.available = available),
+        );
+      } else {
+        modelTable[name] = {
+          name,
+          displayName: displayName || name,
+          available,
+          provider: modelTable[name]?.provider, // Use optional chaining
+        };
       }
-
-      modelTable[name] = {
-        name,
-        displayName: displayName || name,
-        available,
-      };
     });
   return modelTable;
 }