neoagent 3.0.1-beta.2 → 3.0.1-beta.20

package/flutter_app/lib/main_controller.dart

@@ -47,6 +47,7 @@ class NeoAgentController extends ChangeNotifier {
   StreamSubscription<List<ConnectivityResult>>? _connectivitySubscription;
   bool _connectivityPluginAvailable = true;
   static const int _maxVisibleLogs = 400;
+  static const int _maxToolEvents = 500; // separate list from _maxVisibleLogs (chat diagnostics)
 
   static const String _configuredBackendUrl = String.fromEnvironment(
     'NEOAGENT_BACKEND_URL',
@@ -66,6 +67,7 @@ class NeoAgentController extends ChangeNotifier {
   final Map<String, DateTime> _manualRunCooldowns = <String, DateTime>{};
   static const Duration _manualRunCooldownDuration = Duration(seconds: 10);
   static const Duration _homeWidgetSyncCooldown = Duration(seconds: 5);
+  static const int _chatHistoryPageSize = 20;
   DateTime? _lastHomeWidgetSyncAt;
   int _authCycle = 0;
   bool _isPollingQrLogin = false;
@@ -98,6 +100,8 @@ class NeoAgentController extends ChangeNotifier {
   bool isApprovingQrLogin = false;
   bool isCheckingAppUpdate = false;
   bool isOpeningAppUpdate = false;
+  bool isLoadingBilling = false;
+  bool showBillingSection = false;
   bool socketConnected = false;
   bool hasNetworkConnection = true;
   bool networkStatusKnown = false;
@@ -142,12 +146,17 @@ class NeoAgentController extends ChangeNotifier {
   List<RecordingSessionItem> recordingSessions = const <RecordingSessionItem>[];
 
   List<ChatEntry> chatMessages = const <ChatEntry>[];
+  bool chatHistoryHasMore = false;
+  bool isLoadingOlderChatHistory = false;
   List<AgentProfile> agentProfiles = const <AgentProfile>[];
   String? selectedAgentId;
   List<ModelMeta> supportedModels = const <ModelMeta>[];
   List<AiProviderMeta> aiProviders = const <AiProviderMeta>[];
   List<RunSummary> recentRuns = const <RunSummary>[];
   TokenUsageSnapshot? tokenUsage;
+  Map<String, dynamic>? billingSubscription;
+  List<Map<String, dynamic>> billingPlans = const <Map<String, dynamic>>[];
+  List<Map<String, dynamic>> billingInvoices = const <Map<String, dynamic>>[];
   UpdateStatusSnapshot updateStatus = const UpdateStatusSnapshot();
   List<LogEntry> logs = const <LogEntry>[];
   Map<String, MessagingPlatformStatus> messagingStatuses =
@@ -158,6 +167,7 @@ class NeoAgentController extends ChangeNotifier {
   MessagingQrState? pendingMessagingQr;
   ToolApprovalRequest? pendingApproval;
   final List<BlockedSenderNotice> _blockedSenderQueue = <BlockedSenderNotice>[];
+  final Set<String> _ignoredChats = <String>{};
   List<SkillItem> skills = const <SkillItem>[];
   List<StoreSkillItem> storeSkills = const <StoreSkillItem>[];
   List<OfficialIntegrationItem> officialIntegrations =
@@ -199,6 +209,9 @@ class NeoAgentController extends ChangeNotifier {
   String? _pendingChatDraft;
   List<SharedChatAttachment> _pendingSharedChatAttachments =
       const <SharedChatAttachment>[];
+  String? _chatHistoryBeforeCreatedAt;
+  String? _chatHistoryBeforeSource;
+  String? _chatHistoryBeforeId;
 
   ActiveRunState? activeRun;
   List<ToolEventItem> toolEvents = const <ToolEventItem>[];
@@ -494,6 +507,103 @@ class NeoAgentController extends ChangeNotifier {
     ];
   }
 
+  void _resetChatHistoryPagination() {
+    chatHistoryHasMore = false;
+    isLoadingOlderChatHistory = false;
+    _chatHistoryBeforeCreatedAt = null;
+    _chatHistoryBeforeSource = null;
+    _chatHistoryBeforeId = null;
+  }
+
+  void _applyChatHistoryCursor(Map<String, dynamic> history) {
+    chatHistoryHasMore = history['hasMore'] == true;
+    _chatHistoryBeforeCreatedAt = _optionalIdFrom(
+      history['nextBeforeCreatedAt'],
+    );
+    _chatHistoryBeforeSource = _optionalIdFrom(history['nextBeforeSource']);
+    _chatHistoryBeforeId = _optionalIdFrom(history['nextBeforeId']);
+  }
+
+  String _chatEntryKey(ChatEntry entry) {
+    final stableId = entry.id.trim();
+    if (stableId.isNotEmpty) {
+      return [
+        stableId,
+        entry.platform,
+        entry.role,
+        entry.createdAt.toIso8601String(),
+      ].join('|');
+    }
+    return [
+      entry.role,
+      entry.platform,
+      entry.createdAt.toIso8601String(),
+      entry.content,
+    ].join('|');
+  }
+
+  List<ChatEntry> _chatHistoryEntriesFromResponse(
+    Map<String, dynamic> history,
+  ) {
+    return _decodeModelList(
+      'chat_history',
+      history['messages'],
+      ChatEntry.fromJson,
+      fallbackToMapValues: true,
+    );
+  }
+
+  Future<bool> loadOlderChatHistory() async {
+    if (!isAuthenticated ||
+        isLoadingOlderChatHistory ||
+        !chatHistoryHasMore ||
+        _chatHistoryBeforeCreatedAt == null ||
+        _chatHistoryBeforeSource == null ||
+        _chatHistoryBeforeId == null) {
+      return false;
+    }
+
+    final agentId = _scopedAgentId;
+    final beforeCreatedAt = _chatHistoryBeforeCreatedAt;
+    final beforeSource = _chatHistoryBeforeSource;
+    final beforeId = _chatHistoryBeforeId;
+    isLoadingOlderChatHistory = true;
+    notifyListeners();
+    try {
+      final history = await _backendClient.fetchChatHistory(
+        backendUrl,
+        agentId: agentId,
+        limit: _chatHistoryPageSize,
+        beforeCreatedAt: beforeCreatedAt,
+        beforeSource: beforeSource,
+        beforeId: beforeId,
+      );
+      if (agentId != _scopedAgentId) {
+        return false;
+      }
+      final olderMessages = _chatHistoryEntriesFromResponse(history);
+      _applyChatHistoryCursor(history);
+      if (olderMessages.isEmpty) {
+        return false;
+      }
+      final existingKeys = chatMessages.map(_chatEntryKey).toSet();
+      final prepended = olderMessages
+          .where((entry) => existingKeys.add(_chatEntryKey(entry)))
+          .toList(growable: false);
+      if (prepended.isEmpty) {
+        return false;
+      }
+      chatMessages = <ChatEntry>[...prepended, ...chatMessages];
+      return true;
+    } catch (error) {
+      errorMessage = _friendlyErrorMessage(error);
+      return false;
+    } finally {
+      isLoadingOlderChatHistory = false;
+      notifyListeners();
+    }
+  }
+
   String _settingString(String key, String fallback, {bool lowercase = false}) {
     final value = settings[key]?.toString().trim() ?? '';
     if (value.isEmpty) {
@@ -631,6 +741,8 @@ class NeoAgentController extends ChangeNotifier {
   BlockedSenderNotice? get pendingBlockedSenderNotice =>
       _blockedSenderQueue.isEmpty ? null : _blockedSenderQueue.first;
 
+  List<String> get ignoredChats => _ignoredChats.toList();
+
   void _handleRecordingBridgeChanged() {
     _logRecording('bridge.changed');
     notifyListeners();
@@ -716,6 +828,7 @@ class NeoAgentController extends ChangeNotifier {
 
   Future<void> bootstrap() async {
     _prefs = await SharedPreferences.getInstance();
+    _ignoredChats.addAll(_prefs?.getStringList('messaging.ignored_chats') ?? <String>[]);
     await _desktopCompanion.bootstrap(_prefs!);
     final configured = _configuredBackendUrl.trim();
     final savedBackendUrl = _prefs?.getString('backend_url')?.trim() ?? '';
@@ -1552,6 +1665,7 @@ class NeoAgentController extends ChangeNotifier {
     linkedAuthProviders = const <LinkedAuthProviderItem>[];
     settings = const <String, dynamic>{};
     chatMessages = const <ChatEntry>[];
+    _resetChatHistoryPagination();
     agentProfiles = const <AgentProfile>[];
     selectedAgentId = null;
     supportedModels = const <ModelMeta>[];
@@ -1683,6 +1797,9 @@ class NeoAgentController extends ChangeNotifier {
     if (section == AppSection.accountSettings) {
       unawaited(refreshAccountSettings());
     }
+    if (section == AppSection.billing) {
+      unawaited(refreshBilling());
+    }
     notifyListeners();
   }
 
@@ -1711,6 +1828,7 @@ class NeoAgentController extends ChangeNotifier {
     }
     selectedAgentId = id;
     chatMessages = const <ChatEntry>[];
+    _resetChatHistoryPagination();
     recentRuns = const <RunSummary>[];
     messagingStatuses = const <String, MessagingPlatformStatus>{};
     messagingMessages = const <MessagingMessage>[];
@@ -1914,14 +2032,20 @@ class NeoAgentController extends ChangeNotifier {
 
   Future<void> allowMessagingSuggestion(
     String platform,
-    QuickAllowSuggestion suggestion,
-  ) async {
+    QuickAllowSuggestion suggestion, {
+    String? chatId,
+  }) async {
     try {
       final nextPolicy = _policyWithAddedRule(
         currentMessagingAccessPolicy(platform),
         suggestion,
       );
       await saveMessagingAccessPolicy(platform, nextPolicy);
+      if (chatId != null) {
+        _blockedSenderQueue.removeWhere(
+          (notice) => notice.platform == platform && notice.chatId == chatId,
+        );
+      }
       errorMessage = null;
       notifyListeners();
     } catch (error) {
@@ -1930,6 +2054,22 @@ class NeoAgentController extends ChangeNotifier {
     }
   }
 
+  Future<void> ignoreBlockedSender(BlockedSenderNotice notice) async {
+    final key = '${notice.platform}:${notice.chatId ?? notice.sender ?? ''}';
+    _ignoredChats.add(key);
+    _blockedSenderQueue.removeWhere(
+      (n) => n.platform == notice.platform && (n.chatId == notice.chatId || n.sender == notice.sender),
+    );
+    await _prefs?.setStringList('messaging.ignored_chats', _ignoredChats.toList());
+    notifyListeners();
+  }
+
+  Future<void> removeIgnoredChat(String key) async {
+    _ignoredChats.remove(key);
+    await _prefs?.setStringList('messaging.ignored_chats', _ignoredChats.toList());
+    notifyListeners();
+  }
+
   void consumeBlockedSenderNotice(String id) {
     if (_blockedSenderQueue.isNotEmpty && _blockedSenderQueue.first.id == id) {
       _blockedSenderQueue.removeAt(0);
@@ -1940,6 +2080,8 @@ class NeoAgentController extends ChangeNotifier {
   }
 
   void _enqueueBlockedSenderNotice(BlockedSenderNotice notice) {
+    final ignoreKey = '${notice.platform}:${notice.chatId ?? notice.sender ?? ''}';
+    if (_ignoredChats.contains(ignoreKey)) return;
     final exists = _blockedSenderQueue.any((item) => item.id == notice.id);
     if (!exists) {
       _blockedSenderQueue.add(notice);
@@ -2009,8 +2151,12 @@ class NeoAgentController extends ChangeNotifier {
 
       final historyFuture = _softRefreshLoad<Map<String, dynamic>>(
         'chat_history',
-        _backendClient.fetchChatHistory(backendUrl, agentId: agentId),
-        const <String, dynamic>{'messages': <dynamic>[]},
+        _backendClient.fetchChatHistory(
+          backendUrl,
+          agentId: agentId,
+          limit: _chatHistoryPageSize,
+        ),
+        const <String, dynamic>{'messages': <dynamic>[], 'hasMore': false},
       );
       final modelsFuture = _softRefreshLoad<Map<String, dynamic>>(
         'supported_models',
@@ -2113,6 +2259,7 @@ class NeoAgentController extends ChangeNotifier {
       final recordingsFuture = _backendClient
           .fetchRecordingSessions(backendUrl)
           .catchError((_) => const <Map<String, dynamic>>[]);
+      unawaited(checkBillingEnabled());
       final browserFuture = _backendClient
           .fetchBrowserStatus(backendUrl)
           .catchError((_) => const <String, dynamic>{});
@@ -2177,12 +2324,8 @@ class NeoAgentController extends ChangeNotifier {
         return;
       }
 
-      chatMessages = _decodeModelList(
-        'chat_history',
-        history['messages'],
-        ChatEntry.fromJson,
-        fallbackToMapValues: true,
-      );
+      chatMessages = _chatHistoryEntriesFromResponse(history);
+      _applyChatHistoryCursor(history);
 
       supportedModels = _decodeModelList(
         'supported_models',
@@ -4525,12 +4668,17 @@ class NeoAgentController extends ChangeNotifier {
     _appendChatMessage(content, role: 'user', platform: platform);
   }
 
+  List<ToolEventItem> _capToolEvents(List<ToolEventItem> events) {
+    if (events.length <= _maxToolEvents) return events;
+    return events.sublist(events.length - _maxToolEvents);
+  }
+
   void _appendToolNote(String summary, {String toolName = 'note'}) {
     final trimmed = summary.trim();
     if (trimmed.isEmpty) {
       return;
     }
-    toolEvents = <ToolEventItem>[
+    toolEvents = _capToolEvents(<ToolEventItem>[
       ...toolEvents,
       ToolEventItem(
         id: 'note-${DateTime.now().microsecondsSinceEpoch}',
@@ -4539,7 +4687,7 @@ class NeoAgentController extends ChangeNotifier {
         status: 'completed',
         summary: trimmed,
       ),
-    ];
+    ]);
   }
 
   Future<void> refreshUpdateStatus() async {
@@ -4816,6 +4964,95 @@ class NeoAgentController extends ChangeNotifier {
     } catch (_) {}
   }
 
+  // ── Billing ──────────────────────────────────────────────────────────────
+
+  Future<void> checkBillingEnabled() async {
+    try {
+      final r = await _backendClient.getBillingPlans(backendUrl);
+      final enabled = r['plans'] != null;
+      if (showBillingSection != enabled) {
+        showBillingSection = enabled;
+        notifyListeners();
+      }
+    } catch (_) {
+      if (showBillingSection) {
+        showBillingSection = false;
+        notifyListeners();
+      }
+    }
+  }
+
+  Future<void> refreshBilling() async {
+    if (!isAuthenticated || !showBillingSection) return;
+    isLoadingBilling = true;
+    notifyListeners();
+    try {
+      final results = await Future.wait(<Future<Map<String, dynamic>>>[
+        _backendClient.getBillingInfo(backendUrl),
+        _backendClient.getBillingPlans(backendUrl),
+        _backendClient.getBillingInvoices(backendUrl),
+      ]);
+      billingSubscription =
+          results[0]['subscription'] as Map<String, dynamic>?;
+      billingPlans = _asDynList(results[1]['plans'])
+          .cast<Map<String, dynamic>>();
+      billingInvoices = _asDynList(results[2]['invoices'])
+          .cast<Map<String, dynamic>>();
+    } catch (_) {
+      // retain previous data on error
+    } finally {
+      isLoadingBilling = false;
+      notifyListeners();
+    }
+  }
+
+  Future<String?> createCheckoutSession(String planId) async {
+    try {
+      final serverUrl = backendUrl;
+      final result = await _backendClient.createCheckoutSession(
+        baseUrl: serverUrl,
+        planId: planId,
+        successUrl: '$serverUrl/',
+        cancelUrl: '$serverUrl/',
+      );
+      return result['url'] as String?;
+    } catch (e) {
+      errorMessage = _friendlyErrorMessage(e);
+      notifyListeners();
+      return null;
+    }
+  }
+
+  Future<String?> createPortalSession() async {
+    try {
+      final serverUrl = backendUrl;
+      final result = await _backendClient.createPortalSession(
+        baseUrl: serverUrl,
+        returnUrl: '$serverUrl/',
+      );
+      return result['url'] as String?;
+    } catch (e) {
+      errorMessage = _friendlyErrorMessage(e);
+      notifyListeners();
+      return null;
+    }
+  }
+
+  Future<bool> cancelBillingSubscription() async {
+    try {
+      await _backendClient.cancelBillingSubscription(backendUrl);
+      await refreshBilling();
+      return true;
+    } catch (e) {
+      errorMessage = _friendlyErrorMessage(e);
+      notifyListeners();
+      return false;
+    }
+  }
+
+  List<dynamic> _asDynList(dynamic val) =>
+      val is List ? val : const <dynamic>[];
+
   Future<bool> updateAccountEmail({
     required String email,
     required String currentPassword,
@@ -6982,7 +7219,7 @@ class NeoAgentController extends ChangeNotifier {
         'verification: ${payload['verification_need']?.toString() ?? 'none'}',
         'freshness: ${payload['freshness_risk']?.toString() ?? 'none'}',
       ].join(' | ');
-      toolEvents = <ToolEventItem>[
+      toolEvents = _capToolEvents(<ToolEventItem>[
         ...toolEvents,
         ToolEventItem(
           id: 'analysis-${DateTime.now().microsecondsSinceEpoch}',
@@ -6991,7 +7228,7 @@ class NeoAgentController extends ChangeNotifier {
           status: 'completed',
           summary: summary,
         ),
-      ];
+      ]);
       if (activeRun?.runId == runId) {
         activeRun = activeRun!.copyWith(phase: 'Analyzing');
       }
@@ -7016,7 +7253,7 @@ class NeoAgentController extends ChangeNotifier {
           .where((item) => item.trim().isNotEmpty)
           .take(4)
           .join(' | ');
-      toolEvents = <ToolEventItem>[
+      toolEvents = _capToolEvents(<ToolEventItem>[
         ...toolEvents,
         ToolEventItem(
           id: 'plan-${DateTime.now().microsecondsSinceEpoch}',
@@ -7025,7 +7262,7 @@ class NeoAgentController extends ChangeNotifier {
           status: 'completed',
           summary: steps.ifEmpty('Execution plan created.'),
         ),
-      ];
+      ]);
       if (activeRun?.runId == runId) {
         activeRun = activeRun!.copyWith(phase: 'Planning');
       }
@@ -7065,10 +7302,10 @@ class NeoAgentController extends ChangeNotifier {
         status: 'running',
         summary: _summarizeToolArgs(payload['toolArgs']),
       );
-      toolEvents = <ToolEventItem>[
+      toolEvents = _capToolEvents(<ToolEventItem>[
         ...toolEvents.where((event) => event.id != item.id),
         item,
-      ];
+      ]);
       if (activeRun?.runId == runId) {
         activeRun = activeRun!.copyWith(phase: 'Running tool');
       }
@@ -7083,7 +7320,7 @@ class NeoAgentController extends ChangeNotifier {
       if (_backgroundRunIds.contains(runId)) {
         return;
       }
-      toolEvents = <ToolEventItem>[
+      toolEvents = _capToolEvents(<ToolEventItem>[
         ...toolEvents,
         ToolEventItem(
           id: 'verification-${DateTime.now().microsecondsSinceEpoch}',
@@ -7098,7 +7335,7 @@ class NeoAgentController extends ChangeNotifier {
               ) ??
               'Verification completed.',
         ),
-      ];
+      ]);
       if (activeRun?.runId == runId) {
         activeRun = activeRun!.copyWith(phase: 'Verifying');
       }
@@ -7138,7 +7375,7 @@ class NeoAgentController extends ChangeNotifier {
               'Subagent update.',
         ),
       );
-      toolEvents = nextEvents;
+      toolEvents = _capToolEvents(nextEvents);
       notifyListeners();
     });
     socket.on('run:tool_end', (dynamic data) {
@@ -7171,7 +7408,7 @@ class NeoAgentController extends ChangeNotifier {
       if (!replaced) {
         next.add(updated);
       }
-      toolEvents = next;
+      toolEvents = _capToolEvents(next);
       final toolName = payload['toolName']?.toString() ?? '';
       final screenshotPath =
           payload['screenshotPath']?.toString() ??
@@ -7220,7 +7457,7 @@ class NeoAgentController extends ChangeNotifier {
       if (_backgroundRunIds.contains(runId)) {
         return;
       }
-      toolEvents = <ToolEventItem>[
+      toolEvents = _capToolEvents(<ToolEventItem>[
         ...toolEvents,
         ToolEventItem(
           id: 'steer-queued-${DateTime.now().microsecondsSinceEpoch}',
@@ -7230,7 +7467,7 @@ class NeoAgentController extends ChangeNotifier {
           summary:
               'Queued as steering for the current run: ${payload['content']?.toString() ?? ''}',
         ),
-      ];
+      ]);
       if (activeRun?.runId == runId || activeRun?.runId == 'pending') {
         activeRun = activeRun!.copyWith(
           pendingSteeringCount: _asInt(payload['pendingCount']),
@@ -7247,7 +7484,7 @@ class NeoAgentController extends ChangeNotifier {
       if (_backgroundRunIds.contains(runId)) {
         return;
       }
-      toolEvents = <ToolEventItem>[
+      toolEvents = _capToolEvents(<ToolEventItem>[
         ...toolEvents,
         ToolEventItem(
           id: 'steer-applied-${DateTime.now().microsecondsSinceEpoch}',
@@ -7258,7 +7495,7 @@ class NeoAgentController extends ChangeNotifier {
               ? 'Applied the latest steering update to the current run.'
               : 'Applied ${_asInt(payload['count'])} queued steering updates to the current run.',
         ),
-      ];
+      ]);
       if (activeRun?.runId == runId || activeRun?.runId == 'pending') {
         activeRun = activeRun!.copyWith(
           pendingSteeringCount: _asInt(payload['pendingCount']),

package/flutter_app/lib/main_devices.dart

@@ -950,7 +950,7 @@ class _DeviceSurfaceHeader extends StatelessWidget {
                               ? 'Live'
                               : 'Offline'))
             : surface == _DeviceSurface.files
-            ? 'Isolated'
+            ? ''
             : (androidOnline
                   ? 'Live'
                   : androidStarting