neoagent 3.3.1-beta.3 → 3.3.1-beta.5

package/flutter_app/lib/main_controller.dart

@@ -47,6 +47,7 @@ class NeoAgentController extends ChangeNotifier {
     'NEOAGENT_BACKEND_URL',
   );
   static const String _selectedSectionPrefsKey = 'ui.selectedSection';
+  static const String _selectedAgentPrefsKey = 'ui.selectedAgentId';
 
   SharedPreferences? _prefs;
   final FlutterSecureStorage _secureStorage = const FlutterSecureStorage();
@@ -269,6 +270,20 @@ class NeoAgentController extends ChangeNotifier {
 
   String? get _scopedAgentId => selectedAgentId;
 
+  bool _matchesSelectedAgent(String? agentId) {
+    final selected = selectedAgentId?.trim() ?? '';
+    if (selected.isEmpty) {
+      return true;
+    }
+    final incoming = agentId?.trim() ?? '';
+    if (incoming.isEmpty) {
+      // Legacy payloads without agent scope belong to the default/main agent.
+      final active = activeAgent;
+      return active == null || active.isDefault || active.id == selected;
+    }
+    return incoming == selected;
+  }
+
   bool get requiresBackendUrlSetup =>
       !kIsWeb &&
       _configuredBackendUrl.trim().isEmpty &&
@@ -1426,6 +1441,7 @@ class NeoAgentController extends ChangeNotifier {
     _resetChatHistoryPagination();
     agentProfiles = const <AgentProfile>[];
     selectedAgentId = null;
+    unawaited(_persistSelectedAgentId(null));
     supportedModels = const <ModelMeta>[];
     aiProviders = const <AiProviderMeta>[];
     recentRuns = const <RunSummary>[];
@@ -1596,14 +1612,33 @@ class NeoAgentController extends ChangeNotifier {
       (agent) => agent.id == selectedAgentId,
     );
     if (selectedExists) {
+      unawaited(_persistSelectedAgentId(selectedAgentId));
       return;
     }
+
+    final restoredId = _prefs?.getString(_selectedAgentPrefsKey)?.trim() ?? '';
+    if (restoredId.isNotEmpty &&
+        agentProfiles.any((agent) => agent.id == restoredId)) {
+      selectedAgentId = restoredId;
+      return;
+    }
+
     selectedAgentId = agentProfiles
         .firstWhere(
           (agent) => agent.isDefault,
           orElse: () => agentProfiles.first,
         )
         .id;
+    unawaited(_persistSelectedAgentId(selectedAgentId));
+  }
+
+  Future<void> _persistSelectedAgentId(String? id) async {
+    final normalized = id?.trim() ?? '';
+    if (normalized.isEmpty) {
+      await _prefs?.remove(_selectedAgentPrefsKey);
+      return;
+    }
+    await _prefs?.setString(_selectedAgentPrefsKey, normalized);
   }
 
   Future<void> switchAgent(String id) async {
@@ -1611,6 +1646,7 @@ class NeoAgentController extends ChangeNotifier {
       return;
     }
     selectedAgentId = id;
+    unawaited(_persistSelectedAgentId(id));
     chatMessages = const <ChatEntry>[];
     _resetChatHistoryPagination();
     recentRuns = const <RunSummary>[];
@@ -1656,9 +1692,11 @@ class NeoAgentController extends ChangeNotifier {
           await _backendClient.createAgentProfile(backendUrl, payload),
         );
         selectedAgentId = created.id;
+        unawaited(_persistSelectedAgentId(created.id));
       } else {
         await _backendClient.updateAgentProfile(backendUrl, id, payload);
         selectedAgentId = id;
+        unawaited(_persistSelectedAgentId(id));
       }
       await refresh();
       return true;
@@ -1685,6 +1723,7 @@ class NeoAgentController extends ChangeNotifier {
       await _backendClient.archiveAgentProfile(backendUrl, id);
       if (selectedAgentId == id) {
         selectedAgentId = null;
+        unawaited(_persistSelectedAgentId(null));
       }
       await refresh();
     } catch (error) {
@@ -6430,6 +6469,11 @@ class NeoAgentController extends ChangeNotifier {
     });
     socket.on('messaging:sent', (dynamic data) {
       final payload = _jsonMap(data);
+      final agentId =
+          payload['agentId']?.toString() ?? payload['agent_id']?.toString();
+      if (!_matchesSelectedAgent(agentId)) {
+        return;
+      }
       messagingMessages = <MessagingMessage>[
         MessagingMessage.fromSocket(payload, outgoing: true),
         ...messagingMessages,
@@ -6443,6 +6487,11 @@ class NeoAgentController extends ChangeNotifier {
     });
     socket.on('messaging:message', (dynamic data) {
       final payload = _jsonMap(data);
+      final agentId =
+          payload['agentId']?.toString() ?? payload['agent_id']?.toString();
+      if (!_matchesSelectedAgent(agentId)) {
+        return;
+      }
       messagingMessages = <MessagingMessage>[
         MessagingMessage.fromSocket(payload, outgoing: false),
         ...messagingMessages,
@@ -6634,6 +6683,8 @@ class NeoAgentController extends ChangeNotifier {
       final payload = _jsonMap(data);
       final triggerSource = payload['triggerSource']?.toString() ?? '';
       final runId = payload['runId']?.toString() ?? '';
+      final agentId =
+          payload['agentId']?.toString() ?? payload['agent_id']?.toString();
       if (triggerSource == 'voice_live') {
         _voiceRunIds.add(runId);
         return;
@@ -6643,6 +6694,10 @@ class NeoAgentController extends ChangeNotifier {
         _backgroundRunIds.add(runId);
         return;
       }
+      if (!_matchesSelectedAgent(agentId)) {
+        _backgroundRunIds.add(runId);
+        return;
+      }
       activeRun = ActiveRunState(
         runId: runId,
         title:

package/flutter_app/lib/main_models.dart

@@ -557,6 +557,7 @@ class MessagingMessage {
     this.sender,
     this.senderName,
     this.target,
+    this.agentId,
   });
 
   factory MessagingMessage.fromJson(Map<dynamic, dynamic> json) {
@@ -583,6 +584,7 @@ class MessagingMessage {
       sender: sender.isEmpty ? null : sender,
       senderName: senderName.isEmpty ? null : senderName,
       target: chatId.isEmpty ? null : chatId,
+      agentId: json['agent_id']?.toString() ?? json['agentId']?.toString(),
     );
   }
 
@@ -599,6 +601,7 @@ class MessagingMessage {
       sender: json['sender']?.toString(),
       senderName: json['senderName']?.toString(),
       target: json['to']?.toString(),
+      agentId: json['agentId']?.toString() ?? json['agent_id']?.toString(),
     );
   }
 
@@ -630,6 +633,7 @@ class MessagingMessage {
   final String? sender;
   final String? senderName;
   final String? target;
+  final String? agentId;
 
   String get createdAtLabel => _formatTimestamp(createdAt);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neoagent",
-  "version": "3.3.1-beta.3",
+  "version": "3.3.1-beta.5",
   "description": "Self-hosted AI agent for long-running tasks, automation, messaging, device control, and local memory",
   "license": "AGPL-3.0-only",
   "main": "server/index.js",

package/server/public/.last_build_id

@@ -1 +1 @@
-23b2037a06fddf0e98e70869bb93e98b
+93e2d470c306717e1e9ead6365c9d8eb

package/server/public/flutter_bootstrap.js

@@ -37,6 +37,6 @@ _flutter.buildConfig = {"engineRevision":"0cd610717bde95fd88343c64f81c11ba4e5c00
 
 _flutter.loader.load({
   serviceWorkerSettings: {
-    serviceWorkerVersion: "2648135358" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
+    serviceWorkerVersion: "4101806863" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
   }
 });