chore: organize CLI components into feature folders

README.md

@@ -632,7 +632,7 @@ Type `@` anywhere in your input (after a space or at position 0) to trigger file
 
 ```
 explain @src/MandoCode/Services/AIService.cs to me
-what does the ProcessFileReferences method do in @src/MandoCode/Components/App.razor
+what does the ProcessFileReferences method do in @src/MandoCode/Components/Shell/App.razor
 refactor @src/MandoCode/Models/LoadingMessages.cs to use fewer spinners
 ```
 
@@ -892,7 +892,7 @@ This simulation replaces the package update command, verifies the helper waits f
 
 ```
 src/MandoCode/
-  Components/        Razor UI (App, Banner, HelpDisplay, ConfigMenu, Prompt)
+  Components/        Razor UI grouped by feature (see Components/README.md)
   Services/          Core logic (AI, markdown, syntax, tokens, music, diffs, input state machine)
   Models/            Data models, config, system prompts, educational content
   Plugins/           Tool classes bound as AIFunctions (FileSystem, WebSearch, Planning, Skills)

docs/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to MandoCode will be documented in this file.
 
 ## [Unreleased]
 
+### Changed
+
+- Group CLI components into feature folders for shell, workspaces, conversations, input, project browsing, sessions, settings, onboarding, and activity. Keep component namespaces and behavior unchanged, and document where new components belong.
+
 ## [0.16.1] - 2026-10-21
 
 **Startup and component stability.** The chat prompt now waits for model validation and MCP initialization to finish. Prompt state changes run together on the UI dispatcher, and agents closed during startup cannot start an input loop afterward. RazorConsole remains at 0.6.0.

docs/cli-maintainability.md

@@ -1,6 +1,6 @@
 # CLI maintenance boundaries
 
-The CLI is composed from Razor components. `App.razor` retains layout and coordinating state; its partial class files group commands, planning, attachments, integrations, request processing, lifecycle, and terminal effects. Partial files share component state and are not independent services. Extract reusable operations into services rather than adding unrelated responsibilities to these files.
+The CLI is composed from Razor components grouped by feature under `src/MandoCode/Components/`; see the [component folder guide](../src/MandoCode/Components/README.md). Explicit `@namespace MandoCode.Components` declarations preserve component type names after moving files. `Components/Shell/App.razor` retains layout and coordinating state; its partial class files group commands, planning, attachments, integrations, request processing, lifecycle, and terminal effects. Partial files share component state and are not independent services. Extract reusable operations into services rather than adding unrelated responsibilities to these files.
 
 ## State and input
 
@@ -10,7 +10,7 @@ The CLI is composed from Razor components. `App.razor` retains layout and coordi
 
 ## Agent lifetime
 
-`App.Lifecycle.cs` resolves per-agent services from the pane scope, subscribes to events, and releases pending requests on shutdown. `CallbackRegistrations` releases a callback only if it is still owned by that registration. Event delegates must also be detached on disposal. Shared workspace services are resolved from the host; cross-agent operations resolve the target agent's scope.
+`Components/Shell/App.Lifecycle.cs` resolves per-agent services from the pane scope, subscribes to events, and releases pending requests on shutdown. `CallbackRegistrations` releases a callback only if it is still owned by that registration. Event delegates must also be detached on disposal. Shared workspace services are resolved from the host; cross-agent operations resolve the target agent's scope.
 
 ## Shared engine
 

src/MandoCode/Components/AgentStatus.razor → src/MandoCode/Components/Activity/AgentStatus.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using System.Text
 @inject RazorConsole.Core.Rendering.ITerminalViewport Viewport

src/MandoCode/Components/CommandPreviewView.razor → src/MandoCode/Components/Activity/CommandPreviewView.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 <Panel Border="BoxBorder.Rounded" BorderColor="@(new Color(86, 182, 194))" Expand="true" Title="@Preview.Shell">
     <Rows>

src/MandoCode/Components/MusicStatus.razor → src/MandoCode/Components/Activity/MusicStatus.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using MandoCode.Services
 @using MandoCode.Translators
 

src/MandoCode/Components/OperationDisplay.razor → src/MandoCode/Components/Activity/OperationDisplay.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using MandoCode.Models
 @using MandoCode.Services
 @using MandoCode.Translators

src/MandoCode/Components/PlanStepEditor.razor → src/MandoCode/Components/Activity/PlanStepEditor.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Input
 @using RazorConsole.Core.Focus
 @using RazorConsole.Core.Rendering

src/MandoCode/Components/StatusBar.razor → src/MandoCode/Components/Activity/StatusBar.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using MandoCode.Services
 
 @if (!string.IsNullOrEmpty(_display))

src/MandoCode/Components/ChatMessage.razor → src/MandoCode/Components/Conversation/ChatMessage.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using MandoCode.Models
 
 @foreach (var opAnsi in Message.OperationAnsi)

src/MandoCode/Components/ContextMeterLine.razor → src/MandoCode/Components/Conversation/ContextMeterLine.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using RazorConsole.Components
 @using MandoCode.Services

src/MandoCode/Components/ConversationEntry.razor → src/MandoCode/Components/Conversation/ConversationEntry.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @* data-canvas opts into the widget pipeline's Spectre fallback; our middleware
    supplies the cached rich renderable, including code blocks and tool results. *@
 @if (Entry.Command is { } command)

src/MandoCode/Components/ConversationTranscript.razor → src/MandoCode/Components/Conversation/ConversationTranscript.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @foreach (var entry in Entries)
 {
     <Rows @key="entry.Id">

src/MandoCode/Components/ConversationView.razor → src/MandoCode/Components/Conversation/ConversationView.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Rendering
 @inject ScrollableLayoutCoordinator LayoutCoordinator
 @inject RazorConsole.Core.Focus.FocusManager Focus

src/MandoCode/Components/RenderableContent.razor → src/MandoCode/Components/Conversation/RenderableContent.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console.Rendering
 @inject IServiceProvider Services
 @implements IDisposable

src/MandoCode/Components/ScrollPreview.razor → src/MandoCode/Components/Conversation/ScrollPreview.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using RazorConsole.Components
 @using MandoCode.Services

src/MandoCode/Components/UserPrompt.razor → src/MandoCode/Components/Conversation/UserPrompt.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @* A submitted prompt is a stable transcript child, independent of the live composer. *@
 <Rows>
     <Box FillWidth="true">

src/MandoCode/Components/ApprovalSelect.razor → src/MandoCode/Components/Input/ApprovalSelect.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Microsoft.AspNetCore.Components.Web
 @using Spectre.Console
 @using RazorConsole.Components

src/MandoCode/Components/AutocompletePopup.razor → src/MandoCode/Components/Input/AutocompletePopup.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @inject RazorConsole.Core.Rendering.ITerminalViewport Viewport
 

src/MandoCode/Components/CommandSuggestionRow.razor → src/MandoCode/Components/Input/CommandSuggestionRow.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using RazorConsole.Core.Renderables
 @inject RazorConsole.Core.Rendering.ITerminalViewport Viewport

src/MandoCode/Components/FileSuggestionRow.razor → src/MandoCode/Components/Input/FileSuggestionRow.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using RazorConsole.Core.Renderables
 @inject RazorConsole.Core.Rendering.ITerminalViewport Viewport

src/MandoCode/Components/ModelPickerPopup.razor → src/MandoCode/Components/Input/ModelPickerPopup.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @inject RazorConsole.Core.Rendering.ITerminalViewport Viewport
 

src/MandoCode/Components/Prompt.razor → src/MandoCode/Components/Input/Prompt.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 
 @code {

src/MandoCode/Components/PromptInput.razor → src/MandoCode/Components/Input/PromptInput.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @inject IServiceProvider Services
 @using MandoCode.Models
 @using MandoCode.Services

src/MandoCode/Components/OllamaPullPanel.razor → src/MandoCode/Components/Onboarding/OllamaPullPanel.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Renderables
 @using Spectre.Console
 @using RazorConsole.Core.Input

src/MandoCode/Components/SetupWizardPanel.razor → src/MandoCode/Components/Onboarding/SetupWizardPanel.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using RazorConsole.Core.Input
 @inject RazorConsole.Core.Focus.FocusManager Focus

src/MandoCode/Components/AgentFileExplorer.razor → src/MandoCode/Components/Project/AgentFileExplorer.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using System.Diagnostics
 @inject RazorConsole.Core.Focus.FocusManager Focus

src/MandoCode/Components/AgentGitChanges.razor → src/MandoCode/Components/Project/AgentGitChanges.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using RazorConsole.Core.Renderables
 @inject RazorConsole.Core.Focus.FocusManager Focus

src/MandoCode/Components/DirectoryBrowser.razor → src/MandoCode/Components/Project/DirectoryBrowser.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @inject RazorConsole.Core.Focus.FocusManager Focus
 

src/MandoCode/Components/README.md

@@ -0,0 +1,21 @@
+# CLI components
+
+Components are grouped by the feature they render:
+
+| Folder | Responsibility |
+| --- | --- |
+| Shell | Application coordination, main chat shell, home screen, and help |
+| Workspaces | Workspace tabs, picker, agent pane headers, and grid layout |
+| Conversation | Transcript entries, messages, previews, and context meter |
+| Input | Prompt input, autocomplete suggestions, model picker, and approval selection |
+| Project | File explorer, Git changes, and directory browser |
+| Sessions | Saved-agent history and context snapshots |
+| Settings | Agent configuration, integrations, and MCP tools |
+| Onboarding | Setup wizard and model downloads |
+| Activity | Agent/command status, operation previews, music, and plan-step editing |
+
+Each Razor component explicitly declares `@namespace MandoCode.Components`.
+This matches the feature-folder convention used by Services: folders organize
+source without changing public type names or component references. Keep all
+`App` partial files together in Shell so their shared lifecycle state stays visible.
+Shared Razor imports remain in `src/MandoCode/_Imports.razor`.

src/MandoCode/Components/AgentHistoryBrowser.razor → src/MandoCode/Components/Sessions/AgentHistoryBrowser.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using Microsoft.Extensions.DependencyInjection
 @using Microsoft.AspNetCore.Components.Web

src/MandoCode/Components/AgentHistoryConversation.razor → src/MandoCode/Components/Sessions/AgentHistoryConversation.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using RazorConsole.Core.Renderables
 @using RazorConsole.Core.Rendering

src/MandoCode/Components/ContextSnapshotsPanel.razor → src/MandoCode/Components/Sessions/ContextSnapshotsPanel.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Renderables
 @using RazorConsole.Core.Input
 @using Spectre.Console

src/MandoCode/Components/AgentSettingsPanel.razor → src/MandoCode/Components/Settings/AgentSettingsPanel.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using MandoCode.Models
 @using Spectre.Console
 @using RazorConsole.Core.Renderables

src/MandoCode/Components/ConfigMenu.razor → src/MandoCode/Components/Settings/ConfigMenu.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using MandoCode.Models
 @using MandoCode.Services
 @using Spectre.Console

src/MandoCode/Components/IntegrationSettingsPanel.razor → src/MandoCode/Components/Settings/IntegrationSettingsPanel.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using MandoCode.Models
 @using Spectre.Console
 @using RazorConsole.Core.Renderables

src/MandoCode/Components/McpToolsViewer.razor → src/MandoCode/Components/Settings/McpToolsViewer.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Renderables
 @using Spectre.Console
 @inject RazorConsole.Core.Focus.FocusManager Focus

src/MandoCode/Components/App.razor → src/MandoCode/Components/Shell/App.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @inject IServiceProvider Services
 @using Microsoft.Extensions.DependencyInjection
 @using MandoCode.Models

src/MandoCode/Components/AsciiArt.razor → src/MandoCode/Components/Shell/AsciiArt.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using MandoCode.Services
 
 <RenderableContent Content="@PaneColors.Render(_art, Pane, constrainWidth: false)" />

src/MandoCode/Components/Banner.razor → src/MandoCode/Components/Shell/Banner.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console;
 
 <AsciiArt Lines="@Artwork" />

src/MandoCode/Components/ChatShell.razor → src/MandoCode/Components/Shell/ChatShell.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Renderables
 @using Spectre.Console
 @inject RazorConsole.Core.Rendering.ITerminalViewport Viewport

src/MandoCode/Components/HelpDisplay.razor → src/MandoCode/Components/Shell/HelpDisplay.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 
 @*

src/MandoCode/Components/HomeView.razor → src/MandoCode/Components/Shell/HomeView.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using RazorConsole.Core.Renderables
 

src/MandoCode/Components/AgentGridRow.razor → src/MandoCode/Components/Workspaces/AgentGridRow.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Renderables
 
 @if (Workspace.Panes.Any(p => AgentWorkspace.Column(p.Slot) == Row))

src/MandoCode/Components/AgentGridSlot.razor → src/MandoCode/Components/Workspaces/AgentGridSlot.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 
 @if (Pane is not null)

src/MandoCode/Components/AgentNavigationBar.razor → src/MandoCode/Components/Workspaces/AgentNavigationBar.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Renderables
 @using Spectre.Console
 @inject WorkspaceRegistry Registry

src/MandoCode/Components/AgentPaneContent.razor → src/MandoCode/Components/Workspaces/AgentPaneContent.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using RazorConsole.Core.Renderables
 @using Microsoft.Extensions.DependencyInjection

src/MandoCode/Components/AgentWorkspaceView.razor → src/MandoCode/Components/Workspaces/AgentWorkspaceView.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Renderables
 @using Spectre.Console
 @inject AgentWorkspace DefaultWorkspace

src/MandoCode/Components/TerminalWorkspaceView.razor → src/MandoCode/Components/Workspaces/TerminalWorkspaceView.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Renderables
 @using Spectre.Console
 @using Microsoft.Extensions.DependencyInjection

src/MandoCode/Components/WorkspaceButton.razor → src/MandoCode/Components/Workspaces/WorkspaceButton.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @using RazorConsole.Core.Renderables
 @inject WorkspaceRegistry Registry

src/MandoCode/Components/WorkspacePicker.razor → src/MandoCode/Components/Workspaces/WorkspacePicker.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using RazorConsole.Core.Input
 @using Spectre.Console
 @inject WorkspaceRegistry Registry

src/MandoCode/Components/WorkspaceSurface.razor → src/MandoCode/Components/Workspaces/WorkspaceSurface.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @if (!Workspace.IsClosed)
 {
     @* grid selects the renderer's Spectre fallback, which emits zero cells when hidden. *@

src/MandoCode/Components/WorkspaceTab.razor → src/MandoCode/Components/Workspaces/WorkspaceTab.razor

@@ -1,3 +1,4 @@
+@namespace MandoCode.Components
 @using Spectre.Console
 @inject WorkspaceRegistry Registry