Merge dev into main

.gitignore

@@ -57,3 +57,4 @@ android/build/reports/problems/problems-report.html
 **/firebase.json
 firebase.json
 SIGNALS_MIGRATION.md
+EXTERNAL_LIB_OPPORTUNITIES.md

android/app/build.gradle.kts

@@ -1,8 +1,5 @@
 plugins {
     id("com.android.application")
-    // START: FlutterFire Configuration
-    id("com.google.gms.google-services")
-    // END: FlutterFire Configuration
     id("org.jetbrains.kotlin.android")
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id("dev.flutter.flutter-gradle-plugin")

android/settings.gradle.kts

@@ -20,9 +20,6 @@ pluginManagement {
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
     id("com.android.application") version "8.9.1" apply false
-    // START: FlutterFire Configuration
-    id("com.google.gms.google-services") version("4.3.15") apply false
-    // END: FlutterFire Configuration
     id("org.jetbrains.kotlin.android") version "2.1.0" apply false
 }
 

build_model.sh

@@ -1,7 +1,3 @@
 #!/bin/bash
 
 dart run build_runner build --delete-conflicting-outputs
-cd llm && dart run build_runner build --delete-conflicting-outputs
-cd ../mcp && dart run build_runner build --delete-conflicting-outputs
-
-clear

lib/app/app_routes.dart

@@ -37,7 +37,7 @@ Route<dynamic> generateRoute(RouteSettings settings) {
     case AppRoutes.profiles:
       return MaterialPageRoute(builder: (_) => const ChatProfilesScreen());
     case AppRoutes.mcp:
-      return MaterialPageRoute(builder: (_) => const McpServersPage());
+      return MaterialPageRoute(builder: (_) => const McpItemsPage());
     default:
       // Log the undefined route for debugging
       debugPrint(

lib/app/models/default_options.dart

@@ -78,10 +78,10 @@ class DefaultModels {
 
 @JsonSerializable(explicitToJson: true, fieldRename: FieldRename.snake)
 class DefaultModel {
-  final String modelName;
+  final String modelId;
   final String providerId;
 
-  DefaultModel({required this.modelName, required this.providerId});
+  DefaultModel({required this.modelId, required this.providerId});
 
   factory DefaultModel.fromJson(Map<String, dynamic> json) =>
       _$DefaultModelFromJson(json);

lib/core/chat/chat.dart

@@ -1,3 +1,2 @@
 export 'models/conversation.dart';
-export 'models/message.dart';
 export 'storage/conversation_storage.dart';

lib/core/chat/models/conversation.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 
 import 'package:json_annotation/json_annotation.dart';
-import 'package:multigateway/core/chat/models/message.dart';
 
 part 'conversation.g.dart';
 
@@ -11,12 +10,14 @@ class Conversation {
   final String title;
   final DateTime createdAt;
   final DateTime updatedAt;
-  final List<ChatMessage> messages;
+  final List<Map<String, dynamic>> messages;
   final int? tokenCount;
   final String providerId;
-  final String modelName;
+  final String modelId;
   final String profileId;
 
+  String get modelName => modelId;
+
   Conversation({
     required this.id,
     required this.title,
@@ -25,18 +26,17 @@ class Conversation {
     this.messages = const [],
     this.tokenCount,
     required this.providerId,
-    required this.modelName,
+    required this.modelId,
     required this.profileId,
   });
 
   Conversation copyWith({
     String? title,
     DateTime? updatedAt,
-    List<ChatMessage>? messages,
+    List<Map<String, dynamic>>? messages,
     int? tokenCount,
-    bool? isAgentConversation,
     String? providerId,
-    String? modelName,
+    String? modelId,
     String? profileId,
   }) {
     return Conversation(
@@ -47,7 +47,7 @@ class Conversation {
       messages: messages ?? this.messages,
       tokenCount: tokenCount ?? this.tokenCount,
       providerId: providerId ?? this.providerId,
-      modelName: modelName ?? this.modelName,
+      modelId: modelId ?? this.modelId,
       profileId: profileId ?? this.profileId,
     );
   }