From 6ccb53c4bec58693c2cf669c17f881d21e4fe4c5 Mon Sep 17 00:00:00 2001
From: Armando Fernandez <codefilez@gmail.com>
Date: Thu, 16 Jul 2026 18:56:45 -0700
Subject: [PATCH] Add global Skills manager, per-server MCP controls, and
 status-pill transcript polish
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Skills
- New "Skills" rail tab (graduation-cap icon) to manage global skills
  (~/.mandocode/skills), the reusable instruction sets the AI loads on demand.
- Create / edit / delete skills in-app, with an optional "Draft with AI" panel
  that generates a skill's name, description, and instructions from a one-line
  intent using a user-picked model (defaults to the active agent's).
- Install skills from a git URL, a .zip, or a local folder, with recursive
  discovery so nested repo layouts (e.g. skills/<name>/SKILL.md) work.
- Enable/disable each skill (renames SKILL.md so the engine skips it) — changes
  fan out to every open agent immediately.
- Search box, quick-filter chips (All/Enabled/Disabled/Large), grouped
  Enabled/Disabled sections, and a per-skill size estimate so heavyweight
  skills are easy to spot.

MCP servers
- Replaced the per-agent "Use MCP tools" opt-in with per-server enable/disable,
  since servers are shared by every agent. Toggling a server saves and
  restarts/reconnects it across all agents.
- Same layout as Skills: search, filter chips (All/Enabled/Disabled/Failed),
  grouped sections, consolidated [actions | filters] toolbar, and a footer.

Transcript polish
- Tool calls render as a single static pill (shows the loaded skill's name);
  no animation, to avoid a prior CPU-spin regression.
- Connection/status/confirmation output (MCP reload, /copy, /copy-code, /config,
  /music) render as centered, theme-aware status pills — no emoji. Lists,
  errors, and detail-bearing messages stay as readable text.

All changes are confined to the Desktop app; the shared engine submodule is untouched.
---
 src/MandoCode.Desktop/App.xaml.cs             |   2 +
 src/MandoCode.Desktop/MainWindow.xaml         | 439 ++++++++++++-
 src/MandoCode.Desktop/MainWindow.xaml.cs      | 588 +++++++++++++++++-
 .../Services/SessionManager.cs                |   4 +
 src/MandoCode.Desktop/Services/SkillAuthor.cs | 121 ++++
 .../Services/SkillCoordinator.cs              | 376 +++++++++++
 .../Services/TranscriptHtmlBuilder.cs         |  45 +-
 .../ViewModels/ChatController.cs              |  51 +-
 8 files changed, 1576 insertions(+), 50 deletions(-)
 create mode 100644 src/MandoCode.Desktop/Services/SkillAuthor.cs
 create mode 100644 src/MandoCode.Desktop/Services/SkillCoordinator.cs

diff --git a/src/MandoCode.Desktop/App.xaml.cs b/src/MandoCode.Desktop/App.xaml.cs
index a808f1a..30d0ab1 100644
--- a/src/MandoCode.Desktop/App.xaml.cs
+++ b/src/MandoCode.Desktop/App.xaml.cs
@@ -89,10 +89,12 @@ private static ServiceProvider BuildServices()
         // ---- Coordinators + session registry ----
         services.AddSingleton(provider => new ConfigCoordinator(provider.GetRequiredService<MandoCodeConfig>()));
         services.AddSingleton(provider => new McpCoordinator(provider.GetRequiredService<MandoCodeConfig>()));
+        services.AddSingleton(provider => new SkillCoordinator(provider.GetRequiredService<MandoCodeConfig>()));
         services.AddSingleton(provider => new SessionManager(
             provider,
             provider.GetRequiredService<ConfigCoordinator>(),
             provider.GetRequiredService<McpCoordinator>(),
+            provider.GetRequiredService<SkillCoordinator>(),
             projectRoot));
 
         return services.BuildServiceProvider();
diff --git a/src/MandoCode.Desktop/MainWindow.xaml b/src/MandoCode.Desktop/MainWindow.xaml
index 46a91b5..f51fcf5 100644
--- a/src/MandoCode.Desktop/MainWindow.xaml
+++ b/src/MandoCode.Desktop/MainWindow.xaml
@@ -45,11 +45,20 @@
                     ToolTipService.ToolTip="Settings — the selected agent's config">
                 <FontIcon x:Name="NavSettingsIcon" Glyph="&#xE713;" FontSize="16"/>
             </Button>
+            <!-- Divider: everything below is app-global, not per-agent. -->
+            <Border Background="{StaticResource MandoBorderBrush}" Height="1"
+                    HorizontalAlignment="Stretch" Margin="8,2" Opacity="0.6"/>
             <Button x:Name="NavMcp" Click="NavMcp_Click" Padding="10,8" Background="Transparent"
                     BorderThickness="0" HorizontalAlignment="Stretch"
                     ToolTipService.ToolTip="MCP servers — connect external tools">
                 <FontIcon x:Name="NavMcpIcon" Glyph="&#xE71B;" FontSize="16"/>
             </Button>
+            <!-- Global: the user skills directory is app-wide, so one manager serves every agent. -->
+            <Button x:Name="NavSkills" Click="NavSkills_Click" Padding="10,8" Background="Transparent"
+                    BorderThickness="0" HorizontalAlignment="Stretch"
+                    ToolTipService.ToolTip="Skills — reusable instructions the AI loads on demand">
+                <FontIcon x:Name="NavSkillsIcon" Glyph="&#xE7BE;" FontSize="16"/>
+            </Button>
             <!-- Global (a window property, not per-agent): themes + window opacity. Last on the rail
                  since it's cosmetic and set-once. -->
             <Button x:Name="NavAppearance" Click="NavAppearance_Click" Padding="10,8" Background="Transparent"
@@ -459,53 +468,70 @@
                         <TranslateTransform x:Name="McpPageTransform"/>
                     </Grid.RenderTransform>
                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="*"/>
                         <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
 
-                    <StackPanel Orientation="Horizontal" Spacing="10">
-                        <TextBlock Text="MCP Servers" FontSize="22" FontWeight="SemiBold"
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="MCP Servers" FontSize="22" FontWeight="SemiBold" VerticalAlignment="Center"
                                    Foreground="{StaticResource MandoAccentBrush}"/>
-                        <Border Background="{StaticResource MandoPanelBrush}"
+                        <Border Grid.Column="1" Background="{StaticResource MandoPanelBrush}"
                                 BorderBrush="{StaticResource MandoBorderBrush}" BorderThickness="1"
                                 CornerRadius="12" Padding="10,3" VerticalAlignment="Center">
                             <TextBlock Text="shared by every agent" FontSize="12" Opacity="0.7"/>
                         </Border>
-                    </StackPanel>
-                    <StackPanel Grid.Row="1" Spacing="10">
-                        <!-- Static explanation. McpPageStatus below is overwritten with the live
-                             server count on every refresh, so the two can't share an element. -->
-                        <TextBlock Text="MCP servers connect the AI to outside systems — databases, APIs, docs, other apps — as tools it can call during a chat. Servers are shared across every agent; each agent opts in with the toggle below. Changes save immediately."
+                    </Grid>
+                    <StackPanel Grid.Row="1" Spacing="6">
+                        <TextBlock Text="MCP servers connect the AI to outside systems — databases, APIs, docs, other apps — as tools it can call during a chat. Servers are shared by every agent; toggle each one on or off below. Changes save immediately."
                                    Opacity="0.6" FontSize="12" TextWrapping="Wrap"/>
-                        <!-- Per-agent opt-in (EnableMcp is a per-agent setting), even though the server
-                             list above is app-wide. Loaded for the active agent in RefreshMcpListAsync. -->
-                        <ToggleSwitch x:Name="McpEnableToggle" Tag="mcp" Toggled="Setting_Toggled"
-                                      Header="Use MCP tools in the active agent"
-                                      ToolTipService.ToolTip="Whether the active agent attaches the MCP servers' tools. This choice is per-agent."/>
-                        <TextBlock x:Name="McpPageStatus" Text="" Opacity="0.75" FontSize="12"
-                                   TextWrapping="Wrap" Foreground="{StaticResource MandoGoldBrush}"/>
+                        <AutoSuggestBox x:Name="McpSearchBox" QueryIcon="Find" Margin="0,4,0,0"
+                                        PlaceholderText="Search servers by name or transport…"
+                                        TextChanged="McpSearch_TextChanged"
+                                        ToolTipService.ToolTip="Filter the list below by name or transport"/>
                     </StackPanel>
 
-                    <ListView Grid.Row="2" x:Name="McpList" SelectionMode="Single"
+                    <ListView Grid.Row="3" x:Name="McpList" SelectionMode="Single"
                               SelectionChanged="McpList_SelectionChanged" DoubleTapped="McpList_DoubleTapped"
                               Background="{StaticResource MandoPanelBrush}"
                               BorderBrush="{StaticResource MandoBorderBrush}" BorderThickness="1"
                               CornerRadius="8">
+                        <ListView.GroupStyle>
+                            <GroupStyle>
+                                <GroupStyle.HeaderTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Text="{Binding Key}" FontWeight="SemiBold" FontSize="12"
+                                                   Opacity="0.6" Margin="4,10,0,2"/>
+                                    </DataTemplate>
+                                </GroupStyle.HeaderTemplate>
+                            </GroupStyle>
+                        </ListView.GroupStyle>
                         <ListView.ItemTemplate>
                             <DataTemplate x:DataType="local:McpRow">
                                 <Grid Padding="4,8" ColumnSpacing="14">
                                     <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="70"/>
                                         <ColumnDefinition Width="200"/>
                                         <ColumnDefinition Width="60"/>
                                         <ColumnDefinition Width="*"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{x:Bind Name}" FontWeight="SemiBold"
-                                               FontFamily="Cascadia Code,Consolas" FontSize="13"/>
-                                    <TextBlock Grid.Column="1" Text="{x:Bind Transport}" Opacity="0.6" FontSize="12"
+                                    <!-- Per-server on/off (shared by every agent). Tag carries the name
+                                         so the handler knows which server without relying on selection. -->
+                                    <ToggleSwitch IsOn="{x:Bind Enabled}" Tag="{x:Bind Name}"
+                                                  Toggled="McpEnabled_Toggled" OnContent="" OffContent=""
+                                                  MinWidth="0" VerticalAlignment="Center"
+                                                  ToolTipService.ToolTip="Enable or disable this server for every agent"/>
+                                    <TextBlock Grid.Column="1" Text="{x:Bind Name}" FontWeight="SemiBold"
+                                               FontFamily="Cascadia Code,Consolas" FontSize="13" VerticalAlignment="Center"/>
+                                    <TextBlock Grid.Column="2" Text="{x:Bind Transport}" Opacity="0.6" FontSize="12"
                                                VerticalAlignment="Center"/>
-                                    <TextBlock Grid.Column="2" Text="{x:Bind Status}" Foreground="{x:Bind StatusBrush}"
+                                    <TextBlock Grid.Column="3" Text="{x:Bind Status}" Foreground="{x:Bind StatusBrush}"
                                                FontSize="12" VerticalAlignment="Center" TextWrapping="Wrap"/>
                                 </Grid>
                             </DataTemplate>
@@ -515,7 +541,7 @@
                     <!-- Each button's content is an icon + label panel, so it exposes no accessible
                          name on its own. AutomationProperties.Name gives screen readers (and UI
                          tests) something to address. -->
-                    <StackPanel Grid.Row="3" Orientation="Horizontal" Spacing="8">
+                    <StackPanel Grid.Row="2" Orientation="Horizontal" Spacing="8">
                         <Button x:Name="McpAddButton" Click="McpAdd_Click" Style="{StaticResource AccentButtonStyle}"
                                 AutomationProperties.Name="Add MCP Server"
                                 ToolTipService.ToolTip="Add a new MCP server">
@@ -553,7 +579,171 @@
                                 ToolTipService.ToolTip="Refresh this status list only — doesn't touch the servers">
                             <FontIcon Glyph="&#xE72C;" FontSize="14"/>
                         </Button>
+                        <!-- Divider between the action group and the filter group. -->
+                        <Border Width="1" Margin="0,4" VerticalAlignment="Stretch"
+                                Background="{StaticResource MandoBorderBrush}" Opacity="0.6"/>
+                        <ToggleButton x:Name="McpFilterAll" Content="All" IsChecked="True" Tag="all" Click="McpFilter_Click"
+                                      ToolTipService.ToolTip="Show every server"/>
+                        <ToggleButton x:Name="McpFilterEnabled" Content="Enabled" Tag="enabled" Click="McpFilter_Click"
+                                      ToolTipService.ToolTip="Show only enabled servers (running and shared with every agent)"/>
+                        <ToggleButton x:Name="McpFilterDisabled" Content="Disabled" Tag="disabled" Click="McpFilter_Click"
+                                      ToolTipService.ToolTip="Show only disabled servers (turned off, not connected)"/>
+                        <ToggleButton x:Name="McpFilterFailed" Content="Failed" Tag="failed" Click="McpFilter_Click"
+                                      ToolTipService.ToolTip="Show only servers that failed to connect"/>
                     </StackPanel>
+
+                    <!-- Footer status bar: server count / connection status / filter matches. -->
+                    <TextBlock Grid.Row="4" x:Name="McpPageStatus" Text="" Opacity="0.55" FontSize="11"
+                               HorizontalAlignment="Right" TextAlignment="Right" TextWrapping="Wrap"
+                               Margin="0,2,2,0"/>
+                </Grid>
+
+                <!-- ============ SKILLS PAGE ============
+                     Global (user) skills: folders under ~/.mandocode/skills, one SKILL.md each.
+                     App-wide like MCP — one set, shared by every agent — so it lives on the rail. -->
+                <Grid x:Name="SkillsPage" Visibility="Collapsed" Padding="24,16,24,24" RowSpacing="12">
+                    <Grid.RenderTransform>
+                        <TranslateTransform x:Name="SkillsPageTransform"/>
+                    </Grid.RenderTransform>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="Skills" FontSize="22" FontWeight="SemiBold" VerticalAlignment="Center"
+                                   Foreground="{StaticResource MandoAccentBrush}"/>
+                        <Border Grid.Column="1" Background="{StaticResource MandoPanelBrush}"
+                                BorderBrush="{StaticResource MandoBorderBrush}" BorderThickness="1"
+                                CornerRadius="12" Padding="10,3" VerticalAlignment="Center">
+                            <TextBlock Text="shared by every agent" FontSize="12" Opacity="0.7"/>
+                        </Border>
+                    </Grid>
+                    <StackPanel Grid.Row="1" Spacing="6">
+                        <TextBlock Text="A skill is a named set of instructions the AI loads on demand: when your request matches a skill's description, it pulls in the full steps and follows them. These are your global skills — available to every agent. Changes apply immediately."
+                                   Opacity="0.6" FontSize="12" TextWrapping="Wrap"/>
+                        <AutoSuggestBox x:Name="SkillSearchBox" QueryIcon="Find" Margin="0,4,0,0"
+                                        PlaceholderText="Search skills by name or description…"
+                                        TextChanged="SkillSearch_TextChanged"
+                                        ToolTipService.ToolTip="Filter the list below by name or description"/>
+                    </StackPanel>
+
+                    <ListView Grid.Row="3" x:Name="SkillsList" SelectionMode="Single"
+                              SelectionChanged="SkillsList_SelectionChanged" DoubleTapped="SkillsList_DoubleTapped"
+                              Background="{StaticResource MandoPanelBrush}"
+                              BorderBrush="{StaticResource MandoBorderBrush}" BorderThickness="1"
+                              CornerRadius="8">
+                        <ListView.GroupStyle>
+                            <GroupStyle>
+                                <GroupStyle.HeaderTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Text="{Binding Key}" FontWeight="SemiBold" FontSize="12"
+                                                   Opacity="0.6" Margin="4,10,0,2"/>
+                                    </DataTemplate>
+                                </GroupStyle.HeaderTemplate>
+                            </GroupStyle>
+                        </ListView.GroupStyle>
+                        <ListView.ItemTemplate>
+                            <DataTemplate x:DataType="local:SkillRow">
+                                <Grid Padding="4,8" ColumnSpacing="14">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="70"/>
+                                        <ColumnDefinition Width="200"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <!-- Tag carries the folder path so the Toggled handler knows which
+                                         skill to flip without depending on list selection. -->
+                                    <ToggleSwitch IsOn="{x:Bind Enabled}" Tag="{x:Bind FolderPath}"
+                                                  Toggled="SkillEnabled_Toggled" OnContent="" OffContent=""
+                                                  MinWidth="0" VerticalAlignment="Center"
+                                                  ToolTipService.ToolTip="Enable or disable this skill for every agent"/>
+                                    <TextBlock Grid.Column="1" Text="{x:Bind Name}" FontWeight="SemiBold"
+                                               FontFamily="Cascadia Code,Consolas" FontSize="13"
+                                               VerticalAlignment="Center" TextWrapping="Wrap"/>
+                                    <TextBlock Grid.Column="2" Text="{x:Bind Description}" Opacity="0.7"
+                                               FontSize="12" VerticalAlignment="Center" TextWrapping="Wrap"/>
+                                    <!-- Approx size of the instructions body — the load-time prompt cost.
+                                         Gold when large, so heavy skills stand out at a glance. -->
+                                    <TextBlock Grid.Column="3" Text="{x:Bind SizeLabel}" Foreground="{x:Bind SizeBrush}"
+                                               FontSize="11" VerticalAlignment="Center" TextAlignment="Right"
+                                               ToolTipService.ToolTip="Approximate tokens added to the prompt when this skill loads. Larger = heavier for the model."/>
+                                </Grid>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+
+                    <StackPanel Grid.Row="2" Orientation="Horizontal" Spacing="8">
+                        <Button x:Name="SkillNewButton" Click="SkillNew_Click" Style="{StaticResource AccentButtonStyle}"
+                                AutomationProperties.Name="New Skill"
+                                ToolTipService.ToolTip="Write a new global skill">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <FontIcon Glyph="&#xE710;" FontSize="13"/>
+                                <TextBlock Text="New Skill"/>
+                            </StackPanel>
+                        </Button>
+                        <Button x:Name="SkillEditButton" Click="SkillEdit_Click" IsEnabled="False"
+                                AutomationProperties.Name="Edit Skill"
+                                ToolTipService.ToolTip="Edit the selected skill (or double-click a row)">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <FontIcon Glyph="&#xE70F;" FontSize="13"/>
+                                <TextBlock Text="Edit"/>
+                            </StackPanel>
+                        </Button>
+                        <Button x:Name="SkillDeleteButton" Click="SkillDelete_Click" IsEnabled="False"
+                                AutomationProperties.Name="Delete Skill"
+                                ToolTipService.ToolTip="Delete the selected skill's folder">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <FontIcon Glyph="&#xE74D;" FontSize="13"/>
+                                <TextBlock Text="Delete"/>
+                            </StackPanel>
+                        </Button>
+                        <Button x:Name="SkillInstallButton" Click="SkillInstall_Click"
+                                AutomationProperties.Name="Install Skill"
+                                ToolTipService.ToolTip="Install skills from a git URL, a .zip, or a local folder">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <FontIcon Glyph="&#xE896;" FontSize="13"/>
+                                <TextBlock Text="Install from…"/>
+                            </StackPanel>
+                        </Button>
+                        <Button x:Name="SkillOpenFolderButton" Click="SkillOpenFolder_Click"
+                                AutomationProperties.Name="Open skills folder"
+                                ToolTipService.ToolTip="Open the global skills folder in File Explorer">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <FontIcon Glyph="&#xE838;" FontSize="13"/>
+                                <TextBlock Text="Open folder"/>
+                            </StackPanel>
+                        </Button>
+                        <Button x:Name="SkillRefreshButton" Click="SkillRefresh_Click"
+                                AutomationProperties.Name="Refresh skills"
+                                ToolTipService.ToolTip="Re-scan the skills folder">
+                            <FontIcon Glyph="&#xE72C;" FontSize="14"/>
+                        </Button>
+                        <!-- Divider between the action group and the filter group. -->
+                        <Border Width="1" Margin="0,4" VerticalAlignment="Stretch"
+                                Background="{StaticResource MandoBorderBrush}" Opacity="0.6"/>
+                        <ToggleButton x:Name="SkillFilterAll" Content="All" IsChecked="True" Tag="all" Click="SkillFilter_Click"
+                                      ToolTipService.ToolTip="Show every skill"/>
+                        <ToggleButton x:Name="SkillFilterEnabled" Content="Enabled" Tag="enabled" Click="SkillFilter_Click"
+                                      ToolTipService.ToolTip="Show only enabled skills (the ones every agent can load)"/>
+                        <ToggleButton x:Name="SkillFilterDisabled" Content="Disabled" Tag="disabled" Click="SkillFilter_Click"
+                                      ToolTipService.ToolTip="Show only disabled skills (turned off, not in any prompt)"/>
+                        <ToggleButton x:Name="SkillFilterLarge" Content="Large" Tag="large" Click="SkillFilter_Click"
+                                      ToolTipService.ToolTip="Show only large skills — a big instructions body is heavier every time it loads"/>
+                    </StackPanel>
+
+                    <!-- Footer status bar: skill count + folder path (and filter matches). Quiet and
+                         right-aligned below the list, out of the header's way. -->
+                    <TextBlock Grid.Row="4" x:Name="SkillsPageStatus" Text="" Opacity="0.55" FontSize="11"
+                               HorizontalAlignment="Right" TextAlignment="Right" TextWrapping="Wrap"
+                               Margin="0,2,2,0"/>
                 </Grid>
         </Grid>
         </Grid>
@@ -714,5 +904,212 @@
             </Border>
         </Grid>
 
+        <!-- ======= Skill editor modal =======
+             Stretches with the window (capped) rather than a fixed box, so the instructions editor
+             gets real room. Two panes: metadata + AI drafting on the left, the body on the right. -->
+        <Grid x:Name="SkillEditorOverlay" Grid.ColumnSpan="3" Visibility="Collapsed"
+              Background="#B0000000">
+            <Border Margin="72,40" MaxWidth="1200" MaxHeight="900" Padding="24"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                    Background="{StaticResource MandoPanelBrush}"
+                    BorderBrush="{StaticResource MandoAccentBrush}" BorderThickness="1"
+                    CornerRadius="12">
+                <Grid RowSpacing="14" ColumnSpacing="20">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="400"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+
+                    <TextBlock Grid.ColumnSpan="2" x:Name="SkillEditorTitle" Text="New skill" FontSize="18"
+                               FontWeight="SemiBold" Foreground="{StaticResource MandoAccentBrush}"/>
+
+                    <!-- Left pane: Draft with AI, given the whole column so the intent box is large -->
+                    <Grid Grid.Row="1" Grid.Column="0" RowSpacing="10">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <FontIcon Glyph="&#xE945;" FontSize="15" Foreground="{StaticResource MandoGoldBrush}"/>
+                            <TextBlock Text="Draft with AI" FontWeight="SemiBold" FontSize="14"
+                                       VerticalAlignment="Center"/>
+                        </StackPanel>
+
+                        <ComboBox Grid.Row="1" x:Name="Sk_AiModel" HorizontalAlignment="Stretch" Header="Model"
+                                  ToolTipService.ToolTip="Defaults to the active agent's model — change it per draft">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="local:ModelChoice">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <TextBlock Text="{x:Bind Name}" VerticalAlignment="Center"/>
+                                        <TextBlock Text="{x:Bind Tag}" Opacity="0.55" FontSize="11" VerticalAlignment="Center"/>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+
+                        <TextBox Grid.Row="2" x:Name="Sk_AiIntent" AcceptsReturn="True" TextWrapping="Wrap"
+                                 VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
+                                 VerticalContentAlignment="Top"
+                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                 Header="What should this skill do?"
+                                 PlaceholderText="e.g. review a SQL query against the database schema and flag bad column names, then suggest fixes — describe the workflow you want the AI to follow"/>
+
+                        <StackPanel Grid.Row="3" Spacing="8">
+                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                <Button x:Name="Sk_GenerateButton" Click="SkillGenerate_Click"
+                                        Style="{StaticResource AccentButtonStyle}"
+                                        ToolTipService.ToolTip="Draft name, description, and instructions from your intent">
+                                    <StackPanel Orientation="Horizontal" Spacing="6">
+                                        <FontIcon Glyph="&#xE945;" FontSize="13"/>
+                                        <TextBlock Text="Generate"/>
+                                    </StackPanel>
+                                </Button>
+                                <Button x:Name="Sk_RefineButton" Click="SkillRefine_Click"
+                                        ToolTipService.ToolTip="Rewrite the current instructions using your intent as the change to make">
+                                    <StackPanel Orientation="Horizontal" Spacing="6">
+                                        <FontIcon Glyph="&#xE70F;" FontSize="13"/>
+                                        <TextBlock Text="Refine"/>
+                                    </StackPanel>
+                                </Button>
+                                <ProgressRing x:Name="Sk_AiSpin" IsActive="False" Width="18" Height="18"
+                                              Visibility="Collapsed" VerticalAlignment="Center"/>
+                            </StackPanel>
+                            <TextBlock x:Name="Sk_AiStatus" Text="" FontSize="12" Opacity="0.75"
+                                       TextWrapping="Wrap" Foreground="{StaticResource MandoGoldBrush}"/>
+                        </StackPanel>
+                    </Grid>
+
+                    <!-- Right pane: the editable fields — Name, Description, Instructions body -->
+                    <Grid Grid.Row="1" Grid.Column="1" RowSpacing="6">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+
+                        <StackPanel Spacing="6">
+                            <TextBlock Text="Name" FontSize="13" Opacity="0.8"/>
+                            <TextBox x:Name="Sk_Name" PlaceholderText="short name (e.g. commit-message)"/>
+
+                            <TextBlock Text="Description — one line; the AI matches this against your request to decide when to load the skill"
+                                       FontSize="13" Opacity="0.8" TextWrapping="Wrap" Margin="0,6,0,0"/>
+                            <TextBox x:Name="Sk_Description" TextWrapping="Wrap" AcceptsReturn="False"
+                                     PlaceholderText="Write a Conventional Commits message from staged changes"/>
+
+                            <Grid Margin="0,6,0,0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Text="Instructions (markdown) — the steps the AI follows once this skill loads"
+                                           FontSize="13" Opacity="0.8" TextWrapping="Wrap"/>
+                                <TextBlock Grid.Column="1" x:Name="Sk_BodySize" Text="" FontSize="11"
+                                           VerticalAlignment="Bottom" Margin="10,0,0,0"/>
+                            </Grid>
+                        </StackPanel>
+
+                        <TextBox Grid.Row="1" x:Name="Sk_Body" AcceptsReturn="True" TextWrapping="Wrap"
+                                 VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
+                                 VerticalContentAlignment="Top" TextChanged="Sk_Body_TextChanged"
+                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                 FontFamily="Cascadia Code,Consolas" FontSize="13"
+                                 PlaceholderText="## Steps&#x0a;1. Inspect the staged diff&#x0a;2. …"/>
+                    </Grid>
+
+                    <!-- Footer spanning both panes -->
+                    <Grid Grid.Row="2" Grid.ColumnSpan="2" ColumnSpacing="12">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <InfoBar x:Name="Sk_StatusBar" IsOpen="False" IsClosable="True" Severity="Error"
+                                 VerticalAlignment="Center"/>
+                        <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8" HorizontalAlignment="Right">
+                            <Button Content="Cancel" Click="SkillEditorCancel_Click"/>
+                            <Button x:Name="SkillEditorSaveButton" Content="Save" Click="SkillEditorSave_Click"
+                                    Style="{StaticResource AccentButtonStyle}"/>
+                        </StackPanel>
+                    </Grid>
+                </Grid>
+            </Border>
+        </Grid>
+
+        <!-- ======= Skill install modal ======= -->
+        <Grid x:Name="SkillInstallOverlay" Grid.ColumnSpan="3" Visibility="Collapsed"
+              Background="#B0000000">
+            <Border Width="600" Padding="24"
+                    HorizontalAlignment="Center" VerticalAlignment="Center"
+                    Background="{StaticResource MandoPanelBrush}"
+                    BorderBrush="{StaticResource MandoAccentBrush}" BorderThickness="1"
+                    CornerRadius="12">
+                <StackPanel Spacing="12">
+                    <TextBlock Text="Install skills" FontSize="18" FontWeight="SemiBold"
+                               Foreground="{StaticResource MandoAccentBrush}"/>
+                    <TextBlock Text="A source can hold one skill (a SKILL.md at its root) or many (subfolders, each with a SKILL.md). Anything already installed is skipped."
+                               Opacity="0.6" FontSize="12" TextWrapping="Wrap"/>
+
+                    <RadioButtons x:Name="Sk_InstallMode" MaxColumns="2"
+                                  SelectionChanged="SkillInstallMode_Changed">
+                        <x:String>From Git</x:String>
+                        <x:String>From folder / .zip</x:String>
+                    </RadioButtons>
+
+                    <!-- Git: paste is the right interaction, so no Browse here. Needs Git installed. -->
+                    <StackPanel x:Name="Sk_InstallGitPanel" Spacing="6">
+                        <TextBox x:Name="Sk_InstallGitUrl"
+                                 Header="Repository URL"
+                                 PlaceholderText="https://github.com/user/my-skills.git"
+                                 FontFamily="Cascadia Code,Consolas"/>
+                        <TextBlock Text="Clones with git — Git must be installed and on PATH."
+                                   Opacity="0.5" FontSize="11"/>
+                    </StackPanel>
+
+                    <!-- Local: Browse so you don't have to type an exact path. -->
+                    <StackPanel x:Name="Sk_InstallLocalPanel" Spacing="6" Visibility="Collapsed">
+                        <TextBox x:Name="Sk_InstallLocalPath"
+                                 Header="Folder or .zip path"
+                                 PlaceholderText="C:\path\to\skill  (or a .zip)"
+                                 FontFamily="Cascadia Code,Consolas"/>
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <Button Click="SkillBrowseFolder_Click"
+                                    ToolTipService.ToolTip="Pick a folder containing a SKILL.md (or subfolders that do)">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon Glyph="&#xE8B7;" FontSize="13"/>
+                                    <TextBlock Text="Browse folder…"/>
+                                </StackPanel>
+                            </Button>
+                            <Button Click="SkillBrowseZip_Click"
+                                    ToolTipService.ToolTip="Pick a .zip archive of skills">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon Glyph="&#xE8B7;" FontSize="13"/>
+                                    <TextBlock Text="Browse .zip…"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <ProgressRing x:Name="Sk_InstallSpin" IsActive="False" Width="16" Height="16"
+                                      Visibility="Collapsed" VerticalAlignment="Center"/>
+                        <TextBlock x:Name="Sk_InstallStatus" Text="" FontSize="12" Opacity="0.8"
+                                   TextWrapping="Wrap" VerticalAlignment="Center"/>
+                    </StackPanel>
+                    <InfoBar x:Name="Sk_InstallError" IsOpen="False" IsClosable="True" Severity="Error"/>
+                    <StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Right">
+                        <Button Content="Cancel" Click="SkillInstallCancel_Click"/>
+                        <Button x:Name="SkillInstallConfirmButton" Content="Install" Click="SkillInstallConfirm_Click"
+                                Style="{StaticResource AccentButtonStyle}"/>
+                    </StackPanel>
+                </StackPanel>
+            </Border>
+        </Grid>
+
     </Grid>
 </Window>
diff --git a/src/MandoCode.Desktop/MainWindow.xaml.cs b/src/MandoCode.Desktop/MainWindow.xaml.cs
index 92043ba..02e1614 100644
--- a/src/MandoCode.Desktop/MainWindow.xaml.cs
+++ b/src/MandoCode.Desktop/MainWindow.xaml.cs
@@ -46,6 +46,44 @@ public sealed class McpRow
     public string Transport { get; init; } = "";
     public string Status { get; init; } = "";
     public SolidColorBrush StatusBrush { get; init; } = new(Colors.Gray);
+    /// <summary>Per-server on/off (the config's Disabled flag, inverted). Shared by every agent.</summary>
+    public bool Enabled { get; init; }
+}
+
+/// <summary>A section of the skills list (e.g. "Enabled (12)"). A List subclass so a
+/// CollectionViewSource can group on it directly; the header binds to <see cref="Key"/>.</summary>
+public sealed class SkillRowGroup : List<SkillRow>
+{
+    public string Key { get; }
+    public SkillRowGroup(string key, IEnumerable<SkillRow> items) : base(items) => Key = key;
+}
+
+/// <summary>A section of the MCP servers list (e.g. "Disabled (3)").</summary>
+public sealed class McpRowGroup : List<McpRow>
+{
+    public string Key { get; }
+    public McpRowGroup(string key, IEnumerable<McpRow> items) : base(items) => Key = key;
+}
+
+/// <summary>Row model for the global-skills page. FolderPath rides along so per-row actions
+/// (the enable toggle) can act on the right skill without leaning on list selection.</summary>
+public sealed class SkillRow
+{
+    public string Name { get; init; } = "";
+    public string Description { get; init; } = "";
+    public string Body { get; init; } = "";
+    public string FolderPath { get; init; } = "";
+    public bool Enabled { get; init; }
+
+    // Size of the instructions body — what gets injected into the prompt on load, so it's the cost
+    // that spins a local model up. ~4 chars/token is the usual rough estimate.
+    public int ApproxTokens => (Body.Length + 3) / 4;
+    public bool IsLarge => ApproxTokens >= 2000;
+    public string SizeLabel =>
+        (ApproxTokens >= 1000 ? $"≈{ApproxTokens / 1000.0:0.0}k tok" : $"≈{ApproxTokens} tok")
+        + (IsLarge ? " · large" : "");
+    public SolidColorBrush SizeBrush =>
+        new(ThemeManager.C(IsLarge ? ThemeManager.Current.Gold : ThemeManager.Current.Dim));
 }
 
 /// <summary>Chip model for the MCP editor's tool preview (test results).</summary>
@@ -76,6 +114,8 @@ public sealed partial class MainWindow : Window
 {
     private readonly SessionManager _sessions;
     private readonly SnapshotStore _snapshotStore;   // app-wide context snapshots
+    private readonly SkillCoordinator _skillCoordinator;   // app-wide global-skills manager
+    private readonly ConfigCoordinator _configs;   // owns the app-wide MCP server list (defaults)
     private readonly TranscriptHtmlBuilder _html;   // app-global, stateless formatter
     private readonly Microsoft.UI.Dispatching.DispatcherQueue _dispatcher;
     private bool _snapshotsPanelOpen;
@@ -118,6 +158,8 @@ public MainWindow()
         _html = services.GetRequiredService<TranscriptHtmlBuilder>();
         _sessions = services.GetRequiredService<SessionManager>();
         _snapshotStore = services.GetRequiredService<SnapshotStore>();
+        _skillCoordinator = services.GetRequiredService<SkillCoordinator>();
+        _configs = services.GetRequiredService<ConfigCoordinator>();
         // Changed can fire on a background thread (a capture during a model switch).
         _snapshotStore.Changed += () => OnUi(OnSnapshotsChanged);
 
@@ -253,6 +295,8 @@ private void NavSettings_Click(object sender, RoutedEventArgs e)
         => SwitchPage(_currentPage == "settings" ? "chat" : "settings");
     private void NavMcp_Click(object sender, RoutedEventArgs e)
         => SwitchPage(_currentPage == "mcp" ? "chat" : "mcp");
+    private void NavSkills_Click(object sender, RoutedEventArgs e)
+        => SwitchPage(_currentPage == "skills" ? "chat" : "skills");
     private void NavAppearance_Click(object sender, RoutedEventArgs e)
         => SwitchPage(_currentPage == "appearance" ? "chat" : "appearance");
 
@@ -263,12 +307,14 @@ private void SwitchPage(string page)
 
         SettingsPage.Visibility = page == "settings" ? Visibility.Visible : Visibility.Collapsed;
         McpPage.Visibility = page == "mcp" ? Visibility.Visible : Visibility.Collapsed;
+        SkillsPage.Visibility = page == "skills" ? Visibility.Visible : Visibility.Collapsed;
         AppearancePage.Visibility = page == "appearance" ? Visibility.Visible : Visibility.Collapsed;
 
         // Glide the full-screen page in from the rail side (translate + fade). Both run on the
         // composition thread, so the whole page slides smoothly regardless of how much it holds.
         if (page == "settings") SlideInPage(SettingsPage, SettingsPageTransform);
         else if (page == "mcp") SlideInPage(McpPage, McpPageTransform);
+        else if (page == "skills") SlideInPage(SkillsPage, SkillsPageTransform);
         else if (page == "appearance") SlideInPage(AppearancePage, AppearancePageTransform);
 
         // Every agent view stays loaded; only the selected one shows, and only on the chat page.
@@ -291,6 +337,9 @@ private void SwitchPage(string page)
             case "mcp":
                 _ = RefreshMcpListAsync();
                 break;
+            case "skills":
+                RefreshSkillsList();
+                break;
             default:
                 ActiveChat?.FocusInput();
                 break;
@@ -343,6 +392,7 @@ private void RefreshNavIcons()
         NavChatIcon.Foreground = _currentPage == "chat" ? accent : (approvalPending ? gold : normal);
         NavSettingsIcon.Foreground = _currentPage == "settings" ? accent : normal;
         NavMcpIcon.Foreground = _currentPage == "mcp" ? accent : normal;
+        NavSkillsIcon.Foreground = _currentPage == "skills" ? accent : normal;
         NavAppearanceIcon.Foreground = _currentPage == "appearance" ? accent : normal;
         NavSnapshotsIcon.Foreground = _snapshotsPanelOpen ? accent : normal;
         ToolTipService.SetToolTip(NavChat, approvalPending ? "Agents — approval waiting" : "Agents");
@@ -951,30 +1001,110 @@ private async void SettingsSave_Click(object sender, RoutedEventArgs e)
 
     private async void McpRefresh_Click(object sender, RoutedEventArgs e) => await RefreshMcpListAsync();
 
+    // Full unfiltered set; the list shows what matches the search box (see ApplyMcpFilter).
+    private List<McpRow> _allMcpRows = new();
+    private bool _loadingMcp;
+
     private async Task RefreshMcpListAsync()
     {
-        // Reflect the active agent's per-agent MCP opt-in (the servers themselves are app-wide).
-        // Guard so setting IsOn programmatically doesn't fire Setting_Toggled and re-apply it.
-        _loadingSettings = true;
-        McpEnableToggle.IsOn = _controller.Config.EnableMcp;
-        _loadingSettings = false;
+        // Servers are shared across agents and enabled/disabled per-server now, so MCP is always on
+        // at the agent level. Make sure the active agent actually attaches tools (new agents inherit
+        // EnableMcp=true from defaults; this only fires for an agent someone turned off previously).
+        if (!_controller.Config.EnableMcp)
+            await ApplySettingAsync("mcp", "true");
 
         McpPageStatus.Text = "Checking server status…";
         var rows = await Task.Run(_controller.GetMcpStatusRowsAsync);
 
         var green = (SolidColorBrush)Application.Current.Resources["MandoGreenBrush"];
         var gold = (SolidColorBrush)Application.Current.Resources["MandoGoldBrush"];
-        McpList.ItemsSource = rows.Select(r => new McpRow
+        _allMcpRows = rows.Select(r => new McpRow
         {
             Name = r.Name,
             Transport = r.Transport,
             Status = r.Status,
-            StatusBrush = r.Connected ? green : gold
+            StatusBrush = r.Connected ? green : gold,
+            Enabled = !r.Disabled,
         }).ToList();
 
-        McpPageStatus.Text = rows.Count == 0
-            ? "No MCP servers configured yet — add one below."
-            : $"{rows.Count} server(s) configured.";
+        ApplyMcpFilter();
+    }
+
+    private void McpSearch_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args) =>
+        ApplyMcpFilter();
+
+    private string _mcpFilter = "all";
+
+    private void McpFilter_Click(object sender, RoutedEventArgs e)
+    {
+        _mcpFilter = (string)((FrameworkElement)sender).Tag;
+        McpFilterAll.IsChecked = _mcpFilter == "all";
+        McpFilterEnabled.IsChecked = _mcpFilter == "enabled";
+        McpFilterDisabled.IsChecked = _mcpFilter == "disabled";
+        McpFilterFailed.IsChecked = _mcpFilter == "failed";
+        ApplyMcpFilter();
+    }
+
+    /// <summary>Applies search + active chip, then groups into Enabled/Disabled sections. The
+    /// programmatic ItemsSource set realizes rows (firing each toggle), guarded in McpEnabled_Toggled.</summary>
+    private void ApplyMcpFilter()
+    {
+        var q = McpSearchBox.Text?.Trim() ?? "";
+        IEnumerable<McpRow> filtered = _allMcpRows;
+        if (!string.IsNullOrEmpty(q))
+            filtered = filtered.Where(r =>
+                r.Name.Contains(q, StringComparison.OrdinalIgnoreCase) ||
+                r.Transport.Contains(q, StringComparison.OrdinalIgnoreCase));
+        filtered = _mcpFilter switch
+        {
+            "enabled" => filtered.Where(r => r.Enabled),
+            "disabled" => filtered.Where(r => !r.Enabled),
+            "failed" => filtered.Where(r => r.Status.StartsWith("failed", StringComparison.OrdinalIgnoreCase)),
+            _ => filtered,
+        };
+        var shown = filtered.ToList();
+
+        var groups = new List<McpRowGroup>();
+        var en = shown.Where(r => r.Enabled).ToList();
+        var dis = shown.Where(r => !r.Enabled).ToList();
+        if (en.Count > 0) groups.Add(new McpRowGroup($"Enabled ({en.Count})", en));
+        if (dis.Count > 0) groups.Add(new McpRowGroup($"Disabled ({dis.Count})", dis));
+
+        var cvs = new Microsoft.UI.Xaml.Data.CollectionViewSource { IsSourceGrouped = true, Source = groups };
+        _loadingMcp = true;
+        McpList.ItemsSource = cvs.View;
+        _loadingMcp = false;
+
+        McpEditButton.IsEnabled = false;
+        McpRemoveButton.IsEnabled = false;
+
+        var total = _allMcpRows.Count;
+        var enabledTotal = _allMcpRows.Count(r => r.Enabled);
+        var active = q.Length > 0 || _mcpFilter != "all";
+        if (total == 0)
+            McpPageStatus.Text = "No MCP servers configured yet — “Add MCP Server” to connect one.";
+        else if (active)
+            McpPageStatus.Text = $"{shown.Count} of {total} shown  ·  {enabledTotal} enabled";
+        else
+            McpPageStatus.Text = $"{total} server{(total == 1 ? "" : "s")}, {enabledTotal} enabled";
+    }
+
+    /// <summary>Per-server on/off. Flips the shared config's Disabled flag and saves, which restarts
+    /// the servers and re-registers tools on every agent (SaveMcpServerAsync → coordinator reload).</summary>
+    private async void McpEnabled_Toggled(object sender, RoutedEventArgs e)
+    {
+        // Fires while the list realizes rows and binds IsOn — ignore those (state already matches).
+        if (_loadingMcp) return;
+        if (sender is not ToggleSwitch sw || sw.DataContext is not McpRow row) return;
+        if (sw.IsOn == row.Enabled) return;
+
+        // Edit the canonical defaults entry (what SaveMcpServerAsync persists), flip Disabled, save.
+        if (!_configs.Defaults.McpServers.TryGetValue(row.Name, out var server)) return;
+        server.Disabled = !sw.IsOn;
+
+        McpPageStatus.Text = sw.IsOn ? $"Enabling “{row.Name}”…" : $"Disabling “{row.Name}”…";
+        await Task.Run(() => _controller.SaveMcpServerAsync(row.Name, row.Name, server));
+        await RefreshMcpListAsync();
     }
 
     /// <summary>Runs a slash command through the normal pipeline (transcript echo, wizard
@@ -1231,4 +1361,442 @@ private async void McpEditorSave_Click(object sender, RoutedEventArgs e)
         McpPageStatus.Text = message;
     }
 
+    // ============================================================
+    // Skills page — global (user) skills. All file work lives in SkillCoordinator; this is just
+    // the UI + the fan-out call that makes a change land in every open agent's prompt.
+    // ============================================================
+
+    private string? _editingSkillFolder;
+
+    // Full unfiltered set; the ListView shows whatever matches the search box (see ApplySkillFilter).
+    private List<SkillRow> _allSkillRows = new();
+
+    private void RefreshSkillsList()
+    {
+        _allSkillRows = _skillCoordinator.ListGlobalSkills().Select(s => new SkillRow
+        {
+            Name = s.Name,
+            Description = s.Description,
+            Body = s.Body,
+            FolderPath = s.FolderPath,
+            Enabled = s.Enabled,
+        }).ToList();
+
+        ApplySkillFilter();
+    }
+
+    private void SkillSearch_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args) =>
+        ApplySkillFilter();
+
+    private string _skillFilter = "all";
+
+    private void SkillFilter_Click(object sender, RoutedEventArgs e)
+    {
+        _skillFilter = (string)((FrameworkElement)sender).Tag;
+        // Single-select: light the chosen chip, clear the rest.
+        SkillFilterAll.IsChecked = _skillFilter == "all";
+        SkillFilterEnabled.IsChecked = _skillFilter == "enabled";
+        SkillFilterDisabled.IsChecked = _skillFilter == "disabled";
+        SkillFilterLarge.IsChecked = _skillFilter == "large";
+        ApplySkillFilter();
+    }
+
+    /// <summary>Applies the search text + active chip, then groups the result into Enabled/Disabled
+    /// sections. Runs on every refresh and keystroke, so filters survive enable/install/delete.</summary>
+    private void ApplySkillFilter()
+    {
+        var q = SkillSearchBox.Text?.Trim() ?? "";
+        IEnumerable<SkillRow> filtered = _allSkillRows;
+        if (!string.IsNullOrEmpty(q))
+            filtered = filtered.Where(r =>
+                r.Name.Contains(q, StringComparison.OrdinalIgnoreCase) ||
+                r.Description.Contains(q, StringComparison.OrdinalIgnoreCase));
+        filtered = _skillFilter switch
+        {
+            "enabled" => filtered.Where(r => r.Enabled),
+            "disabled" => filtered.Where(r => !r.Enabled),
+            "large" => filtered.Where(r => r.IsLarge),
+            _ => filtered,
+        };
+        var shown = filtered.ToList();
+
+        // Group by state — Enabled first, Disabled below; empty sections omitted.
+        var groups = new List<SkillRowGroup>();
+        var en = shown.Where(r => r.Enabled).ToList();
+        var dis = shown.Where(r => !r.Enabled).ToList();
+        if (en.Count > 0) groups.Add(new SkillRowGroup($"Enabled ({en.Count})", en));
+        if (dis.Count > 0) groups.Add(new SkillRowGroup($"Disabled ({dis.Count})", dis));
+
+        var cvs = new Microsoft.UI.Xaml.Data.CollectionViewSource { IsSourceGrouped = true, Source = groups };
+        SkillsList.ItemsSource = cvs.View;
+
+        // Resetting ItemsSource clears the selection, so the selection-scoped buttons go with it.
+        SkillEditButton.IsEnabled = false;
+        SkillDeleteButton.IsEnabled = false;
+
+        var total = _allSkillRows.Count;
+        var enabledTotal = _allSkillRows.Count(r => r.Enabled);
+        var active = q.Length > 0 || _skillFilter != "all";
+        if (total == 0)
+            SkillsPageStatus.Text = $"No global skills yet — “New Skill” or “Install from…” to add one.  ({_skillCoordinator.UserSkillsDirectory})";
+        else if (active)
+            SkillsPageStatus.Text = $"{shown.Count} of {total} shown  ·  {enabledTotal} enabled";
+        else
+            SkillsPageStatus.Text = $"{total} skill{(total == 1 ? "" : "s")}, {enabledTotal} enabled  ·  {_skillCoordinator.UserSkillsDirectory}";
+    }
+
+    /// <summary>Reload every agent's skill set + prompt, then re-render the list and report.</summary>
+    private async Task ApplySkillChangeAsync(string status)
+    {
+        await _skillCoordinator.ReloadAllAsync();
+        RefreshSkillsList();
+        SkillsPageStatus.Text = status;
+    }
+
+    private void SkillRefresh_Click(object sender, RoutedEventArgs e) => RefreshSkillsList();
+
+    private void SkillsList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        var has = SkillsList.SelectedItem is SkillRow;
+        SkillEditButton.IsEnabled = has;
+        SkillDeleteButton.IsEnabled = has;
+    }
+
+    private void SkillsList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
+    {
+        if (SkillsList.SelectedItem is SkillRow row) OpenSkillEditor(row);
+    }
+
+    private async void SkillEnabled_Toggled(object sender, RoutedEventArgs e)
+    {
+        // Toggled also fires while the list realizes rows and binds IsOn from the row. In that case
+        // the new state equals the row's stored state — a no-op we must ignore, or realizing the
+        // list would rewrite files. A real user flip makes the two differ.
+        if (sender is not ToggleSwitch sw || sw.DataContext is not SkillRow row) return;
+        if (sw.IsOn == row.Enabled) return;
+
+        try
+        {
+            _skillCoordinator.SetEnabled(row.FolderPath, sw.IsOn);
+            await ApplySkillChangeAsync(sw.IsOn ? $"Enabled “{row.Name}”." : $"Disabled “{row.Name}”.");
+        }
+        catch (Exception ex)
+        {
+            SkillsPageStatus.Text = ex.Message;
+        }
+    }
+
+    private void SkillNew_Click(object sender, RoutedEventArgs e) => OpenSkillEditor(null);
+
+    private void SkillEdit_Click(object sender, RoutedEventArgs e)
+    {
+        if (SkillsList.SelectedItem is SkillRow row) OpenSkillEditor(row);
+    }
+
+    private async void SkillDelete_Click(object sender, RoutedEventArgs e)
+    {
+        if (SkillsList.SelectedItem is not SkillRow row) return;
+
+        var dialog = new ContentDialog
+        {
+            Title = "Delete skill",
+            Content = $"Delete “{row.Name}”? This removes its folder from disk and can't be undone.",
+            PrimaryButtonText = "Delete",
+            CloseButtonText = "Cancel",
+            DefaultButton = ContentDialogButton.Close,
+            XamlRoot = Content.XamlRoot,
+        };
+        if (await dialog.ShowAsync() != ContentDialogResult.Primary) return;
+
+        try
+        {
+            _skillCoordinator.DeleteSkill(row.FolderPath);
+            await ApplySkillChangeAsync($"Deleted “{row.Name}”.");
+        }
+        catch (Exception ex)
+        {
+            SkillsPageStatus.Text = ex.Message;
+        }
+    }
+
+    private void SkillOpenFolder_Click(object sender, RoutedEventArgs e)
+    {
+        var dir = _skillCoordinator.UserSkillsDirectory;
+        try
+        {
+            System.IO.Directory.CreateDirectory(dir);
+            Process.Start(new ProcessStartInfo { FileName = dir, UseShellExecute = true });
+        }
+        catch (Exception ex)
+        {
+            SkillsPageStatus.Text = ex.Message;
+        }
+    }
+
+    // ---- Skill editor modal ----
+
+    private void OpenSkillEditor(SkillRow? row)
+    {
+        Sk_StatusBar.IsOpen = false;
+        if (row == null)
+        {
+            _editingSkillFolder = null;
+            SkillEditorTitle.Text = "New skill";
+            Sk_Name.Text = "";
+            Sk_Description.Text = "";
+            Sk_Body.Text = "";
+        }
+        else
+        {
+            _editingSkillFolder = row.FolderPath;
+            SkillEditorTitle.Text = "Edit skill";
+            Sk_Name.Text = row.Name;
+            Sk_Description.Text = row.Description;
+            Sk_Body.Text = row.Body;
+        }
+
+        // Reset the AI panel and default its model to the active agent's (still changeable).
+        Sk_AiIntent.Text = "";
+        SetSkillAiBusy(false, "");
+        _ = LoadSkillAuthorModelsAsync(_sessions.Active?.Controller.ModelName ?? "");
+
+        UpdateSkillBodySize();   // explicit: setting Text="" above won't fire TextChanged if already empty
+        SkillEditorOverlay.Visibility = Visibility.Visible;
+        Sk_Name.Focus(FocusState.Programmatic);
+    }
+
+    private void Sk_Body_TextChanged(object sender, TextChangedEventArgs e) => UpdateSkillBodySize();
+
+    /// <summary>Live size readout for the instructions body — approximate tokens, gold when large,
+    /// matching the size column in the skills list.</summary>
+    private void UpdateSkillBodySize()
+    {
+        var chars = Sk_Body.Text?.Length ?? 0;
+        var tokens = (chars + 3) / 4;
+        var large = tokens >= 2000;
+        Sk_BodySize.Text = (tokens >= 1000 ? $"≈{tokens / 1000.0:0.0}k tokens" : $"≈{tokens} tokens")
+            + (large ? " · large — heavy on local models" : "");
+        Sk_BodySize.Foreground = new SolidColorBrush(
+            ThemeManager.C(large ? ThemeManager.Current.Gold : ThemeManager.Current.Dim));
+    }
+
+    /// <summary>Fills the AI model dropdown: the active agent's model shown selected instantly, then
+    /// the full installed-model list streamed in behind it. Mirrors the snapshot picker.</summary>
+    private async Task LoadSkillAuthorModelsAsync(string activeModel)
+    {
+        if (string.IsNullOrWhiteSpace(activeModel))
+        {
+            Sk_AiModel.ItemsSource = null;
+            return;
+        }
+
+        var current = new ModelChoice(activeModel, MandoCodeConfig.IsCloudModel(activeModel));
+        Sk_AiModel.ItemsSource = new List<ModelChoice> { current };
+        Sk_AiModel.SelectedIndex = 0;
+
+        var result = await _controller.LoadAvailableModelsAsync();
+        if (!result.Ok || result.Models.Count == 0) return;
+
+        // If the user already picked another model while the list loaded, don't clobber it.
+        if ((Sk_AiModel.SelectedItem as ModelChoice)?.Name != activeModel) return;
+
+        var choices = result.Models
+            .Select(m => new ModelChoice(m, MandoCodeConfig.IsCloudModel(m)))
+            .ToList();
+        if (!choices.Any(c => string.Equals(c.Name, activeModel, StringComparison.OrdinalIgnoreCase)))
+            choices.Insert(0, current);
+
+        Sk_AiModel.ItemsSource = choices;
+        Sk_AiModel.SelectedItem =
+            choices.First(c => string.Equals(c.Name, activeModel, StringComparison.OrdinalIgnoreCase));
+    }
+
+    private void SetSkillAiBusy(bool busy, string status)
+    {
+        Sk_AiSpin.Visibility = busy ? Visibility.Visible : Visibility.Collapsed;
+        Sk_AiSpin.IsActive = busy;
+        Sk_GenerateButton.IsEnabled = !busy;
+        Sk_RefineButton.IsEnabled = !busy;
+        Sk_AiStatus.Text = status;
+    }
+
+    private async void SkillGenerate_Click(object sender, RoutedEventArgs e)
+    {
+        var intent = Sk_AiIntent.Text.Trim();
+        if (intent.Length == 0) { Sk_AiStatus.Text = "Describe what the skill should do first."; return; }
+        if (Sk_AiModel.SelectedItem is not ModelChoice model) { Sk_AiStatus.Text = "Pick a model first."; return; }
+
+        Sk_StatusBar.IsOpen = false;
+        SetSkillAiBusy(true, "Drafting…");
+        try
+        {
+            var endpoint = _sessions.Active!.Config.OllamaEndpoint;
+            var draft = await SkillAuthor.GenerateAsync(endpoint, model.Name, intent);
+            if (!string.IsNullOrWhiteSpace(draft.Name)) Sk_Name.Text = draft.Name;
+            if (!string.IsNullOrWhiteSpace(draft.Description)) Sk_Description.Text = draft.Description;
+            if (!string.IsNullOrWhiteSpace(draft.Body)) Sk_Body.Text = draft.Body;
+            SetSkillAiBusy(false, "Draft ready — review and edit before saving.");
+        }
+        catch (Exception ex)
+        {
+            SetSkillAiBusy(false, "");
+            ShowSkillEditorError($"AI draft failed: {ex.Message}");
+        }
+    }
+
+    private async void SkillRefine_Click(object sender, RoutedEventArgs e)
+    {
+        var instruction = Sk_AiIntent.Text.Trim();
+        if (instruction.Length == 0) { Sk_AiStatus.Text = "Type what to change in the box above."; return; }
+        if (Sk_Body.Text.Trim().Length == 0) { Sk_AiStatus.Text = "Nothing to refine yet — write or generate instructions first."; return; }
+        if (Sk_AiModel.SelectedItem is not ModelChoice model) { Sk_AiStatus.Text = "Pick a model first."; return; }
+
+        Sk_StatusBar.IsOpen = false;
+        SetSkillAiBusy(true, "Refining…");
+        try
+        {
+            var endpoint = _sessions.Active!.Config.OllamaEndpoint;
+            var body = await SkillAuthor.RefineAsync(endpoint, model.Name, Sk_Body.Text, instruction);
+            if (!string.IsNullOrWhiteSpace(body)) Sk_Body.Text = body;
+            SetSkillAiBusy(false, "Instructions updated.");
+        }
+        catch (Exception ex)
+        {
+            SetSkillAiBusy(false, "");
+            ShowSkillEditorError($"AI refine failed: {ex.Message}");
+        }
+    }
+
+    private void SkillEditorCancel_Click(object sender, RoutedEventArgs e) =>
+        SkillEditorOverlay.Visibility = Visibility.Collapsed;
+
+    private void ShowSkillEditorError(string message)
+    {
+        Sk_StatusBar.Title = "Check the form";
+        Sk_StatusBar.Message = message;
+        Sk_StatusBar.IsOpen = true;
+    }
+
+    private async void SkillEditorSave_Click(object sender, RoutedEventArgs e)
+    {
+        var name = Sk_Name.Text.Trim();
+        if (name.Length == 0) { ShowSkillEditorError("Give the skill a name."); return; }
+        if (Sk_Body.Text.Trim().Length == 0) { ShowSkillEditorError("The instructions can't be empty."); return; }
+
+        try
+        {
+            _skillCoordinator.SaveSkill(_editingSkillFolder, name, Sk_Description.Text, Sk_Body.Text);
+            SkillEditorOverlay.Visibility = Visibility.Collapsed;
+            await ApplySkillChangeAsync($"Saved “{name}”.");
+        }
+        catch (Exception ex)
+        {
+            ShowSkillEditorError(ex.Message);
+        }
+    }
+
+    // ---- Skill install modal ----
+
+    private void SkillInstall_Click(object sender, RoutedEventArgs e)
+    {
+        Sk_InstallMode.SelectedIndex = 0;   // Git by default
+        Sk_InstallGitPanel.Visibility = Visibility.Visible;
+        Sk_InstallLocalPanel.Visibility = Visibility.Collapsed;
+        Sk_InstallGitUrl.Text = "";
+        Sk_InstallLocalPath.Text = "";
+        Sk_InstallStatus.Text = "";
+        Sk_InstallError.IsOpen = false;
+        Sk_InstallSpin.IsActive = false;
+        Sk_InstallSpin.Visibility = Visibility.Collapsed;
+        SkillInstallConfirmButton.IsEnabled = true;
+        SkillInstallOverlay.Visibility = Visibility.Visible;
+        Sk_InstallGitUrl.Focus(FocusState.Programmatic);
+    }
+
+    private void SkillInstallMode_Changed(object sender, SelectionChangedEventArgs e)
+    {
+        // Fires during InitializeComponent before the panels exist.
+        if (Sk_InstallGitPanel == null || Sk_InstallLocalPanel == null) return;
+        var local = Sk_InstallMode.SelectedIndex == 1;
+        Sk_InstallGitPanel.Visibility = local ? Visibility.Collapsed : Visibility.Visible;
+        Sk_InstallLocalPanel.Visibility = local ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    private async void SkillBrowseFolder_Click(object sender, RoutedEventArgs e)
+    {
+        var picker = new Windows.Storage.Pickers.FolderPicker();
+        picker.FileTypeFilter.Add("*");
+        WinRT.Interop.InitializeWithWindow.Initialize(picker, WinRT.Interop.WindowNative.GetWindowHandle(this));
+        var folder = await picker.PickSingleFolderAsync();
+        if (folder != null) Sk_InstallLocalPath.Text = folder.Path;
+    }
+
+    private async void SkillBrowseZip_Click(object sender, RoutedEventArgs e)
+    {
+        var picker = new Windows.Storage.Pickers.FileOpenPicker();
+        picker.FileTypeFilter.Add(".zip");
+        WinRT.Interop.InitializeWithWindow.Initialize(picker, WinRT.Interop.WindowNative.GetWindowHandle(this));
+        var file = await picker.PickSingleFileAsync();
+        if (file != null) Sk_InstallLocalPath.Text = file.Path;
+    }
+
+    private void SkillInstallCancel_Click(object sender, RoutedEventArgs e) =>
+        SkillInstallOverlay.Visibility = Visibility.Collapsed;
+
+    private async void SkillInstallConfirm_Click(object sender, RoutedEventArgs e)
+    {
+        var source = (Sk_InstallMode.SelectedIndex == 1 ? Sk_InstallLocalPath.Text : Sk_InstallGitUrl.Text).Trim();
+        if (source.Length == 0)
+        {
+            Sk_InstallError.Title = "Nothing to install";
+            Sk_InstallError.Message = "Enter a git URL, a .zip path, or a folder path.";
+            Sk_InstallError.IsOpen = true;
+            return;
+        }
+
+        Sk_InstallError.IsOpen = false;
+        Sk_InstallSpin.Visibility = Visibility.Visible;
+        Sk_InstallSpin.IsActive = true;
+        Sk_InstallStatus.Text = "Fetching…";
+        SkillInstallConfirmButton.IsEnabled = false;
+
+        try
+        {
+            // Clone / extract / copy can block; keep it off the UI thread.
+            var result = await Task.Run(() => _skillCoordinator.InstallFrom(source));
+
+            // Nothing found: keep the modal open so the user can fix the source, and say what a
+            // valid source looks like. (finally still resets the spinner/button below.)
+            if (result.Installed.Count == 0 && result.Skipped.Count == 0)
+            {
+                Sk_InstallError.Title = "No skills found";
+                Sk_InstallError.Message = "That source has no SKILL.md. A skill is a folder containing a SKILL.md file — point at one, or at a folder/repo/.zip that holds them (nested is fine).";
+                Sk_InstallError.IsOpen = true;
+                return;
+            }
+
+            SkillInstallOverlay.Visibility = Visibility.Collapsed;
+            await _skillCoordinator.ReloadAllAsync();
+            RefreshSkillsList();
+
+            var parts = new List<string>();
+            if (result.Installed.Count > 0) parts.Add($"installed {string.Join(", ", result.Installed)}");
+            if (result.Skipped.Count > 0) parts.Add($"skipped (already present): {string.Join(", ", result.Skipped)}");
+            SkillsPageStatus.Text = string.Join("  ·  ", parts);
+        }
+        catch (Exception ex)
+        {
+            Sk_InstallError.Title = "Install failed";
+            Sk_InstallError.Message = ex.Message;
+            Sk_InstallError.IsOpen = true;
+        }
+        finally
+        {
+            Sk_InstallSpin.IsActive = false;
+            Sk_InstallSpin.Visibility = Visibility.Collapsed;
+            Sk_InstallStatus.Text = "";
+            SkillInstallConfirmButton.IsEnabled = true;
+        }
+    }
+
 }
diff --git a/src/MandoCode.Desktop/Services/SessionManager.cs b/src/MandoCode.Desktop/Services/SessionManager.cs
index 4c9e0fe..efc1175 100644
--- a/src/MandoCode.Desktop/Services/SessionManager.cs
+++ b/src/MandoCode.Desktop/Services/SessionManager.cs
@@ -12,6 +12,7 @@ public sealed class SessionManager
     private readonly IServiceProvider _globals;
     private readonly ConfigCoordinator _configs;
     private readonly McpCoordinator _mcp;
+    private readonly SkillCoordinator _skills;
     private readonly string _initialProjectRoot;
     private readonly List<AgentSession> _sessions = new();
 
@@ -28,15 +29,18 @@ public SessionManager(
         IServiceProvider globals,
         ConfigCoordinator configs,
         McpCoordinator mcp,
+        SkillCoordinator skills,
         string initialProjectRoot)
     {
         _globals = globals;
         _configs = configs;
         _mcp = mcp;
+        _skills = skills;
         _initialProjectRoot = initialProjectRoot;
 
         _configs.SessionsAccessor = () => _sessions;
         _mcp.SessionsAccessor = () => _sessions;
+        _skills.SessionsAccessor = () => _sessions;
     }
 
     /// <summary>
diff --git a/src/MandoCode.Desktop/Services/SkillAuthor.cs b/src/MandoCode.Desktop/Services/SkillAuthor.cs
new file mode 100644
index 0000000..2c5991d
--- /dev/null
+++ b/src/MandoCode.Desktop/Services/SkillAuthor.cs
@@ -0,0 +1,121 @@
+using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.ChatCompletion;
+using Microsoft.SemanticKernel.Connectors.Ollama;
+
+namespace MandoCode.Desktop.Services;
+
+/// <summary>A model-drafted skill, split into the three fields the editor binds to.</summary>
+public sealed record DraftSkill(string Name, string Description, string Body);
+
+/// <summary>
+/// One-shot LLM helper that drafts and refines skills for the Skills editor. Like
+/// <see cref="SnapshotEnhancer"/>, it builds a bare Ollama kernel — no plugins, tools, filters, or
+/// shared history — so authoring can never touch a live agent's conversation or fire a tool call.
+/// The draft is returned to the editor for the user to review and edit before anything is saved;
+/// nothing here writes to disk.
+///
+/// Generation asks the model for a complete SKILL.md (frontmatter + body) and splits it back into
+/// name / description / body, so a generated skill is well-formed by construction.
+/// </summary>
+public static class SkillAuthor
+{
+    private const string GenerateSystem =
+        "You write SKILL.md files for an AI coding assistant. A skill is a named, reusable set of " +
+        "instructions the assistant loads on demand when a user's request matches the skill's " +
+        "description. Given the user's intent, output ONE complete SKILL.md and NOTHING else: no " +
+        "commentary, no code fences. Format EXACTLY:\n" +
+        "---\n" +
+        "name: <short-kebab-case-name>\n" +
+        "description: <one sentence, written so the assistant can match it to a request>\n" +
+        "---\n" +
+        "<markdown body: the concrete steps/rules the assistant should follow when this skill loads>\n\n" +
+        "Keep the body focused and actionable — numbered steps or short sections. Don't restate the " +
+        "description. Don't invent tools or file paths that weren't implied by the intent.";
+
+    private const string RefineSystem =
+        "You improve the instructions body of a SKILL.md for an AI coding assistant. Apply the user's " +
+        "requested change to the instructions below and return ONLY the revised markdown body — no " +
+        "frontmatter, no commentary, no code fences. Keep what already works; change what was asked. " +
+        "Keep it concrete and actionable.";
+
+    /// <summary>Drafts a new skill from a one-line intent. Throws on connection/model failure.</summary>
+    public static async Task<DraftSkill> GenerateAsync(
+        string endpoint, string model, string intent, CancellationToken ct = default)
+    {
+        var raw = await CompleteAsync(endpoint, model, GenerateSystem, intent.Trim(), ct);
+        return ParseDraft(StripFences(raw));
+    }
+
+    /// <summary>Rewrites an existing instructions body against an instruction. Returns the new body.</summary>
+    public static async Task<string> RefineAsync(
+        string endpoint, string model, string currentBody, string instruction, CancellationToken ct = default)
+    {
+        var user = $"Requested change:\n{instruction.Trim()}\n\nCurrent instructions:\n{currentBody.Trim()}";
+        var raw = await CompleteAsync(endpoint, model, RefineSystem, user, ct);
+        return StripFences(raw).Trim();
+    }
+
+    private static async Task<string> CompleteAsync(
+        string endpoint, string model, string system, string user, CancellationToken ct)
+    {
+        var kernel = Kernel.CreateBuilder()
+            .AddOllamaChatCompletion(modelId: model, endpoint: new Uri(endpoint))
+            .Build();
+        var chat = kernel.GetRequiredService<IChatCompletionService>();
+
+        var history = new ChatHistory();
+        history.AddSystemMessage(system);
+        history.AddUserMessage(user);
+
+        // A touch of latitude helps phrasing without drifting off-spec.
+        var settings = new OllamaPromptExecutionSettings { Temperature = 0.4f };
+        var result = await chat.GetChatMessageContentAsync(history, settings, kernel, ct);
+        return result.Content?.Trim() ?? "";
+    }
+
+    /// <summary>Strips a wrapping ```fenced block if the model added one despite instructions.</summary>
+    private static string StripFences(string text)
+    {
+        var t = text.Trim();
+        if (!t.StartsWith("```")) return t;
+
+        var firstNewline = t.IndexOf('\n');
+        if (firstNewline < 0) return t;
+        t = t.Substring(firstNewline + 1);              // drop the opening ```lang line
+        var lastFence = t.LastIndexOf("```", StringComparison.Ordinal);
+        if (lastFence >= 0) t = t.Substring(0, lastFence);
+        return t.Trim();
+    }
+
+    /// <summary>Splits a generated SKILL.md into name/description/body. Mirrors the engine's
+    /// frontmatter shape; on anything unexpected it degrades to "whole thing is the body" so the
+    /// user still gets something editable rather than an error.</summary>
+    private static DraftSkill ParseDraft(string raw)
+    {
+        var norm = raw.Replace("\r\n", "\n").Trim();
+        string name = "", description = "", body = norm;
+
+        if (norm.StartsWith("---\n"))
+        {
+            var after = norm.Substring(4);
+            var close = after.IndexOf("\n---", StringComparison.Ordinal);
+            if (close >= 0)
+            {
+                var frontmatter = after.Substring(0, close);
+                body = after.Substring(close + 4).TrimStart('\n');
+
+                foreach (var line in frontmatter.Split('\n'))
+                {
+                    var idx = line.IndexOf(':');
+                    if (idx <= 0) continue;
+                    var key = line.Substring(0, idx).Trim().ToLowerInvariant();
+                    var val = line.Substring(idx + 1).Trim().Trim('"', '\'');
+                    if (key == "name") name = val;
+                    else if (key == "description") description = val;
+                }
+            }
+        }
+
+        return new DraftSkill(name, description, body.Trim());
+    }
+}
diff --git a/src/MandoCode.Desktop/Services/SkillCoordinator.cs b/src/MandoCode.Desktop/Services/SkillCoordinator.cs
new file mode 100644
index 0000000..d373ad2
--- /dev/null
+++ b/src/MandoCode.Desktop/Services/SkillCoordinator.cs
@@ -0,0 +1,376 @@
+using System.Diagnostics;
+using System.IO.Compression;
+using MandoCode.Models;
+
+namespace MandoCode.Desktop.Services;
+
+/// <summary>
+/// App-global owner of the user's (global) skills — the folders under
+/// <c>~/.mandocode/skills</c> (or the configured override). Skills are just directories
+/// each holding a <c>SKILL.md</c>; this service is the UI's create / edit / delete /
+/// enable / install surface for them, plus the fan-out that makes changes reach every
+/// open agent.
+///
+/// Every agent has its OWN <see cref="SkillLoader"/> and its "Available Skills" block is
+/// baked into that agent's system prompt when its kernel is built. So, exactly like
+/// <see cref="McpCoordinator"/> does for MCP tools, a change to the skill set on disk only
+/// reaches a live conversation once we reload that agent's loader and rebuild its prompt —
+/// which is what <see cref="ReloadAllAsync"/> does across every session.
+///
+/// PROJECT skills (a repo's <c>.mandocode/skills</c>) are deliberately out of scope here:
+/// they belong to a checkout, not the app, so they aren't managed from this global surface.
+///
+/// DISABLE without an engine change: the loader skips any folder lacking a <c>SKILL.md</c>,
+/// so disabling renames <c>SKILL.md</c> → <c>SKILL.md.disabled</c> and enabling renames it
+/// back. Reversible, and invisible to the engine.
+/// </summary>
+public sealed class SkillCoordinator
+{
+    private const string SkillFile = "SKILL.md";
+    private const string DisabledSkillFile = "SKILL.md.disabled";
+
+    private readonly MandoCodeConfig _defaults;
+
+    /// <summary>Set by <see cref="SessionManager"/>, same as the other coordinators.</summary>
+    public Func<IEnumerable<AgentSession>> SessionsAccessor { get; set; } = Array.Empty<AgentSession>;
+
+    public SkillCoordinator(MandoCodeConfig defaults)
+    {
+        _defaults = defaults;
+    }
+
+    /// <summary>The app-wide user-skills directory every agent scans.</summary>
+    public string UserSkillsDirectory => _defaults.GetEffectiveUserSkillsDirectory();
+
+    // ---------------------------------------------------------------- read
+
+    /// <summary>
+    /// Lists the global skills as management rows — including DISABLED ones, which the
+    /// engine's loader hides. Ordered by name. Malformed folders are skipped silently.
+    /// </summary>
+    public IReadOnlyList<SkillEntry> ListGlobalSkills()
+    {
+        var dir = UserSkillsDirectory;
+        var rows = new List<SkillEntry>();
+        if (string.IsNullOrWhiteSpace(dir) || !Directory.Exists(dir))
+            return rows;
+
+        foreach (var folder in Directory.EnumerateDirectories(dir))
+        {
+            var enabledPath = Path.Combine(folder, SkillFile);
+            var disabledPath = Path.Combine(folder, DisabledSkillFile);
+
+            var enabled = File.Exists(enabledPath);
+            var path = enabled ? enabledPath : (File.Exists(disabledPath) ? disabledPath : null);
+            if (path == null) continue;   // a draft folder with neither file
+
+            var skill = SkillParser.ParseFile(path, SkillSource.User, out _);
+            var folderName = Path.GetFileName(folder);
+            rows.Add(new SkillEntry
+            {
+                Name = skill?.Name ?? folderName,
+                Description = skill?.Description ?? "",
+                Body = skill?.Body ?? "",
+                FolderPath = folder,
+                Enabled = enabled,
+            });
+        }
+
+        return rows.OrderBy(r => r.Name, StringComparer.OrdinalIgnoreCase).ToList();
+    }
+
+    // ---------------------------------------------------------------- CRUD
+
+    /// <summary>
+    /// Writes a skill's <c>SKILL.md</c>. <paramref name="originalFolder"/> is the folder being
+    /// edited (null for a new skill); when the name changes on edit, the folder is renamed to
+    /// match so the two stay in step. Returns the skill's folder path.
+    /// </summary>
+    public string SaveSkill(string? originalFolder, string name, string description, string body)
+    {
+        name = name.Trim();
+        if (string.IsNullOrWhiteSpace(name))
+            throw new ArgumentException("A skill needs a name.");
+
+        var slug = Slug(name);
+        var root = UserSkillsDirectory;
+        Directory.CreateDirectory(root);
+
+        var targetFolder = Path.Combine(root, slug);
+
+        // Editing and the name (hence slug) changed: move the existing folder rather than
+        // orphaning it. Guard against clobbering a different existing skill.
+        if (originalFolder != null &&
+            !string.Equals(originalFolder, targetFolder, StringComparison.OrdinalIgnoreCase))
+        {
+            if (Directory.Exists(targetFolder))
+                throw new InvalidOperationException($"A skill folder named '{slug}' already exists.");
+            Directory.Move(originalFolder, targetFolder);
+        }
+        else if (originalFolder == null && Directory.Exists(targetFolder))
+        {
+            throw new InvalidOperationException($"A skill named '{name}' already exists.");
+        }
+
+        Directory.CreateDirectory(targetFolder);
+
+        // Preserve the enabled/disabled state of the file we're rewriting.
+        var wasDisabled = originalFolder != null &&
+                          !File.Exists(Path.Combine(targetFolder, SkillFile)) &&
+                          File.Exists(Path.Combine(targetFolder, DisabledSkillFile));
+        var fileName = wasDisabled ? DisabledSkillFile : SkillFile;
+
+        File.WriteAllText(Path.Combine(targetFolder, fileName), BuildSkillMarkdown(name, description, body));
+        return targetFolder;
+    }
+
+    /// <summary>Deletes a skill's folder outright.</summary>
+    public void DeleteSkill(string folderPath)
+    {
+        if (Directory.Exists(folderPath))
+            Directory.Delete(folderPath, recursive: true);
+    }
+
+    /// <summary>Toggles a skill on/off by renaming its SKILL.md — see the class remarks.</summary>
+    public void SetEnabled(string folderPath, bool enabled)
+    {
+        var enabledPath = Path.Combine(folderPath, SkillFile);
+        var disabledPath = Path.Combine(folderPath, DisabledSkillFile);
+
+        if (enabled && File.Exists(disabledPath))
+        {
+            if (File.Exists(enabledPath)) File.Delete(disabledPath);   // shouldn't happen; prefer the live file
+            else File.Move(disabledPath, enabledPath);
+        }
+        else if (!enabled && File.Exists(enabledPath))
+        {
+            if (File.Exists(disabledPath)) File.Delete(disabledPath);
+            File.Move(enabledPath, disabledPath);
+        }
+    }
+
+    // -------------------------------------------------------------- install
+
+    /// <summary>
+    /// Installs skills from a source into the user-skills directory. The source is auto-detected:
+    /// a git URL (cloned), a local <c>.zip</c> (extracted), or a local folder (copied). A source
+    /// may hold ONE skill (a <c>SKILL.md</c> at its root) or MANY (subfolders each with one).
+    /// Returns the names installed; throws with a human message on failure.
+    /// </summary>
+    public InstallResult InstallFrom(string source)
+    {
+        source = source.Trim().Trim('"');
+        if (string.IsNullOrWhiteSpace(source))
+            throw new ArgumentException("Enter a git URL, a .zip path, or a folder path.");
+
+        var staging = Path.Combine(Path.GetTempPath(), "mandocode-skill-" + Guid.NewGuid().ToString("N"));
+        try
+        {
+            var searchRoot = MaterializeSource(source, staging);
+            var skillFolders = DiscoverSkillFolders(searchRoot);
+            // Nothing found isn't an error — it's user input to correct. Return an empty result and
+            // let the caller show a friendly "no SKILL.md here" message instead of throwing.
+            if (skillFolders.Count == 0)
+                return new InstallResult(Array.Empty<string>(), Array.Empty<string>());
+
+            var root = UserSkillsDirectory;
+            Directory.CreateDirectory(root);
+
+            var installed = new List<string>();
+            var skipped = new List<string>();
+            foreach (var src in skillFolders)
+            {
+                var slug = Slug(Path.GetFileName(src));
+                var dest = Path.Combine(root, slug);
+                if (Directory.Exists(dest)) { skipped.Add(slug); continue; }
+                CopyDirectory(src, dest);
+                installed.Add(slug);
+            }
+
+            return new InstallResult(installed, skipped);
+        }
+        finally
+        {
+            TryDeleteDirectory(staging);
+        }
+    }
+
+    /// <summary>Puts the source's contents on disk under <paramref name="staging"/> and returns the
+    /// directory to scan for skills.</summary>
+    private static string MaterializeSource(string source, string staging)
+    {
+        if (LooksLikeGitUrl(source))
+        {
+            Directory.CreateDirectory(staging);
+            RunGitClone(source, staging);
+            return staging;
+        }
+
+        if (source.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) && File.Exists(source))
+        {
+            Directory.CreateDirectory(staging);
+            ZipFile.ExtractToDirectory(source, staging);
+            return staging;
+        }
+
+        if (Directory.Exists(source))
+            return source;   // copied straight from here; no staging needed
+
+        throw new InvalidOperationException(
+            "Source not recognized. Give a git URL (https/git/ssh), a path to a .zip, or a folder that exists.");
+    }
+
+    private static bool LooksLikeGitUrl(string s) =>
+        s.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+        s.StartsWith("https://", StringComparison.OrdinalIgnoreCase) ||
+        s.StartsWith("git@", StringComparison.OrdinalIgnoreCase) ||
+        s.StartsWith("git://", StringComparison.OrdinalIgnoreCase) ||
+        s.EndsWith(".git", StringComparison.OrdinalIgnoreCase);
+
+    private static void RunGitClone(string url, string dest)
+    {
+        var psi = new ProcessStartInfo("git", $"clone --depth 1 \"{url}\" \"{dest}\"")
+        {
+            RedirectStandardError = true,
+            RedirectStandardOutput = true,
+            UseShellExecute = false,
+            CreateNoWindow = true,
+        };
+
+        Process proc;
+        try
+        {
+            proc = Process.Start(psi) ?? throw new InvalidOperationException("Could not start git.");
+        }
+        catch (Exception ex)
+        {
+            throw new InvalidOperationException(
+                "git isn't available on this machine — install Git, or use a .zip / folder instead. (" + ex.Message + ")");
+        }
+
+        var stderr = proc.StandardError.ReadToEnd();
+        proc.WaitForExit();
+        if (proc.ExitCode != 0)
+            throw new InvalidOperationException("git clone failed: " + stderr.Trim());
+    }
+
+    // Folders that never hold a skill but are common in repos/archives — skipped while searching so
+    // a big source doesn't waste time walking them (and can't surface a vendored example SKILL.md).
+    private static readonly HashSet<string> IgnoredScanDirs =
+        new(StringComparer.OrdinalIgnoreCase) { ".git", "node_modules", "bin", "obj", ".vs", ".idea" };
+
+    private const int MaxScanDepth = 6;
+
+    /// <summary>
+    /// Finds every skill folder at or under <paramref name="root"/> — a directory that DIRECTLY
+    /// contains a SKILL.md. Searches recursively (bounded depth) so it handles nested layouts: a
+    /// single skill at the root, a <c>skills/&lt;name&gt;/</c> subtree, a GitHub <c>.zip</c>'s
+    /// <c>repo-main/</c> wrapper folder, or a whole repo of them.
+    ///
+    /// Once a folder is identified as a skill it is NOT descended into — a skill is a unit, and this
+    /// stops a skill that ships example SKILL.md files from fragmenting into several installs.
+    /// </summary>
+    private static List<string> DiscoverSkillFolders(string root)
+    {
+        var found = new List<string>();
+        Walk(root, 0, found);
+        return found;
+    }
+
+    private static void Walk(string dir, int depth, List<string> found)
+    {
+        if (depth > MaxScanDepth) return;
+
+        if (File.Exists(Path.Combine(dir, SkillFile)))
+        {
+            found.Add(dir);
+            return;   // a skill folder is a leaf unit — don't descend into its own contents
+        }
+
+        IEnumerable<string> subs;
+        try { subs = Directory.EnumerateDirectories(dir); }
+        catch (Exception ex) { Debug.WriteLine($"[SkillCoordinator] scan skipped {dir}: {ex.Message}"); return; }
+
+        foreach (var sub in subs)
+        {
+            if (IgnoredScanDirs.Contains(Path.GetFileName(sub))) continue;
+            Walk(sub, depth + 1, found);
+        }
+    }
+
+    // -------------------------------------------------------------- fan-out
+
+    /// <summary>
+    /// Re-scans the skill set on EVERY open agent and rebuilds each one's system prompt so the
+    /// change is live in existing conversations. History is preserved (RefreshSettingsAsync swaps
+    /// system message 0 in place) — see <see cref="McpCoordinator.ReloadAllAsync"/> for the twin.
+    /// </summary>
+    public async Task ReloadAllAsync()
+    {
+        foreach (var session in SessionsAccessor().ToList())
+        {
+            session.Skills.Reload();
+            await session.Ai.RefreshSettingsAsync(session.Config);
+        }
+    }
+
+    // -------------------------------------------------------------- helpers
+
+    private static string BuildSkillMarkdown(string name, string description, string body)
+    {
+        // Frontmatter mirrors SkillParser's expected shape: a --- fenced YAML head, then body.
+        var sb = new System.Text.StringBuilder();
+        sb.Append("---\n");
+        sb.Append("name: ").Append(name).Append('\n');
+        if (!string.IsNullOrWhiteSpace(description))
+            sb.Append("description: ").Append(description.Replace("\r", "").Replace("\n", " ").Trim()).Append('\n');
+        sb.Append("---\n\n");
+        sb.Append(body.Replace("\r\n", "\n").TrimEnd());
+        sb.Append('\n');
+        return sb.ToString();
+    }
+
+    /// <summary>Folder-safe name: lowercase, spaces→hyphens, strip anything else.</summary>
+    private static string Slug(string name)
+    {
+        var chars = name.Trim().ToLowerInvariant()
+            .Select(c => char.IsLetterOrDigit(c) ? c : (c is ' ' or '_' or '-' ? '-' : '\0'))
+            .Where(c => c != '\0')
+            .ToArray();
+        var slug = new string(chars).Trim('-');
+        while (slug.Contains("--")) slug = slug.Replace("--", "-");
+        return string.IsNullOrEmpty(slug) ? "skill" : slug;
+    }
+
+    private static void CopyDirectory(string source, string dest)
+    {
+        Directory.CreateDirectory(dest);
+        foreach (var file in Directory.EnumerateFiles(source))
+            File.Copy(file, Path.Combine(dest, Path.GetFileName(file)), overwrite: true);
+        foreach (var sub in Directory.EnumerateDirectories(source))
+        {
+            // Skip a .git folder so cloned skills don't drag a repo into the skills dir.
+            if (string.Equals(Path.GetFileName(sub), ".git", StringComparison.OrdinalIgnoreCase)) continue;
+            CopyDirectory(sub, Path.Combine(dest, Path.GetFileName(sub)));
+        }
+    }
+
+    private static void TryDeleteDirectory(string dir)
+    {
+        try { if (Directory.Exists(dir)) Directory.Delete(dir, recursive: true); }
+        catch (Exception ex) { Debug.WriteLine($"[SkillCoordinator] temp cleanup failed: {ex.Message}"); }
+    }
+}
+
+/// <summary>A global skill as shown in the management list (includes disabled ones).</summary>
+public sealed class SkillEntry
+{
+    public string Name { get; init; } = "";
+    public string Description { get; init; } = "";
+    public string Body { get; init; } = "";
+    public string FolderPath { get; init; } = "";
+    public bool Enabled { get; init; }
+}
+
+/// <summary>Outcome of an install: what was added and what was skipped as already-present.</summary>
+public sealed record InstallResult(IReadOnlyList<string> Installed, IReadOnlyList<string> Skipped);
diff --git a/src/MandoCode.Desktop/Services/TranscriptHtmlBuilder.cs b/src/MandoCode.Desktop/Services/TranscriptHtmlBuilder.cs
index 1c8a284..3daf151 100644
--- a/src/MandoCode.Desktop/Services/TranscriptHtmlBuilder.cs
+++ b/src/MandoCode.Desktop/Services/TranscriptHtmlBuilder.cs
@@ -74,6 +74,23 @@ public string StatusChip(string primary, string? secondary = null, string state
         return sb.ToString();
     }
 
+    /// <summary>
+    /// A STATIC tool-call pill (no animation — draws once, costs nothing). Replaces the plain
+    /// "[Function] …" / "[Done] ✓" text lines for non-file tools with something that reads as a
+    /// distinct chip, in the same rounded, theme-colored, monochrome-glyph language as StatusChip.
+    /// Deliberately not animated: an ever-spinning element pins the WebView compositor (see the
+    /// reverted animated version). <paramref name="state"/> is "" (neutral), "done", or "err".
+    /// </summary>
+    /// <summary>
+    /// A single STATIC tool-call pill: a neutral status dot + label (e.g. "Skill: deep-research"),
+    /// in the MCP StatusChip family, centered. One pill per call — drawn once on invoke and NEVER
+    /// updated afterward. Recoloring the dot in place on completion ("turn green when done")
+    /// reproduced the CPU/stuck issue and was removed; the dot stays neutral.
+    /// </summary>
+    public string ToolChip(string label) =>
+        $"<div class=\"tool-pill\"><span class=\"tp-dot\"></span>" +
+        $"<span class=\"tp-label\">{E(label).Replace(".", " · ")}</span></div>";
+
     /// <summary>Pre-formatted block (config listings, model lists) in monospace.</summary>
     public string Mono(string text) => $"<pre class=\"mono-block\">{E(text)}</pre>";
 
@@ -181,7 +198,12 @@ public string OperationCard(OperationDisplayEvent op)
             }
             else if (!string.IsNullOrEmpty(op.ContentPreview))
             {
-                sb.Append($"<pre class=\"cmd-out op-detail\">{E(op.ContentPreview)}");
+                // Web results are prose, not code — render them wrapped, in the reading font, dimmed,
+                // so they recede as reference material instead of a highlighted code block. File
+                // content previews (Read) stay monospace/no-wrap since they really are code.
+                var prose = op.OperationType is "WebSearch" or "WebFetch";
+                var detailCls = prose ? "cmd-out op-detail op-prose" : "cmd-out op-detail";
+                sb.Append($"<pre class=\"{detailCls}\">{E(op.ContentPreview)}");
                 if (op.RemainingLines > 0)
                     sb.Append($"\n<span class=\"dim\">… +{op.RemainingLines} more lines</span>");
                 sb.Append("</pre>");
@@ -283,7 +305,8 @@ .md pre {
 
   /* Status chips — compact pills for session/connection state. A CSS status dot
      (crisp, theme-aware) replaces status emoji; state = ok | warn | err | neutral. */
-  .chip-row { margin: 2px 0; }
+  /* Centered to match the tool pills: all system/status chrome sits centered, conversation stays left. */
+  .chip-row { margin: 2px 0; text-align: center; }
   .chip { display: inline-flex; align-items: center; gap: 7px;
     padding: 3px 12px; border-radius: 999px; font-size: 12.5px;
     border: 1px solid var(--border); background: var(--panel);
@@ -301,6 +324,20 @@ chips still grow past it. */
     box-shadow: 0 0 0 3px color-mix(in srgb, var(--red) 24%, transparent); }
   .chip-val { color: var(--fg); font-weight: 600; }
   .chip-key { color: var(--dim); }
+
+  /* Tool-call pills — STATIC (no animation, so they never cause continuous repaint). A rounded,
+     theme-colored chip with a monochrome glyph, matching the StatusChip family. */
+  /* Centered: tool pills are the assistant's machinery, not dialogue — centering (like Slack/Discord
+     system messages) keeps the left column a clean read and marks them as ambient activity.
+     display:flex + fit-content makes the chip block-level and shrink-wrapped so margin auto centers it. */
+  .tool-pill { display: flex; width: fit-content; align-items: center; gap: 8px; margin: 2px auto;
+    padding: 3px 12px; border-radius: 999px; font-size: 12px;
+    border: 1px solid var(--border); background: var(--panel); }
+  .tool-pill .tp-dot { width: 7px; height: 7px; border-radius: 50%; flex: none;
+    background: var(--dim);
+    box-shadow: 0 0 0 3px color-mix(in srgb, var(--dim) 20%, transparent); }
+  .tool-pill .tp-label { color: var(--fg);
+    font-family: "Cascadia Code", Consolas, monospace; font-size: 12px; }
   .panel { background: var(--panel); border: 1px solid var(--border); border-radius: 10px;
     overflow: hidden; }
   .panel.red-border { border-color: var(--red); }
@@ -325,6 +362,10 @@ chips still grow past it. */
   .op-meta { color: var(--dim); font-size: 12px; }
   .op-detail { margin-top: 4px; background: var(--panel); border: 1px solid var(--border);
     border-radius: 8px; }
+  /* Prose tool output (web search/fetch): wrap to width, reading font, dimmed — reference material,
+     not a code block. Declared after pre.cmd-out so these win on shared properties. */
+  pre.op-prose { white-space: pre-wrap; word-break: break-word; overflow-x: hidden;
+    font-family: "Segoe UI", sans-serif; font-size: 12.5px; color: var(--dim); }
   table.plan { border-collapse: collapse; width: 100%; }
   table.plan th, table.plan td { border-top: 1px solid var(--border); padding: 5px 12px;
     text-align: left; vertical-align: top; }
diff --git a/src/MandoCode.Desktop/ViewModels/ChatController.cs b/src/MandoCode.Desktop/ViewModels/ChatController.cs
index 9a5d3c0..e0ac0ea 100644
--- a/src/MandoCode.Desktop/ViewModels/ChatController.cs
+++ b/src/MandoCode.Desktop/ViewModels/ChatController.cs
@@ -588,11 +588,25 @@ private void OnFunctionInvoked(FunctionCall call)
         _lastOperationType = call.FunctionName.Replace("FileSystem_", "").ToLowerInvariant();
 
         if (!call.FunctionName.StartsWith("FileSystem_", StringComparison.Ordinal))
-            _transcript.Append(_html.Dim($"[Function] {call.Description}"));
+            _transcript.Append(_html.ToolChip(DescribeToolCall(call)));
 
         _busy.Update(call.Description);
     }
 
+    /// <summary>Label for a tool-call pill. For a skill load, surfaces WHICH skill (the useful bit)
+    /// instead of the generic "Skills · load_skill"; everything else keeps its normal description.</summary>
+    private static string DescribeToolCall(FunctionCall call)
+    {
+        if (call.FunctionName.EndsWith("load_skill", StringComparison.OrdinalIgnoreCase)
+            && call.Arguments.TryGetValue("name", out var nameObj)
+            && nameObj?.ToString() is { Length: > 0 } skillName)
+        {
+            return $"Skill: {skillName.Trim()}";
+        }
+
+        return call.Description;
+    }
+
     private void OnFunctionCompleted(FunctionExecutionResult result)
     {
         if (result.OperationDisplay != null)
@@ -611,12 +625,10 @@ private void OnFunctionCompleted(FunctionExecutionResult result)
                 _recentReadFiles.Clear();
             }
         }
-        else if (result.Success)
-        {
-            _transcript.Append(_html.Success("[Done] ✓"));
-        }
-        else
+        else if (!result.Success)
         {
+            // No completion pill for success (the invoke pill is the whole record, and recoloring it
+            // in place is what broke things). A failure still surfaces its detail line.
             _transcript.Append(_html.Error($"[Error] {result.Result}"));
         }
 
@@ -861,7 +873,7 @@ private async Task DispatchCommandAsync(string input)
                 else
                 {
                     ClipboardCopyRequested?.Invoke(_lastAiResponse);
-                    _transcript.Append(_html.Success($"Copied to clipboard ({_lastAiResponse.Length} chars)"));
+                    _transcript.Append(_html.StatusChip("Copied", $"{_lastAiResponse.Length} chars", "ok"));
                 }
                 return;
 
@@ -994,7 +1006,7 @@ private async Task HandleConfigCommandAsync(string rawArgs)
             return;
         }
 
-        _transcript.Append(_html.Dim("Opening Settings…"));
+        _transcript.Append(_html.StatusChip("Settings", "opening…"));
         SetupNeeded?.Invoke();
     }
 
@@ -1390,13 +1402,13 @@ private void HandleCopyCodeCommand()
         var matches = Regex.Matches(_lastAiResponse, @"```(?:\w*)\r?\n([\s\S]*?)```");
         if (matches.Count == 0)
         {
-            _transcript.Append(_html.Warn("No code blocks found in the last response."));
+            _transcript.Append(_html.StatusChip("Copy code", "no code blocks in the last response"));
             return;
         }
 
         var codeContent = string.Join("\n\n", matches.Cast<Match>().Select(m => m.Groups[1].Value.TrimEnd()));
         ClipboardCopyRequested?.Invoke(codeContent);
-        _transcript.Append(_html.Success($"Copied {matches.Count} code block(s) to clipboard ({codeContent.Length} chars)"));
+        _transcript.Append(_html.StatusChip("Copied", $"{matches.Count} code block{(matches.Count == 1 ? "" : "s")} · {codeContent.Length} chars", "ok"));
     }
 
     private void ShowSkills()
@@ -1639,7 +1651,7 @@ public async Task<McpTestResult> TestMcpServerAsync(string name, McpServerConfig
         }
     }
 
-    public sealed record McpStatusRow(string Name, string Transport, string Status, bool Connected);
+    public sealed record McpStatusRow(string Name, string Transport, string Status, bool Connected, bool Disabled);
 
     /// <summary>Live MCP server status — feeds both the /mcp listing and the MCP page.</summary>
     public async Task<List<McpStatusRow>> GetMcpStatusRowsAsync()
@@ -1674,7 +1686,7 @@ public async Task<List<McpStatusRow>> GetMcpStatusRowsAsync()
             {
                 status = "not started";
             }
-            rows.Add(new McpStatusRow(name, transport, status, connected));
+            rows.Add(new McpStatusRow(name, transport, status, connected, serverCfg.Disabled));
         }
         return rows;
     }
@@ -1771,15 +1783,17 @@ private async Task HandleMcpRemoveCommandAsync(string serverArg)
 
     private async Task HandleMcpReloadCommandAsync()
     {
-        _transcript.Append(_html.Dim("Restarting MCP servers..."));
+        // Render reload progress as centered status pills — same StatusChip family as the top
+        // "MCP · N connected" chip (a theme-aware dot, no emoji), rather than left-aligned text.
+        _transcript.Append(_html.StatusChip("MCP", "restarting…"));
 
         await _mcp.ReloadAllAsync();   // every tab's kernel re-registers, history kept
 
         var active = _mcpManager.ActiveClients.Count;
         var failed = _mcpManager.StartupErrors.Count;
         _transcript.Append(failed == 0
-            ? _html.Success($"🔌 MCP reloaded: {active} server{(active == 1 ? "" : "s")} connected.")
-            : _html.Warn($"MCP reloaded: {active} connected, {failed} failed."));
+            ? _html.StatusChip("MCP", $"{active} server{(active == 1 ? "" : "s")} connected", "ok")
+            : _html.StatusChip("MCP", $"{active} connected, {failed} failed", "warn"));
     }
 
     // ============================================================
@@ -1857,7 +1871,10 @@ private void ShowMusicStatus()
             return;
         }
 
-        var state = _music.IsPaused ? "paused" : "now playing";
-        _transcript.Append(_html.Info($"♪ {state}: {track.Name}  [{track.Genre}]  · vol {(int)(_music.Volume * 100)}%"));
+        var playing = !_music.IsPaused;
+        _transcript.Append(_html.StatusChip(
+            playing ? "Now playing" : "Paused",
+            $"{track.Name} · {track.Genre} · vol {(int)(_music.Volume * 100)}%",
+            playing ? "ok" : ""));
     }
 }