neoagent 2.3.1-beta.62 → 2.3.1-beta.64

package/flutter_app/lib/main_controller.dart

@@ -37,6 +37,7 @@ class NeoAgentController extends ChangeNotifier {
   final OAuthLauncher _oauthLauncher;
   final app_release_updater.AppReleaseUpdater _appReleaseUpdater =
       app_release_updater.AppReleaseUpdater();
+  final AppAnalytics _analytics = AppAnalytics();
   final LiveVoiceCapture _liveVoiceCapture = LiveVoiceCapture();
   final DesktopScreenCapture _desktopScreenCapture =
       createDesktopScreenCapture();
@@ -98,6 +99,10 @@ class NeoAgentController extends ChangeNotifier {
   bool networkStatusKnown = false;
   bool _desktopFloatingToolbarPopupRequested = false;
   bool _voiceAssistantIncludeScreenContext = false;
+  bool _didTrackAppOpen = false;
+  bool _analyticsConfigured = false;
+  bool _analyticsConsentResolved = false;
+  bool _analyticsConsentGranted = false;
 
   bool hasUser = true;
   bool registrationOpen = false;
@@ -319,6 +324,7 @@ class NeoAgentController extends ChangeNotifier {
     _diagnosticLogSubscription?.cancel();
     _connectivitySubscription?.cancel();
     _appReleaseUpdater.dispose();
+    unawaited(_analytics.dispose());
     _desktopCompanion.removeListener(notifyListeners);
     unawaited(_desktopCompanion.disconnect());
     _recordingBridge.removeListener(_handleRecordingBridgeChanged);
@@ -349,6 +355,12 @@ class NeoAgentController extends ChangeNotifier {
   bool get canCaptureVoiceAssistantScreenContext =>
       _desktopScreenCapture.isSupported;
 
+  bool get showAnalyticsConsentBanner =>
+      kIsWeb && _analyticsConfigured && !_analyticsConsentResolved;
+
+  bool get analyticsConsentGranted =>
+      _analyticsConsentResolved && _analyticsConsentGranted;
+
   bool get isLiveVoiceCaptureEngaged =>
       _isStartingLiveVoice || _liveVoiceCaptureActive;
 
@@ -701,6 +713,7 @@ class NeoAgentController extends ChangeNotifier {
     appUpdateAutoCheckEnabled =
         _prefs?.getBool('app.update.autoCheckEnabled') ?? true;
     installedAppVersion = await _safeLoadInstalledAppVersion();
+    await _initializeAnalytics();
     await refreshConnectivityStatus();
     if (_connectivityPluginAvailable && _connectivitySubscription == null) {
       try {
@@ -862,6 +875,101 @@ class NeoAgentController extends ChangeNotifier {
     }
   }
 
+  Future<void> _initializeAnalytics() async {
+    try {
+      final runtimeConfig = await _backendClient.fetchRuntimeConfig(backendUrl);
+      final analyticsConfig = runtimeConfig['analytics'];
+      final mixpanelConfig = analyticsConfig is Map
+          ? analyticsConfig['mixpanel']
+          : null;
+      final token = mixpanelConfig is Map
+          ? mixpanelConfig['token']?.toString()
+          : null;
+      _analyticsConfigured = token != null && token.trim().isNotEmpty;
+      final consentState = _prefs?.getBool('analytics.cookieConsent');
+      _analyticsConsentResolved = consentState != null;
+      _analyticsConsentGranted = consentState == true;
+      await _analytics.initialize(
+        token: token,
+        consentGranted: _analyticsConsentGranted,
+      );
+      _trackAppOpenedIfNeeded();
+    } catch (_) {
+      _analyticsConfigured = false;
+      _analyticsConsentResolved = false;
+      _analyticsConsentGranted = false;
+      await _analytics.initialize(token: null, consentGranted: false);
+    }
+  }
+
+  void _trackAppOpenedIfNeeded({String? consentSource}) {
+    if (!_analytics.enabled || _didTrackAppOpen) {
+      return;
+    }
+    _didTrackAppOpen = true;
+    unawaited(
+      _analytics.trackAppOpened(
+        appMode: appMode.name,
+        platform: _analyticsPlatformLabel(),
+        backendMode: backendUrl.trim().isEmpty ? 'same_origin' : 'custom',
+        selectedSection: selectedSection.label,
+        deploymentProfile: deploymentProfile,
+        authenticated: isAuthenticated,
+      ),
+    );
+    if (consentSource != null) {
+      unawaited(
+        _analytics.track(
+          'analytics_consent_granted',
+          properties: <String, Object?>{'consent_source': consentSource},
+        ),
+      );
+    }
+  }
+
+  String _analyticsPlatformLabel() {
+    if (kIsWeb) {
+      return 'web';
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return 'android';
+      case TargetPlatform.iOS:
+        return 'ios';
+      case TargetPlatform.macOS:
+        return 'macos';
+      case TargetPlatform.windows:
+        return 'windows';
+      case TargetPlatform.linux:
+        return 'linux';
+      case TargetPlatform.fuchsia:
+        return 'fuchsia';
+    }
+  }
+
+  Future<void> acceptAnalyticsConsent() async {
+    if (!_analyticsConfigured) {
+      return;
+    }
+    _analyticsConsentResolved = true;
+    _analyticsConsentGranted = true;
+    await _prefs?.setBool('analytics.cookieConsent', true);
+    await _analytics.setConsentGranted(true);
+    _trackAppOpenedIfNeeded(consentSource: 'banner');
+    notifyListeners();
+  }
+
+  Future<void> declineAnalyticsConsent() async {
+    if (!_analyticsConfigured) {
+      return;
+    }
+    _analyticsConsentResolved = true;
+    _analyticsConsentGranted = false;
+    await _prefs?.setBool('analytics.cookieConsent', false);
+    await _analytics.setConsentGranted(false);
+    notifyListeners();
+  }
+
   Future<void> setAppUpdateChannel(String channel) async {
     final normalized = channel.trim().toLowerCase() == 'beta'
         ? 'beta'
@@ -886,6 +994,7 @@ class NeoAgentController extends ChangeNotifier {
     if (isCheckingAppUpdate) {
       return;
     }
+    unawaited(_analytics.trackAppUpdateCheck(silent: silent));
     if (!appUpdaterConfigured) {
       appUpdateErrorMessage = kIsWeb
           ? 'Client app update checks are unavailable in the web app.'
@@ -975,6 +1084,11 @@ class NeoAgentController extends ChangeNotifier {
       isBooting = true;
       notifyListeners();
       await bootstrap();
+      unawaited(
+        _analytics.trackBackendUrlSaved(
+          backendMode: backendUrl.trim().isEmpty ? 'same_origin' : 'custom',
+        ),
+      );
       return true;
     } catch (error) {
       errorMessage = _friendlyErrorMessage(error);
@@ -1147,6 +1261,7 @@ class NeoAgentController extends ChangeNotifier {
         response,
         retentionErrorMessage:
             'QR login completed, but NeoAgent could not keep the session. Please try again.',
+        authMethod: 'qr',
       );
     } catch (error) {
       final message = _friendlyErrorMessage(error);
@@ -1199,6 +1314,7 @@ class NeoAgentController extends ChangeNotifier {
     String? fallbackUsername,
     String? retentionErrorMessage,
     bool isRegistration = false,
+    String authMethod = 'password',
   }) async {
     user = Map<String, dynamic>.from(
       response['user'] as Map<dynamic, dynamic>? ??
@@ -1220,6 +1336,14 @@ class NeoAgentController extends ChangeNotifier {
     _clearQrLoginChallenge();
     await _persistCredentials();
     await refresh();
+    if (isAuthenticated) {
+      unawaited(
+        _analytics.trackSignedIn(
+          authMethod: authMethod,
+          isRegistration: isRegistration,
+        ),
+      );
+    }
     if (!isAuthenticated && retentionErrorMessage != null) {
       errorMessage = retentionErrorMessage;
     }
@@ -1289,6 +1413,7 @@ class NeoAgentController extends ChangeNotifier {
       await _completeAuthenticatedResponse(
         response,
         isRegistration: register,
+        authMethod: 'oauth',
         retentionErrorMessage:
             'Sign-in completed, but NeoAgent could not keep the browser session. Please sign in again. If this keeps happening, check backend session cookie settings.',
       );
@@ -1315,6 +1440,7 @@ class NeoAgentController extends ChangeNotifier {
       await _completeAuthenticatedResponse(
         response,
         fallbackUsername: pendingTwoFactorUsername,
+        authMethod: 'two_factor',
         retentionErrorMessage:
             'Two-factor sign-in completed, but NeoAgent could not keep the browser session. Please sign in again.',
       );
@@ -1405,6 +1531,7 @@ class NeoAgentController extends ChangeNotifier {
         response,
         fallbackUsername: username,
         isRegistration: register,
+        authMethod: 'password',
         retentionErrorMessage:
             'Sign-in completed, but NeoAgent could not keep the browser session. Please sign in again. If this keeps happening, the backend session cookie is likely not being retained.',
       );
@@ -1435,6 +1562,7 @@ class NeoAgentController extends ChangeNotifier {
     final logoutFuture = _backendClient.logout(backendUrl);
     _authCycle += 1;
     _clearAuthenticatedState();
+    unawaited(_analytics.trackSignedOut());
     isAuthenticating = true;
     notifyListeners();
 
@@ -1451,6 +1579,7 @@ class NeoAgentController extends ChangeNotifier {
     notifyListeners();
     try {
       await _backendClient.completeOnboarding(backendUrl);
+      unawaited(_analytics.trackOnboardingDismissed());
       if (isAuthenticated && user != null) {
         user!['hasCompletedOnboarding'] = true;
       }
@@ -1604,6 +1733,7 @@ class NeoAgentController extends ChangeNotifier {
   }
 
   void setSelectedSection(AppSection section) {
+    final previousSection = selectedSection;
     selectedSection = section;
     unawaited(_prefs?.setString(_selectedSectionPrefsKey, section.name));
     if (section == AppSection.devices) {
@@ -1612,6 +1742,14 @@ class NeoAgentController extends ChangeNotifier {
     if (section == AppSection.accountSettings) {
       unawaited(refreshAccountSettings());
     }
+    if (previousSection != section) {
+      unawaited(
+        _analytics.trackSectionChanged(
+          section: section.label,
+          previousSection: previousSection.label,
+        ),
+      );
+    }
     notifyListeners();
   }
 
@@ -2422,6 +2560,9 @@ class NeoAgentController extends ChangeNotifier {
   }
 
   Future<void> refreshWidgets({bool all = false}) async {
+    if (all) {
+      unawaited(_analytics.trackWidgetRefreshRequested(all: all));
+    }
     widgets = _decodeModelList(
       'widgets',
       await _backendClient.fetchWidgets(
@@ -3224,6 +3365,7 @@ class NeoAgentController extends ChangeNotifier {
   }
 
   Future<void> startBackgroundRecording() async {
+    unawaited(_analytics.trackRecordingStarted(kind: 'background'));
     await _startRecordingCapture(
       logKey: 'start_background',
       payload: buildAndroidBackgroundRecordingPayload(),
@@ -3250,6 +3392,7 @@ class NeoAgentController extends ChangeNotifier {
       }
       return;
     }
+    unawaited(_analytics.trackRecordingStarted(kind: 'desktop'));
     await _startRecordingCapture(
       logKey: 'start_desktop',
       payload: buildDesktopRecordingPayload(),
@@ -3633,6 +3776,16 @@ class NeoAgentController extends ChangeNotifier {
     notifyListeners();
     try {
       _desktopFloatingToolbarPopupRequested = false;
+      unawaited(
+        _analytics.trackRecordingStopped(
+          kind:
+              recordingRuntime.supportsBackgroundMic &&
+                  !recordingRuntime.supportsScreenAndMic
+              ? 'background'
+              : 'desktop',
+          stopReason: stopReason,
+        ),
+      );
       await _recordingBridge.stopActiveRecording();
       if (isAndroidBackgroundStop) {
         await Future<void>.delayed(const Duration(milliseconds: 600));
@@ -4261,6 +4414,12 @@ class NeoAgentController extends ChangeNotifier {
     if (trimmed.isEmpty || (isSendingMessage && !canSteerLiveRun)) {
       return;
     }
+    unawaited(
+      _analytics.trackChatMessageSent(
+        length: trimmed.length,
+        steeringLiveRun: canSteerLiveRun,
+      ),
+    );
 
     final optimistic = ChatEntry(
       id: '',
@@ -4682,6 +4841,7 @@ class NeoAgentController extends ChangeNotifier {
     errorMessage = null;
     notifyListeners();
     try {
+      unawaited(_analytics.trackAppUpdateTriggered());
       await _backendClient.triggerUpdate(backendUrl);
       await refreshUpdateStatus();
     } catch (error) {
@@ -5412,8 +5572,7 @@ class NeoAgentController extends ChangeNotifier {
       return;
     }
     _pendingChatDraft = normalized;
-    selectedSection = AppSection.chat;
-    notifyListeners();
+    setSelectedSection(AppSection.chat);
   }
 
   String? takePendingChatDraft() {
@@ -5432,17 +5591,15 @@ class NeoAgentController extends ChangeNotifier {
 
   void openWidgetSurface(String widgetId) {
     final normalized = widgetId.trim();
-    selectedSection = AppSection.widgets;
+    setSelectedSection(AppSection.widgets);
     if (normalized.isNotEmpty) {
       _selectedWidgetId = normalized;
       unawaited(refreshWidgets(all: true));
     }
-    notifyListeners();
   }
 
   void openVoiceAssistantSurface() {
-    selectedSection = AppSection.voiceAssistant;
-    notifyListeners();
+    setSelectedSection(AppSection.voiceAssistant);
   }
 
   String? get selectedWidgetId => _selectedWidgetId;
@@ -5475,6 +5632,7 @@ class NeoAgentController extends ChangeNotifier {
       return;
     }
     _startManualRunCooldown('task', '$id');
+    unawaited(_analytics.trackTaskRunRequested(taskId: id));
     await _backendClient.runSavedTask(backendUrl, id);
     await refreshTasks();
     await refreshRunsOnly();

package/flutter_app/lib/main_integrations.dart

@@ -1,26 +1,34 @@
 part of 'main.dart';
 
 class IntegrationsPanel extends StatelessWidget {
-  const IntegrationsPanel({super.key, required this.controller});
+  const IntegrationsPanel({
+    super.key,
+    required this.controller,
+    this.embedded = false,
+  });
 
   final NeoAgentController controller;
+  final bool embedded;
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: _pagePadding(context),
-      child: Column(
-        children: <Widget>[
+    final body = Column(
+      children: <Widget>[
+        if (!embedded) ...<Widget>[
           _PageTitle(
             title: 'Integrations',
             subtitle:
                 'Connect and manage official integrations separately from reusable skills.',
           ),
           const SizedBox(height: 12),
-          Expanded(child: OfficialIntegrationsTab(controller: controller)),
         ],
-      ),
+        Expanded(child: OfficialIntegrationsTab(controller: controller)),
+      ],
     );
+    if (embedded) {
+      return body;
+    }
+    return Padding(padding: _pagePadding(context), child: body);
   }
 }
 

package/flutter_app/lib/main_models.dart

@@ -832,7 +832,7 @@ class MessagingAccessCapabilities {
   });
 
   factory MessagingAccessCapabilities.fromJson(Map<String, dynamic> json) {
-    List<String> _stringList(dynamic value) {
+    List<String> stringList(dynamic value) {
       if (value is! List) return const <String>[];
       return value
           .map((item) => item.toString())
@@ -845,9 +845,9 @@ class MessagingAccessCapabilities {
       supportsSharedPolicy: json['supportsSharedPolicy'] != false,
       supportsMentionGate: json['supportsMentionGate'] == true,
       supportsDiscovery: json['supportsDiscovery'] == true,
-      directRuleScopes: _stringList(json['directRuleScopes']),
-      sharedSpaceRuleScopes: _stringList(json['sharedSpaceRuleScopes']),
-      sharedActorRuleScopes: _stringList(json['sharedActorRuleScopes']),
+      directRuleScopes: stringList(json['directRuleScopes']),
+      sharedSpaceRuleScopes: stringList(json['sharedSpaceRuleScopes']),
+      sharedActorRuleScopes: stringList(json['sharedActorRuleScopes']),
       manualEntryHint: json['manualEntryHint']?.toString() ?? '',
     );
   }
@@ -932,7 +932,7 @@ class MessagingAccessCatalog {
     String platform,
     Map<String, dynamic> json,
   ) {
-    List<MessagingAccessTarget> _targets(dynamic raw) {
+    List<MessagingAccessTarget> parseTargets(dynamic raw) {
       if (raw is! List) return const <MessagingAccessTarget>[];
       return raw
           .whereType<Map>()
@@ -950,8 +950,8 @@ class MessagingAccessCatalog {
       capabilities: MessagingAccessCapabilities.fromJson(
         _jsonMap(json['capabilities']),
       ),
-      discoveredTargets: _targets(json['discoveredTargets']),
-      suggestedTargets: _targets(json['suggestedTargets']),
+      discoveredTargets: parseTargets(json['discoveredTargets']),
+      suggestedTargets: parseTargets(json['suggestedTargets']),
       summary: json['summary']?.toString() ?? 'Access policy',
     );
   }
@@ -1434,6 +1434,7 @@ class RunDetailSnapshot {
   const RunDetailSnapshot({
     required this.run,
     required this.steps,
+    required this.events,
     required this.response,
   });
 
@@ -1444,12 +1445,17 @@ class RunDetailSnapshot {
         json['steps'],
         fallbackToMapValues: true,
       ).map(RunStepItem.fromJson).toList(),
+      events: _jsonMapList(
+        json['events'],
+        fallbackToMapValues: true,
+      ).map(RunEventItem.fromJson).toList(),
       response: json['response']?.toString() ?? '',
     );
   }
 
   final RunSummary run;
   final List<RunStepItem> steps;
+  final List<RunEventItem> events;
   final String response;
 
   int get completedTools => steps
@@ -1469,6 +1475,95 @@ class RunDetailSnapshot {
       steps.where((step) => step.isPlanningRelated).length;
 }
 
+class RunEventItem {
+  const RunEventItem({
+    required this.id,
+    required this.eventType,
+    required this.sequenceIndex,
+    required this.requestId,
+    required this.stepId,
+    required this.payload,
+    required this.createdAt,
+  });
+
+  factory RunEventItem.fromJson(Map<dynamic, dynamic> json) {
+    return RunEventItem(
+      id: _asInt(json['id']),
+      eventType:
+          json['eventType']?.toString().ifEmpty(
+            json['event_type']?.toString() ?? 'event',
+          ) ??
+          'event',
+      sequenceIndex: _asInt(json['sequenceIndex'] ?? json['sequence_index']),
+      requestId:
+          json['requestId']?.toString() ?? json['request_id']?.toString(),
+      stepId: json['stepId']?.toString() ?? json['step_id']?.toString(),
+      payload: json['payload'] is Map
+          ? Map<String, dynamic>.from(json['payload'] as Map)
+          : (json['payload_json'] is Map
+                ? Map<String, dynamic>.from(json['payload_json'] as Map)
+                : const <String, dynamic>{}),
+      createdAt: _parseOptionalTimestamp(
+        json['createdAt']?.toString() ?? json['created_at']?.toString(),
+      ),
+    );
+  }
+
+  final int id;
+  final String eventType;
+  final int sequenceIndex;
+  final String? requestId;
+  final String? stepId;
+  final Map<String, dynamic> payload;
+  final DateTime? createdAt;
+
+  String get title {
+    switch (eventType) {
+      case 'run_started':
+        return 'Run started';
+      case 'memory_injected':
+        return 'Memory injected';
+      case 'model_turn_started':
+        return 'Model turn started';
+      case 'model_turn_completed':
+        return 'Model turn completed';
+      case 'tool_started':
+        return 'Tool started';
+      case 'tool_completed':
+        return 'Tool completed';
+      case 'tool_failed':
+        return 'Tool failed';
+      case 'run_completed':
+        return 'Run completed';
+      case 'run_failed':
+        return 'Run failed';
+      case 'run_stopped':
+        return 'Run stopped';
+      default:
+        return _titleCase(eventType.replaceAll('_', ' '));
+    }
+  }
+
+  String get detail {
+    final toolName = payload['toolName']?.toString() ?? '';
+    if (toolName.trim().isNotEmpty) return toolName;
+    final preview =
+        payload['contentPreview']?.toString() ??
+        payload['recallPreview']?.toString() ??
+        '';
+    if (preview.trim().isNotEmpty) return preview;
+    final error = payload['error']?.toString() ?? '';
+    if (error.trim().isNotEmpty) return error;
+    final titleValue = payload['title']?.toString() ?? '';
+    return titleValue;
+  }
+
+  String get createdAtLabel =>
+      createdAt == null ? '' : _formatTimestamp(createdAt!);
+
+  bool get isFailure => eventType == 'tool_failed' || eventType == 'run_failed';
+}
+
 class RunStepItem {
   const RunStepItem({
     required this.id,
@@ -2802,6 +2897,9 @@ class AiWidgetItem {
     required this.userId,
     required this.agentId,
     required this.name,
+    required this.widgetKind,
+    required this.systemKey,
+    required this.isSystem,
     required this.template,
     required this.layoutVariant,
     required this.definition,
@@ -2823,6 +2921,14 @@ class AiWidgetItem {
       userId: _asInt(json['userId'] ?? json['user_id']),
       agentId: json['agentId']?.toString() ?? json['agent_id']?.toString(),
       name: json['name']?.toString().ifEmpty('Widget') ?? 'Widget',
+      widgetKind:
+          json['widgetKind']?.toString().ifEmpty(
+            json['widget_kind']?.toString() ?? 'custom',
+          ) ??
+          'custom',
+      systemKey:
+          json['systemKey']?.toString() ?? json['system_key']?.toString(),
+      isSystem: json['isSystem'] == true || json['is_system'] == true,
       template: json['template']?.toString().ifEmpty('summary') ?? 'summary',
       layoutVariant:
           json['layoutVariant']?.toString().ifEmpty(
@@ -2876,6 +2982,9 @@ class AiWidgetItem {
   final int userId;
   final String? agentId;
   final String name;
+  final String widgetKind;
+  final String? systemKey;
+  final bool isSystem;
   final String template;
   final String layoutVariant;
   final Map<String, dynamic> definition;