neoagent 2.3.1-beta.63 → 2.3.1-beta.64

package/flutter_app/lib/main.dart

@@ -63,6 +63,7 @@ part 'main_account_settings.dart';
 part 'main_settings.dart';
 part 'main_operations.dart';
 part 'main_admin.dart';
+part 'main_unified.dart';
 
 Future<void> main() async {
   await runNeoAgentApp(mode: _appModeFromEnvironment());

package/flutter_app/lib/main_account_settings.dart

@@ -150,16 +150,23 @@ class _PasswordStrengthIndicator extends StatelessWidget {
 enum AccountSettingsTab { account, security }
 
 class AccountSettingsPanel extends StatefulWidget {
-  const AccountSettingsPanel({super.key, required this.controller});
+  const AccountSettingsPanel({
+    super.key,
+    required this.controller,
+    this.embedded = false,
+    this.initialTab,
+  });
 
   final NeoAgentController controller;
+  final bool embedded;
+  final AccountSettingsTab? initialTab;
 
   @override
   State<AccountSettingsPanel> createState() => _AccountSettingsPanelState();
 }
 
 class _AccountSettingsPanelState extends State<AccountSettingsPanel> {
-  AccountSettingsTab _selectedTab = AccountSettingsTab.account;
+  late AccountSettingsTab _selectedTab;
   late final TextEditingController _emailController;
   late final TextEditingController _emailPasswordController;
   late final TextEditingController _setupPasswordController;
@@ -179,6 +186,7 @@ class _AccountSettingsPanelState extends State<AccountSettingsPanel> {
   @override
   void initState() {
     super.initState();
+    _selectedTab = widget.initialTab ?? AccountSettingsTab.account;
     _emailController = TextEditingController(
       text: widget.controller.user?['email']?.toString() ?? '',
     );
@@ -196,6 +204,10 @@ class _AccountSettingsPanelState extends State<AccountSettingsPanel> {
   @override
   void didUpdateWidget(covariant AccountSettingsPanel oldWidget) {
     super.didUpdateWidget(oldWidget);
+    if (widget.initialTab != null &&
+        oldWidget.initialTab != widget.initialTab) {
+      _selectedTab = widget.initialTab!;
+    }
     final email = widget.controller.user?['email']?.toString() ?? '';
     if (_emailController.text.isEmpty && email.isNotEmpty) {
       _emailController.text = email;
@@ -291,42 +303,43 @@ class _AccountSettingsPanelState extends State<AccountSettingsPanel> {
   @override
   Widget build(BuildContext context) {
     final compact = MediaQuery.sizeOf(context).width < 860;
+    final showTabSwitcher = widget.initialTab == null;
     return ListView(
-      padding: _pagePadding(context),
+      padding: widget.embedded ? EdgeInsets.zero : _pagePadding(context),
       children: <Widget>[
-        _PageTitle(
-          title: 'Account settings',
-          subtitle:
-              'Manage your account email, two-factor authentication, and active sessions.',
-          trailing: OutlinedButton.icon(
-            onPressed: widget.controller.isLoadingAccountSettings
-                ? null
-                : widget.controller.refreshAccountSettings,
-            icon: widget.controller.isLoadingAccountSettings
-                ? const SizedBox.square(
-                    dimension: 16,
-                    child: CircularProgressIndicator(strokeWidth: 2),
-                  )
-                : Icon(Icons.refresh),
-            label: Text('Refresh'),
+        if (!widget.embedded)
+          _PageTitle(
+            title: 'Account settings',
+            subtitle:
+                'Manage your account email, two-factor authentication, and active sessions.',
+            trailing: _refreshButton(),
+          )
+        else
+          Align(
+            alignment: Alignment.centerRight,
+            child: Padding(
+              padding: const EdgeInsets.only(bottom: 12),
+              child: _refreshButton(),
+            ),
           ),
-        ),
         if (widget.controller.errorMessage != null) ...<Widget>[
           _InlineError(message: widget.controller.errorMessage!),
           const SizedBox(height: 16),
         ],
-        if (compact)
+        if (showTabSwitcher && compact)
           _AccountSettingsTabs(
             selected: _selectedTab,
             onSelected: (value) => setState(() => _selectedTab = value),
           )
         else
           const SizedBox.shrink(),
-        if (compact) const SizedBox(height: 16),
+        if (showTabSwitcher && compact) const SizedBox(height: 16),
         Card(
           child: Padding(
             padding: const EdgeInsets.all(20),
-            child: compact
+            child: !showTabSwitcher
+                ? _buildSelectedPanel()
+                : compact
                 ? _buildSelectedPanel()
                 : Row(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -359,6 +372,21 @@ class _AccountSettingsPanelState extends State<AccountSettingsPanel> {
     }
   }
 
+  Widget _refreshButton() {
+    return OutlinedButton.icon(
+      onPressed: widget.controller.isLoadingAccountSettings
+          ? null
+          : widget.controller.refreshAccountSettings,
+      icon: widget.controller.isLoadingAccountSettings
+          ? const SizedBox.square(
+              dimension: 16,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            )
+          : Icon(Icons.refresh),
+      label: Text('Refresh'),
+    );
+  }
+
   Widget _buildAccountPanel() {
     final controller = widget.controller;
     final username = controller.user?['username']?.toString() ?? 'Account';

package/flutter_app/lib/main_admin.dart

@@ -367,24 +367,38 @@ class AgentsPanel extends StatelessWidget {
 }
 
 class McpPanel extends StatelessWidget {
-  const McpPanel({super.key, required this.controller});
+  const McpPanel({super.key, required this.controller, this.embedded = false});
 
   final NeoAgentController controller;
+  final bool embedded;
 
   @override
   Widget build(BuildContext context) {
     return ListView(
-      padding: _pagePadding(context),
+      padding: embedded ? EdgeInsets.zero : _pagePadding(context),
       children: <Widget>[
-        _PageTitle(
-          title: 'MCP',
-          subtitle: 'Configured MCP servers and live server status.',
-          trailing: FilledButton.icon(
-            onPressed: () => _openMcpEditor(context),
-            icon: Icon(Icons.add),
-            label: Text('Add Server'),
+        if (!embedded)
+          _PageTitle(
+            title: 'MCP',
+            subtitle: 'Configured MCP servers and live server status.',
+            trailing: FilledButton.icon(
+              onPressed: () => _openMcpEditor(context),
+              icon: Icon(Icons.add),
+              label: Text('Add Server'),
+            ),
+          )
+        else
+          Align(
+            alignment: Alignment.centerRight,
+            child: Padding(
+              padding: const EdgeInsets.only(bottom: 12),
+              child: FilledButton.icon(
+                onPressed: () => _openMcpEditor(context),
+                icon: const Icon(Icons.add),
+                label: const Text('Add Server'),
+              ),
+            ),
           ),
-        ),
         if (controller.mcpServers.isEmpty)
           const _EmptyCard(
             title: 'No MCP servers configured',

package/flutter_app/lib/main_app_shell.dart

@@ -1120,10 +1120,11 @@ class _HomeViewState extends State<HomeView> {
   }
 
   SidebarGroup? _sidebarGroupForSection(AppSection section) {
-    if (!_mainSections(widget.controller).contains(section)) {
+    final visibleSection = section.canonicalSection;
+    if (!_mainSections(widget.controller).contains(visibleSection)) {
       return null;
     }
-    return section.group;
+    return visibleSection.group;
   }
 
   void _handleControllerChanged() {
@@ -2104,19 +2105,19 @@ class _SectionBody extends StatelessWidget {
       case AppSection.messaging:
         return MessagingPanel(controller: controller);
       case AppSection.runs:
-        return RunsPanel(controller: controller);
+        return RunsAndLogsPanel(controller: controller);
       case AppSection.settings:
-        return SettingsPanel(controller: controller);
+        return SettingsWorkspacePanel(controller: controller);
       case AppSection.accountSettings:
-        return AccountSettingsPanel(controller: controller);
+        return SettingsWorkspacePanel(controller: controller);
       case AppSection.logs:
-        return LogsPanel(controller: controller);
+        return RunsAndLogsPanel(controller: controller);
       case AppSection.skills:
-        return SkillsPanel(controller: controller);
+        return ToolsPanel(controller: controller);
       case AppSection.agents:
         return AgentsPanel(controller: controller);
       case AppSection.integrations:
-        return IntegrationsPanel(controller: controller);
+        return ToolsPanel(controller: controller);
       case AppSection.memory:
         return MemoryPanel(controller: controller);
       case AppSection.tasks:
@@ -2124,7 +2125,7 @@ class _SectionBody extends StatelessWidget {
       case AppSection.widgets:
         return WidgetsPanel(controller: controller);
       case AppSection.mcp:
-        return McpPanel(controller: controller);
+        return ToolsPanel(controller: controller);
       case AppSection.health:
         return controller.showHealthSection
             ? HealthPanel(controller: controller)