Group 46 correction: embed integration control centre

Author: Codie-Shannon

…ktop/IntegrationControlCentreWindow.xaml …esktop/IntegrationControlCentreView.xamlLifeOS.Desktop/IntegrationControlCentreWindow.xaml renamed to LifeOS.Desktop/IntegrationControlCentreView.xaml LifeOS.Desktop/IntegrationControlCentreWindow.xaml renamed to LifeOS.Desktop/IntegrationControlCentreView.xaml

@@ -1,16 +1,11 @@
-<Window x:Class="LifeOS.Desktop.IntegrationControlCentreWindow"
+<UserControl x:Class="LifeOS.Desktop.IntegrationControlCentreView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="LifeOS — Integration Control Centre"
-        Width="1500"
-        Height="900"
-        MinWidth="1100"
-        MinHeight="720"
-        WindowStartupLocation="CenterOwner"
-        Background="{DynamicResource LifeOS.Brush.Window}"
+        Background="Transparent"
         Foreground="{DynamicResource LifeOS.Brush.TextPrimary}"
+        Focusable="True"
         AutomationProperties.AutomationId="IntegrationControlCentre.Root">
-    <Window.Resources>
+    <UserControl.Resources>
         <Style x:Key="Integration.Heading" TargetType="TextBlock">
             <Setter Property="FontSize" Value="20" />
             <Setter Property="FontWeight" Value="SemiBold" />
@@ -71,9 +66,9 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
-    </Window.Resources>
+    </UserControl.Resources>
 
-    <Grid x:Name="RootGrid" Margin="24">
+    <Grid x:Name="RootGrid" Margin="0" MinHeight="720">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -114,7 +109,7 @@
             </Border>
         </WrapPanel>
 
-        <TabControl Grid.Row="2" x:Name="ControlTabs" Background="Transparent" BorderBrush="{DynamicResource LifeOS.Brush.Border}" AutomationProperties.AutomationId="IntegrationControlCentre.Tabs">
+        <TabControl Grid.Row="2" x:Name="ControlTabs" Height="560" Background="Transparent" BorderBrush="{DynamicResource LifeOS.Brush.Border}" AutomationProperties.AutomationId="IntegrationControlCentre.Tabs">
             <TabItem Header="Overview" AutomationProperties.AutomationId="IntegrationControlCentre.Tab.Overview">
                 <ScrollViewer VerticalScrollBarVisibility="Auto" Padding="16">
                     <StackPanel>
@@ -285,7 +280,7 @@
         <Grid Grid.Row="3" Margin="0,14,0,0">
             <Grid.ColumnDefinitions><ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" /></Grid.ColumnDefinitions>
             <TextBlock Text="Local state: %LOCALAPPDATA%\LifeOS\integration-control-centre.json · No OAuth token, client secret or authorization code is stored in this model." VerticalAlignment="Center" Style="{StaticResource Integration.Caption}" />
-            <Button Grid.Column="1" Content="Close" Click="CloseButton_Click" Style="{StaticResource Integration.Button}" Margin="12,0,0,0" AutomationProperties.AutomationId="IntegrationControlCentre.Close" />
+            <Button Grid.Column="1" Content="Back to Settings" Click="BackButton_Click" Style="{StaticResource Integration.Button}" Margin="12,0,0,0" AutomationProperties.AutomationId="IntegrationControlCentre.Back" />
         </Grid>
     </Grid>
-</Window>
+</UserControl>

…p/IntegrationControlCentreWindow.xaml.cs …top/IntegrationControlCentreView.xaml.csLifeOS.Desktop/IntegrationControlCentreWindow.xaml.cs renamed to LifeOS.Desktop/IntegrationControlCentreView.xaml.cs LifeOS.Desktop/IntegrationControlCentreWindow.xaml.cs renamed to LifeOS.Desktop/IntegrationControlCentreView.xaml.cs

@@ -5,13 +5,15 @@
 
 namespace LifeOS.Desktop;
 
-public partial class IntegrationControlCentreWindow : Window
+public partial class IntegrationControlCentreView : UserControl
 {
     private readonly string _storePath;
     private readonly IntegrationControlCentreService _service;
     private string? _selectedAccountId;
 
-    public IntegrationControlCentreWindow(bool compactDensity)
+    public event EventHandler? BackRequested;
+
+    public IntegrationControlCentreView(bool compactDensity)
     {
         InitializeComponent();
 
@@ -21,7 +23,7 @@ public IntegrationControlCentreWindow(bool compactDensity)
             _storePath);
         _service = new IntegrationControlCentreService(state);
 
-        RootGrid.Margin = compactDensity ? new Thickness(16) : new Thickness(24);
+        ApplyDensity(compactDensity);
         RefreshView();
     }
 
@@ -255,10 +257,8 @@ private void ReconnectButton_Click(object sender, RoutedEventArgs e)
         IntegrationConnectionReviewDialog dialog = new(
             account.DisplayName,
             account.ConnectionState,
-            IntegrationConnectionReviewMode.Reconnect)
-        {
-            Owner = this
-        };
+            IntegrationConnectionReviewMode.Reconnect);
+        SetDialogOwner(dialog);
 
         if (dialog.ShowDialog() != true)
         {
@@ -281,10 +281,8 @@ private void RevokeButton_Click(object sender, RoutedEventArgs e)
         IntegrationConnectionReviewDialog dialog = new(
             account.DisplayName,
             account.ConnectionState,
-            IntegrationConnectionReviewMode.Revoke)
-        {
-            Owner = this
-        };
+            IntegrationConnectionReviewMode.Revoke);
+        SetDialogOwner(dialog);
 
         if (dialog.ShowDialog() != true)
         {
@@ -304,10 +302,8 @@ private void DisconnectButton_Click(object sender, RoutedEventArgs e)
         }
 
         ConnectedIntegrationAccount account = _service.GetRequiredAccount(_selectedAccountId);
-        IntegrationDisconnectReviewDialog dialog = new(account.DisplayName)
-        {
-            Owner = this
-        };
+        IntegrationDisconnectReviewDialog dialog = new(account.DisplayName);
+        SetDialogOwner(dialog);
 
         if (dialog.ShowDialog() != true || dialog.SelectedChoice is null)
         {
@@ -341,7 +337,22 @@ exception is IOException or
         }
     }
 
-    private void CloseButton_Click(object sender, RoutedEventArgs e) => Close();
+    public void ApplyDensity(bool compactDensity)
+    {
+        ControlTabs.Height = compactDensity ? 520 : 560;
+    }
+
+    private void SetDialogOwner(Window dialog)
+    {
+        Window? owner = Window.GetWindow(this) ?? Application.Current?.MainWindow;
+        if (owner is { IsVisible: true })
+        {
+            dialog.Owner = owner;
+        }
+    }
+
+    private void BackButton_Click(object sender, RoutedEventArgs e) =>
+        BackRequested?.Invoke(this, EventArgs.Empty);
 
     private static string FormatTimestamp(DateTimeOffset? timestampUtc) =>
         timestampUtc is null

LifeOS.Desktop/V8ShellWindow.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="LifeOS.Desktop.V8ShellWindow"
+<Window x:Class="LifeOS.Desktop.V8ShellWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -220,7 +220,7 @@
                               HorizontalScrollBarVisibility="Disabled">
                     <Grid>
                         <StackPanel x:Name="WorkspaceRoot" Margin="24">
-                            <Grid>
+                            <Grid x:Name="WorkspaceHeaderGrid">
                                 <Grid.ColumnDefinitions><ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" /></Grid.ColumnDefinitions>
                                 <StackPanel>
                                     <TextBlock x:Name="WorkspaceEyebrow" Text="TODAY / PRESSURE / WORK / MONEY" Style="{StaticResource LifeOS.Text.Caption}" />
@@ -283,7 +283,8 @@
                                 </ItemsControl.ItemTemplate>
                             </ItemsControl>
 
-                            <StackPanel x:Name="SettingsRoot" Visibility="Collapsed" Margin="0,8,0,0">
+                            <Grid x:Name="SettingsRoot" Visibility="Collapsed" Margin="0,8,0,0">
+                                <StackPanel x:Name="SettingsOverviewPanel">
                                 <TextBlock Text="Appearance" Style="{StaticResource LifeOS.Text.Heading}" />
                                 <WrapPanel Margin="0,10,0,12">
                                     <Border Style="{StaticResource LifeOS.Card}" Width="330"><StackPanel><TextBlock Text="Theme" Style="{StaticResource LifeOS.Text.Body}" /><ComboBox x:Name="ThemeComboBox" Style="{StaticResource LifeOS.ComboBoxStyle}" AutomationProperties.AutomationId="Settings.Appearance.Theme" /><TextBlock Text="Light, Dark, System or High Contrast." Margin="0,6,0,0" Style="{StaticResource LifeOS.Text.Caption}" /></StackPanel></Border>
@@ -352,7 +353,14 @@
                                     <Button Content="Reset Approved Defaults" Click="ResetSettingsButton_Click" Style="{StaticResource LifeOS.Button}" AutomationProperties.AutomationId="Settings.Reset" />
                                     <TextBlock x:Name="SettingsSaveStatusText" Margin="16,10,0,0" Style="{StaticResource LifeOS.Text.Body}" />
                                 </WrapPanel>
-                            </StackPanel>
+                                </StackPanel>
+
+                                <ContentControl x:Name="SettingsSubpageHost"
+                                                Visibility="Collapsed"
+                                                HorizontalContentAlignment="Stretch"
+                                                VerticalContentAlignment="Top"
+                                                AutomationProperties.AutomationId="Settings.SubpageHost" />
+                            </Grid>
                         </StackPanel>
                     </Grid>
                 </ScrollViewer>

LifeOS.Desktop/V8ShellWindow.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -30,7 +30,7 @@ public partial class V8ShellWindow : Window
     private bool _contextOpen;
     private IInputElement? _focusBeforeCommand;
     private IInputElement? _focusBeforeContext;
-    private IntegrationControlCentreWindow? _integrationControlCentreWindow;
+    private IntegrationControlCentreView? _integrationControlCentreView;
     private WorkspaceSnapshot _snapshot = WorkspaceSnapshot.Load();
 
     private bool IsCommandOpen => CommandOverlay.Visibility == Visibility.Visible;
@@ -201,6 +201,8 @@ private void ApplyDensity()
                     : new Thickness(0, 0, 12, 12);
             }
         }
+
+        _integrationControlCentreView?.ApplyDensity(compact);
     }
 
     private void WorkspaceNav_Click(object sender, RoutedEventArgs e)
@@ -248,6 +250,7 @@ private void NavigateTo(string? requestedWorkspace, bool persist = true)
         SettingsRoot.Visibility = definition.Name == "Settings"
             ? Visibility.Visible
             : Visibility.Collapsed;
+        ShowSettingsOverview(scrollToTop: false);
 
         ContextTitle.Text = $"{definition.Name} context";
         ContextBody.Text = definition.ContextSummary;
@@ -340,6 +343,13 @@ private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
             return;
         }
 
+        if (e.Key == Key.Escape && IsIntegrationControlCentreOpen)
+        {
+            ShowSettingsOverview(scrollToTop: true);
+            e.Handled = true;
+            return;
+        }
+
         if (controlK)
         {
             OpenCommand();
@@ -579,29 +589,44 @@ private void RestoreContextFocus()
         Keyboard.Focus(ContextButton);
     }
 
+    private bool IsIntegrationControlCentreOpen =>
+        SettingsSubpageHost.Visibility == Visibility.Visible;
+
     private void OpenIntegrationControlCentre_Click(object sender, RoutedEventArgs e)
     {
-        if (_integrationControlCentreWindow is { IsLoaded: true } existingWindow)
-        {
-            if (existingWindow.WindowState == WindowState.Minimized)
-            {
-                existingWindow.WindowState = WindowState.Normal;
-            }
+        _integrationControlCentreView ??= CreateIntegrationControlCentreView();
+        _integrationControlCentreView.ApplyDensity(
+            _preferences.Density == V8Density.Compact || ActualWidth <= 980);
 
-            existingWindow.Activate();
-            return;
-        }
+        SettingsOverviewPanel.Visibility = Visibility.Collapsed;
+        SettingsSubpageHost.Content = _integrationControlCentreView;
+        SettingsSubpageHost.Visibility = Visibility.Visible;
+        WorkspaceHeaderGrid.Visibility = Visibility.Collapsed;
+        MetricItems.Visibility = Visibility.Collapsed;
+        WorkspaceScrollViewer.ScrollToTop();
+        Keyboard.Focus(_integrationControlCentreView);
+    }
 
-        IntegrationControlCentreWindow window = new(
-            _preferences.Density == V8Density.Compact)
-        {
-            Owner = this
-        };
+    private IntegrationControlCentreView CreateIntegrationControlCentreView()
+    {
+        IntegrationControlCentreView view = new(
+            _preferences.Density == V8Density.Compact || ActualWidth <= 980);
+        view.BackRequested += (_, _) => ShowSettingsOverview(scrollToTop: true);
+        return view;
+    }
+
+    private void ShowSettingsOverview(bool scrollToTop)
+    {
+        SettingsSubpageHost.Visibility = Visibility.Collapsed;
+        SettingsOverviewPanel.Visibility = Visibility.Visible;
+        WorkspaceHeaderGrid.Visibility = Visibility.Visible;
+        MetricItems.Visibility = Visibility.Visible;
 
-        _integrationControlCentreWindow = window;
-        window.Closed += (_, _) => _integrationControlCentreWindow = null;
-        window.Show();
-        window.Activate();
+        if (scrollToTop)
+        {
+            WorkspaceScrollViewer.ScrollToTop();
+            Keyboard.Focus(SettingsNav);
+        }
     }
 
     private void OpenModule_Click(object sender, RoutedEventArgs e)

docs/manual-tests/group-46/README.md

@@ -1,11 +1,10 @@
 # Group 46 manual verification — Integration Control Centre
 
-Group 46 starts the LifeOS v9 integration lane at `v9.0.0-alpha.1`. It adds the permanent system-level Integration Control Centre under Settings. This group uses deterministic fictional providers and accounts only.
+Group 46 starts the LifeOS v9 integration lane at `v9.0.0-alpha.1`. It adds the permanent system-level Integration Control Centre as an embedded Settings subpage. This group uses deterministic fictional providers and accounts only.
 
 ## Entry conditions
 
-- Repository is on the exact Group 45 baseline before Pack 1 is applied.
-- Pack 1 tests, builds, scans, commit, push and synchronization have completed successfully.
+- Group 46 Pack 1 and both Settings ComboBox corrections are committed, pushed and synchronized.
 - Desktop launches through the permanent eight-workspace v8 shell.
 - No live Microsoft or Google credential, token, account or external provider read is used.
 
@@ -22,26 +21,27 @@ Close LifeOS and delete only that file to restore the deterministic fictional pr
 ## Required manual checks
 
 1. Open **Settings** and confirm **Integration Control Centre** appears inside the Integrations section rather than as a ninth workspace.
-2. Confirm Theme, Accent, Density and Startup workspace retain the established dark custom ComboBox presentation and remain enabled.
-3. Open the Control Centre and confirm it opens modelessly: Settings remains enabled, the four dropdowns do not switch to native white rendering, and reopening the command activates the existing Control Centre instead of creating duplicates.
-4. Confirm all provider cards state **FICTIONAL** and the top boundary states **NO LIVE CREDENTIALS**.
-5. Confirm the provider catalogue exposes Microsoft 365, Google Workspace and Local connectors through one shared lifecycle/permission/health contract.
-6. Confirm the Work account and Personal account are visibly separate, with classification, provider identity and connection state shown independently.
-7. Open **Capabilities & permissions** and confirm Required/Optional is separate from Granted/Missing/Revoked/Not Requested.
-8. Confirm capability health is calculated separately: healthy Mail, stale Calendar and Needs Attention Files must be simultaneously visible for the fictional work account.
-9. Run Refresh and confirm bounded, explicit audit output; no external data or write action occurs.
-10. Open Reconnect review, cancel once, then explicitly confirm and verify ordered audit entries.
-11. Open Revoke review and confirm the account, current state, action effect and no-live-provider boundary are visible before confirmation.
-12. Open Disconnect review and verify all three explicit retention choices:
-    - keep accepted LifeOS records;
-    - archive provider links;
-    - remove unaccepted imported candidates.
-13. Confirm accepted LifeOS records are never described as silently deleted by disconnect or revoke.
-14. Open Audit history and verify consent, sync, permission, reconnect, revoke and disconnect events are ordered, timestamped and sanitized.
-15. Verify the Control Centre in Light, Dark and High Contrast themes.
-16. Verify Comfortable and Compact density plus 100%, 110%, 125% and 140% text scale remain usable.
-17. Verify keyboard focus is visible and the key controls expose stable AutomationIds.
-18. Confirm the local JSON contains no client secret, access token, refresh token, authorization code or password field.
+2. Confirm Theme, Accent, Density, Startup workspace and Text scale retain the established dark custom ComboBox presentation.
+3. Select **Open Integration Control Centre** and confirm it replaces the Settings overview inside the existing LifeOS shell.
+4. Confirm the left workspace rail, top bar, main window title bar and normal window movement/resizing remain available.
+5. Confirm no second LifeOS window, borderless overlay or laptop-sized immovable surface is created.
+6. Select **Back to Settings** and confirm the normal Settings overview returns at the top of the page.
+7. Reopen the Control Centre and confirm only one embedded instance is used.
+8. Press **Escape** while the Control Centre is open and confirm it returns to the Settings overview.
+9. Navigate directly to another workspace while the Control Centre is open and confirm the normal workspace header and metrics are restored.
+10. Confirm all provider cards state **FICTIONAL** and the boundary states **NO LIVE CREDENTIALS**.
+11. Confirm Microsoft 365, Google Workspace and Local connectors use the shared account, permission, health, audit and recovery contract.
+12. Confirm the Work account and Personal account are visibly separate.
+13. Open **Capabilities & permissions** and confirm Required/Optional is separate from Granted/Missing/Revoked/Not Requested.
+14. Confirm healthy, stale and Needs Attention capability states can be visible simultaneously.
+15. Run Refresh and confirm no external read or write occurs.
+16. Open Reconnect, Revoke and Disconnect reviews and confirm only those review confirmations open as modal dialogs owned by the main LifeOS window.
+17. Verify all three disconnect retention choices.
+18. Open Audit history and verify ordered, timestamped and sanitized entries.
+19. Verify Light, Dark and High Contrast themes.
+20. Verify Comfortable and Compact density plus 100%, 110%, 125% and 140% text scale.
+21. Verify keyboard focus, AutomationIds and inner scrolling remain usable on the laptop display.
+22. Confirm the local JSON contains no client secret, access token, refresh token, authorization code or password field.
 
 ## Stop rule
 

docs/release-notes/v9.0-alpha-group-46-integration-control-centre.md

@@ -17,8 +17,15 @@ Group 46 creates the permanent system-level control surface and shared contracts
 - Provider-neutral adapter and normalized connector-result contracts.
 - Atomic local JSON persistence outside Git.
 - Deterministic fictional Microsoft, Google and local proof providers/accounts.
-- Modeless Control Centre launch that keeps Settings active and reuses the existing window.
-- Restored v8 custom ComboBox presentation for Theme, Accent, Density and Startup workspace.
+
+## Corrected before screenshot approval
+
+- Replaced the separate borderless Control Centre window with an embedded Settings subpage inside the existing LifeOS shell.
+- Preserved the normal title bar, workspace rail, top bar, resizing and window movement.
+- Added **Back to Settings** and Escape navigation.
+- Restored the normal workspace header and metrics when leaving the embedded subpage.
+- Kept only reconnect, revoke and disconnect confirmations as owned modal dialogs.
+- Preserved the established custom ComboBox presentation for Theme, Accent, Density, Startup workspace and Text scale.
 
 ## Safety boundary