neoagent 2.3.1-beta.63 → 2.3.1-beta.65

package/flutter_app/lib/main_chat.dart

@@ -43,6 +43,23 @@ class _ChatPanelState extends State<ChatPanel> {
       ..selection = TextSelection.collapsed(offset: draft.length);
   }
 
+  void _scrollToBottom() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted || !_scrollController.hasClients) {
+        return;
+      }
+      _scrollController.jumpTo(_scrollController.position.maxScrollExtent);
+      unawaited(
+        WidgetsBinding.instance.endOfFrame.then((_) {
+          if (!mounted || !_scrollController.hasClients) {
+            return;
+          }
+          _scrollController.jumpTo(_scrollController.position.maxScrollExtent);
+        }),
+      );
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     final controller = widget.controller;
@@ -53,15 +70,7 @@ class _ChatPanelState extends State<ChatPanel> {
       _lastMessageCount = messages.length;
       _lastToolCount = controller.toolEvents.length;
       _lastStream = controller.streamingAssistant;
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (_scrollController.hasClients) {
-          _scrollController.animateTo(
-            _scrollController.position.maxScrollExtent,
-            duration: const Duration(milliseconds: 220),
-            curve: Curves.easeOut,
-          );
-        }
-      });
+      _scrollToBottom();
     }
 
     return Column(
@@ -259,6 +268,87 @@ class _ChatPanelState extends State<ChatPanel> {
   }
 }
 
+class _TypingIndicatorBubble extends StatefulWidget {
+  const _TypingIndicatorBubble();
+
+  @override
+  State<_TypingIndicatorBubble> createState() => _TypingIndicatorBubbleState();
+}
+
+class _TypingIndicatorBubbleState extends State<_TypingIndicatorBubble>
+    with SingleTickerProviderStateMixin {
+  late final AnimationController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 1200),
+    )..repeat();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        const _MessageAvatar(assistant: true),
+        const SizedBox(width: 12),
+        Flexible(
+          child: Container(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
+            decoration: BoxDecoration(
+              color: _bgCard,
+              borderRadius: BorderRadius.circular(14),
+              border: Border.all(color: _border),
+            ),
+            child: AnimatedBuilder(
+              animation: _controller,
+              builder: (context, _) {
+                return Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: List<Widget>.generate(3, (index) {
+                    final phase = ((_controller.value * 3) - index).clamp(
+                      0.0,
+                      1.0,
+                    );
+                    final offset = Curves.easeOut.transform(
+                      phase > 0.5 ? 1 - phase : phase,
+                    );
+                    return Padding(
+                      padding: EdgeInsets.only(
+                        right: index == 2 ? 0 : 6,
+                        top: (1 - offset) * 6,
+                      ),
+                      child: Container(
+                        width: 8,
+                        height: 8,
+                        decoration: BoxDecoration(
+                          color: _textSecondary.withValues(
+                            alpha: 0.45 + (offset * 0.5),
+                          ),
+                          shape: BoxShape.circle,
+                        ),
+                      ),
+                    );
+                  }),
+                );
+              },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
 class MessagingPanel extends StatefulWidget {
   const MessagingPanel({super.key, required this.controller});
 
@@ -343,9 +433,7 @@ class _MessagingPanelState extends State<MessagingPanel> {
       const (
         'Hardware Bridges',
         'Local device bridges and TCP-connected integrations.',
-        [
-          'meshtastic',
-        ],
+        ['meshtastic'],
       ),
       const ('Voice', 'Telephony integrations.', ['telnyx']),
     ];
@@ -440,7 +528,11 @@ class _MessagingPanelState extends State<MessagingPanel> {
                               accessCatalog: controller
                                   .currentMessagingAccessCatalog(platform.id),
                               controller: controller,
-                              onConnect: () => openMessagingConfig(context, controller, platform),
+                              onConnect: () => openMessagingConfig(
+                                context,
+                                controller,
+                                platform,
+                              ),
                               onDisconnect: () => controller
                                   .disconnectMessagingPlatform(platform.id),
                               onLogout: () => controller
@@ -1017,9 +1109,10 @@ class _MessagingActivityItem extends StatelessWidget {
 }
 
 class RunsPanel extends StatefulWidget {
-  const RunsPanel({super.key, required this.controller});
+  const RunsPanel({super.key, required this.controller, this.embedded = false});
 
   final NeoAgentController controller;
+  final bool embedded;
 
   @override
   State<RunsPanel> createState() => _RunsPanelState();
@@ -1210,18 +1303,31 @@ class _RunsPanelState extends State<RunsPanel> {
     final detail = _detail?.run.id == selected?.id ? _detail : null;
 
     return ListView(
-      padding: _pagePadding(context),
+      padding: widget.embedded ? EdgeInsets.zero : _pagePadding(context),
       children: <Widget>[
-        _PageTitle(
-          title: 'Runs',
-          subtitle:
-              'Inspect recent runs, failures, tool steps, and final responses.',
-          trailing: OutlinedButton.icon(
-            onPressed: _refreshRuns,
-            icon: Icon(Icons.refresh),
-            label: Text('Refresh'),
+        if (!widget.embedded)
+          _PageTitle(
+            title: 'Runs',
+            subtitle:
+                'Inspect recent runs, failures, tool steps, and final responses.',
+            trailing: OutlinedButton.icon(
+              onPressed: _refreshRuns,
+              icon: Icon(Icons.refresh),
+              label: Text('Refresh'),
+            ),
+          )
+        else
+          Align(
+            alignment: Alignment.centerRight,
+            child: Padding(
+              padding: const EdgeInsets.only(bottom: 12),
+              child: OutlinedButton.icon(
+                onPressed: _refreshRuns,
+                icon: const Icon(Icons.refresh),
+                label: const Text('Refresh'),
+              ),
+            ),
           ),
-        ),
         if (controller.errorMessage != null) ...<Widget>[
           _InlineError(message: controller.errorMessage!),
           const SizedBox(height: 16),
@@ -2477,6 +2583,13 @@ class _RunHistoryRow extends StatelessWidget {
                     '${run.modelLabel} • ${run.totalTokensLabel} tokens',
                     style: TextStyle(color: _textSecondary, fontSize: 12),
                   ),
+                  if (run.deliverableType.trim().isNotEmpty) ...<Widget>[
+                    const SizedBox(height: 4),
+                    Text(
+                      'Deliverable • ${run.deliverableType.replaceAll('_', ' ')}',
+                      style: TextStyle(color: _accent, fontSize: 12),
+                    ),
+                  ],
                   if (run.error.trim().isNotEmpty) ...<Widget>[
                     const SizedBox(height: 8),
                     Text(
@@ -2595,6 +2708,12 @@ class _RunDetailWorkspace extends StatelessWidget {
                 helper: 'Subagents or helpers',
                 color: _accentHover,
               ),
+              _RunMetricCard(
+                title: 'Trace events',
+                value: '${snapshot.events.length}',
+                helper: 'Structured run timeline',
+                color: _warning,
+              ),
             ],
           ),
           const SizedBox(height: 16),
@@ -2602,8 +2721,14 @@ class _RunDetailWorkspace extends StatelessWidget {
             response: snapshot.response,
             onCopy: () => onCopyResponse(snapshot.response),
           ),
+          if (snapshot.run.deliverableType.trim().isNotEmpty) ...<Widget>[
+            const SizedBox(height: 16),
+            _DeliverableSummaryCard(run: snapshot.run),
+          ],
           const SizedBox(height: 16),
           _RunTimelineCard(steps: snapshot.steps, loading: loading),
+          const SizedBox(height: 16),
+          _RunEventTimelineCard(events: snapshot.events, loading: loading),
         ] else
           const _EmptyCard(
             title: 'No detail available',
@@ -2663,6 +2788,11 @@ class _RunHeroCard extends StatelessWidget {
                           label: run.modelLabel,
                           icon: Icons.memory_outlined,
                         ),
+                        if (run.deliverableType.trim().isNotEmpty)
+                          _MetaPill(
+                            label: run.deliverableType.replaceAll('_', ' '),
+                            icon: Icons.inventory_2_outlined,
+                          ),
                       ],
                     ),
                     const SizedBox(height: 16),
@@ -2788,6 +2918,89 @@ class _RunResponseCard extends StatelessWidget {
   }
 }
 
+class _DeliverableSummaryCard extends StatelessWidget {
+  const _DeliverableSummaryCard({required this.run});
+
+  final RunSummary run;
+
+  @override
+  Widget build(BuildContext context) {
+    final artifacts = run.deliverableArtifacts;
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(18),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            _SectionTitle('Deliverable'),
+            const SizedBox(height: 12),
+            Text(
+              run.deliverableSummary.ifEmpty(
+                'Workflow: ${run.deliverableType.replaceAll('_', ' ')}',
+              ),
+              style: TextStyle(color: _textPrimary, height: 1.45),
+            ),
+            if (artifacts.isNotEmpty) ...<Widget>[
+              const SizedBox(height: 14),
+              ...artifacts.map((artifact) {
+                final meta = <String>[
+                  artifact.kind,
+                  if (artifact.mimeType.trim().isNotEmpty) artifact.mimeType,
+                  if (artifact.size > 0) '${artifact.size} bytes',
+                ].join(' • ');
+                final location = artifact.uri.ifEmpty(artifact.path);
+                return Padding(
+                  padding: const EdgeInsets.only(bottom: 10),
+                  child: Container(
+                    width: double.infinity,
+                    padding: const EdgeInsets.all(12),
+                    decoration: BoxDecoration(
+                      color: _bgSecondary,
+                      borderRadius: BorderRadius.circular(14),
+                      border: Border.all(color: _border),
+                    ),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: <Widget>[
+                        Text(
+                          artifact.displayLabel,
+                          style: TextStyle(fontWeight: FontWeight.w700),
+                        ),
+                        if (meta.trim().isNotEmpty) ...<Widget>[
+                          const SizedBox(height: 4),
+                          Text(
+                            meta,
+                            style: TextStyle(
+                              color: _textSecondary,
+                              fontSize: 12,
+                            ),
+                          ),
+                        ],
+                        if (location.trim().isNotEmpty) ...<Widget>[
+                          const SizedBox(height: 6),
+                          SelectableText(
+                            location,
+                            style: TextStyle(
+                              color: _textSecondary,
+                              fontSize: 12,
+                              fontFamily:
+                                  GoogleFonts.jetBrainsMono().fontFamily,
+                            ),
+                          ),
+                        ],
+                      ],
+                    ),
+                  ),
+                );
+              }),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 class _RunTimelineCard extends StatelessWidget {
   const _RunTimelineCard({required this.steps, required this.loading});
 
@@ -2832,6 +3045,105 @@ class _RunTimelineCard extends StatelessWidget {
   }
 }
 
+class _RunEventTimelineCard extends StatelessWidget {
+  const _RunEventTimelineCard({required this.events, required this.loading});
+
+  final List<RunEventItem> events;
+  final bool loading;
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(18),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            Row(
+              children: <Widget>[
+                Expanded(child: _SectionTitle('Execution Trace')),
+                if (loading)
+                  const SizedBox.square(
+                    dimension: 16,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            if (events.isEmpty)
+              Text(
+                'No structured run events recorded yet.',
+                style: TextStyle(color: _textSecondary),
+              )
+            else
+              ...events.map((event) {
+                return Padding(
+                  padding: const EdgeInsets.only(bottom: 10),
+                  child: _RunEventCard(event: event),
+                );
+              }),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _RunEventCard extends StatelessWidget {
+  const _RunEventCard({required this.event});
+
+  final RunEventItem event;
+
+  @override
+  Widget build(BuildContext context) {
+    final accent = event.isFailure ? _danger : _info;
+    return Container(
+      padding: const EdgeInsets.all(14),
+      decoration: BoxDecoration(
+        color: _bgSecondary,
+        borderRadius: BorderRadius.circular(16),
+        border: Border.all(color: accent.withValues(alpha: 0.24)),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          Row(
+            children: <Widget>[
+              Container(
+                width: 10,
+                height: 10,
+                decoration: BoxDecoration(
+                  color: accent,
+                  shape: BoxShape.circle,
+                ),
+              ),
+              const SizedBox(width: 10),
+              Expanded(
+                child: Text(
+                  event.title,
+                  style: const TextStyle(fontWeight: FontWeight.w700),
+                ),
+              ),
+              if (event.createdAtLabel.isNotEmpty)
+                Text(
+                  event.createdAtLabel,
+                  style: TextStyle(color: _textSecondary, fontSize: 12),
+                ),
+            ],
+          ),
+          if (event.detail.trim().isNotEmpty) ...<Widget>[
+            const SizedBox(height: 8),
+            Text(
+              event.detail,
+              style: TextStyle(color: _textSecondary, height: 1.4),
+            ),
+          ],
+        ],
+      ),
+    );
+  }
+}
+
 class _RunStepCard extends StatelessWidget {
   const _RunStepCard({required this.step});
 
@@ -2994,323 +3306,324 @@ class _RunDetailBlock extends StatelessWidget {
   }
 }
 
-Future<void> openMessagingConfig(BuildContext context, NeoAgentController controller, 
-    MessagingPlatformDescriptor platform,
-  ) async {
-    switch (platform.id) {
-      case 'whatsapp':
-        await _connectMessagingPlatformHelper(context, controller, 
-          platform: 'whatsapp',
-          platformLabel: platform.label,
-        );
-        return;
-      case 'telnyx':
-        return _openTelnyxConfigHelper(context, controller);
-      default:
-        return _openGenericMessagingConfigHelper(context, controller, platform);
-    }
-  }
-
-  Future<bool> _connectMessagingPlatformHelper(BuildContext context, NeoAgentController controller, {
-    required String platform,
-    required String platformLabel,
-    Map<String, dynamic>? config,
-    Map<String, dynamic>? configSnapshot,
-  }) async {
-    try {
-      await controller.connectMessagingPlatform(
-        platform: platform,
-        config: config,
-        configSnapshot: configSnapshot,
-      );
-      return true;
-    } catch (error) {
-      if (!context.mounted) return false;
-      final messenger = ScaffoldMessenger.maybeOf(context);
-      messenger?.showSnackBar(
-        SnackBar(
-          content: Text(
-            'Failed to connect $platformLabel: ${controller.friendlyErrorMessage(error)}',
-          ),
-        ),
+Future<void> openMessagingConfig(
+  BuildContext context,
+  NeoAgentController controller,
+  MessagingPlatformDescriptor platform,
+) async {
+  switch (platform.id) {
+    case 'whatsapp':
+      await _connectMessagingPlatformHelper(
+        context,
+        controller,
+        platform: 'whatsapp',
+        platformLabel: platform.label,
       );
-      return false;
-    }
+      return;
+    case 'telnyx':
+      return _openTelnyxConfigHelper(context, controller);
+    default:
+      return _openGenericMessagingConfigHelper(context, controller, platform);
   }
+}
 
-  Future<void> _openTelnyxConfigHelper(BuildContext context, NeoAgentController controller) async {
-    final saved = _jsonMap(
-      _decodeMaybeJson(controller.settings['telnyx_config']),
-    );
-    final apiKey = TextEditingController(
-      text: saved['apiKey']?.toString() ?? '',
-    );
-    final phoneNumber = TextEditingController(
-      text: saved['phoneNumber']?.toString() ?? '',
-    );
-    final connectionId = TextEditingController(
-      text: saved['connectionId']?.toString() ?? '',
+Future<bool> _connectMessagingPlatformHelper(
+  BuildContext context,
+  NeoAgentController controller, {
+  required String platform,
+  required String platformLabel,
+  Map<String, dynamic>? config,
+  Map<String, dynamic>? configSnapshot,
+}) async {
+  try {
+    await controller.connectMessagingPlatform(
+      platform: platform,
+      config: config,
+      configSnapshot: configSnapshot,
     );
-    final webhookUrl = TextEditingController(
-      text: saved['webhookUrl']?.toString() ?? controller.backendUrl,
+    return true;
+  } catch (error) {
+    if (!context.mounted) return false;
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    messenger?.showSnackBar(
+      SnackBar(
+        content: Text(
+          'Failed to connect $platformLabel: ${controller.friendlyErrorMessage(error)}',
+        ),
+      ),
     );
+    return false;
+  }
+}
 
-    try {
-      await showDialog<void>(
-        context: context,
-        builder: (context) {
-          return StatefulBuilder(
-            builder: (context, setLocalState) {
-              return AlertDialog(
-                backgroundColor: _bgCard,
-                title: Text('Telnyx Voice'),
-                content: SizedBox(
-                  width: 620,
-                  child: SingleChildScrollView(
-                    child: Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: <Widget>[
-                        TextField(
-                          controller: apiKey,
-                          obscureText: true,
-                          decoration: const InputDecoration(
-                            labelText: 'API Key',
-                          ),
-                        ),
-                        const SizedBox(height: 12),
-                        TextField(
-                          controller: phoneNumber,
-                          decoration: const InputDecoration(
-                            labelText: 'Phone Number',
-                          ),
-                        ),
-                        const SizedBox(height: 12),
-                        TextField(
-                          controller: connectionId,
-                          decoration: const InputDecoration(
-                            labelText: 'Connection ID',
-                          ),
+Future<void> _openTelnyxConfigHelper(
+  BuildContext context,
+  NeoAgentController controller,
+) async {
+  final saved = _jsonMap(
+    _decodeMaybeJson(controller.settings['telnyx_config']),
+  );
+  final apiKey = TextEditingController(text: saved['apiKey']?.toString() ?? '');
+  final phoneNumber = TextEditingController(
+    text: saved['phoneNumber']?.toString() ?? '',
+  );
+  final connectionId = TextEditingController(
+    text: saved['connectionId']?.toString() ?? '',
+  );
+  final webhookUrl = TextEditingController(
+    text: saved['webhookUrl']?.toString() ?? controller.backendUrl,
+  );
+
+  try {
+    await showDialog<void>(
+      context: context,
+      builder: (context) {
+        return StatefulBuilder(
+          builder: (context, setLocalState) {
+            return AlertDialog(
+              backgroundColor: _bgCard,
+              title: Text('Telnyx Voice'),
+              content: SizedBox(
+                width: 620,
+                child: SingleChildScrollView(
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: <Widget>[
+                      TextField(
+                        controller: apiKey,
+                        obscureText: true,
+                        decoration: const InputDecoration(labelText: 'API Key'),
+                      ),
+                      const SizedBox(height: 12),
+                      TextField(
+                        controller: phoneNumber,
+                        decoration: const InputDecoration(
+                          labelText: 'Phone Number',
                         ),
-                        const SizedBox(height: 12),
-                        TextField(
-                          controller: webhookUrl,
-                          decoration: const InputDecoration(
-                            labelText: 'Webhook Base URL',
-                          ),
+                      ),
+                      const SizedBox(height: 12),
+                      TextField(
+                        controller: connectionId,
+                        decoration: const InputDecoration(
+                          labelText: 'Connection ID',
                         ),
-                        const SizedBox(height: 12),
-                        Text(
-                          'Voice STT/TTS providers and models are configured in global Settings > Voice.',
-                          style: TextStyle(color: _textSecondary),
+                      ),
+                      const SizedBox(height: 12),
+                      TextField(
+                        controller: webhookUrl,
+                        decoration: const InputDecoration(
+                          labelText: 'Webhook Base URL',
                         ),
-                      ],
-                    ),
+                      ),
+                      const SizedBox(height: 12),
+                      Text(
+                        'Voice STT/TTS providers and models are configured in global Settings > Voice.',
+                        style: TextStyle(color: _textSecondary),
+                      ),
+                    ],
                   ),
                 ),
-                actions: <Widget>[
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(),
-                    child: Text('Cancel'),
-                  ),
-                  FilledButton(
-                    onPressed: () async {
-                      final config = <String, dynamic>{
-                        'apiKey': apiKey.text.trim(),
-                        'phoneNumber': phoneNumber.text.trim(),
-                        'connectionId': connectionId.text.trim(),
-                        'webhookUrl': webhookUrl.text.trim(),
-                      };
-                      final connected = await _connectMessagingPlatformHelper(context, controller, 
-                        platform: 'telnyx',
-                        platformLabel: 'Telnyx Voice',
-                        config: config,
-                        configSnapshot: <String, dynamic>{
-                          'telnyx_config': jsonEncode(config),
-                        },
-                      );
-                      if (connected && context.mounted) {
-                        Navigator.of(context).pop();
-                      }
-                    },
-                    child: Text('Connect'),
-                  ),
-                ],
-              );
-            },
-          );
-        },
-      );
-    } finally {
-      apiKey.dispose();
-      phoneNumber.dispose();
-      connectionId.dispose();
-      webhookUrl.dispose();
-    }
+              ),
+              actions: <Widget>[
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(),
+                  child: Text('Cancel'),
+                ),
+                FilledButton(
+                  onPressed: () async {
+                    final config = <String, dynamic>{
+                      'apiKey': apiKey.text.trim(),
+                      'phoneNumber': phoneNumber.text.trim(),
+                      'connectionId': connectionId.text.trim(),
+                      'webhookUrl': webhookUrl.text.trim(),
+                    };
+                    final connected = await _connectMessagingPlatformHelper(
+                      context,
+                      controller,
+                      platform: 'telnyx',
+                      platformLabel: 'Telnyx Voice',
+                      config: config,
+                      configSnapshot: <String, dynamic>{
+                        'telnyx_config': jsonEncode(config),
+                      },
+                    );
+                    if (connected && context.mounted) {
+                      Navigator.of(context).pop();
+                    }
+                  },
+                  child: Text('Connect'),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+  } finally {
+    apiKey.dispose();
+    phoneNumber.dispose();
+    connectionId.dispose();
+    webhookUrl.dispose();
   }
+}
 
-  Future<void> _openGenericMessagingConfigHelper(BuildContext context, NeoAgentController controller, 
-    MessagingPlatformDescriptor platform,
-  ) async {
-    final saved = _jsonMap(
-      _decodeMaybeJson(controller.settings[platform.settingsKey]),
-    );
-    final textControllers = <String, TextEditingController>{};
-    final boolValues = <String, bool>{};
-    for (final field in platform.configFields) {
-      final savedValue = field.settingsKey == null
-          ? saved[field.key]
-          : controller.settings[field.storageKey];
-      if (field.kind == MessagingConfigFieldKind.boolean) {
-        boolValues[field.key] =
-            savedValue == true || savedValue?.toString() == 'true';
-      } else {
-        textControllers[field.key] = TextEditingController(
-          text: savedValue?.toString() ?? field.defaultValue ?? '',
-        );
-      }
+Future<void> _openGenericMessagingConfigHelper(
+  BuildContext context,
+  NeoAgentController controller,
+  MessagingPlatformDescriptor platform,
+) async {
+  final saved = _jsonMap(
+    _decodeMaybeJson(controller.settings[platform.settingsKey]),
+  );
+  final textControllers = <String, TextEditingController>{};
+  final boolValues = <String, bool>{};
+  for (final field in platform.configFields) {
+    final savedValue = field.settingsKey == null
+        ? saved[field.key]
+        : controller.settings[field.storageKey];
+    if (field.kind == MessagingConfigFieldKind.boolean) {
+      boolValues[field.key] =
+          savedValue == true || savedValue?.toString() == 'true';
+    } else {
+      textControllers[field.key] = TextEditingController(
+        text: savedValue?.toString() ?? field.defaultValue ?? '',
+      );
     }
+  }
 
-    try {
-      await showDialog<void>(
-        context: context,
-        builder: (context) {
-          return StatefulBuilder(
-            builder: (context, setLocalState) {
-              return AlertDialog(
-                backgroundColor: _bgCard,
-                title: Text(platform.label),
-                content: SizedBox(
-                  width: 620,
-                  child: SingleChildScrollView(
-                    child: Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: <Widget>[
-                        if (platform.configFields.isEmpty)
-                          Text(
-                            'No extra settings are required.',
-                            style: TextStyle(color: _textSecondary),
-                          )
-                        else
-                          ...platform.configFields.map((field) {
-                            if (field.kind ==
-                                MessagingConfigFieldKind.boolean) {
-                              return SwitchListTile(
-                                contentPadding: EdgeInsets.zero,
-                                title: Text(field.label),
-                                value: boolValues[field.key] ?? false,
-                                onChanged: (value) {
-                                  setLocalState(() {
-                                    boolValues[field.key] = value;
-                                  });
-                                },
-                              );
-                            }
-                            final controller = textControllers[field.key]!;
-                            return Padding(
-                              padding: const EdgeInsets.only(bottom: 12),
-                              child: TextField(
-                                controller: controller,
-                                obscureText:
-                                    field.obscure ||
-                                    field.kind ==
-                                        MessagingConfigFieldKind.password,
-                                minLines:
-                                    field.kind ==
-                                        MessagingConfigFieldKind.multiline
-                                    ? 4
-                                    : 1,
-                                maxLines:
-                                    field.kind ==
-                                        MessagingConfigFieldKind.multiline
-                                    ? 8
-                                    : 1,
-                                decoration: InputDecoration(
-                                  labelText: field.label,
-                                ),
-                              ),
+  try {
+    await showDialog<void>(
+      context: context,
+      builder: (context) {
+        return StatefulBuilder(
+          builder: (context, setLocalState) {
+            return AlertDialog(
+              backgroundColor: _bgCard,
+              title: Text(platform.label),
+              content: SizedBox(
+                width: 620,
+                child: SingleChildScrollView(
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: <Widget>[
+                      if (platform.configFields.isEmpty)
+                        Text(
+                          'No extra settings are required.',
+                          style: TextStyle(color: _textSecondary),
+                        )
+                      else
+                        ...platform.configFields.map((field) {
+                          if (field.kind == MessagingConfigFieldKind.boolean) {
+                            return SwitchListTile(
+                              contentPadding: EdgeInsets.zero,
+                              title: Text(field.label),
+                              value: boolValues[field.key] ?? false,
+                              onChanged: (value) {
+                                setLocalState(() {
+                                  boolValues[field.key] = value;
+                                });
+                              },
                             );
-                          }),
-                        const SizedBox(height: 8),
-                        if (platform.id == 'meshtastic')
-                          Text(
-                            'Meshtastic connects directly to the device TCP API on port 4403 by default. Normal chat is limited to the configured channel.',
-                            style: TextStyle(
-                              color: _textSecondary,
-                              fontSize: 12,
-                            ),
-                          )
-                        else
-                          SelectableText(
-                            'Inbound webhook: ${controller.backendUrl}/api/messaging/webhook/${platform.id}',
-                            style: TextStyle(
-                              color: _textSecondary,
-                              fontSize: 12,
+                          }
+                          final controller = textControllers[field.key]!;
+                          return Padding(
+                            padding: const EdgeInsets.only(bottom: 12),
+                            child: TextField(
+                              controller: controller,
+                              obscureText:
+                                  field.obscure ||
+                                  field.kind ==
+                                      MessagingConfigFieldKind.password,
+                              minLines:
+                                  field.kind ==
+                                      MessagingConfigFieldKind.multiline
+                                  ? 4
+                                  : 1,
+                              maxLines:
+                                  field.kind ==
+                                      MessagingConfigFieldKind.multiline
+                                  ? 8
+                                  : 1,
+                              decoration: InputDecoration(
+                                labelText: field.label,
+                              ),
                             ),
-                          ),
-                      ],
-                    ),
+                          );
+                        }),
+                      const SizedBox(height: 8),
+                      if (platform.id == 'meshtastic')
+                        Text(
+                          'Meshtastic connects directly to the device TCP API on port 4403 by default. Normal chat is limited to the configured channel.',
+                          style: TextStyle(color: _textSecondary, fontSize: 12),
+                        )
+                      else
+                        SelectableText(
+                          'Inbound webhook: ${controller.backendUrl}/api/messaging/webhook/${platform.id}',
+                          style: TextStyle(color: _textSecondary, fontSize: 12),
+                        ),
+                    ],
                   ),
                 ),
-                actions: <Widget>[
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(),
-                    child: Text('Cancel'),
-                  ),
-                  FilledButton(
-                    onPressed: () async {
-                      final config = <String, dynamic>{};
-                      final snapshot = <String, dynamic>{};
-                      for (final field in platform.configFields) {
-                        if (field.kind == MessagingConfigFieldKind.boolean ||
-                            !field.includeInConfig) {
-                          continue;
+              ),
+              actions: <Widget>[
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(),
+                  child: Text('Cancel'),
+                ),
+                FilledButton(
+                  onPressed: () async {
+                    final config = <String, dynamic>{};
+                    final snapshot = <String, dynamic>{};
+                    for (final field in platform.configFields) {
+                      if (field.kind == MessagingConfigFieldKind.boolean ||
+                          !field.includeInConfig) {
+                        continue;
+                      }
+                      final controller = textControllers[field.key];
+                      final value = controller?.text.trim() ?? '';
+                      if (value.isNotEmpty) config[field.key] = value;
+                    }
+                    for (final field in platform.configFields) {
+                      if (field.kind == MessagingConfigFieldKind.boolean) {
+                        final value = boolValues[field.key] ?? false;
+                        if (field.includeInConfig) {
+                          config[field.key] = value;
+                        }
+                        if (field.settingsKey != null) {
+                          snapshot[field.storageKey] = value;
                         }
+                      } else if (field.settingsKey != null) {
                         final controller = textControllers[field.key];
                         final value = controller?.text.trim() ?? '';
-                        if (value.isNotEmpty) config[field.key] = value;
-                      }
-                      for (final field in platform.configFields) {
-                        if (field.kind == MessagingConfigFieldKind.boolean) {
-                          final value = boolValues[field.key] ?? false;
-                          if (field.includeInConfig) {
-                            config[field.key] = value;
-                          }
-                          if (field.settingsKey != null) {
-                            snapshot[field.storageKey] = value;
-                          }
-                        } else if (field.settingsKey != null) {
-                          final controller = textControllers[field.key];
-                          final value = controller?.text.trim() ?? '';
-                          if (value.isNotEmpty) {
-                            snapshot[field.storageKey] = value;
-                          }
+                        if (value.isNotEmpty) {
+                          snapshot[field.storageKey] = value;
                         }
                       }
-                      snapshot[platform.settingsKey] = jsonEncode(config);
-                      final connected = await _connectMessagingPlatformHelper(context, controller, 
-                        platform: platform.id,
-                        platformLabel: platform.label,
-                        config: config,
-                        configSnapshot: snapshot,
-                      );
-                      if (connected && context.mounted) {
-                        Navigator.of(context).pop();
-                      }
-                    },
-                    child: Text(
-                      'Connect',
-                    ),
-                  ),
-                ],
-              );
-            },
-          );
-        },
-      );
-    } finally {
-      for (final controller in textControllers.values) {
-        controller.dispose();
-      }
+                    }
+                    snapshot[platform.settingsKey] = jsonEncode(config);
+                    final connected = await _connectMessagingPlatformHelper(
+                      context,
+                      controller,
+                      platform: platform.id,
+                      platformLabel: platform.label,
+                      config: config,
+                      configSnapshot: snapshot,
+                    );
+                    if (connected && context.mounted) {
+                      Navigator.of(context).pop();
+                    }
+                  },
+                  child: Text('Connect'),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+  } finally {
+    for (final controller in textControllers.values) {
+      controller.dispose();
     }
   }
-
+}