chore: bump version to 0.3.1

- Add multi-stage Dockerfile (Flutter build → nginx:alpine)
- Add nginx.conf with SPA routing, gzip, and caching
- Add Gitea workflow for release-triggered builds
- Document release procedure in AGENTS.md

Deploys to port 8092, auto-updates via Watchtower.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "mcp__chrome-devtools__take_screenshot",
+      "mcp__puppeteer__puppeteer_evaluate",
+      "mcp__chrome-devtools__navigate_page",
+      "mcp__chrome-devtools__take_snapshot"
+    ]
+  }
+}

.gitea/workflows/build.yml

@@ -0,0 +1,34 @@
+name: Build and Push
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to Gitea Registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.schweitz.internal
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            git.schweitz.internal/jpmschweitzer/tatlock-ui:latest
+            git.schweitz.internal/jpmschweitzer/tatlock-ui:${{ github.ref_name }}
+
+      - name: Trigger Watchtower update
+        if: success()
+        run: |
+          curl -sf -H "Authorization: Bearer ${{ secrets.WATCHTOWER_TOKEN }}" \
+            http://watchtower:8080/v1/update

.gitignore

@@ -12,7 +12,6 @@ pubspec.lock
 *.freezed.dart
 *.gr.dart
 *.mocks.dart
-lib/generated_plugin_registrant.dart
 
 # Keep version.g.dart - it's generated but should be committed
 # so CI/CD builds have version info without running the generator
@@ -25,7 +24,8 @@ lib/**/*.g.dart
 *.iml
 *.ipr
 *.iws
-.vscode/
+.vscode/*
+!.vscode/launch.json
 *.swp
 *.swo
 *~
@@ -118,3 +118,5 @@ secrets/
 
 # Uploads (reference images, not tracked)
 uploads/
+logs/
+.vscode/launch.json

.vscode/launch.json

@@ -0,0 +1,40 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Flutter Web (Chrome)",
+      "type": "dart",
+      "request": "launch",
+      "program": "lib/main.dart",
+      "args": [
+        "-d",
+        "chrome",
+        "--web-port=8080"
+      ]
+    },
+    {
+      "name": "Flutter Web (Chrome) - Profile",
+      "type": "dart",
+      "request": "launch",
+      "program": "lib/main.dart",
+      "flutterMode": "profile",
+      "args": [
+        "-d",
+        "chrome",
+        "--web-port=8080"
+      ]
+    },
+    {
+      "name": "Flutter Web (Chrome) - Release",
+      "type": "dart",
+      "request": "launch",
+      "program": "lib/main.dart",
+      "flutterMode": "release",
+      "args": [
+        "-d",
+        "chrome",
+        "--web-port=8080"
+      ]
+    }
+  ]
+}

AGENTS.md

@@ -42,7 +42,36 @@ This document contains instructions and documentation references for AI assistan
     * Tag after updating `pubspec.yaml` version and CHANGELOG
     * Push tags with `git push --tags`
 
+### 🚀 Release Procedure
+
+This project uses version-tag-based CI/CD. Releases trigger automated Docker builds and deployments.
+
+**Release Steps:**
+
+1. Update version in `pubspec.yaml` (bump major.minor.patch, not build number)
+2. Update `CHANGELOG.md` with changes under `## [x.x.x] - YYYY-MM-DD`
+3. Commit changes: `git commit -m "chore: release vX.X.X"`
+4. Create git tag: `git tag vX.X.X`
+5. Push with tags: `git push origin master --tags`
+6. Create release in Gitea UI (git.schweitz.net → Releases → New Release)
+   * Select the tag
+   * Add release notes (can copy from CHANGELOG)
+   * **Publish** the release (this triggers CI/CD)
+
+**What happens on release:**
+
+* Gitea CI builds Flutter web app in Docker
+* Image pushed to `git.schweitz.internal/jpmschweitzer/tatlock-ui:latest` and `:vX.X.X`
+* Watchtower detects new image and auto-updates running container
+* App available at `http://tower:8092` (and eventually `home.schweitz.net`)
+
+**Rollback:**
+
+* In Portainer, update image tag to previous version (e.g., `:v0.2.0`)
+* Or: `docker pull git.schweitz.internal/jpmschweitzer/tatlock-ui:v0.2.0`
+
 ### 🧪 Testing Requirements
+
 * **Always add tests for new code before committing.** No exceptions.
 * Tests should cover the happy path and key edge cases.
 * Run `flutter test` before committing to ensure all tests pass.
@@ -50,5 +79,14 @@ This document contains instructions and documentation references for AI assistan
 * Code coverage should not decrease with new commits.
 
 ### 📝 Changelog Maintenance
+
 * **Update `CHANGELOG.md`** with every user-facing change.
-* Format: `## [Unreleased] - YYYY-MM-DD` followed by `### Added`, `### Changed`, or `### Fixed`.
+* Format: `## [Unreleased] - YYYY-MM-DD` followed by `### Added`, `### Changed`, or `### Fixed`.
+
+### 🎨 UI Patterns (MUST READ BEFORE CHANGES)
+
+* **Before modifying the widget tree**, read `docs/UI_LAYOUT.md` to understand established patterns.
+* Investigate existing implementations in the codebase before creating new components.
+* **DO NOT** reinvent wheels - check if shared components already exist in `lib/shared/components/`.
+* Look at similar features for reference patterns (e.g., how other list views, forms, or CRUD screens are built).
+* Deviating from established patterns creates inconsistency and technical debt.

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- API defaults now use LAN IPs for local development (no auth required)
+- Auth interceptor skips authentication when using LAN endpoints
+
 ## [0.3.0] - 2025-12-30
 
 ### Added

Dockerfile

@@ -0,0 +1,41 @@
+# Stage 1: Build Flutter web application
+FROM ghcr.io/cirruslabs/flutter:stable AS builder
+
+WORKDIR /app
+
+# Copy dependency files first for better caching
+COPY pubspec.yaml pubspec.lock ./
+
+# Get dependencies
+RUN flutter pub get
+
+# Copy the rest of the application
+COPY . .
+
+# Generate code with build_runner
+RUN dart run build_runner build --delete-conflicting-outputs
+
+# Build for web release
+RUN flutter build web --release
+
+# Stage 2: Serve with nginx
+FROM nginx:alpine
+
+# Install curl for healthcheck
+RUN apk add --no-cache curl
+
+# Copy custom nginx configuration
+COPY nginx.conf /etc/nginx/nginx.conf
+
+# Copy built web app to nginx html directory
+COPY --from=builder /app/build/web /usr/share/nginx/html
+
+# Expose port 80
+EXPOSE 80
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+  CMD curl -f http://localhost:80/ || exit 1
+
+# Run nginx in foreground
+CMD ["nginx", "-g", "daemon off;"]

analysis_options.yaml

@@ -9,6 +9,12 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
+analyzer:
+  errors:
+    # Freezed uses @JsonKey on constructor parameters which triggers this warning
+    # but is the correct pattern for freezed classes
+    invalid_annotation_target: ignore
+
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

docs/UI_LAYOUT.md

@@ -22,36 +22,218 @@ The UI uses a **tabbed room navigation** in the header rather than a traditional
 
 ```
 ┌─────────────────────────────────────────────────────────────────────────────┐
-│  HEADER (intrinsic height)                                                  │
-│  [Logo] [═══════ Room Tabs (scrollable) ═══════] [Notifications] [Profile] │
+│  HEADER BAR (56px, with logo bulge overlay)                                 │
+│  [◯Logo◯] [Room Icons] ─────────────────────────────────── [Profile Menu]  │
 ├─────────────────────────────────────────────────────────────────────────────┤
 │                                                                             │
-│  ┌─────────────────────────────────────────────────┐ ┌───────────────────┐  │
-│  │                                                 │ │                   │  │
-│  │  MAIN CONTENT                                   │ │  CHAT DOCK        │  │
-│  │  flex: 1                                        │ │  flex: 0          │  │
-│  │                                                 │ │                   │  │
-│  │  ┌─────────────┐ ┌────────────────────────────┐ │ │  Tatlock chat     │  │
-│  │  │ CONTEXT     │ │ PRIMARY                    │ │ │  assistant,       │  │
-│  │  │ SIDEBAR     │ │ CONTENT                    │ │ │  persistent       │  │
-│  │  │             │ │                            │ │ │  across rooms     │  │
-│  │  │ flex: 0     │ │ flex: 1                    │ │ │                   │  │
-│  │  │ intrinsic   │ │                            │ │ │                   │  │
-│  │  └─────────────┘ └────────────────────────────┘ │ │                   │  │
-│  │                                                 │ │                   │  │
-│  └─────────────────────────────────────────────────┘ └───────────────────┘  │
+│  ┌─────────────┐ ┌─────────────────────────────────┐ ┌───────────────────┐  │
+│  │ NAV PANEL   │ │  PRIMARY CONTENT                │ │  CHAT DOCK        │  │
+│  │             │ │                                 │ │                   │  │
+│  │ Room-level  │ │  ┌──────────┐ ┌──────────────┐  │ │  Tatlock AI       │  │
+│  │ navigation  │ │  │ FILTER   │ │ DATA GRID    │  │ │  assistant        │  │
+│  │ (sections)  │ │  │ PANEL    │ │              │  │ │                   │  │
+│  │             │ │  │          │ │              │  │ │  Persistent       │  │
+│  │ 280px fixed │ │  │ Optional │ │ flex: 1      │  │ │  across rooms     │  │
+│  │             │ │  │ 280px    │ │              │  │ │                   │  │
+│  └─────────────┘ │  └──────────┘ └──────────────┘  │ │  280px-33vw       │  │
+│                  │                                 │ │                   │  │
+│                  │  flex: 1                        │ │  flex: 0          │  │
+│                  └─────────────────────────────────┘ └───────────────────┘  │
 │                                                                             │
 └─────────────────────────────────────────────────────────────────────────────┘
 ```
 
-### Component Roles
+---
+
+## Panel Taxonomy
+
+All panels share common styling patterns but serve different purposes.
+
+### Panel Types
+
+| Panel | Position | Purpose | Width | Content Alignment |
+|-------|----------|---------|-------|-------------------|
+| **Header Bar** | Top | Room nav, profile | 56px height | Logo in bulge, rest at bottom |
+| **Nav Panel** | Left | Room-level section nav | 280px fixed | Header docked to bottom |
+| **Filter Panel** | Left (inside content) | Data filtering/search | 280px fixed | Header docked to bottom |
+| **Detail Panel** | Right (inside content) | Selected item details | 320-400px | Standard header |
+| **Chat Dock** | Right | AI assistant | 280px-33vw | Standard header |
+
+### Panel Header Behavior
+
+All left-side panels (Nav Panel, Filter Panel) dock their header content to the **bottom** of the header area. This accommodates the logo bulge that overlays into their space.
+
+```
+┌─────────────────────────┐
+│                         │  ← Logo bulge overlays this space
+│         (empty)         │
+│                         │
+│  [Icon] Title   [Action]│  ← Content docked to bottom (8px margin)
+├─────────────────────────┤
+│  Panel content...       │
+```
+
+Right-side panels (Detail Panel, Chat Dock) use standard vertically-centered headers since the logo bulge doesn't reach them.
+
+### Nav Panel Sections
+
+Nav items can be organized into **sections**. Section headers are **conditionally visible** - they only appear when multiple sections exist.
+
+#### Single Section (headers hidden)
+
+When all items belong to one section, no headers are shown:
+
+```
+┌─────────────────────────┐
+│  [≡] Sections     [···] │  ← Panel header
+├─────────────────────────┤
+│  ▸ Containers           │
+│    Networks             │
+│    Volumes              │
+│    Images               │
+│                         │
+└─────────────────────────┘
+```
+
+#### Multiple Sections (headers visible)
+
+When items span multiple sections, section headers appear:
+
+```
+┌─────────────────────────┐
+│  [≡] Sections     [···] │  ← Panel header
+├─────────────────────────┤
+│ ▌Portainer              │  ← Section header (subtle bg, left accent)
+│  ▸ Containers           │
+│    Networks             │
+│    Volumes              │
+│    Images               │
+│                         │
+│ ▌NPM                    │  ← Section header
+│    Proxy Hosts          │
+│    Redirections         │
+│    Streams              │
+│                         │
+│ ▌Authentik              │  ← Section header
+│    Users                │
+│    Groups               │
+│    Applications         │
+│                         │
+└─────────────────────────┘
+```
+
+#### Section Header Styling
+
+```
+┌─────────────────────────┐
+│▌SECTION NAME            │  ← Left accent bar (2px, primary color)
+└─────────────────────────┘   ← Background: surfaceContainerHigh
+                              ← Text: labelSmall, onSurfaceVariant
+                              ← Padding: 8px horizontal, 6px vertical
+                              ← All caps, letter-spacing: 0.5
+```
+
+#### Data Model
+
+```dart
+/// NavItem model (in nav_panel.dart)
+class NavItem {
+  final String id;
+  final String label;
+  final IconData icon;
+  final String? section;  // null = ungrouped
+}
+
+// Section headers auto-generate from unique section values
+// Visibility: items.map((i) => i.section).toSet().length > 1
+```
+
+#### Route Configuration Driven
+
+Sections are defined in the feature's route configuration, not the widget:
+
+```dart
+/// In lib/features/control_room/router.dart
+
+enum ControlRoomNav {
+  // Portainer section
+  containers('containers', 'Containers', Icons.dns, 'Portainer'),
+  networks('networks', 'Networks', Icons.hub, 'Portainer'),
+  volumes('volumes', 'Volumes', Icons.storage, 'Portainer'),
+  images('images', 'Images', Icons.photo_library, 'Portainer'),
+  // NPM section (future)
+  proxyHosts('proxy-hosts', 'Proxy Hosts', Icons.public, 'NPM'),
+  redirections('redirections', 'Redirections', Icons.alt_route, 'NPM'),
+  // Authentik section (future)
+  users('users', 'Users', Icons.people, 'Authentik'),
+  groups('groups', 'Groups', Icons.group_work, 'Authentik');
+
+  const ControlRoomNav(this.id, this.label, this.icon, this.section);
+
+  final String id;
+  final String label;
+  final IconData icon;
+  final String section;
+
+  NavItem toNavItem() => NavItem(
+        id: id,
+        label: label,
+        icon: icon,
+        section: section,
+      );
+}
+```
+
+The NavPanel widget receives items and auto-generates section headers based on unique section values in the list. No section logic lives in the widget - it just renders what the route config provides.
+
+---
+
+## Panel Configurations by Room
+
+### Front Hall
+```
+┌────────────────────────────────────────────────────────────────┬────────────┐
+│  PRIMARY CONTENT (no nav panel)                                │ CHAT DOCK  │
+│  Dashboard cards, activity feed                                │ (expanded) │
+└────────────────────────────────────────────────────────────────┴────────────┘
+```
+
+### Control Room
+```
+┌───────────┬──────────────────────────────────────────────────────┬──────────┐
+│ NAV PANEL │  PRIMARY CONTENT                                     │ CHAT     │
+│           │  ┌────────────┬────────────────────────────────────┐ │ DOCK     │
+│ Sections: │  │ FILTER     │ DATA GRID                          │ │          │
+│ • Contai. │  │ PANEL      │ Container/Stack list               │ │ (collap- │
+│ • Stacks  │  │            │                                    │ │  sed)    │
+│ • Network │  │ Stack list │                                    │ │          │
+│ • Volumes │  │ + search   │                                    │ │          │
+└───────────┴──┴────────────┴────────────────────────────────────┴─┴──────────┘
+```
+
+### Parlor
+```
+┌───────────┬────────────────────────────────────────────────────┬────────────┐
+│ NAV PANEL │  PRIMARY CONTENT                                   │ CHAT DOCK  │
+│           │  Device controls, scenes                           │ (collapsed)│
+│ Areas:    │                                                    │            │
+│ • Living  │                                                    │            │
+│ • Bedroom │                                                    │            │
+│ • Kitchen │                                                    │            │
+└───────────┴────────────────────────────────────────────────────┴────────────┘
+```
+
+---
+
+## Component Roles
 
 | Component | Flex | Description |
 |-----------|------|-------------|
-| **Header** | intrinsic | Logo, room tabs, action icons |
-| **Main Content** | `flex: 1` | Fills remaining horizontal space |
-| **Context Sidebar** | `flex: 0`, intrinsic | Room-specific navigation (Control Room, Parlor) |
-| **Primary Content** | `flex: 1` | Room's main working area |
+| **Header Bar** | intrinsic (56px) | Logo bulge, room icons, profile menu |
+| **Nav Panel** | `flex: 0`, 280px | Room-level section navigation |
+| **Filter Panel** | `flex: 0`, 280px | Data filtering within a section |
+| **Primary Content** | `flex: 1` | Main working area |
+| **Detail Panel** | `flex: 0`, 320-400px | Selected item details (optional) |
 | **Chat Dock** | `flex: 0`, intrinsic | Tatlock assistant, collapsible |
 
 ---
@@ -61,55 +243,76 @@ The UI uses a **tabbed room navigation** in the header rather than a traditional
 ### Wide (>= 1200px)
 
 ```
-┌────────────────────────────────────────────────────────┬────────────────────┐
-│  [Sidebar]  [══════════ Content ══════════]            │  Chat (expanded)   │
-└────────────────────────────────────────────────────────┴────────────────────┘
+┌───────────┬─────────────────────────────────────────────┬────────────────────┐
+│ NAV PANEL │  [Filter Panel]  [═══ Data Grid ═══]        │  CHAT DOCK         │
+│ (280px)   │  (280px)         (flex: 1)                  │  (expanded, 320px) │
+└───────────┴─────────────────────────────────────────────┴────────────────────┘
 ```
 
+- All panels visible
 - Chat dock expanded by default on Front Hall
-- Context sidebar visible with labels
+- Nav panel visible with full labels
+- Filter panel visible (where applicable)
 - Full data grid columns
 
 ### Medium (>= 800px, < 1200px)
 
 ```
-┌────────────────────────────────────────────────────────────────────────┬────┐
-│  [Sidebar]  [══════════════════ Content ══════════════════]            │ 💬 │
-└────────────────────────────────────────────────────────────────────────┴────┘
+┌───────────┬───────────────────────────────────────────────────────────┬────┐
+│ NAV PANEL │  [Filter Panel]  [═══════════ Data Grid ═══════════]      │ 💬 │
+│ (280px)   │  (280px)         (flex: 1)                                │48px│
+└───────────┴───────────────────────────────────────────────────────────┴────┘
 ```
 
-- Chat dock collapsed to icon rail
-- Click to expand as overlay
-- Context sidebar still visible
+- Chat dock collapsed to icon rail (48px)
+- Click chat icon to expand as overlay
+- Nav panel still visible
+- Filter panel still visible
+- Data grid may hide some columns
 
 ### Compact (>= 600px, < 800px)
 
 ```
-┌────────────────────────────────────────────────────────────────────────┬────┐
-│  [≡]  [════════════════════ Content ════════════════════]              │ 💬 │
-└────────────────────────────────────────────────────────────────────────┴────┘
+┌────┬───────────────────────────────────────────────────────────────────┬────┐
+│ ≡  │  [═══════════════════════ Content ═══════════════════════]        │ 💬 │
+│48px│  Filter panel becomes top bar or collapsible                      │48px│
+└────┴───────────────────────────────────────────────────────────────────┴────┘
 ```
 
-- Context sidebar becomes drawer (hamburger menu)
-- Chat dock collapsed
-- Reduced data grid columns
+- Nav panel collapses to icon rail (48px), expands as drawer on tap
+- Filter panel moves to top of content or becomes collapsible
+- Chat dock remains collapsed (48px)
+- Data grid shows essential columns only
 
 ### Mobile (< 600px)
 
 ```
 ┌────────────────────────────────────────────────────────────────────────┐
-│  [≡]  [Tabs scroll horizontally]                            [💬]      │
+│  HEADER: [≡] [Room Icons scroll] ─────────────────────────────── [💬] │
 ├────────────────────────────────────────────────────────────────────────┤
 │                                                                        │
-│  [══════════════════════ Content ══════════════════════]               │
+│  [═══════════════════════ Content ══════════════════════]              │
+│  Filter as expandable section at top                                   │
 │                                                                        │
 └────────────────────────────────────────────────────────────────────────┘
 ```
 
 - Single column layout
-- Room tabs scroll horizontally
-- Chat opens as bottom sheet
-- Context sidebar as full-screen drawer
+- Nav panel opens as full-screen drawer (hamburger menu)
+- Filter panel becomes expandable section at top of content
+- Chat opens as bottom sheet (60vh max)
+- Data grid becomes card list or single-column table
+
+---
+
+## Panel Folding Summary
+
+| Panel | Wide (≥1200) | Medium (≥800) | Compact (≥600) | Mobile (<600) |
+|-------|--------------|---------------|----------------|---------------|
+| **Nav Panel** | 280px visible | 280px visible | 48px rail → drawer | Hidden → drawer |
+| **Filter Panel** | 280px visible | 280px visible | Collapsed/top bar | Expandable section |
+| **Chat Dock** | 320px expanded | 48px rail → overlay | 48px rail → overlay | Icon → bottom sheet |
+| **Detail Panel** | 320-400px slide-in | 320px slide-in | Full-width overlay | Full-screen |
 
 ---
 
@@ -168,29 +371,51 @@ Primary landing page. Chat dock expanded by default.
 
 ### Control Room (Infrastructure)
 
-Context sidebar with section navigation. Chat collapsed.
+Nav panel with grouped section navigation. Chat collapsed.
 
+**Current state** (single grouper - headers hidden):
 ```
 ┌───────────────┬───────────────────────────────────────────────────────┬──────┐
 │               │                                                       │      │
 │  SECTIONS     │  CONTAINERS                        [Search] [+ New]   │  💬  │
 │               │  ─────────────────────────────────────────────────── │      │
 │  ▸ Containers │  ☑ NAME          STATUS    CPU    MEM    IMAGE    ⋮  │      │
-│    Stacks     │  ☐ jellyfin      ● Run     2.3%   1.2GB  latest   ⋮  │      │
+│    Networks   │  ☐ jellyfin      ● Run     2.3%   1.2GB  latest   ⋮  │      │
+│    Volumes    │  ☐ ollama        ● Run     45%    8.0GB  0.1.32   ⋮  │      │
+│    Images     │  ☐ postgres      ● Run     1.1%   512MB  16-alp   ⋮  │      │
+│               │  ☐ redis         ● Run     0.2%   128MB  7-alp    ⋮  │      │
+│               │  ─────────────────────────────────────────────────── │      │
+│               │  Showing 5 of 40                    < 1 2 3 4 5 >    │      │
+│               │                                                       │      │
+└───────────────┴───────────────────────────────────────────────────────┴──────┘
+```
+
+**Future state** (multiple groupers - headers visible):
+```
+┌───────────────┬───────────────────────────────────────────────────────┬──────┐
+│               │                                                       │      │
+│  SECTIONS     │  CONTAINERS                        [Search] [+ New]   │  💬  │
+│               │  ─────────────────────────────────────────────────── │      │
+│ ▌PORTAINER    │  ☑ NAME          STATUS    CPU    MEM    IMAGE    ⋮  │      │
+│  ▸ Containers │  ☐ jellyfin      ● Run     2.3%   1.2GB  latest   ⋮  │      │
 │    Networks   │  ☐ ollama        ● Run     45%    8.0GB  0.1.32   ⋮  │      │
-│    Volumes    │  ☐ postgres      ● Run     1.1%   512MB  16-alp   ⋮  │      │
-│    Images     │  ☐ redis         ● Run     0.2%   128MB  7-alp    ⋮  │      │
-│               │  ☐ authentik     ○ Stop    -      -      2024.2   ⋮  │      │
-│  ──────────── │  ─────────────────────────────────────────────────── │      │
-│    Netdata  ↗ │  Showing 5 of 40                    < 1 2 3 4 5 >    │      │
-│    Portainer↗ │                                                       │      │
-│    NPM      ↗ │                                                       │      │
+│    Volumes    │  ─────────────────────────────────────────────────── │      │
+│    Images     │  Showing 3 of 40                    < 1 2 3 4 5 >    │      │
+│               │                                                       │      │
+│ ▌NPM          │                                                       │      │
+│    Proxy Hosts│                                                       │      │
+│    Redirects  │                                                       │      │
+│               │                                                       │      │
+│ ▌AUTHENTIK    │                                                       │      │
+│    Users      │                                                       │      │
+│    Groups     │                                                       │      │
 │               │                                                       │      │
 └───────────────┴───────────────────────────────────────────────────────┴──────┘
 ```
 
 **Components:**
-- Context Sidebar: Section nav + external links
+- Nav Panel: Grouped section navigation (grouper headers conditional)
+- Filter Panel: Stack/item filtering within section
 - DataGrid: Container list with bulk actions
 - Detail Panel: Opens on row selection (replaces grid or slides in)
 
@@ -275,6 +500,42 @@ The Tatlock chat assistant is **omnipresent** - accessible from any room.
 
 ## Flutter Implementation Notes
 
+### Panel Widget Library
+
+All panels are built from shared components in `lib/shared/layouts/widgets/`:
+
+| Widget | File | Purpose |
+|--------|------|---------|
+| `PanelContainer` | `panel_container.dart` | Base container for all panels |
+| `PanelHeader` | `panel_header.dart` | Configurable header (bottom-docked or centered) |
+| `NavPanel` | `nav_panel.dart` | Left-side room navigation |
+| `FilterPanel` | `filter_panel.dart` | Left-side data filtering |
+| `DetailPanel` | `detail_panel.dart` | Right-side item details |
+| `ChatDock` | `chat_dock.dart` | Right-side AI assistant |
+
+### PanelHeader Configuration
+
+```dart
+/// Panel header with configurable content alignment.
+class PanelHeader extends StatelessWidget {
+  const PanelHeader({
+    required this.title,
+    required this.icon,
+    this.actions,
+    this.dockToBottom = false, // true for left-side panels
+  });
+}
+```
+
+**Left-side panels** (Nav, Filter) use `dockToBottom: true` to accommodate the logo bulge:
+- Header height: 56px (matches app header)
+- Content aligned to bottom with 8px margin
+- Empty space at top allows logo bulge overlay
+
+**Right-side panels** (Detail, Chat) use `dockToBottom: false`:
+- Standard vertically-centered content
+- No accommodation needed for logo bulge
+
 ### Recommended Widgets
 
 | Concept | Flutter Widget |
@@ -296,6 +557,19 @@ abstract class Breakpoints {
 }
 ```
 
+### Panel Width Constants
+
+```dart
+abstract class PanelWidths {
+  static const double navPanel = 280;
+  static const double filterPanel = 280;
+  static const double detailPanel = 360;
+  static const double chatDockExpanded = 320;
+  static const double chatDockCollapsed = 48;
+  static const double railWidth = 48;
+}
+```
+
 ### Layout Builder Pattern
 
 ```dart

ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

ios/Podfile

@@ -0,0 +1,43 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '13.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+  end
+end

lib/app.dart

@@ -12,7 +12,7 @@ class TatlockApp extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final router = ref.watch(appRouterProvider);
-    final themeAsync = ref.watch(themeNotifierProvider);
+    final themeAsync = ref.watch(themeProvider);
 
     // Get theme mode, defaulting to system while loading
     final themeMode = switch (themeAsync) {

lib/core/api/api_client.dart

@@ -1,14 +1,13 @@
 import 'package:dio/dio.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-
-import '../config/app_config.dart';
-import 'api_interceptors.dart';
+import 'package:tatlock_ui/core/api/api_interceptors.dart';
+import 'package:tatlock_ui/core/config/app_config.dart';
 
 part 'api_client.g.dart';
 
 /// Provides the Dio instance for Core API.
 @riverpod
-Dio coreApiClient(CoreApiClientRef ref) {
+Dio coreApiClient(Ref ref) {
   final dio = Dio(
     BaseOptions(
       baseUrl: AppConfig.coreApiUrl,
@@ -32,7 +31,7 @@ Dio coreApiClient(CoreApiClientRef ref) {
 
 /// Provides the Dio instance for Tatlock API.
 @riverpod
-Dio tatlockApiClient(TatlockApiClientRef ref) {
+Dio tatlockApiClient(Ref ref) {
   final dio = Dio(
     BaseOptions(
       baseUrl: AppConfig.tatlockApiUrl,

lib/core/api/api_interceptors.dart

@@ -2,11 +2,13 @@ import 'dart:developer' as developer;
 
 import 'package:dio/dio.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import '../auth/auth_provider.dart';
-import '../error/app_exception.dart';
+import 'package:tatlock_ui/core/auth/auth_provider.dart';
+import 'package:tatlock_ui/core/config/app_config.dart';
+import 'package:tatlock_ui/core/error/app_exception.dart';
 
 /// Adds authentication token to requests.
+///
+/// Skipped entirely when [AppConfig.requiresAuth] is false (LAN development).
 class AuthInterceptor extends Interceptor {
   AuthInterceptor(this._ref);
 
@@ -14,7 +16,13 @@ class AuthInterceptor extends Interceptor {
 
   @override
   void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
-    final authState = _ref.read(authNotifierProvider);
+    // Skip auth for LAN development
+    if (!AppConfig.requiresAuth) {
+      handler.next(options);
+      return;
+    }
+
+    final authState = _ref.read(authProvider);
 
     authState.whenData((auth) {
       if (auth.isAuthenticated && auth.accessToken != null) {
@@ -27,9 +35,15 @@ class AuthInterceptor extends Interceptor {
 
   @override
   void onError(DioException err, ErrorInterceptorHandler handler) {
+    // Skip auth error handling for LAN development
+    if (!AppConfig.requiresAuth) {
+      handler.next(err);
+      return;
+    }
+
     if (err.response?.statusCode == 401) {
       // Token expired - trigger re-authentication
-      _ref.read(authNotifierProvider.notifier).signOut();
+      _ref.read(authProvider.notifier).signOut();
     }
     handler.next(err);
   }

lib/core/auth/auth_state.dart

@@ -4,7 +4,7 @@ part 'auth_state.freezed.dart';
 
 /// Authentication state.
 @freezed
-class AuthState with _$AuthState {
+sealed class AuthState with _$AuthState {
   const factory AuthState({
     @Default(false) bool isAuthenticated,
     String? accessToken,

lib/core/config/app_config.dart

@@ -1,19 +1,35 @@
 /// Application configuration from compile-time environment variables.
 ///
-/// Set via: flutter build --dart-define=API_URL=https://...
+/// ## Development (LAN - no auth required)
+/// Default values use LAN IPs for local development:
+/// ```bash
+/// flutter run -d chrome
+/// ```
+///
+/// ## Production (public URLs - auth required)
+/// Override with public URLs for production builds:
+/// ```bash
+/// flutter build web \
+///   --dart-define=CORE_API_URL=https://api.schweitz.net \
+///   --dart-define=TATLOCK_API_URL=https://tatlock.schweitz.net
+/// ```
 class AppConfig {
   AppConfig._();
 
   /// Core API base URL
+  /// - LAN default: No auth required
+  /// - Production: https://api.schweitz.net (requires OIDC)
   static const coreApiUrl = String.fromEnvironment(
     'CORE_API_URL',
-    defaultValue: 'https://api.schweitz.net',
+    defaultValue: 'http://192.168.86.149:8083',
   );
 
   /// Tatlock API base URL
+  /// - LAN default: No auth required
+  /// - Production: https://tatlock.schweitz.net (requires OIDC)
   static const tatlockApiUrl = String.fromEnvironment(
     'TATLOCK_API_URL',
-    defaultValue: 'https://tatlock.schweitz.net',
+    defaultValue: 'http://192.168.86.149:8000',
   );
 
   /// Authentik OIDC discovery URL
@@ -37,4 +53,21 @@ class AppConfig {
 
   /// Whether running in debug mode
   static const isDebug = bool.fromEnvironment('DEBUG', defaultValue: false);
+
+  /// Whether auth is required (false for LAN development)
+  static bool get requiresAuth =>
+      coreApiUrl.contains('schweitz.net') ||
+      tatlockApiUrl.contains('schweitz.net');
+
+  /// Portainer URL for container management
+  static const portainerUrl = String.fromEnvironment(
+    'PORTAINER_URL',
+    defaultValue: 'http://192.168.86.149:9000',
+  );
+
+  /// Netdata URL for system monitoring
+  static const netdataUrl = String.fromEnvironment(
+    'NETDATA_URL',
+    defaultValue: 'http://192.168.86.149:19999',
+  );
 }

lib/features/control_room/containers/data/datasources/containers_datasource.dart

@@ -0,0 +1,71 @@
+import 'package:dio/dio.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:tatlock_ui/core/api/api_client.dart';
+import 'package:tatlock_ui/features/control_room/containers/data/models/container_model.dart';
+
+part 'containers_datasource.g.dart';
+
+/// Remote data source for container operations.
+class ContainersDatasource {
+  ContainersDatasource(this._dio);
+
+  final Dio _dio;
+
+  /// Gets all containers from the API.
+  Future<List<ContainerModel>> getContainers({bool all = true}) async {
+    final response = await _dio.get<List<dynamic>>(
+      '/infrastructure/containers',
+      queryParameters: {'all': all},
+    );
+
+    return response.data!
+        .map((json) => ContainerModel.fromJson(json as Map<String, dynamic>))
+        .toList();
+  }
+
+  /// Gets a single container by ID.
+  Future<ContainerModel> getContainer(String id) async {
+    final response = await _dio.get<Map<String, dynamic>>(
+      '/infrastructure/containers/$id',
+    );
+
+    return ContainerModel.fromJson(response.data!);
+  }
+
+  /// Performs an action on a container.
+  Future<void> containerAction(String id, String action) async {
+    await _dio.post<void>('/infrastructure/containers/$id/$action');
+  }
+
+  /// Gets container logs.
+  Future<String> getContainerLogs(
+    String id, {
+    int? tail,
+    bool timestamps = false,
+  }) async {
+    final response = await _dio.get<String>(
+      '/infrastructure/containers/$id/logs',
+      queryParameters: {
+        if (tail != null) 'tail': tail,
+        'timestamps': timestamps,
+      },
+    );
+
+    return response.data ?? '';
+  }
+
+  /// Removes a container.
+  Future<void> removeContainer(String id, {bool force = false}) async {
+    await _dio.delete<void>(
+      '/infrastructure/containers/$id',
+      queryParameters: {'force': force},
+    );
+  }
+}
+
+/// Provides the containers datasource.
+@riverpod
+ContainersDatasource containersDatasource(Ref ref) {
+  final dio = ref.watch(coreApiClientProvider);
+  return ContainersDatasource(dio);
+}

lib/features/control_room/containers/data/models/container_model.dart

@@ -0,0 +1,129 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:tatlock_ui/features/control_room/containers/domain/entities/container.dart';
+
+part 'container_model.freezed.dart';
+part 'container_model.g.dart';
+
+/// Container data model for API serialization.
+@freezed
+sealed class ContainerModel with _$ContainerModel {
+  const factory ContainerModel({
+    @JsonKey(name: 'Id') required String id,
+    @JsonKey(name: 'Names') required List<String> names,
+    @JsonKey(name: 'Image') required String image,
+    @JsonKey(name: 'State') required String state,
+    @JsonKey(name: 'Status') required String status,
+    @JsonKey(name: 'Labels') @Default({}) Map<String, String> labels,
+    @JsonKey(name: 'Ports') @Default([]) List<PortModel> ports,
+    @JsonKey(name: 'Mounts') @Default([]) List<MountModel> mounts,
+    @JsonKey(name: 'NetworkSettings') NetworkSettingsModel? networkSettings,
+    @JsonKey(name: 'Created') int? created,
+    @JsonKey(name: 'SizeRw') int? sizeRw,
+    @JsonKey(name: 'SizeRootFs') int? sizeRootFs,
+  }) = _ContainerModel;
+
+  const ContainerModel._();
+
+  factory ContainerModel.fromJson(Map<String, dynamic> json) =>
+      _$ContainerModelFromJson(json);
+
+  /// Converts to domain entity.
+  Container toEntity() {
+    // Extract stack name from labels (Docker Compose convention)
+    final stackName = labels['com.docker.compose.project'];
+    final stackId = stackName; // Use project name as ID for now
+
+    return Container(
+      id: id.substring(0, 12),
+      fullId: id,
+      name: names.isNotEmpty ? names.first.replaceFirst('/', '') : id,
+      image: image,
+      state: _parseState(state),
+      status: status,
+      stackName: stackName,
+      stackId: stackId,
+      ports: ports.map((p) => p.toEntity()).toList(),
+      labels: labels,
+      mounts: mounts.map((m) => m.toEntity()).toList(),
+      networks: networkSettings?.networks.keys.toList() ?? [],
+      createdAt: created != null
+          ? DateTime.fromMillisecondsSinceEpoch(created! * 1000)
+          : null,
+    );
+  }
+
+  ContainerState _parseState(String state) {
+    return switch (state.toLowerCase()) {
+      'created' => ContainerState.created,
+      'running' => ContainerState.running,
+      'paused' => ContainerState.paused,
+      'restarting' => ContainerState.restarting,
+      'removing' => ContainerState.removing,
+      'exited' => ContainerState.exited,
+      'dead' => ContainerState.dead,
+      _ => ContainerState.exited,
+    };
+  }
+}
+
+/// Port mapping model.
+@freezed
+sealed class PortModel with _$PortModel {
+  const factory PortModel({
+    @JsonKey(name: 'IP') String? ip,
+    @JsonKey(name: 'PrivatePort') required int privatePort,
+    @JsonKey(name: 'PublicPort') int? publicPort,
+    @JsonKey(name: 'Type') @Default('tcp') String type,
+  }) = _PortModel;
+
+  const PortModel._();
+
+  factory PortModel.fromJson(Map<String, dynamic> json) =>
+      _$PortModelFromJson(json);
+
+  PortMapping toEntity() {
+    return PortMapping(
+      hostIp: ip,
+      hostPort: publicPort,
+      containerPort: privatePort,
+      protocol: type,
+    );
+  }
+}
+
+/// Mount model.
+@freezed
+sealed class MountModel with _$MountModel {
+  const factory MountModel({
+    @JsonKey(name: 'Type') required String type,
+    @JsonKey(name: 'Source') required String source,
+    @JsonKey(name: 'Destination') required String destination,
+    @JsonKey(name: 'Mode') @Default('rw') String mode,
+    @JsonKey(name: 'RW') @Default(true) bool rw,
+  }) = _MountModel;
+
+  const MountModel._();
+
+  factory MountModel.fromJson(Map<String, dynamic> json) =>
+      _$MountModelFromJson(json);
+
+  VolumeMount toEntity() {
+    return VolumeMount(
+      type: type,
+      source: source,
+      destination: destination,
+      mode: rw ? 'rw' : 'ro',
+    );
+  }
+}
+
+/// Network settings model.
+@freezed
+sealed class NetworkSettingsModel with _$NetworkSettingsModel {
+  const factory NetworkSettingsModel({
+    @JsonKey(name: 'Networks') @Default({}) Map<String, dynamic> networks,
+  }) = _NetworkSettingsModel;
+
+  factory NetworkSettingsModel.fromJson(Map<String, dynamic> json) =>
+      _$NetworkSettingsModelFromJson(json);
+}

lib/features/control_room/containers/data/repositories/container_repository_impl.dart

@@ -0,0 +1,83 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:tatlock_ui/features/control_room/containers/data/datasources/containers_datasource.dart';
+import 'package:tatlock_ui/features/control_room/containers/domain/entities/container.dart';
+import 'package:tatlock_ui/features/control_room/containers/domain/repositories/container_repository.dart';
+
+part 'container_repository_impl.g.dart';
+
+/// Implementation of ContainerRepository using remote datasource.
+class ContainerRepositoryImpl implements ContainerRepository {
+  ContainerRepositoryImpl(this._datasource);
+
+  final ContainersDatasource _datasource;
+
+  @override
+  Future<List<Container>> getContainers() async {
+    final models = await _datasource.getContainers();
+    return models.map((m) => m.toEntity()).toList();
+  }
+
+  @override
+  Future<List<Container>> getContainersByStack(String stackId) async {
+    final containers = await getContainers();
+    return containers.where((c) => c.stackId == stackId).toList();
+  }
+
+  @override
+  Future<Container> getContainer(String id) async {
+    final model = await _datasource.getContainer(id);
+    return model.toEntity();
+  }
+
+  @override
+  Future<void> startContainer(String id) async {
+    await _datasource.containerAction(id, 'start');
+  }
+
+  @override
+  Future<void> stopContainer(String id) async {
+    await _datasource.containerAction(id, 'stop');
+  }
+
+  @override
+  Future<void> restartContainer(String id) async {
+    await _datasource.containerAction(id, 'restart');
+  }
+
+  @override
+  Future<void> pauseContainer(String id) async {
+    await _datasource.containerAction(id, 'pause');
+  }
+
+  @override
+  Future<void> unpauseContainer(String id) async {
+    await _datasource.containerAction(id, 'unpause');
+  }
+
+  @override
+  Future<void> removeContainer(String id, {bool force = false}) async {
+    await _datasource.removeContainer(id, force: force);
+  }
+
+  @override
+  Future<String> getContainerLogs(
+    String id, {
+    int? tail,
+    bool timestamps = false,
+  }) async {
+    return _datasource.getContainerLogs(id, tail: tail, timestamps: timestamps);
+  }
+
+  @override
+  Stream<String> streamContainerLogs(String id, {bool timestamps = false}) {
+    // TODO: Implement WebSocket/SSE streaming
+    throw UnimplementedError('Log streaming not yet implemented');
+  }
+}
+
+/// Provides the container repository.
+@riverpod
+ContainerRepository containerRepository(Ref ref) {
+  final datasource = ref.watch(containersDatasourceProvider);
+  return ContainerRepositoryImpl(datasource);
+}

lib/features/control_room/containers/domain/entities/container.dart

@@ -0,0 +1,171 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'container.freezed.dart';
+
+/// Docker container entity.
+@freezed
+sealed class Container with _$Container {
+  const factory Container({
+    /// Container ID (short form).
+    required String id,
+
+    /// Full container ID.
+    required String fullId,
+
+    /// Container name (without leading slash).
+    required String name,
+
+    /// Image name with tag.
+    required String image,
+
+    /// Current container state.
+    required ContainerState state,
+
+    /// Container status string (e.g., "Up 2 hours").
+    required String status,
+
+    /// Stack/project this container belongs to.
+    String? stackName,
+
+    /// Stack ID if part of a stack.
+    String? stackId,
+
+    /// Mapped ports.
+    @Default([]) List<PortMapping> ports,
+
+    /// Environment variables (key-value pairs).
+    @Default({}) Map<String, String> environment,
+
+    /// Container labels.
+    @Default({}) Map<String, String> labels,
+
+    /// Mounted volumes.
+    @Default([]) List<VolumeMount> mounts,
+
+    /// Networks the container is connected to.
+    @Default([]) List<String> networks,
+
+    /// When the container was created.
+    DateTime? createdAt,
+
+    /// When the container was started.
+    DateTime? startedAt,
+
+    /// CPU usage percentage (0-100).
+    double? cpuPercent,
+
+    /// Memory usage in bytes.
+    int? memoryUsage,
+
+    /// Memory limit in bytes.
+    int? memoryLimit,
+  }) = _Container;
+
+  const Container._();
+
+  /// Whether the container is running.
+  bool get isRunning => state == ContainerState.running;
+
+  /// Whether the container can be started.
+  bool get canStart =>
+      state == ContainerState.exited ||
+      state == ContainerState.created ||
+      state == ContainerState.paused;
+
+  /// Whether the container can be stopped.
+  bool get canStop => state == ContainerState.running;
+
+  /// Whether the container can be restarted.
+  bool get canRestart =>
+      state == ContainerState.running || state == ContainerState.exited;
+
+  /// Memory usage as a percentage of the limit.
+  double? get memoryPercent {
+    if (memoryUsage == null || memoryLimit == null || memoryLimit == 0) {
+      return null;
+    }
+    return (memoryUsage! / memoryLimit!) * 100;
+  }
+
+  /// Formatted memory usage string.
+  String get memoryFormatted {
+    if (memoryUsage == null) return '--';
+    return _formatBytes(memoryUsage!);
+  }
+
+  /// Formatted memory limit string.
+  String get memoryLimitFormatted {
+    if (memoryLimit == null) return '--';
+    return _formatBytes(memoryLimit!);
+  }
+
+  String _formatBytes(int bytes) {
+    if (bytes < 1024) return '$bytes B';
+    if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)} KB';
+    if (bytes < 1024 * 1024 * 1024) {
+      return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB';
+    }
+    return '${(bytes / (1024 * 1024 * 1024)).toStringAsFixed(2)} GB';
+  }
+}
+
+/// Container state.
+enum ContainerState {
+  created,
+  running,
+  paused,
+  restarting,
+  removing,
+  exited,
+  dead,
+}
+
+/// Port mapping configuration.
+@freezed
+sealed class PortMapping with _$PortMapping {
+  const factory PortMapping({
+    /// Host IP (usually 0.0.0.0).
+    String? hostIp,
+
+    /// Port on the host.
+    int? hostPort,
+
+    /// Port inside the container.
+    required int containerPort,
+
+    /// Protocol (tcp/udp).
+    @Default('tcp') String protocol,
+  }) = _PortMapping;
+
+  const PortMapping._();
+
+  /// Formatted string representation.
+  String get formatted {
+    if (hostPort == null) return '$containerPort/$protocol';
+    final ip = hostIp == '0.0.0.0' ? '' : '$hostIp:';
+    return '$ip$hostPort->$containerPort/$protocol';
+  }
+}
+
+/// Volume mount configuration.
+@freezed
+sealed class VolumeMount with _$VolumeMount {
+  const factory VolumeMount({
+    /// Mount type (bind, volume, tmpfs).
+    required String type,
+
+    /// Source path or volume name.
+    required String source,
+
+    /// Destination path in container.
+    required String destination,
+
+    /// Mount mode (rw, ro).
+    @Default('rw') String mode,
+  }) = _VolumeMount;
+
+  const VolumeMount._();
+
+  /// Whether the mount is read-only.
+  bool get isReadOnly => mode == 'ro';
+}

lib/features/control_room/containers/domain/repositories/container_repository.dart

@@ -0,0 +1,44 @@
+import 'package:tatlock_ui/features/control_room/containers/domain/entities/container.dart';
+
+/// Repository interface for container operations.
+abstract class ContainerRepository {
+  /// Gets all containers.
+  Future<List<Container>> getContainers();
+
+  /// Gets containers filtered by stack.
+  Future<List<Container>> getContainersByStack(String stackId);
+
+  /// Gets a single container by ID.
+  Future<Container> getContainer(String id);
+
+  /// Starts a container.
+  Future<void> startContainer(String id);
+
+  /// Stops a container.
+  Future<void> stopContainer(String id);
+
+  /// Restarts a container.
+  Future<void> restartContainer(String id);
+
+  /// Pauses a container.
+  Future<void> pauseContainer(String id);
+
+  /// Unpauses a container.
+  Future<void> unpauseContainer(String id);
+
+  /// Removes a container.
+  Future<void> removeContainer(String id, {bool force = false});
+
+  /// Gets container logs.
+  Future<String> getContainerLogs(
+    String id, {
+    int? tail,
+    bool timestamps = false,
+  });
+
+  /// Streams container logs in real-time.
+  Stream<String> streamContainerLogs(
+    String id, {
+    bool timestamps = false,
+  });
+}

lib/features/control_room/containers/presentation/pages/containers_list_page.dart

@@ -0,0 +1,302 @@
+import 'package:flutter/material.dart' hide Container;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:tatlock_ui/core/api/api_client.dart';
+import 'package:tatlock_ui/features/control_room/containers/presentation/providers/containers_provider.dart';
+import 'package:tatlock_ui/features/control_room/containers/presentation/widgets/container_logs_viewer.dart';
+import 'package:tatlock_ui/features/control_room/containers/presentation/widgets/container_status_badge.dart';
+import 'package:tatlock_ui/shared/components/data_grid/adapters/core_api_source.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_exports.dart';
+
+/// Container data class for DataGrid display.
+class ContainerData {
+  ContainerData({
+    required this.id,
+    required this.fullId,
+    required this.name,
+    required this.image,
+    required this.state,
+    required this.status,
+    required this.ports,
+  });
+
+  factory ContainerData.fromJson(Map<String, dynamic> json) {
+    final ports = (json['ports'] as List<dynamic>?)
+            ?.map((p) => ContainerPort.fromJson(p as Map<String, dynamic>))
+            .toList() ??
+        [];
+
+    return ContainerData(
+      id: json['id'] as String,
+      fullId: json['full_id'] as String? ?? json['id'] as String,
+      name: json['name'] as String,
+      image: json['image'] as String,
+      state: json['state'] as String,
+      status: json['status'] as String,
+      ports: ports,
+    );
+  }
+
+  final String id;
+  final String fullId;
+  final String name;
+  final String image;
+  final String state;
+  final String status;
+  final List<ContainerPort> ports;
+
+  bool get canStart => state == 'exited' || state == 'created';
+  bool get canStop => state == 'running';
+  bool get canRestart => state == 'running';
+}
+
+class ContainerPort {
+  ContainerPort({required this.privatePort, this.publicPort, this.type = 'tcp'});
+
+  factory ContainerPort.fromJson(Map<String, dynamic> json) => ContainerPort(
+        privatePort: json['private_port'] as int? ?? json['PrivatePort'] as int? ?? 0,
+        publicPort: json['public_port'] as int? ?? json['PublicPort'] as int?,
+        type: json['type'] as String? ?? json['Type'] as String? ?? 'tcp',
+      );
+
+  final int privatePort;
+  final int? publicPort;
+  final String type;
+
+  String get formatted => publicPort != null ? '$publicPort:$privatePort' : '$privatePort';
+}
+
+/// Page displaying the list of containers using DataGrid.
+class ContainersListPage extends ConsumerStatefulWidget {
+  const ContainersListPage({super.key});
+
+  @override
+  ConsumerState<ContainersListPage> createState() => _ContainersListPageState();
+}
+
+class _ContainersListPageState extends ConsumerState<ContainersListPage> {
+  late final StateNotifierProvider<DataGridController<ContainerData>,
+      DataGridState<ContainerData>> _gridProvider;
+
+  @override
+  void initState() {
+    super.initState();
+    final dio = ref.read(coreApiClientProvider);
+    final source = CoreApiDataSource<ContainerData>(
+      dio: dio,
+      endpoint: '/infrastructure/containers',
+      fromJson: ContainerData.fromJson,
+    );
+
+    _gridProvider = dataGridProvider<ContainerData>(
+      source: source,
+      config: _buildConfig(),
+      idSelector: (c) => c.id,
+    );
+  }
+
+  DataGridConfig<ContainerData> _buildConfig() {
+    return DataGridConfig<ContainerData>(
+      columns: [
+        DataGridColumn<ContainerData>(
+          header: 'Container',
+          valueBuilder: (c) => c.name,
+          sortable: true,
+          searchable: true,
+          width: const DataGridColumnWidth.flex(2),
+          cellBuilder: (context, c) => _ContainerCell(container: c),
+        ),
+        DataGridColumn<ContainerData>(
+          header: 'Ports',
+          valueBuilder: (c) => c.ports.map((p) => p.formatted).join(', '),
+          width: const DataGridColumnWidth.flex(1),
+          cellBuilder: (context, c) => _PortsCell(ports: c.ports),
+        ),
+        DataGridColumn<ContainerData>(
+          header: 'Status',
+          valueBuilder: (c) => c.status,
+          width: const DataGridColumnWidth.fixed(140),
+          alignment: DataGridColumnAlignment.end,
+        ),
+      ],
+      actions: [
+        DataGridAction<ContainerData>(
+          icon: Icons.play_arrow,
+          label: 'Start',
+          onTap: (c) async => _handleAction(c, 'start'),
+          showWhen: (c) => c.canStart,
+        ),
+        DataGridAction<ContainerData>(
+          icon: Icons.stop,
+          label: 'Stop',
+          onTap: (c) async => _handleAction(c, 'stop'),
+          showWhen: (c) => c.canStop,
+        ),
+        DataGridAction<ContainerData>(
+          icon: Icons.refresh,
+          label: 'Restart',
+          onTap: (c) async => _handleAction(c, 'restart'),
+          showWhen: (c) => c.canRestart,
+        ),
+        DataGridAction<ContainerData>(
+          icon: Icons.article,
+          label: 'View Logs',
+          onTap: (c) async => _showLogs(c),
+        ),
+      ],
+      enableSearch: true,
+      searchHint: 'Search containers...',
+      showHeader: true,
+      showFooter: true,
+    );
+  }
+
+  Future<void> _handleAction(ContainerData container, String action) async {
+    final actions = ref.read(containerActionsProvider.notifier);
+    switch (action) {
+      case 'start':
+        await actions.start(container.fullId);
+      case 'stop':
+        await actions.stop(container.fullId);
+      case 'restart':
+        await actions.restart(container.fullId);
+    }
+    // Refresh the grid after action
+    ref.read(_gridProvider.notifier).refresh();
+  }
+
+  Future<void> _showLogs(ContainerData container) async {
+    if (!mounted) return;
+    showContainerLogs(
+      context,
+      containerId: container.fullId,
+      containerName: container.name,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    // Listen for container action results to show snackbars
+    ref.listen<AsyncValue<void>>(containerActionsProvider, (previous, next) {
+      if (previous?.isLoading == true && !next.isLoading) {
+        next.whenOrNull(
+          data: (_) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: const Text('Container action completed'),
+                backgroundColor: colorScheme.primaryContainer,
+                behavior: SnackBarBehavior.floating,
+                duration: const Duration(seconds: 2),
+              ),
+            );
+          },
+          error: (error, _) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Row(
+                  children: [
+                    Icon(Icons.error_outline, color: colorScheme.onErrorContainer),
+                    const SizedBox(width: 8),
+                    Expanded(
+                      child: Text(
+                        'Container action failed: $error',
+                        style: TextStyle(color: colorScheme.onErrorContainer),
+                      ),
+                    ),
+                  ],
+                ),
+                backgroundColor: colorScheme.errorContainer,
+                behavior: SnackBarBehavior.floating,
+                duration: const Duration(seconds: 4),
+              ),
+            );
+          },
+        );
+      }
+    });
+
+    return DataGrid<ContainerData>(
+      provider: _gridProvider,
+      config: _buildConfig(),
+      idSelector: (c) => c.id,
+      toolbarActions: [
+        IconButton(
+          icon: const Icon(Icons.refresh),
+          tooltip: 'Refresh',
+          onPressed: () => ref.read(_gridProvider.notifier).refresh(),
+        ),
+      ],
+    );
+  }
+}
+
+class _ContainerCell extends StatelessWidget {
+  const _ContainerCell({required this.container});
+
+  final ContainerData container;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Row(
+      children: [
+        ContainerStatusBadge.fromString(container.state),
+        const SizedBox(width: 8),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text(
+                container.name,
+                style: const TextStyle(fontWeight: FontWeight.w500),
+                overflow: TextOverflow.ellipsis,
+              ),
+              Text(
+                container.image,
+                style: TextStyle(
+                  fontSize: 12,
+                  color: colorScheme.onSurfaceVariant,
+                ),
+                overflow: TextOverflow.ellipsis,
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _PortsCell extends StatelessWidget {
+  const _PortsCell({required this.ports});
+
+  final List<ContainerPort> ports;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    if (ports.isEmpty) {
+      return Text(
+        '-',
+        style: TextStyle(
+          fontSize: 12,
+          color: colorScheme.outline,
+        ),
+      );
+    }
+
+    return Text(
+      ports.map((p) => p.formatted).join(', '),
+      style: TextStyle(
+        fontSize: 12,
+        color: colorScheme.onSurfaceVariant,
+        fontFamily: 'monospace',
+      ),
+      overflow: TextOverflow.ellipsis,
+    );
+  }
+}

lib/features/control_room/containers/presentation/providers/containers_provider.dart

@@ -0,0 +1,91 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:tatlock_ui/features/control_room/containers/data/repositories/container_repository_impl.dart';
+import 'package:tatlock_ui/features/control_room/containers/domain/entities/container.dart';
+import 'package:tatlock_ui/features/control_room/stacks/presentation/providers/stacks_provider.dart';
+
+part 'containers_provider.g.dart';
+
+/// Provides all containers.
+@riverpod
+Future<List<Container>> allContainers(Ref ref) async {
+  final repository = ref.watch(containerRepositoryProvider);
+  return repository.getContainers();
+}
+
+/// Provides containers filtered by the selected stack.
+@riverpod
+Future<List<Container>> containers(Ref ref) async {
+  final repository = ref.watch(containerRepositoryProvider);
+  final selectedStack = ref.watch(selectedStackProvider);
+
+  if (selectedStack == null) {
+    return repository.getContainers();
+  }
+
+  return repository.getContainersByStack(selectedStack);
+}
+
+/// Provides a single container by ID.
+@riverpod
+Future<Container> container(Ref ref, String id) async {
+  final repository = ref.watch(containerRepositoryProvider);
+  return repository.getContainer(id);
+}
+
+/// Controller for container actions.
+@riverpod
+class ContainerActions extends _$ContainerActions {
+  @override
+  AsyncValue<void> build() => const AsyncValue.data(null);
+
+  Future<void> start(String id) async {
+    state = const AsyncValue.loading();
+    state = await AsyncValue.guard(() async {
+      final repository = ref.read(containerRepositoryProvider);
+      await repository.startContainer(id);
+      ref.invalidate(allContainersProvider);
+      ref.invalidate(containersProvider);
+    });
+  }
+
+  Future<void> stop(String id) async {
+    state = const AsyncValue.loading();
+    state = await AsyncValue.guard(() async {
+      final repository = ref.read(containerRepositoryProvider);
+      await repository.stopContainer(id);
+      ref.invalidate(allContainersProvider);
+      ref.invalidate(containersProvider);
+    });
+  }
+
+  Future<void> restart(String id) async {
+    state = const AsyncValue.loading();
+    state = await AsyncValue.guard(() async {
+      final repository = ref.read(containerRepositoryProvider);
+      await repository.restartContainer(id);
+      ref.invalidate(allContainersProvider);
+      ref.invalidate(containersProvider);
+    });
+  }
+
+  Future<void> remove(String id, {bool force = false}) async {
+    state = const AsyncValue.loading();
+    state = await AsyncValue.guard(() async {
+      final repository = ref.read(containerRepositoryProvider);
+      await repository.removeContainer(id, force: force);
+      ref.invalidate(allContainersProvider);
+      ref.invalidate(containersProvider);
+    });
+  }
+}
+
+/// Container logs provider.
+@riverpod
+Future<String> containerLogs(
+  Ref ref,
+  String id, {
+  int? tail = 100,
+}) async {
+  final repository = ref.watch(containerRepositoryProvider);
+  return repository.getContainerLogs(id, tail: tail);
+}

lib/features/control_room/containers/presentation/widgets/container_logs_viewer.dart

@@ -0,0 +1,170 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:tatlock_ui/features/control_room/containers/presentation/providers/containers_provider.dart';
+
+/// Widget for displaying container logs.
+class ContainerLogsViewer extends ConsumerStatefulWidget {
+  const ContainerLogsViewer({
+    super.key,
+    required this.containerId,
+    required this.containerName,
+  });
+
+  final String containerId;
+  final String containerName;
+
+  @override
+  ConsumerState<ContainerLogsViewer> createState() =>
+      _ContainerLogsViewerState();
+}
+
+class _ContainerLogsViewerState extends ConsumerState<ContainerLogsViewer> {
+  final _scrollController = ScrollController();
+  int _tailLines = 100;
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final logsAsync = ref.watch(
+      containerLogsProvider(widget.containerId, tail: _tailLines),
+    );
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        // Toolbar
+        Container(
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+          decoration: BoxDecoration(
+            color: colorScheme.surfaceContainerHighest,
+            border: Border(
+              bottom: BorderSide(color: colorScheme.outlineVariant),
+            ),
+          ),
+          child: Row(
+            children: [
+              Text(
+                widget.containerName,
+                style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                      fontWeight: FontWeight.w600,
+                    ),
+              ),
+              const Spacer(),
+              // Tail lines selector
+              DropdownButton<int>(
+                value: _tailLines,
+                items: const [
+                  DropdownMenuItem(value: 50, child: Text('50 lines')),
+                  DropdownMenuItem(value: 100, child: Text('100 lines')),
+                  DropdownMenuItem(value: 500, child: Text('500 lines')),
+                  DropdownMenuItem(value: 1000, child: Text('1000 lines')),
+                ],
+                onChanged: (value) {
+                  if (value != null) {
+                    setState(() => _tailLines = value);
+                  }
+                },
+                underline: const SizedBox.shrink(),
+              ),
+              const SizedBox(width: 8),
+              IconButton(
+                icon: const Icon(Icons.copy, size: 18),
+                tooltip: 'Copy logs',
+                onPressed: logsAsync.whenOrNull(
+                  data: (logs) => () async {
+                    await Clipboard.setData(ClipboardData(text: logs));
+                    if (context.mounted) {
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        const SnackBar(content: Text('Logs copied to clipboard')),
+                      );
+                    }
+                  },
+                ),
+              ),
+              IconButton(
+                icon: const Icon(Icons.refresh, size: 18),
+                tooltip: 'Refresh',
+                onPressed: () {
+                  ref.invalidate(
+                    containerLogsProvider(widget.containerId, tail: _tailLines),
+                  );
+                },
+              ),
+            ],
+          ),
+        ),
+        // Logs content
+        Expanded(
+          child: logsAsync.when(
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error: (error, _) => Center(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Icon(Icons.error_outline, color: colorScheme.error, size: 48),
+                  const SizedBox(height: 16),
+                  Text('Failed to load logs'),
+                  const SizedBox(height: 8),
+                  Text(
+                    error.toString(),
+                    style: TextStyle(color: colorScheme.outline),
+                  ),
+                ],
+              ),
+            ),
+            data: (logs) => logs.isEmpty
+                ? Center(
+                    child: Text(
+                      'No logs available',
+                      style: TextStyle(color: colorScheme.outline),
+                    ),
+                  )
+                : Container(
+                    color: Colors.black87,
+                    padding: const EdgeInsets.all(12),
+                    child: SelectableText(
+                      logs,
+                      style: const TextStyle(
+                        fontFamily: 'monospace',
+                        fontSize: 12,
+                        color: Colors.white70,
+                        height: 1.4,
+                      ),
+                    ),
+                  ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+/// Shows container logs in a bottom sheet.
+void showContainerLogs(
+  BuildContext context, {
+  required String containerId,
+  required String containerName,
+}) {
+  showModalBottomSheet(
+    context: context,
+    isScrollControlled: true,
+    useSafeArea: true,
+    builder: (context) => DraggableScrollableSheet(
+      initialChildSize: 0.7,
+      minChildSize: 0.3,
+      maxChildSize: 0.95,
+      expand: false,
+      builder: (context, scrollController) => ContainerLogsViewer(
+        containerId: containerId,
+        containerName: containerName,
+      ),
+    ),
+  );
+}

lib/features/control_room/containers/presentation/widgets/container_status_badge.dart

@@ -0,0 +1,115 @@
+import 'package:flutter/material.dart' hide Container;
+
+/// Container state enum for status display.
+enum ContainerState {
+  created,
+  running,
+  paused,
+  restarting,
+  removing,
+  exited,
+  dead;
+
+  /// Parse a string to ContainerState.
+  static ContainerState fromString(String value) {
+    return ContainerState.values.firstWhere(
+      (s) => s.name == value.toLowerCase(),
+      orElse: () => ContainerState.exited,
+    );
+  }
+}
+
+/// Status badge for container state.
+class ContainerStatusBadge extends StatelessWidget {
+  const ContainerStatusBadge({
+    super.key,
+    required this.state,
+    this.showLabel = true,
+  });
+
+  /// Create badge from a string state value.
+  factory ContainerStatusBadge.fromString(String state, {bool showLabel = true}) {
+    return ContainerStatusBadge(
+      state: ContainerState.fromString(state),
+      showLabel: showLabel,
+    );
+  }
+
+  final ContainerState state;
+  final bool showLabel;
+
+  @override
+  Widget build(BuildContext context) {
+    final (color, icon, label) = _getStateStyle(context);
+
+    return DecoratedBox(
+      decoration: BoxDecoration(
+        color: color.withValues(alpha: 0.15),
+        borderRadius: BorderRadius.circular(4),
+        border: Border.all(color: color.withValues(alpha: 0.3)),
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(icon, size: 14, color: color),
+            if (showLabel) ...[
+              const SizedBox(width: 4),
+              Text(
+                label,
+                style: TextStyle(
+                  fontSize: 12,
+                  fontWeight: FontWeight.w500,
+                  color: color,
+                ),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+
+  (Color, IconData, String) _getStateStyle(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return switch (state) {
+      ContainerState.running => (
+          Colors.green,
+          Icons.play_circle,
+          'Running',
+        ),
+      ContainerState.paused => (
+          Colors.orange,
+          Icons.pause_circle,
+          'Paused',
+        ),
+      ContainerState.restarting => (
+          Colors.blue,
+          Icons.refresh,
+          'Restarting',
+        ),
+      ContainerState.exited => (
+          colorScheme.outline,
+          Icons.stop_circle,
+          'Exited',
+        ),
+      ContainerState.created => (
+          colorScheme.outline,
+          Icons.circle_outlined,
+          'Created',
+        ),
+      ContainerState.removing => (
+          Colors.red,
+          Icons.delete,
+          'Removing',
+        ),
+      ContainerState.dead => (
+          colorScheme.error,
+          Icons.error,
+          'Dead',
+        ),
+    };
+  }
+}

lib/features/control_room/npm/data/datasources/proxy_hosts_datasource.dart

@@ -0,0 +1,68 @@
+import 'package:dio/dio.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:tatlock_ui/core/api/api_client.dart';
+import 'package:tatlock_ui/features/control_room/npm/data/models/proxy_host_model.dart';
+
+part 'proxy_hosts_datasource.g.dart';
+
+/// Remote data source for NPM proxy host operations via Core API.
+class ProxyHostsDatasource {
+  ProxyHostsDatasource(this._dio);
+
+  final Dio _dio;
+
+  /// Gets all configured domains from Core API.
+  Future<List<DomainInfoModel>> getDomains() async {
+    final response = await _dio.get<List<dynamic>>(
+      '/infrastructure/domains',
+    );
+
+    return response.data!
+        .map((json) => DomainInfoModel.fromJson(json as Map<String, dynamic>))
+        .toList();
+  }
+
+  /// Gets detailed proxy host configuration by ID.
+  Future<ProxyHostModel> getProxyHost(int proxyId) async {
+    final response = await _dio.get<Map<String, dynamic>>(
+      '/infrastructure/proxy/$proxyId',
+    );
+
+    return ProxyHostModel.fromJson(response.data!);
+  }
+
+  /// Creates a new proxy host.
+  Future<void> createProxyHost({
+    required List<String> domainNames,
+    required String forwardScheme,
+    required String forwardHost,
+    required int forwardPort,
+    bool sslEnabled = false,
+  }) async {
+    await _dio.post<void>(
+      '/infrastructure/proxy',
+      data: {
+        'domain_names': domainNames,
+        'forward_scheme': forwardScheme,
+        'forward_host': forwardHost,
+        'forward_port': forwardPort,
+        'ssl_enabled': sslEnabled,
+      },
+    );
+  }
+
+  /// Updates an existing proxy host.
+  Future<void> updateProxyHost(int proxyId, Map<String, dynamic> config) async {
+    await _dio.put<void>(
+      '/infrastructure/proxy/$proxyId',
+      data: config,
+    );
+  }
+}
+
+/// Provides the proxy hosts datasource.
+@riverpod
+ProxyHostsDatasource proxyHostsDatasource(Ref ref) {
+  final dio = ref.watch(coreApiClientProvider);
+  return ProxyHostsDatasource(dio);
+}

lib/features/control_room/npm/data/models/proxy_host_model.dart

@@ -0,0 +1,137 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:tatlock_ui/features/control_room/npm/domain/entities/proxy_host.dart';
+
+part 'proxy_host_model.freezed.dart';
+part 'proxy_host_model.g.dart';
+
+/// Converts API values that can be either int or bool (false) to int?.
+/// NPM returns false instead of null for missing IDs.
+class NullableIntOrBoolConverter implements JsonConverter<int?, dynamic> {
+  const NullableIntOrBoolConverter();
+
+  @override
+  int? fromJson(dynamic json) {
+    if (json == null || json == false) return null;
+    if (json is int) return json;
+    if (json is num) return json.toInt();
+    return null;
+  }
+
+  @override
+  dynamic toJson(int? object) => object;
+}
+
+/// Converts API values that can be either int or bool to int.
+/// NPM returns true/false for some 0/1 fields.
+class IntOrBoolConverter implements JsonConverter<int, dynamic> {
+  const IntOrBoolConverter();
+
+  @override
+  int fromJson(dynamic json) {
+    if (json == null) return 0;
+    if (json is bool) return json ? 1 : 0;
+    if (json is int) return json;
+    if (json is num) return json.toInt();
+    return 0;
+  }
+
+  @override
+  dynamic toJson(int object) => object;
+}
+
+/// Proxy host data model for API serialization.
+///
+/// Maps to the NPM API response format via Core API.
+@freezed
+sealed class ProxyHostModel with _$ProxyHostModel {
+  const factory ProxyHostModel({
+    required int id,
+    @JsonKey(name: 'domain_names') required List<String> domainNames,
+    @JsonKey(name: 'forward_scheme') required String forwardScheme,
+    @JsonKey(name: 'forward_host') required String forwardHost,
+    @JsonKey(name: 'forward_port') required int forwardPort,
+    @JsonKey(name: 'ssl_forced') @Default(false) bool sslForced,
+    @NullableIntOrBoolConverter() @JsonKey(name: 'certificate_id') int? certificateId,
+    @IntOrBoolConverter() @Default(1) int enabled,
+    @IntOrBoolConverter() @JsonKey(name: 'http2_support') @Default(0) int http2Support,
+    @IntOrBoolConverter() @JsonKey(name: 'hsts_enabled') @Default(0) int hstsEnabled,
+    @NullableIntOrBoolConverter() @JsonKey(name: 'access_list_id') int? accessListId,
+    @IntOrBoolConverter() @JsonKey(name: 'caching_enabled') @Default(0) int cachingEnabled,
+    @IntOrBoolConverter() @JsonKey(name: 'block_exploits') @Default(0) int blockExploits,
+    @IntOrBoolConverter() @JsonKey(name: 'allow_websocket_upgrade') @Default(0) int allowWebsocketUpgrade,
+    @JsonKey(name: 'created_on') String? createdOn,
+    @JsonKey(name: 'modified_on') String? modifiedOn,
+    @Default([]) List<ProxyLocationModel> locations,
+  }) = _ProxyHostModel;
+
+  const ProxyHostModel._();
+
+  factory ProxyHostModel.fromJson(Map<String, dynamic> json) =>
+      _$ProxyHostModelFromJson(json);
+
+  /// Converts to domain entity.
+  ProxyHost toEntity() {
+    return ProxyHost(
+      id: id,
+      domainNames: domainNames,
+      forwardScheme: forwardScheme,
+      forwardHost: forwardHost,
+      forwardPort: forwardPort,
+      sslEnabled: certificateId != null && certificateId! > 0,
+      certificateId: certificateId,
+      enabled: enabled == 1,
+      http2Support: http2Support == 1,
+      hstsEnabled: hstsEnabled == 1,
+      forceSSL: sslForced,
+      accessListId: accessListId,
+      cacheAssets: cachingEnabled == 1,
+      blockExploits: blockExploits == 1,
+      websocketSupport: allowWebsocketUpgrade == 1,
+      locations: locations.map((l) => l.toEntity()).toList(),
+      createdAt: createdOn != null ? DateTime.tryParse(createdOn!) : null,
+      modifiedAt: modifiedOn != null ? DateTime.tryParse(modifiedOn!) : null,
+    );
+  }
+}
+
+/// Proxy location model.
+@freezed
+sealed class ProxyLocationModel with _$ProxyLocationModel {
+  const factory ProxyLocationModel({
+    required String path,
+    @JsonKey(name: 'forward_scheme') required String forwardScheme,
+    @JsonKey(name: 'forward_host') required String forwardHost,
+    @JsonKey(name: 'forward_port') required int forwardPort,
+  }) = _ProxyLocationModel;
+
+  const ProxyLocationModel._();
+
+  factory ProxyLocationModel.fromJson(Map<String, dynamic> json) =>
+      _$ProxyLocationModelFromJson(json);
+
+  ProxyLocation toEntity() {
+    return ProxyLocation(
+      path: path,
+      forwardScheme: forwardScheme,
+      forwardHost: forwardHost,
+      forwardPort: forwardPort,
+    );
+  }
+}
+
+/// Domain info model for the /infrastructure/domains endpoint.
+///
+/// This is a simpler model used for listing domains.
+@freezed
+sealed class DomainInfoModel with _$DomainInfoModel {
+  const factory DomainInfoModel({
+    required String domain,
+    required String service,
+    @JsonKey(name: 'proxy_host_id') required int proxyHostId,
+    @JsonKey(name: 'ssl_enabled') @Default(false) bool sslEnabled,
+    @JsonKey(name: 'certificate_id') int? certificateId,
+  }) = _DomainInfoModel;
+
+  factory DomainInfoModel.fromJson(Map<String, dynamic> json) =>
+      _$DomainInfoModelFromJson(json);
+}

lib/features/control_room/npm/domain/entities/proxy_host.dart

@@ -0,0 +1,93 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'proxy_host.freezed.dart';
+
+/// NPM proxy host entity representing a domain configuration.
+@freezed
+sealed class ProxyHost with _$ProxyHost {
+  const factory ProxyHost({
+    /// Proxy host ID.
+    required int id,
+
+    /// Domain names (can have multiple).
+    required List<String> domainNames,
+
+    /// Forward scheme (http or https).
+    required String forwardScheme,
+
+    /// Forward host (IP or hostname).
+    required String forwardHost,
+
+    /// Forward port.
+    required int forwardPort,
+
+    /// Whether SSL is enabled.
+    required bool sslEnabled,
+
+    /// SSL certificate ID (if enabled).
+    int? certificateId,
+
+    /// Whether the host is enabled.
+    @Default(true) bool enabled,
+
+    /// Whether HTTP/2 is enabled.
+    @Default(false) bool http2Support,
+
+    /// Whether HSTS is enabled.
+    @Default(false) bool hstsEnabled,
+
+    /// Whether to force SSL.
+    @Default(false) bool forceSSL,
+
+    /// Custom locations (advanced nginx config).
+    @Default([]) List<ProxyLocation> locations,
+
+    /// Access list ID (for auth).
+    int? accessListId,
+
+    /// Cache assets enabled.
+    @Default(false) bool cacheAssets,
+
+    /// Block common exploits.
+    @Default(false) bool blockExploits,
+
+    /// Websocket support.
+    @Default(false) bool websocketSupport,
+
+    /// Created timestamp.
+    DateTime? createdAt,
+
+    /// Modified timestamp.
+    DateTime? modifiedAt,
+  }) = _ProxyHost;
+
+  const ProxyHost._();
+
+  /// Primary domain (first in list).
+  String get primaryDomain =>
+      domainNames.isNotEmpty ? domainNames.first : 'Unknown';
+
+  /// Forward URL (scheme://host:port).
+  String get forwardUrl => '$forwardScheme://$forwardHost:$forwardPort';
+
+  /// SSL status label.
+  String get sslStatus => sslEnabled ? 'SSL Enabled' : 'No SSL';
+}
+
+/// Proxy location for advanced routing.
+@freezed
+sealed class ProxyLocation with _$ProxyLocation {
+  const factory ProxyLocation({
+    /// Location path.
+    required String path,
+
+    /// Forward scheme.
+    required String forwardScheme,
+
+    /// Forward host.
+    required String forwardHost,
+
+    /// Forward port.
+    required int forwardPort,
+  }) = _ProxyLocation;
+}

lib/features/control_room/npm/presentation/pages/proxy_host_page.dart

@@ -0,0 +1,297 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:tatlock_ui/features/control_room/npm/domain/entities/proxy_host.dart';
+import 'package:tatlock_ui/features/control_room/npm/presentation/providers/proxy_hosts_provider.dart';
+import 'package:tatlock_ui/features/control_room/npm/presentation/widgets/proxy_host_form.dart';
+import 'package:tatlock_ui/shared/widgets/entity_page.dart';
+
+/// Unified page for proxy host create, view, and edit.
+///
+/// Usage:
+/// - Create: `ProxyHostPage.create(onClose: ...)`
+/// - View/Edit: `ProxyHostPage(proxyHostId: 123, onClose: ...)`
+class ProxyHostPage extends ConsumerStatefulWidget {
+  const ProxyHostPage({
+    super.key,
+    required this.proxyHostId,
+    required this.onClose,
+  }) : _isCreate = false;
+
+  const ProxyHostPage.create({
+    super.key,
+    required this.onClose,
+  })  : proxyHostId = null,
+        _isCreate = true;
+
+  final int? proxyHostId;
+  final VoidCallback onClose;
+  final bool _isCreate;
+
+  @override
+  ConsumerState<ProxyHostPage> createState() => _ProxyHostPageState();
+}
+
+class _ProxyHostPageState extends ConsumerState<ProxyHostPage>
+    with EntityPageModeMixin {
+  @override
+  void initState() {
+    super.initState();
+    // Start in create mode if no ID, otherwise view mode
+    mode = widget._isCreate ? EntityPageMode.create : EntityPageMode.view;
+  }
+
+  String get _title {
+    switch (mode) {
+      case EntityPageMode.create:
+        return 'New Proxy Host';
+      case EntityPageMode.view:
+        return 'Proxy Host Details';
+      case EntityPageMode.edit:
+        return 'Edit Proxy Host';
+    }
+  }
+
+  void _handleSaved() {
+    if (widget._isCreate) {
+      // After create, close and return to list
+      widget.onClose();
+    } else {
+      // After edit, return to view mode and refresh
+      stopEditing();
+      ref.invalidate(proxyHostProvider(widget.proxyHostId!));
+    }
+    ref.invalidate(domainsProvider);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Create mode - no need to fetch existing data
+    if (widget._isCreate) {
+      return EntityPageScaffold(
+        title: _title,
+        onBack: widget.onClose,
+        child: ProxyHostForm(
+          mode: EntityPageMode.create,
+          onCancel: widget.onClose,
+          onSaved: _handleSaved,
+        ),
+      );
+    }
+
+    // View/Edit mode - fetch existing proxy host
+    final proxyHostAsync = ref.watch(proxyHostProvider(widget.proxyHostId!));
+
+    return EntityPageScaffold(
+      title: _title,
+      onBack: widget.onClose,
+      actions: [
+        if (isViewing)
+          IconButton(
+            icon: const Icon(Icons.edit),
+            tooltip: 'Edit',
+            onPressed: startEditing,
+          ),
+        IconButton(
+          icon: const Icon(Icons.refresh),
+          tooltip: 'Refresh',
+          onPressed: () =>
+              ref.invalidate(proxyHostProvider(widget.proxyHostId!)),
+        ),
+      ],
+      child: EntityAsyncContent<ProxyHost>(
+        isLoading: proxyHostAsync.isLoading,
+        error: proxyHostAsync.error,
+        data: proxyHostAsync.value,
+        onRetry: () => ref.invalidate(proxyHostProvider(widget.proxyHostId!)),
+        builder: (proxyHost) {
+          if (isEditing) {
+            return ProxyHostForm(
+              mode: EntityPageMode.edit,
+              proxyHost: proxyHost,
+              onCancel: stopEditing,
+              onSaved: _handleSaved,
+            );
+          }
+          return _ProxyHostView(proxyHost: proxyHost);
+        },
+      ),
+    );
+  }
+}
+
+/// Read-only view of proxy host details.
+class _ProxyHostView extends StatelessWidget {
+  const _ProxyHostView({required this.proxyHost});
+
+  final ProxyHost proxyHost;
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      padding: const EdgeInsets.all(24),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          // Domain names
+          EntitySection(
+            title: 'Domain Names',
+            icon: Icons.public,
+            child: Wrap(
+              spacing: 8,
+              runSpacing: 8,
+              children: proxyHost.domainNames.map((domain) {
+                return Chip(
+                  avatar: Icon(
+                    proxyHost.sslEnabled ? Icons.lock : Icons.lock_open,
+                    size: 16,
+                    color: proxyHost.sslEnabled ? Colors.green : null,
+                  ),
+                  label: Text(domain),
+                );
+              }).toList(),
+            ),
+          ),
+          const SizedBox(height: 24),
+
+          // Forward destination
+          EntitySection(
+            title: 'Forward Destination',
+            icon: Icons.arrow_forward,
+            child: Card(
+              child: Padding(
+                padding: const EdgeInsets.all(16),
+                child: Row(
+                  children: [
+                    Icon(Icons.dns,
+                        color: Theme.of(context).colorScheme.primary),
+                    const SizedBox(width: 12),
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            proxyHost.forwardUrl,
+                            style: Theme.of(context)
+                                .textTheme
+                                .titleMedium
+                                ?.copyWith(fontFamily: 'monospace'),
+                          ),
+                          const SizedBox(height: 4),
+                          Text(
+                            '${proxyHost.forwardScheme.toUpperCase()} → ${proxyHost.forwardHost}:${proxyHost.forwardPort}',
+                            style: TextStyle(
+                                color: Theme.of(context).colorScheme.outline),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+          const SizedBox(height: 24),
+
+          // SSL Settings
+          EntitySection(
+            title: 'SSL Settings',
+            icon: Icons.verified_user,
+            child: Card(
+              child: Padding(
+                padding: const EdgeInsets.all(16),
+                child: Column(
+                  children: [
+                    EntitySettingRow(
+                      label: 'SSL Enabled',
+                      value: proxyHost.sslEnabled,
+                    ),
+                    if (proxyHost.sslEnabled) ...[
+                      const Divider(),
+                      EntitySettingRow(
+                        label: 'Force SSL',
+                        value: proxyHost.forceSSL,
+                        subtitle: 'Redirect HTTP to HTTPS',
+                      ),
+                      const Divider(),
+                      EntitySettingRow(
+                        label: 'HTTP/2 Support',
+                        value: proxyHost.http2Support,
+                      ),
+                      const Divider(),
+                      EntitySettingRow(
+                        label: 'HSTS Enabled',
+                        value: proxyHost.hstsEnabled,
+                      ),
+                    ],
+                  ],
+                ),
+              ),
+            ),
+          ),
+          const SizedBox(height: 24),
+
+          // Advanced Settings
+          EntitySection(
+            title: 'Advanced Settings',
+            icon: Icons.settings,
+            child: Card(
+              child: Padding(
+                padding: const EdgeInsets.all(16),
+                child: Column(
+                  children: [
+                    EntitySettingRow(
+                      label: 'WebSocket Support',
+                      value: proxyHost.websocketSupport,
+                    ),
+                    const Divider(),
+                    EntitySettingRow(
+                      label: 'Block Exploits',
+                      value: proxyHost.blockExploits,
+                    ),
+                    const Divider(),
+                    EntitySettingRow(
+                      label: 'Cache Assets',
+                      value: proxyHost.cacheAssets,
+                    ),
+                    const Divider(),
+                    EntitySettingRow(
+                      label: 'Enabled',
+                      value: proxyHost.enabled,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+
+          // Locations (if any)
+          if (proxyHost.locations.isNotEmpty) ...[
+            const SizedBox(height: 24),
+            EntitySection(
+              title: 'Custom Locations',
+              icon: Icons.route,
+              child: Card(
+                child: ListView.separated(
+                  shrinkWrap: true,
+                  physics: const NeverScrollableScrollPhysics(),
+                  itemCount: proxyHost.locations.length,
+                  separatorBuilder: (_, index) => const Divider(height: 1),
+                  itemBuilder: (context, index) {
+                    final loc = proxyHost.locations[index];
+                    return ListTile(
+                      leading: const Icon(Icons.subdirectory_arrow_right),
+                      title: Text(loc.path,
+                          style: const TextStyle(fontFamily: 'monospace')),
+                      subtitle: Text(
+                          '${loc.forwardScheme}://${loc.forwardHost}:${loc.forwardPort}'),
+                    );
+                  },
+                ),
+              ),
+            ),
+          ],
+        ],
+      ),
+    );
+  }
+}

lib/features/control_room/npm/presentation/pages/proxy_hosts_page.dart

@@ -0,0 +1,243 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:tatlock_ui/core/api/api_client.dart';
+import 'package:tatlock_ui/features/control_room/npm/presentation/pages/proxy_host_page.dart';
+import 'package:tatlock_ui/features/control_room/npm/presentation/providers/proxy_hosts_provider.dart';
+import 'package:tatlock_ui/shared/components/data_grid/adapters/core_api_source.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_exports.dart';
+
+/// Domain info data class for DataGrid display.
+class DomainData {
+  DomainData({
+    required this.domain,
+    required this.service,
+    required this.proxyHostId,
+    required this.sslEnabled,
+    this.certificateId,
+  });
+
+  factory DomainData.fromJson(Map<String, dynamic> json) => DomainData(
+        domain: json['domain'] as String,
+        service: json['service'] as String,
+        proxyHostId: json['proxy_host_id'] as int,
+        sslEnabled: json['ssl_enabled'] as bool? ?? false,
+        certificateId: json['certificate_id'] as int?,
+      );
+
+  final String domain;
+  final String service;
+  final int proxyHostId;
+  final bool sslEnabled;
+  final int? certificateId;
+}
+
+/// Page displaying the list of proxy hosts (domains) from NPM.
+class ProxyHostsPage extends ConsumerStatefulWidget {
+  const ProxyHostsPage({super.key});
+
+  @override
+  ConsumerState<ProxyHostsPage> createState() => _ProxyHostsPageState();
+}
+
+class _ProxyHostsPageState extends ConsumerState<ProxyHostsPage> {
+  late final StateNotifierProvider<DataGridController<DomainData>,
+      DataGridState<DomainData>> _gridProvider;
+
+  @override
+  void initState() {
+    super.initState();
+    final dio = ref.read(coreApiClientProvider);
+    final source = CoreApiDataSource<DomainData>(
+      dio: dio,
+      endpoint: '/infrastructure/domains',
+      fromJson: DomainData.fromJson,
+    );
+
+    _gridProvider = dataGridProvider<DomainData>(
+      source: source,
+      config: _buildConfig(),
+      idSelector: (d) => d.proxyHostId.toString(),
+    );
+  }
+
+  DataGridConfig<DomainData> _buildConfig() {
+    return DataGridConfig<DomainData>(
+      columns: [
+        DataGridColumn<DomainData>(
+          header: 'Domain',
+          valueBuilder: (d) => d.domain,
+          sortable: true,
+          searchable: true,
+          width: const DataGridColumnWidth.flex(2),
+          cellBuilder: (context, d) => _DomainCell(domain: d),
+        ),
+        DataGridColumn<DomainData>(
+          header: 'Service',
+          valueBuilder: (d) => d.service,
+          width: const DataGridColumnWidth.flex(1),
+          cellBuilder: (context, d) => _ServiceCell(service: d.service),
+        ),
+        DataGridColumn<DomainData>(
+          header: 'SSL',
+          valueBuilder: (d) => d.sslEnabled ? 'Enabled' : 'Disabled',
+          width: const DataGridColumnWidth.fixed(100),
+          alignment: DataGridColumnAlignment.end,
+          cellBuilder: (context, d) => _SslBadge(enabled: d.sslEnabled),
+        ),
+      ],
+      actions: [
+        DataGridAction<DomainData>(
+          icon: Icons.edit,
+          label: 'Edit',
+          onTap: (d) async => _viewDomain(d),
+        ),
+      ],
+      enableSearch: true,
+      searchHint: 'Search domains...',
+      showHeader: true,
+      showFooter: true,
+    );
+  }
+
+  void _viewDomain(DomainData domain) {
+    ref.read(selectedProxyHostProvider.notifier).select(domain.proxyHostId);
+  }
+
+  void _createNew() {
+    ref.read(creatingProxyHostProvider.notifier).start();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final selectedId = ref.watch(selectedProxyHostProvider);
+    final isCreating = ref.watch(creatingProxyHostProvider);
+
+    // Show create page if creating new
+    if (isCreating) {
+      return ProxyHostPage.create(
+        onClose: () {
+          ref.read(creatingProxyHostProvider.notifier).stop();
+          ref.read(_gridProvider.notifier).refresh();
+        },
+      );
+    }
+
+    // Show detail page if a proxy host is selected
+    if (selectedId != null) {
+      return ProxyHostPage(
+        proxyHostId: selectedId,
+        onClose: () {
+          ref.read(selectedProxyHostProvider.notifier).clear();
+          ref.read(_gridProvider.notifier).refresh();
+        },
+      );
+    }
+
+    return DataGrid<DomainData>(
+      provider: _gridProvider,
+      config: _buildConfig(),
+      idSelector: (d) => d.proxyHostId.toString(),
+      toolbarActions: [
+        IconButton(
+          icon: const Icon(Icons.refresh),
+          tooltip: 'Refresh',
+          onPressed: () => ref.read(_gridProvider.notifier).refresh(),
+        ),
+        const SizedBox(width: 8),
+        FilledButton.icon(
+          onPressed: _createNew,
+          icon: const Icon(Icons.add),
+          label: const Text('New'),
+        ),
+      ],
+    );
+  }
+}
+
+class _DomainCell extends StatelessWidget {
+  const _DomainCell({required this.domain});
+
+  final DomainData domain;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Row(
+      children: [
+        Container(
+          padding: const EdgeInsets.all(8),
+          decoration: BoxDecoration(
+            color: domain.sslEnabled
+                ? Colors.green.withValues(alpha: 0.1)
+                : colorScheme.surfaceContainerHighest,
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: Icon(
+            domain.sslEnabled ? Icons.lock : Icons.lock_open,
+            size: 20,
+            color: domain.sslEnabled ? Colors.green : colorScheme.outline,
+          ),
+        ),
+        const SizedBox(width: 12),
+        Expanded(
+          child: Text(
+            domain.domain,
+            style: const TextStyle(fontWeight: FontWeight.w500),
+            overflow: TextOverflow.ellipsis,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _ServiceCell extends StatelessWidget {
+  const _ServiceCell({required this.service});
+
+  final String service;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Text(
+      service,
+      style: TextStyle(
+        fontSize: 12,
+        color: colorScheme.onSurfaceVariant,
+        fontFamily: 'monospace',
+      ),
+      overflow: TextOverflow.ellipsis,
+    );
+  }
+}
+
+class _SslBadge extends StatelessWidget {
+  const _SslBadge({required this.enabled});
+
+  final bool enabled;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      decoration: BoxDecoration(
+        color: enabled
+            ? Colors.green.withValues(alpha: 0.1)
+            : colorScheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(4),
+      ),
+      child: Text(
+        enabled ? 'SSL' : 'HTTP',
+        style: TextStyle(
+          fontSize: 11,
+          fontWeight: FontWeight.w500,
+          color: enabled ? Colors.green : colorScheme.outline,
+        ),
+      ),
+    );
+  }
+}

lib/features/control_room/npm/presentation/providers/proxy_hosts_provider.dart

@@ -0,0 +1,72 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:tatlock_ui/features/control_room/npm/data/datasources/proxy_hosts_datasource.dart';
+import 'package:tatlock_ui/features/control_room/npm/data/models/proxy_host_model.dart';
+import 'package:tatlock_ui/features/control_room/npm/domain/entities/proxy_host.dart';
+
+part 'proxy_hosts_provider.g.dart';
+
+/// Provider for the list of configured domains.
+@riverpod
+Future<List<DomainInfoModel>> domains(Ref ref) async {
+  final datasource = ref.watch(proxyHostsDatasourceProvider);
+  return datasource.getDomains();
+}
+
+/// Provider for a specific proxy host details.
+@riverpod
+Future<ProxyHost> proxyHost(Ref ref, int proxyId) async {
+  final datasource = ref.watch(proxyHostsDatasourceProvider);
+  final model = await datasource.getProxyHost(proxyId);
+  return model.toEntity();
+}
+
+/// Provider for selected proxy host ID (for detail view).
+@riverpod
+class SelectedProxyHost extends _$SelectedProxyHost {
+  @override
+  int? build() => null;
+
+  void select(int id) => state = id;
+  void clear() => state = null;
+}
+
+/// Provider for tracking if we're creating a new proxy host.
+@riverpod
+class CreatingProxyHost extends _$CreatingProxyHost {
+  @override
+  bool build() => false;
+
+  void start() => state = true;
+  void stop() => state = false;
+}
+
+/// Provider for creating a new proxy host.
+@riverpod
+Future<void> createProxyHost(
+  Ref ref, {
+  required List<String> domainNames,
+  required String forwardScheme,
+  required String forwardHost,
+  required int forwardPort,
+  bool sslEnabled = false,
+}) async {
+  final datasource = ref.watch(proxyHostsDatasourceProvider);
+  await datasource.createProxyHost(
+    domainNames: domainNames,
+    forwardScheme: forwardScheme,
+    forwardHost: forwardHost,
+    forwardPort: forwardPort,
+    sslEnabled: sslEnabled,
+  );
+}
+
+/// Provider for updating an existing proxy host.
+@riverpod
+Future<void> updateProxyHost(
+  Ref ref, {
+  required int id,
+  required Map<String, dynamic> config,
+}) async {
+  final datasource = ref.watch(proxyHostsDatasourceProvider);
+  await datasource.updateProxyHost(id, config);
+}

lib/features/control_room/npm/presentation/widgets/proxy_host_form.dart

@@ -0,0 +1,291 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:tatlock_ui/features/control_room/npm/domain/entities/proxy_host.dart';
+import 'package:tatlock_ui/features/control_room/npm/presentation/providers/proxy_hosts_provider.dart';
+import 'package:tatlock_ui/shared/widgets/entity_form_dialog.dart';
+import 'package:tatlock_ui/shared/widgets/entity_page.dart';
+
+/// Form for creating or editing a proxy host.
+class ProxyHostForm extends ConsumerStatefulWidget {
+  const ProxyHostForm({
+    super.key,
+    this.proxyHost,
+    this.mode = EntityPageMode.create,
+    required this.onCancel,
+    required this.onSaved,
+  });
+
+  /// Existing proxy host for editing (null for create).
+  final ProxyHost? proxyHost;
+
+  /// Form mode - create or edit.
+  final EntityPageMode mode;
+
+  final VoidCallback onCancel;
+  final VoidCallback onSaved;
+
+  bool get isEditing => mode == EntityPageMode.edit;
+
+  @override
+  ConsumerState<ProxyHostForm> createState() => _ProxyHostFormState();
+}
+
+class _ProxyHostFormState extends ConsumerState<ProxyHostForm> {
+  final _formKey = GlobalKey<FormState>();
+
+  late final TextEditingController _domainController;
+  late final TextEditingController _forwardHostController;
+  late final TextEditingController _forwardPortController;
+
+  late String _forwardScheme;
+  late bool _forceSSL;
+  late bool _http2Support;
+  late bool _websocketSupport;
+  late bool _blockExploits;
+  late bool _cacheAssets;
+
+  bool _isSaving = false;
+  String? _error;
+
+  @override
+  void initState() {
+    super.initState();
+    final host = widget.proxyHost;
+
+    _domainController = TextEditingController(
+      text: host?.domainNames.join(', ') ?? '',
+    );
+    _forwardHostController = TextEditingController(
+      text: host?.forwardHost ?? '',
+    );
+    _forwardPortController = TextEditingController(
+      text: host?.forwardPort.toString() ?? '80',
+    );
+
+    _forwardScheme = host?.forwardScheme ?? 'http';
+    _forceSSL = host?.forceSSL ?? false;
+    _http2Support = host?.http2Support ?? false;
+    _websocketSupport = host?.websocketSupport ?? false;
+    _blockExploits = host?.blockExploits ?? true;
+    _cacheAssets = host?.cacheAssets ?? false;
+  }
+
+  @override
+  void dispose() {
+    _domainController.dispose();
+    _forwardHostController.dispose();
+    _forwardPortController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _handleSave() async {
+    if (!_formKey.currentState!.validate()) return;
+
+    setState(() {
+      _isSaving = true;
+      _error = null;
+    });
+
+    try {
+      final domains = _domainController.text
+          .split(',')
+          .map((d) => d.trim())
+          .where((d) => d.isNotEmpty)
+          .toList();
+
+      if (widget.isEditing) {
+        await ref.read(updateProxyHostProvider(
+          id: widget.proxyHost!.id,
+          config: {
+            'domain_names': domains,
+            'forward_scheme': _forwardScheme,
+            'forward_host': _forwardHostController.text,
+            'forward_port': int.parse(_forwardPortController.text),
+            'ssl_forced': _forceSSL,
+            'http2_support': _http2Support ? 1 : 0,
+            'allow_websocket_upgrade': _websocketSupport ? 1 : 0,
+            'block_exploits': _blockExploits ? 1 : 0,
+            'caching_enabled': _cacheAssets ? 1 : 0,
+          },
+        ).future);
+      } else {
+        await ref.read(createProxyHostProvider(
+          domainNames: domains,
+          forwardScheme: _forwardScheme,
+          forwardHost: _forwardHostController.text,
+          forwardPort: int.parse(_forwardPortController.text),
+        ).future);
+      }
+
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(widget.isEditing
+                ? 'Proxy host updated successfully'
+                : 'Proxy host created successfully'),
+            backgroundColor: Colors.green,
+          ),
+        );
+        widget.onSaved();
+      }
+    } catch (e) {
+      setState(() => _error = e.toString());
+    } finally {
+      if (mounted) {
+        setState(() => _isSaving = false);
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return EntityForm(
+      formKey: _formKey,
+      mode: widget.mode,
+      onCancel: widget.onCancel,
+      onSave: _handleSave,
+      isSaving: _isSaving,
+      error: _error,
+      children: [
+        // Domain Names
+        Text('Domain Names', style: Theme.of(context).textTheme.titleMedium),
+        const SizedBox(height: 8),
+        TextFormField(
+          controller: _domainController,
+          decoration: const InputDecoration(
+            hintText: 'example.com, www.example.com',
+            helperText: 'Separate multiple domains with commas',
+            border: OutlineInputBorder(),
+          ),
+          validator: (value) {
+            if (value == null || value.trim().isEmpty) {
+              return 'At least one domain is required';
+            }
+            return null;
+          },
+        ),
+        const SizedBox(height: 24),
+
+        // Forward Destination
+        Text('Forward Destination', style: Theme.of(context).textTheme.titleMedium),
+        const SizedBox(height: 8),
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // Scheme dropdown
+            SizedBox(
+              width: 120,
+              child: DropdownButtonFormField<String>(
+                initialValue: _forwardScheme,
+                decoration: const InputDecoration(
+                  labelText: 'Scheme',
+                  border: OutlineInputBorder(),
+                ),
+                items: const [
+                  DropdownMenuItem(value: 'http', child: Text('HTTP')),
+                  DropdownMenuItem(value: 'https', child: Text('HTTPS')),
+                ],
+                onChanged: (value) {
+                  if (value != null) setState(() => _forwardScheme = value);
+                },
+              ),
+            ),
+            const SizedBox(width: 12),
+            // Host
+            Expanded(
+              flex: 2,
+              child: TextFormField(
+                controller: _forwardHostController,
+                decoration: const InputDecoration(
+                  labelText: 'Host',
+                  hintText: '192.168.1.100 or hostname',
+                  border: OutlineInputBorder(),
+                ),
+                validator: (value) {
+                  if (value == null || value.trim().isEmpty) {
+                    return 'Host is required';
+                  }
+                  return null;
+                },
+              ),
+            ),
+            const SizedBox(width: 12),
+            // Port
+            SizedBox(
+              width: 100,
+              child: TextFormField(
+                controller: _forwardPortController,
+                decoration: const InputDecoration(
+                  labelText: 'Port',
+                  border: OutlineInputBorder(),
+                ),
+                keyboardType: TextInputType.number,
+                validator: (value) {
+                  if (value == null || value.trim().isEmpty) {
+                    return 'Required';
+                  }
+                  final port = int.tryParse(value);
+                  if (port == null || port < 1 || port > 65535) {
+                    return 'Invalid';
+                  }
+                  return null;
+                },
+              ),
+            ),
+          ],
+        ),
+        const SizedBox(height: 24),
+
+        // SSL & Security Options
+        Text('SSL & Security', style: Theme.of(context).textTheme.titleMedium),
+        const SizedBox(height: 8),
+        Card(
+          child: Column(
+            children: [
+              SwitchListTile(
+                title: const Text('Force SSL'),
+                subtitle: const Text('Redirect HTTP to HTTPS'),
+                value: _forceSSL,
+                onChanged: (v) => setState(() => _forceSSL = v),
+              ),
+              const Divider(height: 1),
+              SwitchListTile(
+                title: const Text('HTTP/2 Support'),
+                value: _http2Support,
+                onChanged: (v) => setState(() => _http2Support = v),
+              ),
+              const Divider(height: 1),
+              SwitchListTile(
+                title: const Text('Block Common Exploits'),
+                value: _blockExploits,
+                onChanged: (v) => setState(() => _blockExploits = v),
+              ),
+            ],
+          ),
+        ),
+        const SizedBox(height: 24),
+
+        // Advanced Options
+        Text('Advanced', style: Theme.of(context).textTheme.titleMedium),
+        const SizedBox(height: 8),
+        Card(
+          child: Column(
+            children: [
+              SwitchListTile(
+                title: const Text('WebSocket Support'),
+                value: _websocketSupport,
+                onChanged: (v) => setState(() => _websocketSupport = v),
+              ),
+              const Divider(height: 1),
+              SwitchListTile(
+                title: const Text('Cache Assets'),
+                value: _cacheAssets,
+                onChanged: (v) => setState(() => _cacheAssets = v),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/features/control_room/presentation/pages/control_room_page.dart

@@ -0,0 +1,403 @@
+import 'package:flutter/material.dart' hide Stack;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:tatlock_ui/features/control_room/containers/presentation/pages/containers_list_page.dart';
+import 'package:tatlock_ui/features/control_room/npm/presentation/pages/proxy_hosts_page.dart';
+import 'package:tatlock_ui/features/control_room/router.dart';
+import 'package:tatlock_ui/features/control_room/stacks/data/repositories/stack_repository_impl.dart';
+import 'package:tatlock_ui/features/control_room/stacks/domain/entities/stack.dart';
+import 'package:tatlock_ui/features/control_room/stacks/presentation/pages/stack_detail_page.dart';
+import 'package:tatlock_ui/features/control_room/stacks/presentation/providers/stacks_provider.dart';
+import 'package:tatlock_ui/features/control_room/stacks/presentation/widgets/stack_list_tile.dart';
+import 'package:tatlock_ui/shared/layouts/widgets/filter_panel.dart';
+import 'package:tatlock_ui/shared/layouts/widgets/nav_panel.dart';
+
+/// Main Control Room page with nav panel and section content.
+class ControlRoomPage extends ConsumerWidget {
+  const ControlRoomPage({
+    super.key,
+    this.nav = ControlRoomNav.containers,
+  });
+
+  /// The current nav item to display.
+  final ControlRoomNav nav;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Scaffold(
+      body: Row(
+        children: [
+          // Nav Panel - section navigation with grouping
+          NavPanel(
+            title: 'Sections',
+            icon: Icons.dns_outlined,
+            items: ControlRoomNav.values.map((n) => n.toNavItem()).toList(),
+            selectedId: nav.id,
+            onItemSelected: (id) {
+              final newNav = ControlRoomNav.values.firstWhere(
+                (n) => n.id == id,
+              );
+              // Navigate to section URL
+              context.go(pathForNav(newNav));
+              // Clear stack selection when changing sections
+              ref.read(selectedStackProvider.notifier).clear();
+            },
+          ),
+          // Divider
+          VerticalDivider(
+            width: 1,
+            thickness: 1,
+            color: colorScheme.outlineVariant,
+          ),
+          // Section content
+          Expanded(
+            child: _SectionContent(nav: nav),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// Renders content for the selected nav item.
+class _SectionContent extends ConsumerWidget {
+  const _SectionContent({required this.nav});
+
+  final ControlRoomNav nav;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    switch (nav) {
+      case ControlRoomNav.containers:
+        return const _ContainersSection();
+      case ControlRoomNav.proxyHosts:
+        return const ProxyHostsPage();
+      default:
+        return _PlaceholderSection(nav: nav);
+    }
+  }
+}
+
+/// Containers section with optional stack filter.
+class _ContainersSection extends ConsumerWidget {
+  const _ContainersSection();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final selectedStack = ref.watch(selectedStackProvider);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Row(
+      children: [
+        // Stacks filter panel
+        const _StacksFilterPanel(),
+        // Divider
+        VerticalDivider(
+          width: 1,
+          thickness: 1,
+          color: colorScheme.outlineVariant,
+        ),
+        // Main content - containers list or stack detail
+        Expanded(
+          child: selectedStack == null
+              ? const ContainersListPage()
+              : StackDetailPage(stackId: selectedStack),
+        ),
+      ],
+    );
+  }
+}
+
+/// Placeholder for nav items not yet implemented.
+class _PlaceholderSection extends StatelessWidget {
+  const _PlaceholderSection({required this.nav});
+
+  final ControlRoomNav nav;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final textTheme = Theme.of(context).textTheme;
+
+    return Center(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(
+            nav.icon,
+            size: 64,
+            color: colorScheme.outline,
+          ),
+          const SizedBox(height: 16),
+          Text(
+            nav.label,
+            style: textTheme.headlineSmall?.copyWith(
+              color: colorScheme.onSurfaceVariant,
+            ),
+          ),
+          const SizedBox(height: 8),
+          Text(
+            '${nav.section} • Coming soon',
+            style: textTheme.bodyMedium?.copyWith(
+              color: colorScheme.outline,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// Stacks filter panel for Containers section (includes "All Containers" option).
+class _StacksFilterPanel extends ConsumerWidget {
+  const _StacksFilterPanel();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final stacksAsync = ref.watch(stacksProvider);
+    final selectedStack = ref.watch(selectedStackProvider);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return FilterPanel(
+      title: 'Stacks',
+      icon: Icons.layers,
+      onRefresh: () => ref.invalidate(stacksProvider),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          // All containers option
+          ListTile(
+            selected: selectedStack == null,
+            selectedTileColor:
+                colorScheme.primaryContainer.withValues(alpha: 0.3),
+            leading: Icon(
+              Icons.all_inbox,
+              color: selectedStack == null
+                  ? colorScheme.primary
+                  : colorScheme.onSurfaceVariant,
+            ),
+            title: const Text('All Containers'),
+            onTap: () => ref.read(selectedStackProvider.notifier).clear(),
+          ),
+          const Divider(height: 1),
+          // Stacks list
+          Expanded(
+            child: stacksAsync.when(
+              loading: () => const Center(
+                child: CircularProgressIndicator(),
+              ),
+              error: (error, _) => Center(
+                child: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Icon(
+                        Icons.error_outline,
+                        color: colorScheme.error,
+                      ),
+                      const SizedBox(height: 8),
+                      Text(
+                        'Failed to load stacks',
+                        style: TextStyle(color: colorScheme.error),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+              data: (stacks) => _StacksList(
+                stacks: stacks,
+                selectedStackId: selectedStack,
+                onStackSelected: (id) =>
+                    ref.read(selectedStackProvider.notifier).select(id),
+                onStackAction: (id, action) =>
+                    _handleStackAction(context, ref, id, action),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _handleStackAction(
+    BuildContext context,
+    WidgetRef ref,
+    String stackId,
+    String action,
+  ) async {
+    final repository = ref.read(stackRepositoryProvider);
+    final messenger = ScaffoldMessenger.of(context);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    try {
+      switch (action) {
+        case 'start':
+          await repository.startStack(stackId);
+        case 'stop':
+          await repository.stopStack(stackId);
+        case 'restart':
+          await repository.restartStack(stackId);
+      }
+
+      // Refresh data
+      ref.invalidate(stacksProvider);
+
+      // Show success snackbar
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text('Stack ${action}ed successfully'),
+          backgroundColor: colorScheme.primaryContainer,
+          behavior: SnackBarBehavior.floating,
+          duration: const Duration(seconds: 2),
+        ),
+      );
+    } catch (e) {
+      messenger.showSnackBar(
+        SnackBar(
+          content: Row(
+            children: [
+              Icon(Icons.error_outline, color: colorScheme.onErrorContainer),
+              const SizedBox(width: 8),
+              Expanded(
+                child: Text(
+                  'Failed to $action stack: ${e.toString()}',
+                  style: TextStyle(color: colorScheme.onErrorContainer),
+                ),
+              ),
+            ],
+          ),
+          backgroundColor: colorScheme.errorContainer,
+          behavior: SnackBarBehavior.floating,
+          duration: const Duration(seconds: 4),
+        ),
+      );
+    }
+  }
+}
+
+class _StacksList extends StatefulWidget {
+  const _StacksList({
+    required this.stacks,
+    required this.selectedStackId,
+    required this.onStackSelected,
+    required this.onStackAction,
+  });
+
+  final List<Stack> stacks;
+  final String? selectedStackId;
+  final void Function(String) onStackSelected;
+  final void Function(String, String) onStackAction;
+
+  @override
+  State<_StacksList> createState() => _StacksListState();
+}
+
+class _StacksListState extends State<_StacksList> {
+  final _searchController = TextEditingController();
+  String _searchQuery = '';
+
+  @override
+  void dispose() {
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  List<Stack> get _filteredStacks {
+    if (_searchQuery.isEmpty) return widget.stacks;
+    final query = _searchQuery.toLowerCase();
+    return widget.stacks.where((s) {
+      return s.name.toLowerCase().contains(query);
+    }).toList();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final filtered = _filteredStacks;
+
+    return Column(
+      children: [
+        // Search field
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+          child: TextField(
+            controller: _searchController,
+            decoration: InputDecoration(
+              hintText: 'Search stacks...',
+              prefixIcon: const Icon(Icons.search, size: 18),
+              suffixIcon: _searchQuery.isNotEmpty
+                  ? IconButton(
+                      icon: const Icon(Icons.clear, size: 16),
+                      onPressed: () {
+                        _searchController.clear();
+                        setState(() => _searchQuery = '');
+                      },
+                    )
+                  : null,
+              isDense: true,
+              contentPadding: const EdgeInsets.symmetric(
+                horizontal: 12,
+                vertical: 8,
+              ),
+              border: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(8),
+              ),
+            ),
+            style: const TextStyle(fontSize: 13),
+            onChanged: (value) => setState(() => _searchQuery = value),
+          ),
+        ),
+        // Stack list or empty state
+        Expanded(
+          child: filtered.isEmpty
+              ? Center(
+                  child: Padding(
+                    padding: const EdgeInsets.all(16),
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Icon(
+                          _searchQuery.isEmpty
+                              ? Icons.layers_clear
+                              : Icons.search_off,
+                          size: 32,
+                          color: colorScheme.outline,
+                        ),
+                        const SizedBox(height: 8),
+                        Text(
+                          _searchQuery.isEmpty
+                              ? 'No stacks found'
+                              : 'No stacks match "$_searchQuery"',
+                          style: TextStyle(
+                            color: colorScheme.outline,
+                            fontSize: 13,
+                          ),
+                          textAlign: TextAlign.center,
+                        ),
+                      ],
+                    ),
+                  ),
+                )
+              : ListView.builder(
+                  itemCount: filtered.length,
+                  itemBuilder: (context, index) {
+                    final stack = filtered[index];
+                    return StackListTile(
+                      stack: stack,
+                      isSelected: stack.id == widget.selectedStackId,
+                      onTap: () => widget.onStackSelected(stack.id),
+                      onStart: () => widget.onStackAction(stack.id, 'start'),
+                      onStop: () => widget.onStackAction(stack.id, 'stop'),
+                      onRestart: () => widget.onStackAction(stack.id, 'restart'),
+                    );
+                  },
+                ),
+        ),
+      ],
+    );
+  }
+}
+

lib/features/control_room/router.dart

@@ -0,0 +1,80 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:tatlock_ui/features/control_room/presentation/pages/control_room_page.dart';
+import 'package:tatlock_ui/shared/layouts/widgets/nav_panel.dart';
+
+/// Route paths for Control Room.
+abstract class ControlRoomRoutes {
+  static const base = '/control-room';
+  // Portainer
+  static const containers = '/control-room/containers';
+  static const networks = '/control-room/networks';
+  static const volumes = '/control-room/volumes';
+  static const images = '/control-room/images';
+  // NPM
+  static const proxyHosts = '/control-room/proxy-hosts';
+  static const redirections = '/control-room/redirections';
+  static const streams = '/control-room/streams';
+  static const certificates = '/control-room/certificates';
+}
+
+/// Control Room navigation items with section grouping.
+enum ControlRoomNav {
+  // Portainer section
+  containers('containers', 'Containers', Icons.dns, 'Portainer'),
+  networks('networks', 'Networks', Icons.hub, 'Portainer'),
+  volumes('volumes', 'Volumes', Icons.storage, 'Portainer'),
+  images('images', 'Images', Icons.photo_library, 'Portainer'),
+  // NPM section
+  proxyHosts('proxy-hosts', 'Proxy Hosts', Icons.public, 'NPM'),
+  redirections('redirections', 'Redirections', Icons.alt_route, 'NPM'),
+  streams('streams', 'Streams', Icons.stream, 'NPM'),
+  certificates('certificates', 'SSL Certificates', Icons.verified_user, 'NPM');
+
+  const ControlRoomNav(this.id, this.label, this.icon, this.section);
+
+  final String id;
+  final String label;
+  final IconData icon;
+  final String section;
+
+  NavItem toNavItem() => NavItem(
+        id: id,
+        label: label,
+        icon: icon,
+        section: section,
+      );
+
+  /// Get route path for this nav item.
+  String get path => '/control-room/$id';
+}
+
+/// Get route path for a nav item.
+String pathForNav(ControlRoomNav nav) => nav.path;
+
+/// Control Room routes for go_router.
+List<RouteBase> controlRoomRoutes() {
+  return [
+    // Redirect /control-room to /control-room/containers
+    GoRoute(
+      path: ControlRoomRoutes.base,
+      name: 'controlRoom',
+      redirect: (context, state) => ControlRoomRoutes.containers,
+    ),
+    // Generate routes for all nav items
+    for (final nav in ControlRoomNav.values)
+      GoRoute(
+        path: nav.path,
+        name: 'controlRoom${_capitalize(nav.id.replaceAll('-', '_'))}',
+        builder: (context, state) => ControlRoomPage(nav: nav),
+      ),
+  ];
+}
+
+String _capitalize(String s) {
+  if (s.isEmpty) return s;
+  return s
+      .split('_')
+      .map((part) => part[0].toUpperCase() + part.substring(1))
+      .join('');
+}

lib/features/control_room/stacks/data/datasources/stacks_datasource.dart

@@ -0,0 +1,132 @@
+import 'package:dio/dio.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:tatlock_ui/core/api/api_client.dart';
+import 'package:tatlock_ui/features/control_room/containers/data/datasources/containers_datasource.dart';
+import 'package:tatlock_ui/features/control_room/containers/domain/entities/container.dart';
+import 'package:tatlock_ui/features/control_room/stacks/domain/entities/stack.dart';
+
+part 'stacks_datasource.g.dart';
+
+/// Data source for stack operations.
+///
+/// Stacks are derived from container labels (Docker Compose convention).
+/// The Core API provides endpoints for stack YAML and environment variables.
+class StacksDatasource {
+  StacksDatasource(this._dio, this._containersDatasource);
+
+  final Dio _dio;
+  final ContainersDatasource _containersDatasource;
+
+  /// Gets all stacks by aggregating container data.
+  Future<List<Stack>> getStacks() async {
+    final containers = await _containersDatasource.getContainers();
+    final containerEntities = containers.map((c) => c.toEntity()).toList();
+
+    // Group containers by stack name
+    final stackMap = <String, List<Container>>{};
+
+    for (final container in containerEntities) {
+      final stackName = container.stackName;
+      if (stackName != null) {
+        stackMap.putIfAbsent(stackName, () => []).add(container);
+      }
+    }
+
+    // Convert to Stack entities
+    return stackMap.entries.map((entry) {
+      final name = entry.key;
+      final stackContainers = entry.value;
+      final runningCount = stackContainers.where((c) => c.isRunning).length;
+
+      return Stack(
+        id: name, // Use name as ID for compose stacks
+        name: name,
+        type: StackType.compose,
+        status: runningCount == stackContainers.length
+            ? StackStatus.active
+            : runningCount > 0
+                ? StackStatus.active
+                : StackStatus.inactive,
+        containerCount: stackContainers.length,
+        runningCount: runningCount,
+      );
+    }).toList()
+      ..sort((a, b) => a.name.compareTo(b.name));
+  }
+
+  /// Gets a single stack by ID.
+  Future<Stack> getStack(String id) async {
+    final stacks = await getStacks();
+    return stacks.firstWhere(
+      (s) => s.id == id,
+      orElse: () => throw Exception('Stack not found: $id'),
+    );
+  }
+
+  /// Performs an action on all containers in a stack.
+  Future<void> stackAction(String stackId, String action) async {
+    final containers = await _containersDatasource.getContainers();
+    final stackContainers = containers
+        .map((c) => c.toEntity())
+        .where((c) => c.stackId == stackId)
+        .toList();
+
+    for (final container in stackContainers) {
+      await _containersDatasource.containerAction(container.fullId, action);
+    }
+  }
+
+  /// Gets the compose YAML for a stack.
+  Future<String> getStackYaml(String stackId) async {
+    final response = await _dio.get<String>(
+      '/infrastructure/stacks/$stackId/compose',
+    );
+    return response.data ?? '';
+  }
+
+  /// Updates the compose YAML for a stack.
+  Future<void> updateStackYaml(String stackId, String yaml) async {
+    await _dio.put<void>(
+      '/infrastructure/stacks/$stackId/compose',
+      data: yaml,
+      options: Options(contentType: 'text/yaml'),
+    );
+  }
+
+  /// Gets the environment variables for a stack.
+  Future<Map<String, String>> getStackEnvVars(String stackId) async {
+    final response = await _dio.get<Map<String, dynamic>>(
+      '/infrastructure/stacks/$stackId/env',
+    );
+    return response.data?.map((k, v) => MapEntry(k, v.toString())) ?? {};
+  }
+
+  /// Updates the environment variables for a stack.
+  Future<void> updateStackEnvVars(
+    String stackId,
+    Map<String, String> envVars,
+  ) async {
+    await _dio.put<void>(
+      '/infrastructure/stacks/$stackId/env',
+      data: envVars,
+    );
+  }
+
+  /// Deploys/redeploys a stack with current configuration.
+  Future<void> deployStack(String stackId) async {
+    await _dio.post<void>('/infrastructure/stacks/$stackId/deploy');
+  }
+
+  /// Rebuilds a stack (pulls fresh images and recreates containers).
+  Future<void> rebuildStack(String stackId) async {
+    await _dio.post<void>('/infrastructure/stacks/$stackId/rebuild');
+  }
+}
+
+/// Provides the stacks datasource.
+@riverpod
+StacksDatasource stacksDatasource(Ref ref) {
+  final dio = ref.watch(coreApiClientProvider);
+  final containersDatasource = ref.watch(containersDatasourceProvider);
+  return StacksDatasource(dio, containersDatasource);
+}

lib/features/control_room/stacks/data/models/stack_model.dart

@@ -0,0 +1,61 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:tatlock_ui/features/control_room/stacks/domain/entities/stack.dart';
+
+part 'stack_model.freezed.dart';
+part 'stack_model.g.dart';
+
+/// Stack data model for API serialization.
+@freezed
+sealed class StackModel with _$StackModel {
+  const factory StackModel({
+    required String id,
+    required String name,
+    @JsonKey(name: 'type') String? typeString,
+    @JsonKey(name: 'status') String? statusString,
+    @JsonKey(name: 'container_count') @Default(0) int containerCount,
+    @JsonKey(name: 'running_count') @Default(0) int runningCount,
+    @JsonKey(name: 'compose_file') String? composeFile,
+    String? environment,
+    @JsonKey(name: 'created_at') String? createdAt,
+    @JsonKey(name: 'updated_at') String? updatedAt,
+  }) = _StackModel;
+
+  const StackModel._();
+
+  factory StackModel.fromJson(Map<String, dynamic> json) =>
+      _$StackModelFromJson(json);
+
+  /// Converts to domain entity.
+  Stack toEntity() {
+    return Stack(
+      id: id,
+      name: name,
+      type: _parseStackType(typeString),
+      status: _parseStackStatus(statusString),
+      containerCount: containerCount,
+      runningCount: runningCount,
+      composeFile: composeFile,
+      environment: environment,
+      createdAt: createdAt != null ? DateTime.tryParse(createdAt!) : null,
+      updatedAt: updatedAt != null ? DateTime.tryParse(updatedAt!) : null,
+    );
+  }
+
+  StackType _parseStackType(String? type) {
+    return switch (type?.toLowerCase()) {
+      'compose' => StackType.compose,
+      'swarm' => StackType.swarm,
+      'kubernetes' || 'k8s' => StackType.kubernetes,
+      _ => StackType.compose,
+    };
+  }
+
+  StackStatus _parseStackStatus(String? status) {
+    return switch (status?.toLowerCase()) {
+      'active' || 'running' => StackStatus.active,
+      'inactive' || 'stopped' => StackStatus.inactive,
+      'error' => StackStatus.error,
+      _ => StackStatus.unknown,
+    };
+  }
+}

lib/features/control_room/stacks/data/repositories/stack_repository_impl.dart

@@ -0,0 +1,81 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:tatlock_ui/features/control_room/stacks/data/datasources/stacks_datasource.dart';
+import 'package:tatlock_ui/features/control_room/stacks/domain/entities/stack.dart';
+import 'package:tatlock_ui/features/control_room/stacks/domain/repositories/stack_repository.dart';
+
+part 'stack_repository_impl.g.dart';
+
+/// Implementation of StackRepository.
+class StackRepositoryImpl implements StackRepository {
+  StackRepositoryImpl(this._datasource);
+
+  final StacksDatasource _datasource;
+
+  @override
+  Future<List<Stack>> getStacks() async {
+    return _datasource.getStacks();
+  }
+
+  @override
+  Future<Stack> getStack(String id) async {
+    return _datasource.getStack(id);
+  }
+
+  @override
+  Future<void> startStack(String id) async {
+    await _datasource.stackAction(id, 'start');
+  }
+
+  @override
+  Future<void> stopStack(String id) async {
+    await _datasource.stackAction(id, 'stop');
+  }
+
+  @override
+  Future<void> restartStack(String id) async {
+    await _datasource.stackAction(id, 'restart');
+  }
+
+  @override
+  Future<void> removeStack(String id) async {
+    // TODO: Implement stack removal
+    throw UnimplementedError('Stack removal not yet implemented');
+  }
+
+  @override
+  Future<String> getStackYaml(String id) async {
+    return _datasource.getStackYaml(id);
+  }
+
+  @override
+  Future<void> updateStackYaml(String id, String yaml) async {
+    await _datasource.updateStackYaml(id, yaml);
+  }
+
+  @override
+  Future<Map<String, String>> getStackEnvVars(String id) async {
+    return _datasource.getStackEnvVars(id);
+  }
+
+  @override
+  Future<void> updateStackEnvVars(String id, Map<String, String> envVars) async {
+    await _datasource.updateStackEnvVars(id, envVars);
+  }
+
+  @override
+  Future<void> deployStack(String id) async {
+    await _datasource.deployStack(id);
+  }
+
+  @override
+  Future<void> rebuildStack(String id) async {
+    await _datasource.rebuildStack(id);
+  }
+}
+
+/// Provides the stack repository.
+@riverpod
+StackRepository stackRepository(Ref ref) {
+  final datasource = ref.watch(stacksDatasourceProvider);
+  return StackRepositoryImpl(datasource);
+}

lib/features/control_room/stacks/domain/entities/stack.dart

@@ -0,0 +1,72 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'stack.freezed.dart';
+
+/// Container orchestration stack (Docker Compose stack).
+@freezed
+sealed class Stack with _$Stack {
+  const factory Stack({
+    /// Unique stack identifier.
+    required String id,
+
+    /// Stack name.
+    required String name,
+
+    /// Stack type (compose, swarm, kubernetes).
+    @Default(StackType.compose) StackType type,
+
+    /// Current stack status.
+    @Default(StackStatus.unknown) StackStatus status,
+
+    /// Number of containers in the stack.
+    @Default(0) int containerCount,
+
+    /// Number of running containers.
+    @Default(0) int runningCount,
+
+    /// Path to the compose file (if applicable).
+    String? composeFile,
+
+    /// Compose YAML content.
+    String? yaml,
+
+    /// Environment variables for the stack.
+    @Default({}) Map<String, String> envVars,
+
+    /// Environment name (e.g., production, staging).
+    String? environment,
+
+    /// When the stack was created.
+    DateTime? createdAt,
+
+    /// When the stack was last updated.
+    DateTime? updatedAt,
+  }) = _Stack;
+
+  const Stack._();
+
+  /// Whether all containers in the stack are running.
+  bool get isHealthy => runningCount == containerCount && containerCount > 0;
+
+  /// Whether the stack has any running containers.
+  bool get hasRunningContainers => runningCount > 0;
+
+  /// Whether the stack is partially running.
+  bool get isPartial =>
+      runningCount > 0 && runningCount < containerCount;
+}
+
+/// Stack orchestration type.
+enum StackType {
+  compose,
+  swarm,
+  kubernetes,
+}
+
+/// Stack status.
+enum StackStatus {
+  active,
+  inactive,
+  error,
+  unknown,
+}

lib/features/control_room/stacks/domain/repositories/stack_repository.dart

@@ -0,0 +1,40 @@
+import 'package:tatlock_ui/features/control_room/stacks/domain/entities/stack.dart';
+
+/// Repository interface for stack operations.
+abstract class StackRepository {
+  /// Gets all stacks.
+  Future<List<Stack>> getStacks();
+
+  /// Gets a single stack by ID.
+  Future<Stack> getStack(String id);
+
+  /// Starts all containers in a stack.
+  Future<void> startStack(String id);
+
+  /// Stops all containers in a stack.
+  Future<void> stopStack(String id);
+
+  /// Restarts all containers in a stack.
+  Future<void> restartStack(String id);
+
+  /// Removes a stack (stops and removes containers).
+  Future<void> removeStack(String id);
+
+  /// Gets the compose YAML for a stack.
+  Future<String> getStackYaml(String id);
+
+  /// Updates the compose YAML for a stack.
+  Future<void> updateStackYaml(String id, String yaml);
+
+  /// Gets the environment variables for a stack.
+  Future<Map<String, String>> getStackEnvVars(String id);
+
+  /// Updates the environment variables for a stack.
+  Future<void> updateStackEnvVars(String id, Map<String, String> envVars);
+
+  /// Deploys/redeploys a stack with current configuration.
+  Future<void> deployStack(String id);
+
+  /// Rebuilds a stack (pulls fresh images and recreates containers).
+  Future<void> rebuildStack(String id);
+}

lib/features/control_room/stacks/presentation/pages/stack_detail_page.dart

@@ -0,0 +1,334 @@
+import 'package:flutter/material.dart' hide Stack;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:tatlock_ui/features/control_room/containers/presentation/providers/containers_provider.dart';
+import 'package:tatlock_ui/features/control_room/containers/presentation/widgets/container_logs_viewer.dart';
+import 'package:tatlock_ui/features/control_room/containers/presentation/widgets/container_status_badge.dart';
+import 'package:tatlock_ui/features/control_room/stacks/domain/entities/stack.dart';
+import 'package:tatlock_ui/features/control_room/stacks/presentation/providers/stacks_provider.dart';
+import 'package:tatlock_ui/features/control_room/stacks/presentation/widgets/env_vars_editor.dart';
+import 'package:tatlock_ui/features/control_room/stacks/presentation/widgets/yaml_editor.dart';
+
+/// Detail page for a selected stack with YAML editor, env vars, and container list.
+class StackDetailPage extends ConsumerStatefulWidget {
+  const StackDetailPage({
+    super.key,
+    required this.stackId,
+  });
+
+  final String stackId;
+
+  @override
+  ConsumerState<StackDetailPage> createState() => _StackDetailPageState();
+}
+
+class _StackDetailPageState extends ConsumerState<StackDetailPage>
+    with SingleTickerProviderStateMixin {
+  late TabController _tabController;
+
+  @override
+  void initState() {
+    super.initState();
+    _tabController = TabController(length: 2, vsync: this);
+  }
+
+  @override
+  void dispose() {
+    _tabController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final stackAsync = ref.watch(stackProvider(widget.stackId));
+    final containersAsync = ref.watch(containersProvider);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    // Listen for config action results
+    ref.listen<AsyncValue<void>>(stackConfigActionsProvider, (previous, next) {
+      if (previous?.isLoading == true && !next.isLoading) {
+        next.whenOrNull(
+          data: (_) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: const Text('Configuration saved'),
+                backgroundColor: colorScheme.primaryContainer,
+                behavior: SnackBarBehavior.floating,
+              ),
+            );
+          },
+          error: (error, _) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text('Failed to save: $error'),
+                backgroundColor: colorScheme.errorContainer,
+                behavior: SnackBarBehavior.floating,
+              ),
+            );
+          },
+        );
+      }
+    });
+
+    return Column(
+      children: [
+        // Stack editor (top section - 60%)
+        Expanded(
+          flex: 6,
+          child: stackAsync.when(
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error: (error, _) => Center(child: Text('Error: $error')),
+            data: (stack) => _StackEditor(
+              stack: stack,
+              tabController: _tabController,
+            ),
+          ),
+        ),
+        // Divider with drag handle appearance
+        Container(
+          height: 8,
+          color: colorScheme.surfaceContainerHighest,
+          child: Center(
+            child: Container(
+              width: 40,
+              height: 4,
+              decoration: BoxDecoration(
+                color: colorScheme.outline,
+                borderRadius: BorderRadius.circular(2),
+              ),
+            ),
+          ),
+        ),
+        // Container list (bottom section - 40%)
+        Expanded(
+          flex: 4,
+          child: containersAsync.when(
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error: (error, _) => Center(child: Text('Error: $error')),
+            data: (containers) => _CompactContainerList(
+              containers: containers,
+              stackId: widget.stackId,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+/// Stack configuration editor with tabs for YAML and environment variables.
+class _StackEditor extends ConsumerWidget {
+  const _StackEditor({
+    required this.stack,
+    required this.tabController,
+  });
+
+  final Stack stack;
+  final TabController tabController;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Column(
+      children: [
+        // Header with stack info and actions
+        Container(
+          padding: const EdgeInsets.all(16),
+          decoration: BoxDecoration(
+            color: colorScheme.surfaceContainerHighest,
+            border: Border(
+              bottom: BorderSide(color: colorScheme.outlineVariant),
+            ),
+          ),
+          child: Row(
+            children: [
+              Icon(Icons.layers, color: colorScheme.primary),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      stack.name,
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                            fontWeight: FontWeight.w600,
+                          ),
+                    ),
+                    Text(
+                      '${stack.runningCount}/${stack.containerCount} containers running',
+                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                            color: colorScheme.onSurfaceVariant,
+                          ),
+                    ),
+                  ],
+                ),
+              ),
+              OutlinedButton.icon(
+                onPressed: () {
+                  ref.read(stackConfigActionsProvider.notifier).rebuild(stack.id);
+                },
+                icon: const Icon(Icons.refresh, size: 18),
+                label: const Text('Rebuild'),
+              ),
+              const SizedBox(width: 8),
+              FilledButton.icon(
+                onPressed: () {
+                  ref.read(stackConfigActionsProvider.notifier).deploy(stack.id);
+                },
+                icon: const Icon(Icons.rocket_launch, size: 18),
+                label: const Text('Deploy'),
+              ),
+            ],
+          ),
+        ),
+        // Tab bar
+        TabBar(
+          controller: tabController,
+          tabs: const [
+            Tab(text: 'Compose YAML'),
+            Tab(text: 'Environment Variables'),
+          ],
+        ),
+        // Tab content
+        Expanded(
+          child: TabBarView(
+            controller: tabController,
+            children: [
+              YamlEditor(stackId: stack.id),
+              EnvVarsEditor(stackId: stack.id),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+/// Compact container list for the docked bottom section.
+class _CompactContainerList extends ConsumerWidget {
+  const _CompactContainerList({
+    required this.containers,
+    required this.stackId,
+  });
+
+  final List<dynamic> containers;
+  final String stackId;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final actions = ref.read(containerActionsProvider.notifier);
+
+    // Filter containers for this stack
+    final stackContainers = containers
+        .where((c) => c.stackId == stackId || c.stackName == stackId)
+        .toList();
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        // Header
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+          child: Row(
+            children: [
+              Icon(Icons.dns, size: 18, color: colorScheme.primary),
+              const SizedBox(width: 8),
+              Text(
+                'Containers (${stackContainers.length})',
+                style: Theme.of(context).textTheme.titleSmall,
+              ),
+              const Spacer(),
+              IconButton(
+                icon: const Icon(Icons.refresh, size: 18),
+                tooltip: 'Refresh',
+                onPressed: () => ref.invalidate(containersProvider),
+              ),
+            ],
+          ),
+        ),
+        const Divider(height: 1),
+        // Container list
+        Expanded(
+          child: stackContainers.isEmpty
+              ? Center(
+                  child: Text(
+                    'No containers in this stack',
+                    style: TextStyle(color: colorScheme.outline),
+                  ),
+                )
+              : ListView.builder(
+                  padding: const EdgeInsets.symmetric(horizontal: 8),
+                  itemCount: stackContainers.length,
+                  itemBuilder: (context, index) {
+                    final container = stackContainers[index];
+                    return Card(
+                      margin: const EdgeInsets.symmetric(
+                        horizontal: 8,
+                        vertical: 2,
+                      ),
+                      child: ListTile(
+                        dense: true,
+                        leading: ContainerStatusBadge(state: container.state),
+                        title: Text(
+                          container.name,
+                          style: const TextStyle(fontSize: 13),
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                        subtitle: Text(
+                          container.image,
+                          style: TextStyle(
+                            fontSize: 11,
+                            color: colorScheme.onSurfaceVariant,
+                          ),
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                        trailing: PopupMenuButton<String>(
+                          icon: const Icon(Icons.more_vert, size: 18),
+                          itemBuilder: (context) => [
+                            if (container.canStart)
+                              const PopupMenuItem(
+                                value: 'start',
+                                child: Text('Start'),
+                              ),
+                            if (container.canStop)
+                              const PopupMenuItem(
+                                value: 'stop',
+                                child: Text('Stop'),
+                              ),
+                            if (container.canRestart)
+                              const PopupMenuItem(
+                                value: 'restart',
+                                child: Text('Restart'),
+                              ),
+                            const PopupMenuItem(
+                              value: 'logs',
+                              child: Text('View Logs'),
+                            ),
+                          ],
+                          onSelected: (action) {
+                            switch (action) {
+                              case 'start':
+                                actions.start(container.fullId);
+                              case 'stop':
+                                actions.stop(container.fullId);
+                              case 'restart':
+                                actions.restart(container.fullId);
+                              case 'logs':
+                                showContainerLogs(
+                                  context,
+                                  containerId: container.fullId,
+                                  containerName: container.name,
+                                );
+                            }
+                          },
+                        ),
+                      ),
+                    );
+                  },
+                ),
+        ),
+      ],
+    );
+  }
+}

lib/features/control_room/stacks/presentation/providers/stacks_provider.dart

@@ -0,0 +1,91 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:tatlock_ui/features/control_room/stacks/data/repositories/stack_repository_impl.dart';
+import 'package:tatlock_ui/features/control_room/stacks/domain/entities/stack.dart';
+
+part 'stacks_provider.g.dart';
+
+/// Provides the list of all stacks.
+@riverpod
+Future<List<Stack>> stacks(Ref ref) async {
+  final repository = ref.watch(stackRepositoryProvider);
+  return repository.getStacks();
+}
+
+/// Provides a single stack by ID.
+@riverpod
+Future<Stack> stack(Ref ref, String id) async {
+  final repository = ref.watch(stackRepositoryProvider);
+  return repository.getStack(id);
+}
+
+/// Currently selected stack ID (null = all containers).
+@riverpod
+class SelectedStack extends _$SelectedStack {
+  @override
+  String? build() => null;
+
+  void select(String? stackId) {
+    state = stackId;
+  }
+
+  void clear() {
+    state = null;
+  }
+}
+
+/// Provides the YAML content for a stack.
+@riverpod
+Future<String> stackYaml(Ref ref, String stackId) async {
+  final repository = ref.watch(stackRepositoryProvider);
+  return repository.getStackYaml(stackId);
+}
+
+/// Provides the environment variables for a stack.
+@riverpod
+Future<Map<String, String>> stackEnvVars(Ref ref, String stackId) async {
+  final repository = ref.watch(stackRepositoryProvider);
+  return repository.getStackEnvVars(stackId);
+}
+
+/// Controller for stack configuration actions.
+@riverpod
+class StackConfigActions extends _$StackConfigActions {
+  @override
+  AsyncValue<void> build() => const AsyncValue.data(null);
+
+  Future<void> saveYaml(String stackId, String yaml) async {
+    state = const AsyncValue.loading();
+    state = await AsyncValue.guard(() async {
+      final repository = ref.read(stackRepositoryProvider);
+      await repository.updateStackYaml(stackId, yaml);
+      ref.invalidate(stackYamlProvider(stackId));
+    });
+  }
+
+  Future<void> saveEnvVars(String stackId, Map<String, String> envVars) async {
+    state = const AsyncValue.loading();
+    state = await AsyncValue.guard(() async {
+      final repository = ref.read(stackRepositoryProvider);
+      await repository.updateStackEnvVars(stackId, envVars);
+      ref.invalidate(stackEnvVarsProvider(stackId));
+    });
+  }
+
+  Future<void> deploy(String stackId) async {
+    state = const AsyncValue.loading();
+    state = await AsyncValue.guard(() async {
+      final repository = ref.read(stackRepositoryProvider);
+      await repository.deployStack(stackId);
+      ref.invalidate(stacksProvider);
+    });
+  }
+
+  Future<void> rebuild(String stackId) async {
+    state = const AsyncValue.loading();
+    state = await AsyncValue.guard(() async {
+      final repository = ref.read(stackRepositoryProvider);
+      await repository.rebuildStack(stackId);
+      ref.invalidate(stacksProvider);
+    });
+  }
+}

lib/features/control_room/stacks/presentation/widgets/env_vars_editor.dart

@@ -0,0 +1,351 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:tatlock_ui/features/control_room/stacks/presentation/providers/stacks_provider.dart';
+
+/// Environment variables editor for stack configuration.
+class EnvVarsEditor extends ConsumerStatefulWidget {
+  const EnvVarsEditor({
+    super.key,
+    required this.stackId,
+  });
+
+  final String stackId;
+
+  @override
+  ConsumerState<EnvVarsEditor> createState() => _EnvVarsEditorState();
+}
+
+class _EnvVarsEditorState extends ConsumerState<EnvVarsEditor> {
+  final List<_EnvVarEntry> _entries = [];
+  Map<String, String> _originalEnvVars = {};
+  bool _hasChanges = false;
+
+  void _initializeEntries(Map<String, String> envVars) {
+    if (_originalEnvVars.isEmpty && envVars.isNotEmpty) {
+      _originalEnvVars = Map.from(envVars);
+      _entries.clear();
+      for (final entry in envVars.entries) {
+        _entries.add(_EnvVarEntry(
+          keyController: TextEditingController(text: entry.key),
+          valueController: TextEditingController(text: entry.value),
+        ));
+      }
+    }
+  }
+
+  void _checkChanges() {
+    final currentMap = <String, String>{};
+    for (final entry in _entries) {
+      final key = entry.keyController.text.trim();
+      if (key.isNotEmpty) {
+        currentMap[key] = entry.valueController.text;
+      }
+    }
+
+    final hasChanges = !_mapsEqual(currentMap, _originalEnvVars);
+    if (hasChanges != _hasChanges) {
+      setState(() => _hasChanges = hasChanges);
+    }
+  }
+
+  bool _mapsEqual(Map<String, String> a, Map<String, String> b) {
+    if (a.length != b.length) return false;
+    for (final key in a.keys) {
+      if (!b.containsKey(key) || a[key] != b[key]) return false;
+    }
+    return true;
+  }
+
+  void _addEntry() {
+    setState(() {
+      _entries.add(_EnvVarEntry(
+        keyController: TextEditingController(),
+        valueController: TextEditingController(),
+      ));
+    });
+  }
+
+  void _removeEntry(int index) {
+    setState(() {
+      _entries[index].dispose();
+      _entries.removeAt(index);
+      _checkChanges();
+    });
+  }
+
+  void _onSave() {
+    final envVars = <String, String>{};
+    for (final entry in _entries) {
+      final key = entry.keyController.text.trim();
+      if (key.isNotEmpty) {
+        envVars[key] = entry.valueController.text;
+      }
+    }
+
+    ref
+        .read(stackConfigActionsProvider.notifier)
+        .saveEnvVars(widget.stackId, envVars);
+
+    setState(() {
+      _originalEnvVars = Map.from(envVars);
+      _hasChanges = false;
+    });
+  }
+
+  void _onReset() {
+    for (final entry in _entries) {
+      entry.dispose();
+    }
+    _entries.clear();
+
+    for (final entry in _originalEnvVars.entries) {
+      _entries.add(_EnvVarEntry(
+        keyController: TextEditingController(text: entry.key),
+        valueController: TextEditingController(text: entry.value),
+      ));
+    }
+
+    setState(() => _hasChanges = false);
+  }
+
+  @override
+  void dispose() {
+    for (final entry in _entries) {
+      entry.dispose();
+    }
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final envVarsAsync = ref.watch(stackEnvVarsProvider(widget.stackId));
+    final colorScheme = Theme.of(context).colorScheme;
+    final configState = ref.watch(stackConfigActionsProvider);
+    final isLoading = configState.isLoading;
+
+    return envVarsAsync.when(
+      loading: () => const Center(child: CircularProgressIndicator()),
+      error: (error, _) => Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(Icons.error_outline, color: colorScheme.error, size: 48),
+            const SizedBox(height: 16),
+            Text(
+              'Failed to load environment variables',
+              style: TextStyle(color: colorScheme.error),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              error.toString(),
+              style: TextStyle(color: colorScheme.outline, fontSize: 12),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 16),
+            FilledButton.icon(
+              onPressed: () =>
+                  ref.invalidate(stackEnvVarsProvider(widget.stackId)),
+              icon: const Icon(Icons.refresh),
+              label: const Text('Retry'),
+            ),
+          ],
+        ),
+      ),
+      data: (envVars) {
+        _initializeEntries(envVars);
+        return Column(
+          children: [
+            // Toolbar
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+              decoration: BoxDecoration(
+                color: colorScheme.surfaceContainerLow,
+                border: Border(
+                  bottom: BorderSide(color: colorScheme.outlineVariant),
+                ),
+              ),
+              child: Row(
+                children: [
+                  Icon(
+                    Icons.settings,
+                    size: 18,
+                    color: colorScheme.onSurfaceVariant,
+                  ),
+                  const SizedBox(width: 8),
+                  Text(
+                    '.env',
+                    style: TextStyle(
+                      fontFamily: 'monospace',
+                      fontSize: 13,
+                      color: colorScheme.onSurfaceVariant,
+                    ),
+                  ),
+                  if (_hasChanges) ...[
+                    const SizedBox(width: 8),
+                    Container(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 8,
+                        vertical: 2,
+                      ),
+                      decoration: BoxDecoration(
+                        color: colorScheme.tertiaryContainer,
+                        borderRadius: BorderRadius.circular(4),
+                      ),
+                      child: Text(
+                        'Modified',
+                        style: TextStyle(
+                          fontSize: 11,
+                          color: colorScheme.onTertiaryContainer,
+                        ),
+                      ),
+                    ),
+                  ],
+                  const Spacer(),
+                  IconButton(
+                    icon: const Icon(Icons.add),
+                    tooltip: 'Add variable',
+                    onPressed: _addEntry,
+                  ),
+                  if (_hasChanges) ...[
+                    TextButton(
+                      onPressed: isLoading ? null : _onReset,
+                      child: const Text('Reset'),
+                    ),
+                    const SizedBox(width: 8),
+                    FilledButton.icon(
+                      onPressed: isLoading ? null : _onSave,
+                      icon: isLoading
+                          ? const SizedBox(
+                              width: 16,
+                              height: 16,
+                              child: CircularProgressIndicator(strokeWidth: 2),
+                            )
+                          : const Icon(Icons.save, size: 18),
+                      label: const Text('Save'),
+                    ),
+                  ],
+                ],
+              ),
+            ),
+            // Environment variables list
+            Expanded(
+              child: _entries.isEmpty
+                  ? Center(
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Icon(
+                            Icons.settings_outlined,
+                            size: 48,
+                            color: colorScheme.outline,
+                          ),
+                          const SizedBox(height: 16),
+                          Text(
+                            'No environment variables',
+                            style: TextStyle(color: colorScheme.outline),
+                          ),
+                          const SizedBox(height: 8),
+                          TextButton.icon(
+                            onPressed: _addEntry,
+                            icon: const Icon(Icons.add),
+                            label: const Text('Add Variable'),
+                          ),
+                        ],
+                      ),
+                    )
+                  : ListView.builder(
+                      padding: const EdgeInsets.all(16),
+                      itemCount: _entries.length,
+                      itemBuilder: (context, index) {
+                        final entry = _entries[index];
+                        return Padding(
+                          padding: const EdgeInsets.only(bottom: 8),
+                          child: Row(
+                            children: [
+                              // Key field
+                              Expanded(
+                                flex: 2,
+                                child: TextField(
+                                  controller: entry.keyController,
+                                  onChanged: (_) => _checkChanges(),
+                                  style: const TextStyle(
+                                    fontFamily: 'monospace',
+                                    fontSize: 13,
+                                  ),
+                                  decoration: InputDecoration(
+                                    labelText: 'Key',
+                                    isDense: true,
+                                    border: OutlineInputBorder(
+                                      borderRadius: BorderRadius.circular(8),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              const SizedBox(width: 8),
+                              // Equals sign
+                              Text(
+                                '=',
+                                style: TextStyle(
+                                  fontSize: 18,
+                                  color: colorScheme.outline,
+                                  fontWeight: FontWeight.bold,
+                                ),
+                              ),
+                              const SizedBox(width: 8),
+                              // Value field
+                              Expanded(
+                                flex: 3,
+                                child: TextField(
+                                  controller: entry.valueController,
+                                  onChanged: (_) => _checkChanges(),
+                                  style: const TextStyle(
+                                    fontFamily: 'monospace',
+                                    fontSize: 13,
+                                  ),
+                                  decoration: InputDecoration(
+                                    labelText: 'Value',
+                                    isDense: true,
+                                    border: OutlineInputBorder(
+                                      borderRadius: BorderRadius.circular(8),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              const SizedBox(width: 8),
+                              // Delete button
+                              IconButton(
+                                icon: Icon(
+                                  Icons.delete_outline,
+                                  color: colorScheme.error,
+                                ),
+                                tooltip: 'Remove',
+                                onPressed: () => _removeEntry(index),
+                              ),
+                            ],
+                          ),
+                        );
+                      },
+                    ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
+
+/// Helper class to manage key-value pair controllers.
+class _EnvVarEntry {
+  _EnvVarEntry({
+    required this.keyController,
+    required this.valueController,
+  });
+
+  final TextEditingController keyController;
+  final TextEditingController valueController;
+
+  void dispose() {
+    keyController.dispose();
+    valueController.dispose();
+  }
+}

lib/features/control_room/stacks/presentation/widgets/stack_list_tile.dart

@@ -0,0 +1,130 @@
+import 'package:flutter/material.dart' hide Stack;
+import 'package:tatlock_ui/features/control_room/stacks/domain/entities/stack.dart';
+
+/// List tile for displaying a stack in the sidebar.
+class StackListTile extends StatelessWidget {
+  const StackListTile({
+    super.key,
+    required this.stack,
+    required this.isSelected,
+    required this.onTap,
+    this.onStart,
+    this.onStop,
+    this.onRestart,
+  });
+
+  final Stack stack;
+  final bool isSelected;
+  final VoidCallback onTap;
+  final VoidCallback? onStart;
+  final VoidCallback? onStop;
+  final VoidCallback? onRestart;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return ListTile(
+      selected: isSelected,
+      selectedTileColor: colorScheme.primaryContainer.withValues(alpha: 0.3),
+      leading: _buildStatusIndicator(context),
+      title: Text(
+        stack.name,
+        style: const TextStyle(fontWeight: FontWeight.w500),
+      ),
+      subtitle: Text(
+        '${stack.runningCount}/${stack.containerCount} containers',
+        style: TextStyle(
+          fontSize: 12,
+          color: colorScheme.onSurfaceVariant,
+        ),
+      ),
+      trailing: _buildActions(context),
+      onTap: onTap,
+    );
+  }
+
+  Widget _buildStatusIndicator(BuildContext context) {
+    final color = switch (stack.status) {
+      StackStatus.active when stack.isHealthy => Colors.green,
+      StackStatus.active when stack.isPartial => Colors.orange,
+      StackStatus.active => Colors.green,
+      StackStatus.inactive => Theme.of(context).colorScheme.outline,
+      StackStatus.error => Theme.of(context).colorScheme.error,
+      StackStatus.unknown => Theme.of(context).colorScheme.outline,
+    };
+
+    return Container(
+      width: 12,
+      height: 12,
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        color: color,
+        boxShadow: [
+          if (stack.isHealthy)
+            BoxShadow(
+              color: color.withValues(alpha: 0.4),
+              blurRadius: 4,
+              spreadRadius: 1,
+            ),
+        ],
+      ),
+    );
+  }
+
+  Widget? _buildActions(BuildContext context) {
+    if (onStart == null && onStop == null && onRestart == null) {
+      return null;
+    }
+
+    return PopupMenuButton<String>(
+      icon: const Icon(Icons.more_vert, size: 18),
+      tooltip: 'Stack actions',
+      onSelected: (action) {
+        switch (action) {
+          case 'start':
+            onStart?.call();
+          case 'stop':
+            onStop?.call();
+          case 'restart':
+            onRestart?.call();
+        }
+      },
+      itemBuilder: (context) => [
+        if (onStart != null && !stack.isHealthy)
+          const PopupMenuItem(
+            value: 'start',
+            child: Row(
+              children: [
+                Icon(Icons.play_arrow, size: 18),
+                SizedBox(width: 8),
+                Text('Start'),
+              ],
+            ),
+          ),
+        if (onStop != null && stack.hasRunningContainers)
+          const PopupMenuItem(
+            value: 'stop',
+            child: Row(
+              children: [
+                Icon(Icons.stop, size: 18),
+                SizedBox(width: 8),
+                Text('Stop'),
+              ],
+            ),
+          ),
+        if (onRestart != null && stack.hasRunningContainers)
+          const PopupMenuItem(
+            value: 'restart',
+            child: Row(
+              children: [
+                Icon(Icons.refresh, size: 18),
+                SizedBox(width: 8),
+                Text('Restart'),
+              ],
+            ),
+          ),
+      ],
+    );
+  }
+}

lib/features/control_room/stacks/presentation/widgets/yaml_editor.dart

@@ -0,0 +1,175 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:tatlock_ui/features/control_room/stacks/presentation/providers/stacks_provider.dart';
+import 'package:tatlock_ui/shared/components/code_editor/code_editor.dart';
+
+/// YAML editor for stack compose configuration.
+class YamlEditor extends ConsumerStatefulWidget {
+  const YamlEditor({
+    super.key,
+    required this.stackId,
+  });
+
+  final String stackId;
+
+  @override
+  ConsumerState<YamlEditor> createState() => _YamlEditorState();
+}
+
+class _YamlEditorState extends ConsumerState<YamlEditor> {
+  final _editorKey = GlobalKey<CodeEditorState>();
+  bool _hasChanges = false;
+  String _originalYaml = '';
+  bool _initialized = false;
+
+  void _initializeEditor(String yaml) {
+    if (!_initialized && yaml.isNotEmpty) {
+      _originalYaml = yaml;
+      _initialized = true;
+    }
+  }
+
+  void _onChanged(String value) {
+    setState(() {
+      _hasChanges = value != _originalYaml;
+    });
+  }
+
+  void _onSave() {
+    final currentText = _editorKey.currentState?.text ?? '';
+    ref
+        .read(stackConfigActionsProvider.notifier)
+        .saveYaml(widget.stackId, currentText);
+    setState(() {
+      _originalYaml = currentText;
+      _hasChanges = false;
+    });
+  }
+
+  void _onReset() {
+    _editorKey.currentState?.text = _originalYaml;
+    setState(() {
+      _hasChanges = false;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final yamlAsync = ref.watch(stackYamlProvider(widget.stackId));
+    final colorScheme = Theme.of(context).colorScheme;
+    final configState = ref.watch(stackConfigActionsProvider);
+    final isLoading = configState.isLoading;
+
+    return yamlAsync.when(
+      loading: () => const Center(child: CircularProgressIndicator()),
+      error: (error, _) => Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(Icons.error_outline, color: colorScheme.error, size: 48),
+            const SizedBox(height: 16),
+            Text(
+              'Failed to load YAML',
+              style: TextStyle(color: colorScheme.error),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              error.toString(),
+              style: TextStyle(color: colorScheme.outline, fontSize: 12),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 16),
+            FilledButton.icon(
+              onPressed: () => ref.invalidate(stackYamlProvider(widget.stackId)),
+              icon: const Icon(Icons.refresh),
+              label: const Text('Retry'),
+            ),
+          ],
+        ),
+      ),
+      data: (yaml) {
+        _initializeEditor(yaml);
+        return Column(
+          children: [
+            // Toolbar
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+              decoration: BoxDecoration(
+                color: colorScheme.surfaceContainerLow,
+                border: Border(
+                  bottom: BorderSide(color: colorScheme.outlineVariant),
+                ),
+              ),
+              child: Row(
+                children: [
+                  Icon(
+                    Icons.code,
+                    size: 18,
+                    color: colorScheme.onSurfaceVariant,
+                  ),
+                  const SizedBox(width: 8),
+                  Text(
+                    'docker-compose.yml',
+                    style: TextStyle(
+                      fontFamily: 'monospace',
+                      fontSize: 13,
+                      color: colorScheme.onSurfaceVariant,
+                    ),
+                  ),
+                  if (_hasChanges) ...[
+                    const SizedBox(width: 8),
+                    Container(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 8,
+                        vertical: 2,
+                      ),
+                      decoration: BoxDecoration(
+                        color: colorScheme.tertiaryContainer,
+                        borderRadius: BorderRadius.circular(4),
+                      ),
+                      child: Text(
+                        'Modified',
+                        style: TextStyle(
+                          fontSize: 11,
+                          color: colorScheme.onTertiaryContainer,
+                        ),
+                      ),
+                    ),
+                  ],
+                  const Spacer(),
+                  if (_hasChanges) ...[
+                    TextButton(
+                      onPressed: isLoading ? null : _onReset,
+                      child: const Text('Reset'),
+                    ),
+                    const SizedBox(width: 8),
+                    FilledButton.icon(
+                      onPressed: isLoading ? null : _onSave,
+                      icon: isLoading
+                          ? const SizedBox(
+                              width: 16,
+                              height: 16,
+                              child: CircularProgressIndicator(strokeWidth: 2),
+                            )
+                          : const Icon(Icons.save, size: 18),
+                      label: const Text('Save'),
+                    ),
+                  ],
+                ],
+              ),
+            ),
+            // Editor with syntax highlighting
+            Expanded(
+              child: CodeEditor(
+                key: _editorKey,
+                language: CodeEditorLanguage.yaml,
+                initialValue: yaml,
+                onChanged: _onChanged,
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}

lib/features/front_hall/presentation/pages/front_hall_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
-
-import '../../../../version.g.dart';
+import 'package:tatlock_ui/version.g.dart';
 
 /// Front Hall - estate overview and quick access.
 class FrontHallPage extends StatelessWidget {
@@ -10,19 +9,8 @@ class FrontHallPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
 
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Front Hall'),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.refresh),
-            onPressed: () {
-              // TODO: Refresh data
-            },
-          ),
-        ],
-      ),
-      body: ListView(
+    // No Scaffold/AppBar needed - header is provided by AppScaffold
+    return ListView(
         padding: const EdgeInsets.all(16),
         children: [
           // Welcome card
@@ -107,8 +95,7 @@ class FrontHallPage extends StatelessWidget {
             ),
           ),
         ],
-      ),
-    );
+      );
   }
 }
 

lib/features/security/groups/groups_list_page.dart

@@ -0,0 +1,188 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:tatlock_ui/core/api/api_client.dart';
+import 'package:tatlock_ui/shared/components/data_grid/adapters/core_api_source.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_exports.dart';
+
+/// Simple group data class for display.
+class GroupData {
+  GroupData({
+    required this.id,
+    required this.name,
+    required this.isSuperuser,
+    required this.memberCount,
+    this.parentName,
+  });
+
+  factory GroupData.fromJson(Map<String, dynamic> json) => GroupData(
+        id: json['id'] as String,
+        name: json['name'] as String,
+        isSuperuser: json['is_superuser'] as bool? ?? false,
+        memberCount: json['member_count'] as int? ?? 0,
+        parentName: json['parent_name'] as String?,
+      );
+
+  final String id;
+  final String name;
+  final bool isSuperuser;
+  final int memberCount;
+  final String? parentName;
+}
+
+/// Groups list page using the shared DataGrid component.
+class GroupsListPage extends ConsumerStatefulWidget {
+  const GroupsListPage({super.key});
+
+  @override
+  ConsumerState<GroupsListPage> createState() => _GroupsListPageState();
+}
+
+class _GroupsListPageState extends ConsumerState<GroupsListPage> {
+  late final StateNotifierProvider<DataGridController<GroupData>,
+      DataGridState<GroupData>> _gridProvider;
+  bool _isSyncing = false;
+
+  @override
+  void initState() {
+    super.initState();
+    // Create provider in initState to ensure stable reference
+    final dio = ref.read(coreApiClientProvider);
+    final source = CoreApiDataSource<GroupData>(
+      dio: dio,
+      endpoint: '/auth/groups',
+      fromJson: GroupData.fromJson,
+    );
+
+    _gridProvider = dataGridProvider<GroupData>(
+      source: source,
+      config: _buildConfig(),
+      idSelector: (g) => g.id,
+    );
+  }
+
+  Future<void> _syncFromAuthentik() async {
+    if (_isSyncing) return;
+    setState(() => _isSyncing = true);
+
+    try {
+      final dio = ref.read(coreApiClientProvider);
+      await dio.post<void>('/auth/groups/sync-from-authentik');
+
+      if (!mounted) return;
+      ref.read(_gridProvider.notifier).refresh();
+
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: const Text('Groups synced from Authentik'),
+          behavior: SnackBarBehavior.floating,
+          duration: const Duration(seconds: 2),
+        ),
+      );
+    } catch (e) {
+      if (!mounted) return;
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text('Sync failed: $e'),
+          behavior: SnackBarBehavior.floating,
+          duration: const Duration(seconds: 4),
+        ),
+      );
+    } finally {
+      if (mounted) setState(() => _isSyncing = false);
+    }
+  }
+
+  DataGridConfig<GroupData> _buildConfig() {
+    return DataGridConfig<GroupData>(
+      columns: [
+        DataGridColumn<GroupData>(
+          header: 'Name',
+          valueBuilder: (g) => g.name,
+          sortable: true,
+          searchable: true,
+          width: const DataGridColumnWidth.flex(2),
+        ),
+        DataGridColumn<GroupData>(
+          header: 'Members',
+          valueBuilder: (g) => g.memberCount.toString(),
+          width: const DataGridColumnWidth.fixed(100),
+          alignment: DataGridColumnAlignment.end,
+        ),
+        DataGridColumn<GroupData>(
+          header: 'Type',
+          valueBuilder: (g) => g.isSuperuser ? 'Superuser' : 'Standard',
+          cellBuilder: (context, g) => _GroupTypeBadge(isSuperuser: g.isSuperuser),
+          width: const DataGridColumnWidth.fixed(120),
+        ),
+        DataGridColumn<GroupData>(
+          header: 'Parent',
+          valueBuilder: (g) => g.parentName ?? '-',
+          width: const DataGridColumnWidth.flex(1),
+        ),
+      ],
+      enableSearch: true,
+      searchHint: 'Search groups...',
+      showHeader: true,
+      showFooter: true,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DataGrid<GroupData>(
+      provider: _gridProvider,
+      config: _buildConfig(),
+      idSelector: (g) => g.id,
+      toolbarActions: [
+        IconButton(
+          icon: const Icon(Icons.refresh),
+          tooltip: 'Refresh',
+          onPressed: () => ref.read(_gridProvider.notifier).refresh(),
+        ),
+        const SizedBox(width: 8),
+        FilledButton.icon(
+          onPressed: _isSyncing ? null : _syncFromAuthentik,
+          icon: _isSyncing
+              ? const SizedBox(
+                  width: 16,
+                  height: 16,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                )
+              : const Icon(Icons.sync),
+          label: const Text('Sync from Authentik'),
+        ),
+      ],
+    );
+  }
+}
+
+class _GroupTypeBadge extends StatelessWidget {
+  const _GroupTypeBadge({required this.isSuperuser});
+
+  final bool isSuperuser;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      decoration: BoxDecoration(
+        color: isSuperuser
+            ? colorScheme.primaryContainer
+            : colorScheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(4),
+      ),
+      child: Text(
+        isSuperuser ? 'Superuser' : 'Standard',
+        style: TextStyle(
+          fontSize: 12,
+          fontWeight: FontWeight.w500,
+          color: isSuperuser
+              ? colorScheme.onPrimaryContainer
+              : colorScheme.onSurfaceVariant,
+        ),
+      ),
+    );
+  }
+}

lib/features/security/presentation/pages/security_page.dart

@@ -0,0 +1,113 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:tatlock_ui/features/security/router.dart';
+import 'package:tatlock_ui/features/security/users/users_list_page.dart';
+import 'package:tatlock_ui/features/security/groups/groups_list_page.dart';
+import 'package:tatlock_ui/shared/layouts/widgets/nav_panel.dart';
+
+/// Main Security room page with nav panel and section content.
+class SecurityPage extends ConsumerWidget {
+  const SecurityPage({
+    super.key,
+    this.nav = SecurityNav.users,
+  });
+
+  /// The current nav item to display.
+  final SecurityNav nav;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Scaffold(
+      body: Row(
+        children: [
+          // Nav Panel - section navigation with grouping
+          NavPanel(
+            title: 'Sections',
+            icon: Icons.security_outlined,
+            items: SecurityNav.values.map((n) => n.toNavItem()).toList(),
+            selectedId: nav.id,
+            onItemSelected: (id) {
+              final newNav = SecurityNav.values.firstWhere(
+                (n) => n.id == id,
+              );
+              // Navigate to section URL
+              context.go(pathForSecurityNav(newNav));
+            },
+          ),
+          // Divider
+          VerticalDivider(
+            width: 1,
+            thickness: 1,
+            color: colorScheme.outlineVariant,
+          ),
+          // Section content
+          Expanded(
+            child: _SectionContent(nav: nav),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// Renders content for the selected nav item.
+class _SectionContent extends StatelessWidget {
+  const _SectionContent({required this.nav});
+
+  final SecurityNav nav;
+
+  @override
+  Widget build(BuildContext context) {
+    switch (nav) {
+      case SecurityNav.users:
+        return const UsersListPage();
+      case SecurityNav.groups:
+        return const GroupsListPage();
+      default:
+        return _PlaceholderSection(nav: nav);
+    }
+  }
+}
+
+/// Placeholder for nav items not yet implemented.
+class _PlaceholderSection extends StatelessWidget {
+  const _PlaceholderSection({required this.nav});
+
+  final SecurityNav nav;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final textTheme = Theme.of(context).textTheme;
+
+    return Center(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(
+            nav.icon,
+            size: 64,
+            color: colorScheme.outline,
+          ),
+          const SizedBox(height: 16),
+          Text(
+            nav.label,
+            style: textTheme.headlineSmall?.copyWith(
+              color: colorScheme.onSurfaceVariant,
+            ),
+          ),
+          const SizedBox(height: 8),
+          Text(
+            '${nav.section} • Coming soon',
+            style: textTheme.bodyMedium?.copyWith(
+              color: colorScheme.outline,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/features/security/router.dart

@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:tatlock_ui/features/security/presentation/pages/security_page.dart';
+import 'package:tatlock_ui/shared/layouts/widgets/nav_panel.dart';
+
+/// Route paths for Security room.
+abstract class SecurityRoutes {
+  static const base = '/security';
+  // User Management (Authentik)
+  static const users = '/security/users';
+  static const groups = '/security/groups';
+  // Monitoring (future)
+  static const cveMonitor = '/security/cve-monitor';
+  static const networkMonitor = '/security/network-monitor';
+  static const dnsAdblock = '/security/dns-adblock';
+}
+
+/// Security room navigation items with section grouping.
+enum SecurityNav {
+  // User Management section (moved from Control Room)
+  users('users', 'Users', Icons.people, 'User Management'),
+  groups('groups', 'Groups', Icons.group_work, 'User Management'),
+  // Monitoring section (placeholders for future)
+  cveMonitor('cve-monitor', 'CVE Monitor', Icons.security, 'Monitoring'),
+  networkMonitor('network-monitor', 'Network Monitor', Icons.router, 'Monitoring'),
+  dnsAdblock('dns-adblock', 'DNS / Adblock', Icons.dns, 'Monitoring');
+
+  const SecurityNav(this.id, this.label, this.icon, this.section);
+
+  final String id;
+  final String label;
+  final IconData icon;
+  final String section;
+
+  NavItem toNavItem() => NavItem(
+        id: id,
+        label: label,
+        icon: icon,
+        section: section,
+      );
+
+  /// Get route path for this nav item.
+  String get path => '/security/$id';
+}
+
+/// Get route path for a nav item.
+String pathForSecurityNav(SecurityNav nav) => nav.path;
+
+/// Security room routes for go_router.
+List<RouteBase> securityRoutes() {
+  return [
+    // Redirect /security to /security/users
+    GoRoute(
+      path: SecurityRoutes.base,
+      name: 'security',
+      redirect: (context, state) => SecurityRoutes.users,
+    ),
+    // Generate routes for all nav items
+    for (final nav in SecurityNav.values)
+      GoRoute(
+        path: nav.path,
+        name: 'security${_capitalize(nav.id.replaceAll('-', '_'))}',
+        builder: (context, state) => SecurityPage(nav: nav),
+      ),
+  ];
+}
+
+String _capitalize(String s) {
+  if (s.isEmpty) return s;
+  return s
+      .split('_')
+      .map((part) => part[0].toUpperCase() + part.substring(1))
+      .join('');
+}

lib/features/security/users/users_list_page.dart

@@ -0,0 +1,306 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:tatlock_ui/core/api/api_client.dart';
+import 'package:tatlock_ui/shared/components/data_grid/adapters/core_api_source.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_exports.dart';
+
+/// Simple user data class for display.
+class UserData {
+  UserData({
+    required this.id,
+    required this.email,
+    required this.name,
+    this.avatarUrl,
+    required this.createdAt,
+    this.lastLogin,
+    this.roles = const [],
+  });
+
+  factory UserData.fromJson(Map<String, dynamic> json) => UserData(
+        id: json['id'] as String,
+        email: json['email'] as String,
+        name: json['name'] as String,
+        avatarUrl: json['avatar_url'] as String?,
+        createdAt: DateTime.parse(json['created_at'] as String),
+        lastLogin: json['last_login'] != null
+            ? DateTime.parse(json['last_login'] as String)
+            : null,
+        roles: (json['roles'] as List<dynamic>?)?.cast<String>() ?? [],
+      );
+
+  final String id;
+  final String email;
+  final String name;
+  final String? avatarUrl;
+  final DateTime createdAt;
+  final DateTime? lastLogin;
+  final List<String> roles;
+
+  bool get isAdmin => roles.any((r) => r.endsWith(':admin'));
+
+  String get initials {
+    final parts = name.split(' ');
+    if (parts.length >= 2) {
+      return '${parts.first[0]}${parts.last[0]}'.toUpperCase();
+    }
+    return name.substring(0, name.length.clamp(0, 2)).toUpperCase();
+  }
+
+  String get lastLoginFormatted {
+    if (lastLogin == null) return 'Never';
+    final diff = DateTime.now().difference(lastLogin!);
+    if (diff.inDays > 30) {
+      return '${lastLogin!.day}/${lastLogin!.month}/${lastLogin!.year}';
+    }
+    if (diff.inDays > 0) return '${diff.inDays}d ago';
+    if (diff.inHours > 0) return '${diff.inHours}h ago';
+    if (diff.inMinutes > 0) return '${diff.inMinutes}m ago';
+    return 'Just now';
+  }
+}
+
+/// Users list page using the shared DataGrid component.
+class UsersListPage extends ConsumerStatefulWidget {
+  const UsersListPage({super.key});
+
+  @override
+  ConsumerState<UsersListPage> createState() => _UsersListPageState();
+}
+
+class _UsersListPageState extends ConsumerState<UsersListPage> {
+  late final StateNotifierProvider<DataGridController<UserData>,
+      DataGridState<UserData>> _gridProvider;
+  bool _isSyncing = false;
+
+  @override
+  void initState() {
+    super.initState();
+    final dio = ref.read(coreApiClientProvider);
+    final source = CoreApiDataSource<UserData>(
+      dio: dio,
+      endpoint: '/auth/users',
+      fromJson: UserData.fromJson,
+    );
+
+    _gridProvider = dataGridProvider<UserData>(
+      source: source,
+      config: _buildConfig(),
+      idSelector: (u) => u.id,
+    );
+  }
+
+  Future<void> _syncFromAuthentik() async {
+    if (_isSyncing) return;
+    setState(() => _isSyncing = true);
+
+    try {
+      final dio = ref.read(coreApiClientProvider);
+      await dio.post<void>('/auth/users/sync-from-authentik');
+
+      if (!mounted) return;
+      ref.read(_gridProvider.notifier).refresh();
+
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: const Text('Users synced from Authentik'),
+          behavior: SnackBarBehavior.floating,
+          duration: const Duration(seconds: 2),
+        ),
+      );
+    } catch (e) {
+      if (!mounted) return;
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text('Sync failed: $e'),
+          behavior: SnackBarBehavior.floating,
+          duration: const Duration(seconds: 4),
+        ),
+      );
+    } finally {
+      if (mounted) setState(() => _isSyncing = false);
+    }
+  }
+
+  DataGridConfig<UserData> _buildConfig() {
+    return DataGridConfig<UserData>(
+      columns: [
+        DataGridColumn<UserData>(
+          header: 'User',
+          valueBuilder: (u) => u.name,
+          sortable: true,
+          searchable: true,
+          width: const DataGridColumnWidth.flex(2),
+          cellBuilder: (context, u) => _UserCell(user: u),
+        ),
+        DataGridColumn<UserData>(
+          header: 'Roles',
+          valueBuilder: (u) => u.roles.join(', '),
+          width: const DataGridColumnWidth.flex(1),
+          cellBuilder: (context, u) => _RolesCell(roles: u.roles),
+        ),
+        DataGridColumn<UserData>(
+          header: 'Last Login',
+          valueBuilder: (u) => u.lastLoginFormatted,
+          width: const DataGridColumnWidth.fixed(120),
+          alignment: DataGridColumnAlignment.end,
+        ),
+      ],
+      enableSearch: true,
+      searchHint: 'Search users...',
+      showHeader: true,
+      showFooter: true,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DataGrid<UserData>(
+      provider: _gridProvider,
+      config: _buildConfig(),
+      idSelector: (u) => u.id,
+      toolbarActions: [
+        IconButton(
+          icon: const Icon(Icons.refresh),
+          tooltip: 'Refresh',
+          onPressed: () => ref.read(_gridProvider.notifier).refresh(),
+        ),
+        const SizedBox(width: 8),
+        FilledButton.icon(
+          onPressed: _isSyncing ? null : _syncFromAuthentik,
+          icon: _isSyncing
+              ? const SizedBox(
+                  width: 16,
+                  height: 16,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                )
+              : const Icon(Icons.sync),
+          label: const Text('Sync from Authentik'),
+        ),
+      ],
+    );
+  }
+}
+
+class _UserCell extends StatelessWidget {
+  const _UserCell({required this.user});
+
+  final UserData user;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Row(
+      children: [
+        CircleAvatar(
+          radius: 16,
+          backgroundColor: colorScheme.primaryContainer,
+          backgroundImage:
+              user.avatarUrl != null ? NetworkImage(user.avatarUrl!) : null,
+          child: user.avatarUrl == null
+              ? Text(
+                  user.initials,
+                  style: TextStyle(
+                    fontSize: 12,
+                    color: colorScheme.onPrimaryContainer,
+                    fontWeight: FontWeight.w500,
+                  ),
+                )
+              : null,
+        ),
+        const SizedBox(width: 12),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Row(
+                children: [
+                  Flexible(
+                    child: Text(
+                      user.name,
+                      style: const TextStyle(fontWeight: FontWeight.w500),
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                  if (user.isAdmin) ...[
+                    const SizedBox(width: 8),
+                    Container(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 6,
+                        vertical: 2,
+                      ),
+                      decoration: BoxDecoration(
+                        color: colorScheme.primaryContainer,
+                        borderRadius: BorderRadius.circular(4),
+                      ),
+                      child: Text(
+                        'Admin',
+                        style: TextStyle(
+                          fontSize: 10,
+                          fontWeight: FontWeight.w500,
+                          color: colorScheme.onPrimaryContainer,
+                        ),
+                      ),
+                    ),
+                  ],
+                ],
+              ),
+              Text(
+                user.email,
+                style: TextStyle(
+                  fontSize: 12,
+                  color: colorScheme.onSurfaceVariant,
+                ),
+                overflow: TextOverflow.ellipsis,
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _RolesCell extends StatelessWidget {
+  const _RolesCell({required this.roles});
+
+  final List<String> roles;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    if (roles.isEmpty) {
+      return Text(
+        'No roles',
+        style: TextStyle(
+          fontSize: 12,
+          color: colorScheme.outline,
+          fontStyle: FontStyle.italic,
+        ),
+      );
+    }
+
+    return Wrap(
+      spacing: 4,
+      runSpacing: 4,
+      children: roles.take(3).map((role) {
+        return Container(
+          padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+          decoration: BoxDecoration(
+            color: colorScheme.surfaceContainerHighest,
+            borderRadius: BorderRadius.circular(4),
+          ),
+          child: Text(
+            role.split(':').last,
+            style: TextStyle(
+              fontSize: 10,
+              color: colorScheme.onSurfaceVariant,
+            ),
+          ),
+        );
+      }).toList(),
+    );
+  }
+}

lib/routing/app_router.dart

@@ -1,25 +1,23 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-
-import '../shared/layouts/app_scaffold.dart';
-import '../features/front_hall/presentation/pages/front_hall_page.dart';
+import 'package:tatlock_ui/features/control_room/router.dart';
+import 'package:tatlock_ui/features/front_hall/presentation/pages/front_hall_page.dart';
+import 'package:tatlock_ui/features/security/router.dart';
+import 'package:tatlock_ui/shared/layouts/app_scaffold.dart';
 
 part 'app_router.g.dart';
 
 /// Route paths as constants.
 abstract class AppRoutes {
   static const frontHall = '/';
-  static const controlRoom = '/control-room';
-  static const containers = '/control-room/containers';
-  static const containerDetail = '/control-room/containers/:id';
   static const parlor = '/parlor';
   static const settings = '/settings';
 }
 
 /// Provides the GoRouter instance.
 @riverpod
-GoRouter appRouter(AppRouterRef ref) {
+GoRouter appRouter(Ref ref) {
   return GoRouter(
     initialLocation: AppRoutes.frontHall,
     debugLogDiagnostics: true,
@@ -32,30 +30,8 @@ GoRouter appRouter(AppRouterRef ref) {
             name: 'frontHall',
             builder: (context, state) => const FrontHallPage(),
           ),
-          GoRoute(
-            path: AppRoutes.controlRoom,
-            name: 'controlRoom',
-            builder: (context, state) =>
-                const _PlaceholderPage(title: 'Control Room'),
-            routes: [
-              GoRoute(
-                path: 'containers',
-                name: 'containers',
-                builder: (context, state) =>
-                    const _PlaceholderPage(title: 'Containers'),
-                routes: [
-                  GoRoute(
-                    path: ':id',
-                    name: 'containerDetail',
-                    builder: (context, state) {
-                      final id = state.pathParameters['id']!;
-                      return _PlaceholderPage(title: 'Container: $id');
-                    },
-                  ),
-                ],
-              ),
-            ],
-          ),
+          ...controlRoomRoutes(),
+          ...securityRoutes(),
           GoRoute(
             path: AppRoutes.parlor,
             name: 'parlor',

lib/shared/components/code_editor/code_editor.dart

@@ -0,0 +1,183 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_code_editor/flutter_code_editor.dart';
+
+import 'code_editor_language.dart';
+
+export 'code_editor_language.dart';
+
+/// A generic code editor widget with syntax highlighting.
+///
+/// Supports multiple languages via [CodeEditorLanguage] configuration.
+class CodeEditor extends StatefulWidget {
+  const CodeEditor({
+    super.key,
+    required this.language,
+    this.initialValue = '',
+    this.onChanged,
+    this.readOnly = false,
+    this.showLineNumbers = true,
+  });
+
+  /// The programming language for syntax highlighting.
+  final CodeEditorLanguage language;
+
+  /// Initial content of the editor.
+  final String initialValue;
+
+  /// Called when the content changes.
+  final ValueChanged<String>? onChanged;
+
+  /// Whether the editor is read-only.
+  final bool readOnly;
+
+  /// Whether to show line numbers.
+  final bool showLineNumbers;
+
+  @override
+  State<CodeEditor> createState() => CodeEditorState();
+}
+
+class CodeEditorState extends State<CodeEditor> {
+  late CodeController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _initController();
+  }
+
+  void _initController() {
+    _controller = CodeController(
+      text: widget.initialValue,
+      language: widget.language.mode,
+    );
+
+    _controller.addListener(_onTextChanged);
+  }
+
+  void _onTextChanged() {
+    widget.onChanged?.call(_controller.text);
+  }
+
+  @override
+  void didUpdateWidget(CodeEditor oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.language != widget.language) {
+      // Language changed, recreate controller
+      _controller.removeListener(_onTextChanged);
+      final currentText = _controller.text;
+      _controller.dispose();
+      _controller = CodeController(
+        text: currentText,
+        language: widget.language.mode,
+      );
+      _controller.addListener(_onTextChanged);
+    }
+  }
+
+  @override
+  void dispose() {
+    _controller.removeListener(_onTextChanged);
+    _controller.dispose();
+    super.dispose();
+  }
+
+  /// Gets the current text content.
+  String get text => _controller.text;
+
+  /// Sets the text content programmatically.
+  set text(String value) {
+    _controller.text = value;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+
+    return CodeTheme(
+      data: isDark ? _darkTheme(colorScheme) : _lightTheme(colorScheme),
+      child: SingleChildScrollView(
+        child: CodeField(
+          controller: _controller,
+          readOnly: widget.readOnly,
+          minLines: 1,
+          gutterStyle: widget.showLineNumbers
+              ? GutterStyle(
+                  showLineNumbers: true,
+                  showErrors: false,
+                  showFoldingHandles: false,
+                  margin: 0,
+                  textStyle: TextStyle(
+                    fontFamily: 'monospace',
+                    fontSize: 12,
+                    color: colorScheme.outline,
+                  ),
+                  background: colorScheme.surfaceContainerLow,
+                )
+              : GutterStyle.none,
+          textStyle: TextStyle(
+            fontFamily: 'monospace',
+            fontSize: 13,
+            height: 1.5,
+            color: colorScheme.onSurface,
+          ),
+          padding: const EdgeInsets.all(16),
+          background: colorScheme.surfaceContainerLowest,
+        ),
+      ),
+    );
+  }
+
+  CodeThemeData _lightTheme(ColorScheme colorScheme) {
+    return CodeThemeData(
+      styles: {
+        'root': TextStyle(
+          color: colorScheme.onSurface,
+          backgroundColor: colorScheme.surfaceContainerLowest,
+        ),
+        'keyword': TextStyle(color: Colors.purple.shade700),
+        'string': TextStyle(color: Colors.green.shade700),
+        'number': TextStyle(color: Colors.blue.shade700),
+        'comment': TextStyle(
+          color: Colors.grey.shade600,
+          fontStyle: FontStyle.italic,
+        ),
+        'attr': TextStyle(color: Colors.orange.shade800),
+        'literal': TextStyle(color: Colors.teal.shade700),
+        'built_in': TextStyle(color: Colors.indigo.shade600),
+        'type': TextStyle(color: Colors.cyan.shade800),
+        'variable': TextStyle(color: Colors.brown.shade600),
+        'symbol': TextStyle(color: Colors.red.shade700),
+        'section': TextStyle(color: Colors.deepPurple.shade700),
+        'meta': TextStyle(color: Colors.pink.shade700),
+      },
+    );
+  }
+
+  CodeThemeData _darkTheme(ColorScheme colorScheme) {
+    return CodeThemeData(
+      styles: {
+        'root': TextStyle(
+          color: colorScheme.onSurface,
+          backgroundColor: colorScheme.surfaceContainerLowest,
+        ),
+        'keyword': const TextStyle(color: Color(0xFFC792EA)),
+        'string': const TextStyle(color: Color(0xFFC3E88D)),
+        'number': const TextStyle(color: Color(0xFFF78C6C)),
+        'comment': TextStyle(
+          color: Colors.grey.shade500,
+          fontStyle: FontStyle.italic,
+        ),
+        'attr': const TextStyle(color: Color(0xFFFFCB6B)),
+        'literal': const TextStyle(color: Color(0xFF82AAFF)),
+        'built_in': const TextStyle(color: Color(0xFF89DDFF)),
+        'type': const TextStyle(color: Color(0xFFFFCB6B)),
+        'variable': const TextStyle(color: Color(0xFFEEFFFF)),
+        'symbol': const TextStyle(color: Color(0xFFF07178)),
+        'section': const TextStyle(color: Color(0xFF82AAFF)),
+        'meta': const TextStyle(color: Color(0xFFF78C6C)),
+      },
+    );
+  }
+}

lib/shared/components/code_editor/code_editor_language.dart

@@ -0,0 +1,39 @@
+import 'package:highlight/highlight_core.dart';
+import 'package:highlight/languages/yaml.dart' as hl_yaml;
+import 'package:highlight/languages/json.dart' as hl_json;
+import 'package:highlight/languages/dockerfile.dart' as hl_dockerfile;
+import 'package:highlight/languages/bash.dart' as hl_bash;
+import 'package:highlight/languages/ini.dart' as hl_ini;
+
+/// Supported languages for the code editor.
+enum CodeEditorLanguage {
+  yaml('yaml', 'YAML'),
+  json('json', 'JSON'),
+  dockerfile('dockerfile', 'Dockerfile'),
+  bash('bash', 'Bash'),
+  ini('ini', 'INI/ENV'),
+  plaintext('plaintext', 'Plain Text');
+
+  const CodeEditorLanguage(this.id, this.displayName);
+
+  final String id;
+  final String displayName;
+
+  /// Gets the highlight Mode for this language.
+  Mode? get mode {
+    switch (this) {
+      case CodeEditorLanguage.yaml:
+        return hl_yaml.yaml;
+      case CodeEditorLanguage.json:
+        return hl_json.json;
+      case CodeEditorLanguage.dockerfile:
+        return hl_dockerfile.dockerfile;
+      case CodeEditorLanguage.bash:
+        return hl_bash.bash;
+      case CodeEditorLanguage.ini:
+        return hl_ini.ini;
+      case CodeEditorLanguage.plaintext:
+        return null;
+    }
+  }
+}

lib/shared/components/data_grid/adapters/core_api_source.dart

@@ -0,0 +1,138 @@
+import 'package:dio/dio.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_source.dart';
+
+/// Data source adapter for Core API endpoints.
+///
+/// Implements the DataGrid data source interface for fetching data
+/// from the Core API with support for search, sorting, and pagination.
+///
+/// Example:
+/// ```dart
+/// final containersSource = CoreApiDataSource<Container>(
+///   dio: dio,
+///   endpoint: '/infrastructure/containers',
+///   fromJson: Container.fromJson,
+///   searchParam: 'search',
+///   sortParam: 'sort_by',
+///   orderParam: 'order',
+/// );
+/// ```
+class CoreApiDataSource<T> extends DataGridSource<T> {
+  CoreApiDataSource({
+    required this.dio,
+    required this.endpoint,
+    required this.fromJson,
+    this.searchParam = 'search',
+    this.sortParam = 'sort',
+    this.orderParam = 'order',
+    this.offsetParam = 'offset',
+    this.limitParam = 'limit',
+    this.itemsKey = 'items',
+    this.totalCountKey = 'total',
+  });
+
+  /// Dio HTTP client instance.
+  final Dio dio;
+
+  /// API endpoint path.
+  final String endpoint;
+
+  /// Function to parse JSON into the item type.
+  final T Function(Map<String, dynamic> json) fromJson;
+
+  /// Query parameter name for search.
+  final String searchParam;
+
+  /// Query parameter name for sort field.
+  final String sortParam;
+
+  /// Query parameter name for sort order.
+  final String orderParam;
+
+  /// Query parameter name for pagination offset.
+  final String offsetParam;
+
+  /// Query parameter name for pagination limit.
+  final String limitParam;
+
+  /// JSON key for items array in response.
+  final String itemsKey;
+
+  /// JSON key for total count in response.
+  final String totalCountKey;
+
+  @override
+  Future<DataGridResult<T>> fetch({
+    String? searchQuery,
+    String? sortField,
+    bool sortDescending = false,
+    int? offset,
+    int? limit,
+  }) async {
+    final queryParams = <String, dynamic>{};
+
+    if (searchQuery != null && searchQuery.isNotEmpty) {
+      queryParams[searchParam] = searchQuery;
+    }
+
+    if (sortField != null) {
+      queryParams[sortParam] = sortField;
+      queryParams[orderParam] = sortDescending ? 'desc' : 'asc';
+    }
+
+    if (offset != null) {
+      queryParams[offsetParam] = offset;
+    }
+
+    if (limit != null) {
+      queryParams[limitParam] = limit;
+    }
+
+    final response = await dio.get<dynamic>(
+      endpoint,
+      queryParameters: queryParams,
+    );
+
+    final responseData = response.data!;
+
+    // Handle both paginated and wrapped responses
+    List<dynamic> itemsJson;
+    int totalCount;
+
+    if (responseData is List) {
+      // Direct array response: [...]
+      itemsJson = responseData;
+      totalCount = itemsJson.length;
+    } else if (responseData is Map<String, dynamic>) {
+      final data = responseData;
+      if (data.containsKey(itemsKey)) {
+        // Paginated response: { items: [...], total: N }
+        itemsJson = data[itemsKey] as List<dynamic>;
+        totalCount = data[totalCountKey] as int? ?? itemsJson.length;
+      } else {
+        // Try common wrapper patterns: { data: [...] } or { results: [...] }
+        itemsJson = (data['data'] ?? data['results'] ?? []) as List<dynamic>;
+        totalCount = data['count'] as int? ??
+            data['total'] as int? ??
+            data['totalCount'] as int? ??
+            itemsJson.length;
+      }
+    } else {
+      throw FormatException('Unexpected response type: ${responseData.runtimeType}');
+    }
+
+    final items = itemsJson
+        .map((json) => fromJson(json as Map<String, dynamic>))
+        .toList();
+
+    final hasMore = offset != null && limit != null
+        ? (offset + items.length) < totalCount
+        : false;
+
+    return DataGridResult(
+      items: items,
+      totalCount: totalCount,
+      hasMore: hasMore,
+    );
+  }
+}

lib/shared/components/data_grid/data_grid.dart

@@ -0,0 +1,215 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
+
+import 'data_grid_config.dart';
+import 'data_grid_provider.dart';
+import 'data_grid_state.dart';
+import 'widgets/data_grid_bulk_actions.dart';
+import 'widgets/data_grid_empty_state.dart';
+import 'widgets/data_grid_footer.dart';
+import 'widgets/data_grid_header.dart';
+import 'widgets/data_grid_row.dart';
+import 'widgets/data_grid_search_bar.dart';
+
+/// A configurable data grid widget for displaying tabular data.
+///
+/// Features:
+/// - Sortable columns
+/// - Row selection (single and bulk)
+/// - Per-row and bulk actions
+/// - Search/filtering
+/// - Pagination or infinite scroll
+/// - Custom cell rendering
+/// - Empty, loading, and error states
+///
+/// Usage:
+/// ```dart
+/// DataGrid<Container>(
+///   provider: containersGridProvider,
+///   config: containersGridConfig,
+///   idSelector: (c) => c.id,
+/// )
+/// ```
+class DataGrid<T> extends ConsumerWidget {
+  const DataGrid({
+    super.key,
+    required this.provider,
+    required this.config,
+    required this.idSelector,
+    this.toolbarActions,
+  });
+
+  /// The Riverpod provider for this grid's state.
+  final StateNotifierProvider<DataGridController<T>, DataGridState<T>> provider;
+
+  /// Grid configuration.
+  final DataGridConfig<T> config;
+
+  /// Function to extract unique ID from an item.
+  final Object Function(T item) idSelector;
+
+  /// Additional actions to show in the toolbar (next to search).
+  final List<Widget>? toolbarActions;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final state = ref.watch(provider);
+    final controller = ref.read(provider.notifier);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        // Toolbar: search + bulk actions + custom actions
+        if (config.enableSearch ||
+            (state.selectedCount > 0 && config.bulkActions.isNotEmpty) ||
+            toolbarActions != null)
+          _buildToolbar(context, state, controller),
+
+        // Header
+        if (config.showHeader)
+          DataGridHeader<T>(
+            config: config,
+            sortColumnIndex: state.sortColumnIndex,
+            sortDescending: state.sortDescending,
+            onSort: controller.sortBy,
+            showCheckbox: config.rowsSelectable,
+            allSelected: state.allSelected,
+            someSelected: state.someSelected,
+            onSelectAll: controller.toggleSelectAll,
+          ),
+
+        // Content area
+        Expanded(
+          child: _buildContent(context, state, controller),
+        ),
+
+        // Footer
+        if (config.showFooter)
+          DataGridFooter(
+            totalCount: state.totalCount,
+            displayedCount: state.items.length,
+            dataMode: config.dataMode,
+            currentPage: state.currentPage,
+            onPageChange: controller.goToPage,
+            isLoading: state.isLoading,
+          ),
+      ],
+    );
+  }
+
+  Widget _buildToolbar(
+    BuildContext context,
+    DataGridState<T> state,
+    DataGridController<T> controller,
+  ) {
+    return Padding(
+      padding: const EdgeInsets.all(16),
+      child: Row(
+        children: [
+          if (config.enableSearch)
+            DataGridSearchBar(
+              onSearch: controller.search,
+              onClear: controller.clearSearch,
+              hintText: config.searchHint,
+              initialValue: state.searchQuery,
+            ),
+          if (state.selectedCount > 0 && config.bulkActions.isNotEmpty) ...[
+            const SizedBox(width: 16),
+            Expanded(
+              child: DataGridBulkActions<T>(
+                selectedCount: state.selectedCount,
+                bulkActions: config.bulkActions,
+                onClearSelection: controller.clearSelection,
+                getSelectedItems: controller.getSelectedItems,
+              ),
+            ),
+          ] else ...[
+            const Spacer(),
+          ],
+          if (toolbarActions != null) ...toolbarActions!,
+        ],
+      ),
+    );
+  }
+
+  Widget _buildContent(
+    BuildContext context,
+    DataGridState<T> state,
+    DataGridController<T> controller,
+  ) {
+    // Initial loading state
+    if (state.isInitialLoad && state.isLoading) {
+      return config.loadingBuilder?.call(context) ??
+          const DataGridLoadingState();
+    }
+
+    // Error state
+    if (state.hasError && state.items.isEmpty) {
+      return config.errorBuilder?.call(context, state.error!, controller.refresh) ??
+          DataGridErrorState(
+            error: state.error!,
+            onRetry: controller.refresh,
+          );
+    }
+
+    // Empty state
+    if (state.isEmpty) {
+      return config.emptyStateBuilder?.call(context) ??
+          DataGridEmptyState(
+            title: state.searchQuery.isNotEmpty
+                ? 'No results found'
+                : 'No items found',
+            subtitle: state.searchQuery.isNotEmpty
+                ? 'Try a different search term'
+                : null,
+          );
+    }
+
+    // Data rows
+    return _buildListView(state, controller);
+  }
+
+  Widget _buildListView(
+    DataGridState<T> state,
+    DataGridController<T> controller,
+  ) {
+    final isInfiniteScroll = config.dataMode is InfiniteDataMode;
+
+    return NotificationListener<ScrollNotification>(
+      onNotification: (notification) {
+        if (isInfiniteScroll &&
+            notification is ScrollEndNotification &&
+            notification.metrics.extentAfter < 200) {
+          controller.loadMore();
+        }
+        return false;
+      },
+      child: ListView.builder(
+        itemCount: state.items.length + (state.isLoading && !state.isInitialLoad ? 1 : 0),
+        itemBuilder: (context, index) {
+          // Loading indicator at bottom for infinite scroll
+          if (index >= state.items.length) {
+            return const Padding(
+              padding: EdgeInsets.all(16),
+              child: Center(child: CircularProgressIndicator()),
+            );
+          }
+
+          final item = state.items[index];
+          final isSelected = controller.isSelected(item);
+
+          return DataGridRow<T>(
+            item: item,
+            index: index,
+            config: config,
+            isSelected: isSelected,
+            onSelect: () => controller.toggleSelection(item),
+            onTap: config.onRowTap != null ? () => config.onRowTap!(item) : null,
+            backgroundColor: config.rowColor?.call(context, item, index),
+          );
+        },
+      ),
+    );
+  }
+}

lib/shared/components/data_grid/data_grid_action.dart

@@ -0,0 +1,83 @@
+import 'package:flutter/material.dart';
+
+/// Per-row action for DataGrid.
+class DataGridAction<T> {
+  const DataGridAction({
+    required this.icon,
+    required this.label,
+    required this.onTap,
+    this.showWhen,
+    this.destructive = false,
+    this.requiresConfirmation = false,
+    this.confirmationMessage,
+  });
+
+  /// Icon to display in the action menu.
+  final IconData icon;
+
+  /// Label for the action.
+  final String label;
+
+  /// Callback when the action is triggered.
+  final Future<void> Function(T item) onTap;
+
+  /// Condition to show/hide this action for specific items.
+  final bool Function(T item)? showWhen;
+
+  /// Whether this is a destructive action (styled differently).
+  final bool destructive;
+
+  /// Whether to show a confirmation dialog before executing.
+  final bool requiresConfirmation;
+
+  /// Custom confirmation message. Defaults to "Are you sure?".
+  final String? confirmationMessage;
+
+  /// Checks if this action should be shown for the given item.
+  bool shouldShow(T item) => showWhen?.call(item) ?? true;
+}
+
+/// Bulk action for selected rows in DataGrid.
+class DataGridBulkAction<T> {
+  const DataGridBulkAction({
+    required this.icon,
+    required this.label,
+    required this.onTap,
+    this.minSelected = 1,
+    this.maxSelected,
+    this.destructive = false,
+    this.requiresConfirmation = false,
+    this.confirmationMessage,
+  });
+
+  /// Icon to display.
+  final IconData icon;
+
+  /// Label for the action.
+  final String label;
+
+  /// Callback when the action is triggered with selected items.
+  final Future<void> Function(List<T> items) onTap;
+
+  /// Minimum number of items that must be selected.
+  final int minSelected;
+
+  /// Maximum number of items that can be selected (null = no limit).
+  final int? maxSelected;
+
+  /// Whether this is a destructive action.
+  final bool destructive;
+
+  /// Whether to show a confirmation dialog before executing.
+  final bool requiresConfirmation;
+
+  /// Custom confirmation message.
+  final String? confirmationMessage;
+
+  /// Checks if this action is available for the given selection count.
+  bool isAvailable(int selectedCount) {
+    if (selectedCount < minSelected) return false;
+    if (maxSelected != null && selectedCount > maxSelected!) return false;
+    return true;
+  }
+}

lib/shared/components/data_grid/data_grid_column.dart

@@ -0,0 +1,110 @@
+import 'package:flutter/material.dart';
+
+/// Column width specification for DataGrid columns.
+sealed class DataGridColumnWidth {
+  const DataGridColumnWidth._();
+
+  /// Fixed width in logical pixels.
+  const factory DataGridColumnWidth.fixed(double width) = GridFixedWidth;
+
+  /// Flexible width with flex factor (like Expanded).
+  const factory DataGridColumnWidth.flex([int flex]) = GridFlexWidth;
+
+  /// Fraction of available width (0.0 to 1.0).
+  const factory DataGridColumnWidth.fraction(double fraction) =
+      GridFractionWidth;
+}
+
+/// Fixed column width.
+final class GridFixedWidth extends DataGridColumnWidth {
+  const GridFixedWidth(this.width) : super._();
+  final double width;
+}
+
+/// Flexible column width.
+final class GridFlexWidth extends DataGridColumnWidth {
+  const GridFlexWidth([this.flex = 1]) : super._();
+  final int flex;
+}
+
+/// Fractional column width.
+final class GridFractionWidth extends DataGridColumnWidth {
+  const GridFractionWidth(this.fraction)
+      : assert(fraction > 0 && fraction <= 1),
+        super._();
+  final double fraction;
+}
+
+/// Column alignment options.
+enum DataGridColumnAlignment {
+  start,
+  center,
+  end,
+}
+
+/// Column definition for DataGrid.
+class DataGridColumn<T> {
+  const DataGridColumn({
+    required this.header,
+    required this.valueBuilder,
+    this.cellBuilder,
+    this.cellControlsBuilder,
+    this.width = const DataGridColumnWidth.flex(1),
+    this.alignment = DataGridColumnAlignment.start,
+    this.sortable = false,
+    this.sortField,
+    this.searchable = false,
+    this.visible = true,
+    this.tooltip,
+  });
+
+  /// Column header text.
+  final String header;
+
+  /// Extracts the string value from an item for sorting/searching.
+  final String Function(T item) valueBuilder;
+
+  /// Custom cell widget builder. If null, displays valueBuilder result as text.
+  final Widget Function(BuildContext context, T item)? cellBuilder;
+
+  /// Additional controls to show in the cell (e.g., quick actions).
+  final Widget Function(BuildContext context, T item)? cellControlsBuilder;
+
+  /// Column width specification.
+  final DataGridColumnWidth width;
+
+  /// Text alignment within the column.
+  final DataGridColumnAlignment alignment;
+
+  /// Whether this column can be sorted.
+  final bool sortable;
+
+  /// API field name for server-side sorting. Defaults to using header if null.
+  final String? sortField;
+
+  /// Whether this column is included in search.
+  final bool searchable;
+
+  /// Whether this column is visible.
+  final bool visible;
+
+  /// Tooltip builder for cell hover.
+  final String Function(T item)? tooltip;
+
+  /// Gets the effective sort field name.
+  String get effectiveSortField => sortField ?? header.toLowerCase();
+
+  /// Converts alignment enum to CrossAxisAlignment.
+  CrossAxisAlignment get crossAxisAlignment => switch (alignment) {
+        DataGridColumnAlignment.start => CrossAxisAlignment.start,
+        DataGridColumnAlignment.center => CrossAxisAlignment.center,
+        DataGridColumnAlignment.end => CrossAxisAlignment.end,
+      };
+
+  /// Converts alignment enum to TextAlign.
+  TextAlign get textAlign => switch (alignment) {
+        DataGridColumnAlignment.start => TextAlign.start,
+        DataGridColumnAlignment.center => TextAlign.center,
+        DataGridColumnAlignment.end => TextAlign.end,
+      };
+}

lib/shared/components/data_grid/data_grid_config.dart

@@ -0,0 +1,142 @@
+import 'package:flutter/material.dart';
+
+import 'data_grid_action.dart';
+import 'data_grid_column.dart';
+
+/// Data loading mode for the grid.
+sealed class DataGridDataMode {
+  const DataGridDataMode._();
+
+  /// Load all data at once.
+  const factory DataGridDataMode.all() = AllDataMode;
+
+  /// Paginated loading with page controls.
+  const factory DataGridDataMode.paginated({int pageSize}) = PaginatedDataMode;
+
+  /// Infinite scroll loading.
+  const factory DataGridDataMode.infinite({
+    int initialLoad,
+    int loadMoreThreshold,
+  }) = InfiniteDataMode;
+}
+
+/// Load all data mode.
+final class AllDataMode extends DataGridDataMode {
+  const AllDataMode() : super._();
+}
+
+/// Paginated data mode.
+final class PaginatedDataMode extends DataGridDataMode {
+  const PaginatedDataMode({this.pageSize = 25}) : super._();
+  final int pageSize;
+}
+
+/// Infinite scroll data mode.
+final class InfiniteDataMode extends DataGridDataMode {
+  const InfiniteDataMode({
+    this.initialLoad = 50,
+    this.loadMoreThreshold = 10,
+  }) : super._();
+
+  final int initialLoad;
+  final int loadMoreThreshold;
+}
+
+/// Main configuration for a DataGrid.
+class DataGridConfig<T> {
+  const DataGridConfig({
+    required this.columns,
+    this.actions = const [],
+    this.bulkActions = const [],
+    this.rowsSelectable = false,
+    this.showHeader = true,
+    this.showFooter = true,
+    this.enableSearch = false,
+    this.searchHint = 'Search...',
+    this.defaultSortColumn,
+    this.defaultSortDescending = false,
+    this.emptyStateBuilder,
+    this.loadingBuilder,
+    this.errorBuilder,
+    this.onRowTap,
+    this.cellPadding = const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+    this.headerHeight = 48.0,
+    this.rowHeight,
+    this.dataMode = const DataGridDataMode.all(),
+    this.rowColor,
+    this.alternatingRowColors = false,
+  });
+
+  /// Column definitions.
+  final List<DataGridColumn<T>> columns;
+
+  /// Per-row actions (shown in actions menu).
+  final List<DataGridAction<T>> actions;
+
+  /// Bulk actions for selected rows.
+  final List<DataGridBulkAction<T>> bulkActions;
+
+  /// Whether rows can be selected.
+  final bool rowsSelectable;
+
+  /// Whether to show the header row.
+  final bool showHeader;
+
+  /// Whether to show the footer with count/pagination.
+  final bool showFooter;
+
+  /// Whether to show search bar.
+  final bool enableSearch;
+
+  /// Placeholder text for search input.
+  final String searchHint;
+
+  /// Index of column to sort by default.
+  final int? defaultSortColumn;
+
+  /// Whether default sort is descending.
+  final bool defaultSortDescending;
+
+  /// Custom empty state widget builder.
+  final Widget Function(BuildContext context)? emptyStateBuilder;
+
+  /// Custom loading widget builder.
+  final Widget Function(BuildContext context)? loadingBuilder;
+
+  /// Custom error widget builder.
+  final Widget Function(BuildContext context, Object error, VoidCallback retry)?
+      errorBuilder;
+
+  /// Callback when a row is tapped.
+  final void Function(T item)? onRowTap;
+
+  /// Padding for each cell.
+  final EdgeInsetsGeometry cellPadding;
+
+  /// Height of the header row.
+  final double headerHeight;
+
+  /// Height of each data row. If null, rows size to content.
+  final double? rowHeight;
+
+  /// Data loading mode.
+  final DataGridDataMode dataMode;
+
+  /// Custom row background color builder.
+  final Color? Function(BuildContext context, T item, int index)? rowColor;
+
+  /// Whether to use alternating row colors.
+  final bool alternatingRowColors;
+
+  /// Gets visible columns only.
+  List<DataGridColumn<T>> get visibleColumns =>
+      columns.where((c) => c.visible).toList();
+
+  /// Gets searchable column indices.
+  List<int> get searchableColumnIndices => columns
+      .asMap()
+      .entries
+      .where((e) => e.value.searchable)
+      .map((e) => e.key)
+      .toList();
+}

lib/shared/components/data_grid/data_grid_exports.dart

@@ -0,0 +1,88 @@
+/// DataGrid component for displaying tabular data.
+///
+/// This library provides a configurable, feature-rich data grid widget
+/// for Flutter applications using Riverpod for state management.
+///
+/// Features:
+/// - Sortable columns
+/// - Row selection (single and bulk)
+/// - Per-row and bulk actions with confirmations
+/// - Search/filtering
+/// - Pagination or infinite scroll
+/// - Custom cell rendering
+/// - Empty, loading, and error states
+/// - Responsive column widths
+///
+/// Example:
+/// ```dart
+/// // Define your data source
+/// final usersSource = InMemoryDataSource<User>(
+///   items: users,
+///   searchMatcher: (user, query) =>
+///     user.name.toLowerCase().contains(query.toLowerCase()),
+/// );
+///
+/// // Define grid configuration
+/// final usersConfig = DataGridConfig<User>(
+///   columns: [
+///     DataGridColumn(
+///       header: 'Name',
+///       valueBuilder: (u) => u.name,
+///       sortable: true,
+///       searchable: true,
+///     ),
+///     DataGridColumn(
+///       header: 'Email',
+///       valueBuilder: (u) => u.email,
+///     ),
+///     DataGridColumn(
+///       header: 'Status',
+///       valueBuilder: (u) => u.status,
+///       cellBuilder: (context, u) => StatusBadge(status: u.status),
+///     ),
+///   ],
+///   actions: [
+///     DataGridAction(
+///       icon: Icons.edit,
+///       label: 'Edit',
+///       onTap: (user) async => editUser(user),
+///     ),
+///     DataGridAction(
+///       icon: Icons.delete,
+///       label: 'Delete',
+///       onTap: (user) async => deleteUser(user),
+///       destructive: true,
+///       requiresConfirmation: true,
+///     ),
+///   ],
+///   rowsSelectable: true,
+///   enableSearch: true,
+/// );
+///
+/// // Create the provider
+/// final usersGridProvider = dataGridProvider<User>(
+///   source: usersSource,
+///   config: usersConfig,
+///   idSelector: (u) => u.id,
+/// );
+///
+/// // Use in widget
+/// DataGrid<User>(
+///   provider: usersGridProvider,
+///   config: usersConfig,
+///   idSelector: (u) => u.id,
+/// )
+/// ```
+library;
+
+export 'package:flutter_riverpod/legacy.dart'
+    show StateNotifierProvider, StateNotifier;
+
+export 'data_grid.dart';
+export 'data_grid_action.dart';
+export 'data_grid_column.dart';
+export 'data_grid_config.dart';
+export 'data_grid_provider.dart';
+export 'data_grid_source.dart';
+export 'data_grid_state.dart';
+export 'widgets/data_grid_empty_state.dart';

lib/shared/components/data_grid/data_grid_provider.dart

@@ -0,0 +1,266 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter_riverpod/legacy.dart';
+
+import 'data_grid_config.dart';
+import 'data_grid_source.dart';
+import 'data_grid_state.dart';
+
+/// Controller for a DataGrid instance.
+///
+/// Manages loading, searching, sorting, and selection state.
+class DataGridController<T> extends StateNotifier<DataGridState<T>> {
+  DataGridController({
+    required this.source,
+    required this.config,
+    required this.idSelector,
+  }) : super(DataGridState<T>(
+          sortColumnIndex: config.defaultSortColumn,
+          sortDescending: config.defaultSortDescending,
+        )) {
+    // Initial load
+    _load();
+  }
+
+  /// Data source for fetching items.
+  final DataGridSource<T> source;
+
+  /// Grid configuration.
+  final DataGridConfig<T> config;
+
+  /// Function to extract unique ID from an item.
+  final Object Function(T item) idSelector;
+
+  /// Debounce timer for search.
+  Timer? _searchDebounce;
+
+  @override
+  void dispose() {
+    _searchDebounce?.cancel();
+    super.dispose();
+  }
+
+  /// Loads or reloads data from the source.
+  Future<void> _load({bool refresh = false}) async {
+    if (refresh) {
+      state = state.copyWith(isLoading: true, error: null);
+    } else {
+      state = state.copyWith(isLoading: true, isInitialLoad: true, error: null);
+    }
+
+    try {
+      final sortField = state.sortColumnIndex != null
+          ? config.columns[state.sortColumnIndex!].effectiveSortField
+          : null;
+
+      final (offset, limit) = _getPaginationParams();
+
+      final result = await source.fetch(
+        searchQuery: state.searchQuery.isEmpty ? null : state.searchQuery,
+        sortField: sortField,
+        sortDescending: state.sortDescending,
+        offset: offset,
+        limit: limit,
+      );
+
+      state = state.copyWith(
+        items: result.items,
+        totalCount: result.totalCount,
+        hasMore: result.hasMore,
+        isLoading: false,
+        isInitialLoad: false,
+        error: null,
+      );
+    } catch (e, stack) {
+      debugPrint('DataGrid load error: $e\n$stack');
+      state = state.copyWith(
+        isLoading: false,
+        isInitialLoad: false,
+        error: e,
+      );
+    }
+  }
+
+  /// Gets pagination parameters based on data mode.
+  (int?, int?) _getPaginationParams() {
+    return switch (config.dataMode) {
+      AllDataMode() => (null, null),
+      PaginatedDataMode(:final pageSize) => (
+          state.currentPage * pageSize,
+          pageSize,
+        ),
+      InfiniteDataMode(:final initialLoad) => (0, initialLoad),
+    };
+  }
+
+  /// Refreshes the grid data.
+  Future<void> refresh() => _load(refresh: true);
+
+  /// Sets the search query with debouncing.
+  void search(String query) {
+    _searchDebounce?.cancel();
+    _searchDebounce = Timer(const Duration(milliseconds: 300), () {
+      if (state.searchQuery != query) {
+        state = state.copyWith(searchQuery: query, currentPage: 0);
+        _load(refresh: true);
+      }
+    });
+  }
+
+  /// Clears the search query.
+  void clearSearch() {
+    _searchDebounce?.cancel();
+    if (state.searchQuery.isNotEmpty) {
+      state = state.copyWith(searchQuery: '', currentPage: 0);
+      _load(refresh: true);
+    }
+  }
+
+  /// Sorts by the given column index.
+  void sortBy(int columnIndex) {
+    final column = config.columns[columnIndex];
+    if (!column.sortable) return;
+
+    final newDescending =
+        state.sortColumnIndex == columnIndex ? !state.sortDescending : false;
+
+    state = state.copyWith(
+      sortColumnIndex: columnIndex,
+      sortDescending: newDescending,
+      currentPage: 0,
+    );
+    _load(refresh: true);
+  }
+
+  /// Clears sorting.
+  void clearSort() {
+    state = state.copyWith(
+      sortColumnIndex: null,
+      sortDescending: false,
+      currentPage: 0,
+    );
+    _load(refresh: true);
+  }
+
+  /// Toggles selection of an item.
+  void toggleSelection(T item) {
+    if (!config.rowsSelectable) return;
+
+    final id = idSelector(item);
+    final newSelection = Set<Object>.from(state.selectedIds);
+
+    if (newSelection.contains(id)) {
+      newSelection.remove(id);
+    } else {
+      newSelection.add(id);
+    }
+
+    state = state.copyWith(selectedIds: newSelection);
+  }
+
+  /// Selects all visible items.
+  void selectAll() {
+    if (!config.rowsSelectable) return;
+
+    final allIds = state.items.map(idSelector).toSet();
+    state = state.copyWith(selectedIds: allIds);
+  }
+
+  /// Clears all selections.
+  void clearSelection() {
+    state = state.copyWith(selectedIds: {});
+  }
+
+  /// Toggles select all / clear all.
+  void toggleSelectAll() {
+    if (state.allSelected) {
+      clearSelection();
+    } else {
+      selectAll();
+    }
+  }
+
+  /// Checks if an item is selected.
+  bool isSelected(T item) => state.selectedIds.contains(idSelector(item));
+
+  /// Gets the selected items.
+  List<T> getSelectedItems() {
+    return state.items.where((item) => isSelected(item)).toList();
+  }
+
+  /// Goes to a specific page (for paginated mode).
+  void goToPage(int page) {
+    if (config.dataMode is! PaginatedDataMode) return;
+
+    final mode = config.dataMode as PaginatedDataMode;
+    final maxPage = (state.totalCount / mode.pageSize).ceil() - 1;
+
+    if (page < 0 || page > maxPage) return;
+
+    state = state.copyWith(currentPage: page);
+    _load(refresh: true);
+  }
+
+  /// Goes to the next page.
+  void nextPage() => goToPage(state.currentPage + 1);
+
+  /// Goes to the previous page.
+  void previousPage() => goToPage(state.currentPage - 1);
+
+  /// Loads more items (for infinite scroll mode).
+  Future<void> loadMore() async {
+    if (config.dataMode is! InfiniteDataMode) return;
+    if (state.isLoading || !state.hasMore) return;
+
+    state = state.copyWith(isLoading: true);
+
+    try {
+      final sortField = state.sortColumnIndex != null
+          ? config.columns[state.sortColumnIndex!].effectiveSortField
+          : null;
+
+      final result = await source.fetch(
+        searchQuery: state.searchQuery.isEmpty ? null : state.searchQuery,
+        sortField: sortField,
+        sortDescending: state.sortDescending,
+        offset: state.items.length,
+        limit: (config.dataMode as InfiniteDataMode).initialLoad,
+      );
+
+      state = state.copyWith(
+        items: [...state.items, ...result.items],
+        totalCount: result.totalCount,
+        hasMore: result.hasMore,
+        isLoading: false,
+      );
+    } catch (e) {
+      state = state.copyWith(isLoading: false, error: e);
+    }
+  }
+}
+
+/// Creates a DataGridController provider for a specific grid.
+///
+/// Usage:
+/// ```dart
+/// final containersGridProvider = dataGridProvider<Container>(
+///   source: containersDataSource,
+///   config: containersGridConfig,
+///   idSelector: (c) => c.id,
+/// );
+/// ```
+StateNotifierProvider<DataGridController<T>, DataGridState<T>>
+    dataGridProvider<T>({
+  required DataGridSource<T> source,
+  required DataGridConfig<T> config,
+  required Object Function(T) idSelector,
+}) {
+  return StateNotifierProvider<DataGridController<T>, DataGridState<T>>(
+    (ref) => DataGridController<T>(
+      source: source,
+      config: config,
+      idSelector: idSelector,
+    ),
+  );
+}

lib/shared/components/data_grid/data_grid_source.dart

@@ -0,0 +1,108 @@
+/// Result from a data source fetch operation.
+class DataGridResult<T> {
+  const DataGridResult({
+    required this.items,
+    required this.totalCount,
+    this.hasMore = false,
+  });
+
+  /// The fetched items.
+  final List<T> items;
+
+  /// Total count of items (for pagination display).
+  final int totalCount;
+
+  /// Whether there are more items to load (for infinite scroll).
+  final bool hasMore;
+
+  /// Creates an empty result.
+  const DataGridResult.empty()
+      : items = const [],
+        totalCount = 0,
+        hasMore = false;
+}
+
+/// Abstract data source for DataGrid.
+///
+/// Implement this to provide data to the grid. Can be backed by
+/// API calls, local database, or in-memory lists.
+abstract class DataGridSource<T> {
+  /// Fetches items from the data source.
+  ///
+  /// - [searchQuery]: Optional search text to filter results.
+  /// - [sortField]: Field name to sort by.
+  /// - [sortDescending]: Whether to sort in descending order.
+  /// - [offset]: Number of items to skip (for pagination).
+  /// - [limit]: Maximum number of items to return.
+  Future<DataGridResult<T>> fetch({
+    String? searchQuery,
+    String? sortField,
+    bool sortDescending = false,
+    int? offset,
+    int? limit,
+  });
+
+  /// Gets the total count of items matching the query.
+  ///
+  /// Override this if you need a separate count query.
+  /// By default, returns the totalCount from the last fetch.
+  Future<int> count({String? searchQuery}) async {
+    final result = await fetch(searchQuery: searchQuery, limit: 0);
+    return result.totalCount;
+  }
+}
+
+/// In-memory data source for local data.
+class InMemoryDataSource<T> extends DataGridSource<T> {
+  InMemoryDataSource({
+    required this.items,
+    this.searchMatcher,
+    this.sortComparator,
+  });
+
+  /// All items in the data source.
+  final List<T> items;
+
+  /// Function to check if an item matches the search query.
+  final bool Function(T item, String query)? searchMatcher;
+
+  /// Function to compare two items for sorting.
+  final int Function(T a, T b, String field, bool descending)? sortComparator;
+
+  @override
+  Future<DataGridResult<T>> fetch({
+    String? searchQuery,
+    String? sortField,
+    bool sortDescending = false,
+    int? offset,
+    int? limit,
+  }) async {
+    var result = List<T>.from(items);
+
+    // Apply search filter
+    if (searchQuery != null && searchQuery.isNotEmpty && searchMatcher != null) {
+      result = result.where((item) => searchMatcher!(item, searchQuery)).toList();
+    }
+
+    // Apply sorting
+    if (sortField != null && sortComparator != null) {
+      result.sort((a, b) => sortComparator!(a, b, sortField, sortDescending));
+    }
+
+    final totalCount = result.length;
+
+    // Apply pagination
+    if (offset != null && offset > 0) {
+      result = result.skip(offset).toList();
+    }
+    if (limit != null && limit > 0) {
+      result = result.take(limit).toList();
+    }
+
+    return DataGridResult(
+      items: result,
+      totalCount: totalCount,
+      hasMore: offset != null && limit != null && (offset + limit) < totalCount,
+    );
+  }
+}

lib/shared/components/data_grid/data_grid_state.dart

@@ -0,0 +1,62 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'data_grid_state.freezed.dart';
+
+/// State for a DataGrid instance.
+@freezed
+sealed class DataGridState<T> with _$DataGridState<T> {
+  const factory DataGridState({
+    /// Current items being displayed.
+    @Default([]) List<T> items,
+
+    /// Total count of items (may differ from items.length for pagination).
+    @Default(0) int totalCount,
+
+    /// Whether data is currently loading.
+    @Default(false) bool isLoading,
+
+    /// Whether initial load is in progress.
+    @Default(true) bool isInitialLoad,
+
+    /// Error that occurred during loading.
+    Object? error,
+
+    /// Current search query.
+    @Default('') String searchQuery,
+
+    /// Index of the column currently sorted by.
+    int? sortColumnIndex,
+
+    /// Whether sort is descending.
+    @Default(false) bool sortDescending,
+
+    /// Currently selected item IDs (if selectable).
+    @Default({}) Set<Object> selectedIds,
+
+    /// Current page (for paginated mode).
+    @Default(0) int currentPage,
+
+    /// Whether more items can be loaded (for infinite scroll).
+    @Default(false) bool hasMore,
+  }) = _DataGridState<T>;
+}
+
+/// Extension methods for DataGridState.
+extension DataGridStateX<T> on DataGridState<T> {
+  /// Whether the grid has an error.
+  bool get hasError => error != null;
+
+  /// Whether the grid is empty (no items and not loading).
+  bool get isEmpty => items.isEmpty && !isLoading && !hasError;
+
+  /// Whether all visible items are selected.
+  bool get allSelected =>
+      items.isNotEmpty && selectedIds.length == items.length;
+
+  /// Whether some (but not all) items are selected.
+  bool get someSelected =>
+      selectedIds.isNotEmpty && selectedIds.length < items.length;
+
+  /// Number of selected items.
+  int get selectedCount => selectedIds.length;
+}

lib/shared/components/data_grid/widgets/data_grid_actions_menu.dart

@@ -0,0 +1,98 @@
+import 'package:flutter/material.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_action.dart';
+
+/// Actions menu for a DataGrid row.
+class DataGridActionsMenu<T> extends StatelessWidget {
+  const DataGridActionsMenu({
+    super.key,
+    required this.item,
+    required this.actions,
+  });
+
+  final T item;
+  final List<DataGridAction<T>> actions;
+
+  @override
+  Widget build(BuildContext context) {
+    final visibleActions = actions.where((a) => a.shouldShow(item)).toList();
+
+    if (visibleActions.isEmpty) {
+      return const SizedBox.shrink();
+    }
+
+    return PopupMenuButton<DataGridAction<T>>(
+      icon: const Icon(Icons.more_vert),
+      tooltip: 'Actions',
+      onSelected: (action) => _handleAction(context, action),
+      itemBuilder: (context) => visibleActions.map((action) {
+        final colorScheme = Theme.of(context).colorScheme;
+
+        return PopupMenuItem<DataGridAction<T>>(
+          value: action,
+          child: Row(
+            children: [
+              Icon(
+                action.icon,
+                size: 20,
+                color: action.destructive ? colorScheme.error : null,
+              ),
+              const SizedBox(width: 12),
+              Text(
+                action.label,
+                style: TextStyle(
+                  color: action.destructive ? colorScheme.error : null,
+                ),
+              ),
+            ],
+          ),
+        );
+      }).toList(),
+    );
+  }
+
+  Future<void> _handleAction(
+    BuildContext context,
+    DataGridAction<T> action,
+  ) async {
+    if (action.requiresConfirmation) {
+      final confirmed = await _showConfirmationDialog(context, action);
+      if (!confirmed) return;
+    }
+
+    await action.onTap(item);
+  }
+
+  Future<bool> _showConfirmationDialog(
+    BuildContext context,
+    DataGridAction<T> action,
+  ) async {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return await showDialog<bool>(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: Text(action.label),
+            content: Text(
+              action.confirmationMessage ?? 'Are you sure you want to proceed?',
+            ),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.of(context).pop(false),
+                child: const Text('Cancel'),
+              ),
+              FilledButton(
+                onPressed: () => Navigator.of(context).pop(true),
+                style: action.destructive
+                    ? FilledButton.styleFrom(
+                        backgroundColor: colorScheme.error,
+                        foregroundColor: colorScheme.onError,
+                      )
+                    : null,
+                child: const Text('Confirm'),
+              ),
+            ],
+          ),
+        ) ??
+        false;
+  }
+}

lib/shared/components/data_grid/widgets/data_grid_bulk_actions.dart

@@ -0,0 +1,143 @@
+import 'package:flutter/material.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_action.dart';
+
+/// Bulk actions bar shown when items are selected.
+class DataGridBulkActions<T> extends StatelessWidget {
+  const DataGridBulkActions({
+    super.key,
+    required this.selectedCount,
+    required this.bulkActions,
+    required this.onClearSelection,
+    required this.getSelectedItems,
+  });
+
+  final int selectedCount;
+  final List<DataGridBulkAction<T>> bulkActions;
+  final VoidCallback onClearSelection;
+  final List<T> Function() getSelectedItems;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      decoration: BoxDecoration(
+        color: colorScheme.primaryContainer,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Row(
+        children: [
+          Text(
+            '$selectedCount selected',
+            style: TextStyle(
+              fontWeight: FontWeight.w500,
+              color: colorScheme.onPrimaryContainer,
+            ),
+          ),
+          const SizedBox(width: 16),
+          ...bulkActions.where((a) => a.isAvailable(selectedCount)).map(
+                (action) => Padding(
+                  padding: const EdgeInsets.only(right: 8),
+                  child: _BulkActionButton(
+                    action: action,
+                    onPressed: () => _handleAction(context, action),
+                  ),
+                ),
+              ),
+          const Spacer(),
+          IconButton(
+            icon: const Icon(Icons.close),
+            onPressed: onClearSelection,
+            tooltip: 'Clear selection',
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _handleAction(
+    BuildContext context,
+    DataGridBulkAction<T> action,
+  ) async {
+    if (action.requiresConfirmation) {
+      final confirmed = await _showConfirmationDialog(context, action);
+      if (!confirmed) return;
+    }
+
+    final items = getSelectedItems();
+    await action.onTap(items);
+  }
+
+  Future<bool> _showConfirmationDialog(
+    BuildContext context,
+    DataGridBulkAction<T> action,
+  ) async {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return await showDialog<bool>(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: Text(action.label),
+            content: Text(
+              action.confirmationMessage ??
+                  'Are you sure you want to ${action.label.toLowerCase()} $selectedCount items?',
+            ),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.of(context).pop(false),
+                child: const Text('Cancel'),
+              ),
+              FilledButton(
+                onPressed: () => Navigator.of(context).pop(true),
+                style: action.destructive
+                    ? FilledButton.styleFrom(
+                        backgroundColor: colorScheme.error,
+                        foregroundColor: colorScheme.onError,
+                      )
+                    : null,
+                child: const Text('Confirm'),
+              ),
+            ],
+          ),
+        ) ??
+        false;
+  }
+}
+
+class _BulkActionButton<T> extends StatelessWidget {
+  const _BulkActionButton({
+    required this.action,
+    required this.onPressed,
+  });
+
+  final DataGridBulkAction<T> action;
+  final VoidCallback onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    if (action.destructive) {
+      return OutlinedButton.icon(
+        onPressed: onPressed,
+        icon: Icon(action.icon, size: 18),
+        label: Text(action.label),
+        style: OutlinedButton.styleFrom(
+          foregroundColor: colorScheme.error,
+          side: BorderSide(color: colorScheme.error),
+        ),
+      );
+    }
+
+    return OutlinedButton.icon(
+      onPressed: onPressed,
+      icon: Icon(action.icon, size: 18),
+      label: Text(action.label),
+      style: OutlinedButton.styleFrom(
+        foregroundColor: colorScheme.onPrimaryContainer,
+        side: BorderSide(color: colorScheme.onPrimaryContainer),
+      ),
+    );
+  }
+}

lib/shared/components/data_grid/widgets/data_grid_empty_state.dart

@@ -0,0 +1,133 @@
+import 'package:flutter/material.dart';
+
+/// Default empty state for DataGrid.
+class DataGridEmptyState extends StatelessWidget {
+  const DataGridEmptyState({
+    super.key,
+    this.icon = Icons.inbox_outlined,
+    this.title = 'No items found',
+    this.subtitle,
+    this.action,
+    this.onAction,
+  });
+
+  final IconData icon;
+  final String title;
+  final String? subtitle;
+  final String? action;
+  final VoidCallback? onAction;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Center(
+      child: Padding(
+        padding: const EdgeInsets.all(32),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(
+              icon,
+              size: 64,
+              color: colorScheme.outline,
+            ),
+            const SizedBox(height: 16),
+            Text(
+              title,
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    color: colorScheme.onSurfaceVariant,
+                  ),
+            ),
+            if (subtitle != null) ...[
+              const SizedBox(height: 8),
+              Text(
+                subtitle!,
+                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                      color: colorScheme.outline,
+                    ),
+                textAlign: TextAlign.center,
+              ),
+            ],
+            if (action != null && onAction != null) ...[
+              const SizedBox(height: 24),
+              FilledButton.tonal(
+                onPressed: onAction,
+                child: Text(action!),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// Loading state for DataGrid.
+class DataGridLoadingState extends StatelessWidget {
+  const DataGridLoadingState({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Center(
+      child: Padding(
+        padding: EdgeInsets.all(32),
+        child: CircularProgressIndicator(),
+      ),
+    );
+  }
+}
+
+/// Error state for DataGrid.
+class DataGridErrorState extends StatelessWidget {
+  const DataGridErrorState({
+    super.key,
+    required this.error,
+    required this.onRetry,
+  });
+
+  final Object error;
+  final VoidCallback onRetry;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Center(
+      child: Padding(
+        padding: const EdgeInsets.all(32),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(
+              Icons.error_outline,
+              size: 64,
+              color: colorScheme.error,
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Failed to load data',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    color: colorScheme.onSurfaceVariant,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              error.toString(),
+              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                    color: colorScheme.outline,
+                  ),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 24),
+            FilledButton.icon(
+              onPressed: onRetry,
+              icon: const Icon(Icons.refresh),
+              label: const Text('Retry'),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/shared/components/data_grid/widgets/data_grid_footer.dart

@@ -0,0 +1,110 @@
+import 'package:flutter/material.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_config.dart';
+
+/// Footer for DataGrid with item count and pagination controls.
+class DataGridFooter extends StatelessWidget {
+  const DataGridFooter({
+    super.key,
+    required this.totalCount,
+    required this.displayedCount,
+    required this.dataMode,
+    this.currentPage = 0,
+    this.onPageChange,
+    this.isLoading = false,
+  });
+
+  final int totalCount;
+  final int displayedCount;
+  final DataGridDataMode dataMode;
+  final int currentPage;
+  final void Function(int page)? onPageChange;
+  final bool isLoading;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerHighest,
+        border: Border(
+          top: BorderSide(color: colorScheme.outlineVariant),
+        ),
+      ),
+      child: Row(
+        children: [
+          Text(
+            _getCountText(),
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
+                ),
+          ),
+          const Spacer(),
+          if (dataMode is PaginatedDataMode) _buildPaginationControls(context),
+        ],
+      ),
+    );
+  }
+
+  String _getCountText() {
+    return switch (dataMode) {
+      AllDataMode() => '$totalCount items',
+      PaginatedDataMode(:final pageSize) => _getPaginatedCountText(pageSize),
+      InfiniteDataMode() => '$displayedCount of $totalCount items',
+    };
+  }
+
+  String _getPaginatedCountText(int pageSize) {
+    final start = currentPage * pageSize + 1;
+    final end = (start + displayedCount - 1).clamp(start, totalCount);
+    return '$start-$end of $totalCount items';
+  }
+
+  Widget _buildPaginationControls(BuildContext context) {
+    final mode = dataMode as PaginatedDataMode;
+    final totalPages = (totalCount / mode.pageSize).ceil();
+    final canGoPrevious = currentPage > 0;
+    final canGoNext = currentPage < totalPages - 1;
+
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        IconButton(
+          icon: const Icon(Icons.first_page),
+          onPressed: canGoPrevious ? () => onPageChange?.call(0) : null,
+          tooltip: 'First page',
+          iconSize: 20,
+        ),
+        IconButton(
+          icon: const Icon(Icons.chevron_left),
+          onPressed:
+              canGoPrevious ? () => onPageChange?.call(currentPage - 1) : null,
+          tooltip: 'Previous page',
+          iconSize: 20,
+        ),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 8),
+          child: Text(
+            'Page ${currentPage + 1} of $totalPages',
+            style: Theme.of(context).textTheme.bodySmall,
+          ),
+        ),
+        IconButton(
+          icon: const Icon(Icons.chevron_right),
+          onPressed:
+              canGoNext ? () => onPageChange?.call(currentPage + 1) : null,
+          tooltip: 'Next page',
+          iconSize: 20,
+        ),
+        IconButton(
+          icon: const Icon(Icons.last_page),
+          onPressed:
+              canGoNext ? () => onPageChange?.call(totalPages - 1) : null,
+          tooltip: 'Last page',
+          iconSize: 20,
+        ),
+      ],
+    );
+  }
+}

lib/shared/components/data_grid/widgets/data_grid_header.dart

@@ -0,0 +1,143 @@
+import 'package:flutter/material.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_column.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_config.dart';
+
+/// Header row for DataGrid.
+class DataGridHeader<T> extends StatelessWidget {
+  const DataGridHeader({
+    super.key,
+    required this.config,
+    required this.sortColumnIndex,
+    required this.sortDescending,
+    required this.onSort,
+    this.showCheckbox = false,
+    this.allSelected = false,
+    this.someSelected = false,
+    this.onSelectAll,
+  });
+
+  final DataGridConfig<T> config;
+  final int? sortColumnIndex;
+  final bool sortDescending;
+  final void Function(int columnIndex) onSort;
+  final bool showCheckbox;
+  final bool allSelected;
+  final bool someSelected;
+  final VoidCallback? onSelectAll;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final columns = config.visibleColumns;
+
+    return Container(
+      height: config.headerHeight,
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerHighest,
+        border: Border(
+          bottom: BorderSide(color: colorScheme.outlineVariant),
+        ),
+      ),
+      child: Row(
+        children: [
+          if (showCheckbox)
+            SizedBox(
+              width: 56,
+              child: Center(
+                child: Checkbox(
+                  value: allSelected ? true : (someSelected ? null : false),
+                  tristate: true,
+                  onChanged: (_) => onSelectAll?.call(),
+                ),
+              ),
+            ),
+          ...columns.asMap().entries.map((entry) {
+            final index = entry.key;
+            final column = entry.value;
+            final isSorted = sortColumnIndex == index;
+
+            return _buildHeaderCell(
+              context,
+              column,
+              index,
+              isSorted,
+              isSorted && sortDescending,
+            );
+          }),
+          if (config.actions.isNotEmpty)
+            const SizedBox(width: 56), // Space for actions column
+        ],
+      ),
+    );
+  }
+
+  Widget _buildHeaderCell(
+    BuildContext context,
+    DataGridColumn<T> column,
+    int index,
+    bool isSorted,
+    bool isDescending,
+  ) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final textStyle = Theme.of(context).textTheme.labelLarge?.copyWith(
+          fontWeight: FontWeight.w600,
+          color: colorScheme.onSurfaceVariant,
+        );
+
+    Widget content = Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Flexible(
+          child: Text(
+            column.header,
+            style: textStyle,
+            overflow: TextOverflow.ellipsis,
+            textAlign: column.textAlign,
+          ),
+        ),
+        if (column.sortable) ...[
+          const SizedBox(width: 4),
+          AnimatedRotation(
+            turns: isDescending ? 0.5 : 0,
+            duration: const Duration(milliseconds: 200),
+            child: Icon(
+              isSorted ? Icons.arrow_upward : Icons.unfold_more,
+              size: 16,
+              color: isSorted
+                  ? colorScheme.primary
+                  : colorScheme.onSurfaceVariant.withValues(alpha: 0.5),
+            ),
+          ),
+        ],
+      ],
+    );
+
+    if (column.sortable) {
+      content = InkWell(
+        onTap: () => onSort(index),
+        child: Padding(
+          padding: config.cellPadding,
+          child: content,
+        ),
+      );
+    } else {
+      content = Padding(
+        padding: config.cellPadding,
+        child: content,
+      );
+    }
+
+    return _wrapWithWidth(column.width, content);
+  }
+
+  Widget _wrapWithWidth(DataGridColumnWidth width, Widget child) {
+    return switch (width) {
+      GridFixedWidth(:final width) => SizedBox(width: width, child: child),
+      GridFlexWidth(:final flex) => Expanded(flex: flex, child: child),
+      GridFractionWidth(:final fraction) => FractionallySizedBox(
+          widthFactor: fraction,
+          child: child,
+        ),
+    };
+  }
+}

lib/shared/components/data_grid/widgets/data_grid_row.dart

@@ -0,0 +1,149 @@
+import 'package:flutter/material.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_column.dart';
+import 'package:tatlock_ui/shared/components/data_grid/data_grid_config.dart';
+import 'package:tatlock_ui/shared/components/data_grid/widgets/data_grid_actions_menu.dart';
+
+/// A single data row in the DataGrid.
+class DataGridRow<T> extends StatelessWidget {
+  const DataGridRow({
+    super.key,
+    required this.item,
+    required this.index,
+    required this.config,
+    this.isSelected = false,
+    this.onSelect,
+    this.onTap,
+    this.backgroundColor,
+  });
+
+  final T item;
+  final int index;
+  final DataGridConfig<T> config;
+  final bool isSelected;
+  final VoidCallback? onSelect;
+  final VoidCallback? onTap;
+  final Color? backgroundColor;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final columns = config.visibleColumns;
+
+    // Determine row background color
+    Color? bgColor = backgroundColor;
+    if (bgColor == null && config.alternatingRowColors) {
+      bgColor = index.isOdd
+          ? colorScheme.surfaceContainerLowest
+          : colorScheme.surface;
+    }
+    if (isSelected) {
+      bgColor = colorScheme.primaryContainer.withValues(alpha: 0.3);
+    }
+
+    final rowContent = Container(
+      height: config.rowHeight,
+      constraints: config.rowHeight == null
+          ? const BoxConstraints(minHeight: 48)
+          : null,
+      decoration: BoxDecoration(
+        color: bgColor,
+        border: Border(
+          bottom: BorderSide(
+            color: colorScheme.outlineVariant.withValues(alpha: 0.5),
+          ),
+        ),
+      ),
+      child: Row(
+        children: [
+          if (config.rowsSelectable)
+            SizedBox(
+              width: 56,
+              child: Center(
+                child: Checkbox(
+                  value: isSelected,
+                  onChanged: (_) => onSelect?.call(),
+                ),
+              ),
+            ),
+          ...columns.map((column) => _buildCell(context, column)),
+          if (config.actions.isNotEmpty)
+            SizedBox(
+              width: 56,
+              child: DataGridActionsMenu<T>(
+                item: item,
+                actions: config.actions,
+              ),
+            ),
+        ],
+      ),
+    );
+
+    if (onTap != null) {
+      return InkWell(
+        onTap: onTap,
+        child: rowContent,
+      );
+    }
+
+    return rowContent;
+  }
+
+  Widget _buildCell(BuildContext context, DataGridColumn<T> column) {
+    Widget content;
+
+    if (column.cellBuilder != null) {
+      content = column.cellBuilder!(context, item);
+    } else {
+      content = Text(
+        column.valueBuilder(item),
+        textAlign: column.textAlign,
+        overflow: TextOverflow.ellipsis,
+      );
+    }
+
+    // Wrap with controls if provided
+    if (column.cellControlsBuilder != null) {
+      content = Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Flexible(child: content),
+          const SizedBox(width: 8),
+          column.cellControlsBuilder!(context, item),
+        ],
+      );
+    }
+
+    // Wrap with tooltip if provided
+    if (column.tooltip != null) {
+      content = Tooltip(
+        message: column.tooltip!(item),
+        child: content,
+      );
+    }
+
+    final cell = Padding(
+      padding: config.cellPadding,
+      child: Align(
+        alignment: switch (column.alignment) {
+          DataGridColumnAlignment.start => Alignment.centerLeft,
+          DataGridColumnAlignment.center => Alignment.center,
+          DataGridColumnAlignment.end => Alignment.centerRight,
+        },
+        child: content,
+      ),
+    );
+
+    return _wrapWithWidth(column.width, cell);
+  }
+
+  Widget _wrapWithWidth(DataGridColumnWidth width, Widget child) {
+    return switch (width) {
+      GridFixedWidth(:final width) => SizedBox(width: width, child: child),
+      GridFlexWidth(:final flex) => Expanded(flex: flex, child: child),
+      GridFractionWidth(:final fraction) => FractionallySizedBox(
+          widthFactor: fraction,
+          child: child,
+        ),
+    };
+  }
+}

lib/shared/components/data_grid/widgets/data_grid_search_bar.dart

@@ -0,0 +1,76 @@
+import 'package:flutter/material.dart';
+
+/// Search bar for DataGrid.
+class DataGridSearchBar extends StatefulWidget {
+  const DataGridSearchBar({
+    super.key,
+    required this.onSearch,
+    required this.onClear,
+    this.hintText = 'Search...',
+    this.initialValue = '',
+  });
+
+  final void Function(String query) onSearch;
+  final VoidCallback onClear;
+  final String hintText;
+  final String initialValue;
+
+  @override
+  State<DataGridSearchBar> createState() => _DataGridSearchBarState();
+}
+
+class _DataGridSearchBarState extends State<DataGridSearchBar> {
+  late final TextEditingController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = TextEditingController(text: widget.initialValue);
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return SizedBox(
+      width: 300,
+      child: TextField(
+        controller: _controller,
+        decoration: InputDecoration(
+          hintText: widget.hintText,
+          prefixIcon: const Icon(Icons.search),
+          suffixIcon: _controller.text.isNotEmpty
+              ? IconButton(
+                  icon: const Icon(Icons.clear),
+                  onPressed: () {
+                    _controller.clear();
+                    widget.onClear();
+                  },
+                )
+              : null,
+          isDense: true,
+          filled: true,
+          fillColor: colorScheme.surfaceContainerHighest,
+          border: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(8),
+            borderSide: BorderSide.none,
+          ),
+          contentPadding: const EdgeInsets.symmetric(
+            horizontal: 16,
+            vertical: 12,
+          ),
+        ),
+        onChanged: (value) {
+          setState(() {}); // Update clear button visibility
+          widget.onSearch(value);
+        },
+      ),
+    );
+  }
+}

lib/shared/layouts/app_scaffold.dart

@@ -1,66 +1,72 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
 import 'package:go_router/go_router.dart';
+import 'package:tatlock_ui/features/control_room/router.dart';
+import 'package:tatlock_ui/features/security/router.dart';
+import 'package:tatlock_ui/routing/app_router.dart';
+import 'package:tatlock_ui/shared/layouts/widgets/top_header_bar.dart';
 
-import '../../routing/app_router.dart';
-
-/// Main application scaffold with adaptive navigation.
+/// Main application scaffold with top header navigation.
+///
+/// Layout structure per UI_LAYOUT.md:
+/// ```
+/// ┌─────────────────────────────────────────────────────────────────┐
+/// │  HEADER: [Logo] [Room Tabs] [Profile]                           │
+/// ├─────────────────────────────────────────────────────────────────┤
+/// │  BODY: Room page content (may include room-specific sidebar)    │
+/// └─────────────────────────────────────────────────────────────────┘
+/// ```
 class AppScaffold extends StatelessWidget {
   const AppScaffold({super.key, required this.child});
 
   final Widget child;
 
+  // Header height must match TopHeaderBar._headerHeight
+  static const double _headerHeight = 56.0;
+
   @override
   Widget build(BuildContext context) {
-    // TODO: Replace AdaptiveScaffold with custom layout per UI_LAYOUT.md
-    // - Header with room tabs (not bottom/rail nav)
-    // - Chat dock on right side
-    return AdaptiveScaffold(
-      selectedIndex: _selectedIndex(context),
-      onSelectedIndexChange: (index) => _onNavSelected(context, index),
-      destinations: const [
-        NavigationDestination(
-          icon: Icon(Icons.door_front_door_outlined),
-          selectedIcon: Icon(Icons.door_front_door),
-          label: 'Front Hall',
-        ),
-        NavigationDestination(
-          icon: Icon(Icons.dns_outlined),
-          selectedIcon: Icon(Icons.dns),
-          label: 'Control Room',
-        ),
-        NavigationDestination(
-          icon: Icon(Icons.weekend_outlined),
-          selectedIcon: Icon(Icons.weekend),
-          label: 'Parlor',
-        ),
-        NavigationDestination(
-          icon: Icon(Icons.settings_outlined),
-          selectedIcon: Icon(Icons.settings),
-          label: 'Settings',
-        ),
-      ],
-      body: (_) => child,
-      smallBody: (_) => child,
-      useDrawer: false,
+    return Scaffold(
+      body: Stack(
+        children: [
+          // Main content area with top padding for header
+          Positioned.fill(
+            child: Padding(
+              padding: const EdgeInsets.only(top: _headerHeight),
+              child: child,
+            ),
+          ),
+
+          // Top header overlays content (bulge extends into content area)
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: TopHeaderBar(
+              selectedIndex: _selectedIndex(context),
+              onRoomSelected: (index) => _onNavSelected(context, index),
+            ),
+          ),
+        ],
+      ),
     );
   }
 
   int _selectedIndex(BuildContext context) {
     final location = GoRouterState.of(context).matchedLocation;
 
-    if (location.startsWith(AppRoutes.controlRoom)) return 1;
-    if (location.startsWith(AppRoutes.parlor)) return 2;
-    if (location.startsWith(AppRoutes.settings)) return 3;
+    if (location.startsWith(ControlRoomRoutes.base)) return 1;
+    if (location.startsWith(SecurityRoutes.base)) return 2;
+    if (location.startsWith(AppRoutes.parlor)) return 3;
+    // Settings is no longer in main nav (accessed via Profile dropdown)
     return 0; // Front Hall
   }
 
   void _onNavSelected(BuildContext context, int index) {
     final route = switch (index) {
       0 => AppRoutes.frontHall,
-      1 => AppRoutes.controlRoom,
-      2 => AppRoutes.parlor,
-      3 => AppRoutes.settings,
+      1 => ControlRoomRoutes.containers,
+      2 => SecurityRoutes.users,
+      3 => AppRoutes.parlor,
       _ => AppRoutes.frontHall,
     };
     context.go(route);

lib/shared/layouts/widgets/filter_panel.dart

@@ -0,0 +1,64 @@
+import 'package:flutter/material.dart';
+
+import 'panel_header.dart';
+
+/// Left-side filter panel for data filtering and selection.
+///
+/// Used within primary content area to filter data grids (e.g., stack list
+/// in Control Room). Header content is docked to bottom to accommodate
+/// the logo bulge overlay.
+///
+/// See UI_LAYOUT.md for panel taxonomy and layout specifications.
+class FilterPanel extends StatelessWidget {
+  const FilterPanel({
+    super.key,
+    required this.title,
+    required this.icon,
+    required this.child,
+    this.width = 280,
+    this.onRefresh,
+  });
+
+  /// Panel title displayed in header.
+  final String title;
+
+  /// Leading icon for the header.
+  final IconData icon;
+
+  /// Panel content (e.g., list, search field, filters).
+  final Widget child;
+
+  /// Panel width (default 280px per UI_LAYOUT.md spec).
+  final double width;
+
+  /// Optional refresh callback - adds refresh button to header.
+  final VoidCallback? onRefresh;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: width,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          PanelHeader(
+            title: title,
+            icon: icon,
+            dockToBottom: true, // Left-side panel
+            actions: [
+              if (onRefresh != null)
+                IconButton(
+                  icon: const Icon(Icons.refresh, size: 20),
+                  tooltip: 'Refresh',
+                  onPressed: onRefresh,
+                  padding: EdgeInsets.zero,
+                  constraints: const BoxConstraints(),
+                ),
+            ],
+          ),
+          Expanded(child: child),
+        ],
+      ),
+    );
+  }
+}

lib/shared/layouts/widgets/nav_panel.dart

@@ -0,0 +1,263 @@
+import 'package:flutter/material.dart';
+
+import 'panel_header.dart';
+
+/// A navigation item in the NavPanel.
+class NavItem {
+  const NavItem({
+    required this.id,
+    required this.label,
+    required this.icon,
+    this.section,
+    this.badge,
+  });
+
+  /// Unique identifier for routing.
+  final String id;
+
+  /// Display label.
+  final String label;
+
+  /// Item icon.
+  final IconData icon;
+
+  /// Optional section grouping (e.g., 'Portainer', 'NPM', 'Authentik').
+  /// Section headers are shown only when multiple sections exist.
+  final String? section;
+
+  /// Optional badge (e.g., item count).
+  final String? badge;
+}
+
+/// Left-side navigation panel for room-level section navigation.
+///
+/// Shows a list of items within the current room (e.g., Containers, Networks
+/// for Control Room). Items can be grouped into sections with headers.
+/// Section headers only appear when multiple sections exist.
+///
+/// Header content is docked to bottom to accommodate the logo bulge overlay.
+///
+/// See UI_LAYOUT.md for panel taxonomy and layout specifications.
+class NavPanel extends StatelessWidget {
+  const NavPanel({
+    super.key,
+    required this.title,
+    required this.icon,
+    required this.items,
+    required this.selectedId,
+    required this.onItemSelected,
+    this.width = 280,
+    this.trailing,
+  });
+
+  /// Panel title displayed in header.
+  final String title;
+
+  /// Leading icon for the header.
+  final IconData icon;
+
+  /// List of navigation items.
+  final List<NavItem> items;
+
+  /// Currently selected item ID.
+  final String selectedId;
+
+  /// Callback when an item is tapped.
+  final ValueChanged<String> onItemSelected;
+
+  /// Panel width (default 280px per UI_LAYOUT.md spec).
+  final double width;
+
+  /// Optional trailing widget below items (e.g., external links).
+  final Widget? trailing;
+
+  /// Returns true if section headers should be shown.
+  bool get _showSectionHeaders {
+    final sections = items.map((i) => i.section).where((s) => s != null).toSet();
+    return sections.length > 1;
+  }
+
+  /// Groups items by section, preserving order.
+  List<(String?, List<NavItem>)> get _groupedItems {
+    final groups = <String?, List<NavItem>>{};
+    final order = <String?>[];
+
+    for (final item in items) {
+      if (!groups.containsKey(item.section)) {
+        groups[item.section] = [];
+        order.add(item.section);
+      }
+      groups[item.section]!.add(item);
+    }
+
+    return order.map((section) => (section, groups[section]!)).toList();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return SizedBox(
+      width: width,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          PanelHeader(
+            title: title,
+            icon: icon,
+            dockToBottom: true, // Left-side panel
+          ),
+          Expanded(
+            child: ListView(
+              padding: const EdgeInsets.symmetric(vertical: 8),
+              children: _buildItemList(context),
+            ),
+          ),
+          if (trailing != null) ...[
+            Divider(height: 1, color: colorScheme.outlineVariant),
+            trailing!,
+          ],
+        ],
+      ),
+    );
+  }
+
+  List<Widget> _buildItemList(BuildContext context) {
+    final widgets = <Widget>[];
+    final showHeaders = _showSectionHeaders;
+
+    for (final (section, sectionItems) in _groupedItems) {
+      // Add section header if multiple sections exist
+      if (showHeaders && section != null) {
+        widgets.add(_SectionHeader(title: section));
+      }
+
+      // Add items
+      for (final item in sectionItems) {
+        widgets.add(
+          _NavTile(
+            item: item,
+            isSelected: item.id == selectedId,
+            onTap: () => onItemSelected(item.id),
+          ),
+        );
+      }
+    }
+
+    return widgets;
+  }
+}
+
+/// Section header widget with left accent bar.
+class _SectionHeader extends StatelessWidget {
+  const _SectionHeader({required this.title});
+
+  final String title;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final textTheme = Theme.of(context).textTheme;
+
+    return Container(
+      margin: const EdgeInsets.only(top: 8, bottom: 4),
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerHigh,
+        border: Border(
+          left: BorderSide(
+            color: colorScheme.primary,
+            width: 2,
+          ),
+        ),
+      ),
+      child: Text(
+        title.toUpperCase(),
+        style: textTheme.labelSmall?.copyWith(
+          color: colorScheme.onSurfaceVariant,
+          letterSpacing: 0.5,
+          fontWeight: FontWeight.w600,
+        ),
+      ),
+    );
+  }
+}
+
+class _NavTile extends StatelessWidget {
+  const _NavTile({
+    required this.item,
+    required this.isSelected,
+    required this.onTap,
+  });
+
+  final NavItem item;
+  final bool isSelected;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final textTheme = Theme.of(context).textTheme;
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
+      child: Material(
+        color: isSelected
+            ? colorScheme.primaryContainer.withValues(alpha: 0.4)
+            : Colors.transparent,
+        borderRadius: BorderRadius.circular(8),
+        child: InkWell(
+          onTap: onTap,
+          borderRadius: BorderRadius.circular(8),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+            child: Row(
+              children: [
+                Icon(
+                  item.icon,
+                  size: 20,
+                  color: isSelected
+                      ? colorScheme.primary
+                      : colorScheme.onSurfaceVariant,
+                ),
+                const SizedBox(width: 12),
+                Expanded(
+                  child: Text(
+                    item.label,
+                    style: textTheme.bodyMedium?.copyWith(
+                      color: isSelected
+                          ? colorScheme.primary
+                          : colorScheme.onSurface,
+                      fontWeight: isSelected ? FontWeight.w600 : null,
+                    ),
+                  ),
+                ),
+                if (item.badge != null)
+                  Container(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 8,
+                      vertical: 2,
+                    ),
+                    decoration: BoxDecoration(
+                      color: isSelected
+                          ? colorScheme.primary.withValues(alpha: 0.2)
+                          : colorScheme.surfaceContainerHighest,
+                      borderRadius: BorderRadius.circular(12),
+                    ),
+                    child: Text(
+                      item.badge!,
+                      style: textTheme.labelSmall?.copyWith(
+                        color: isSelected
+                            ? colorScheme.primary
+                            : colorScheme.onSurfaceVariant,
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/shared/layouts/widgets/panel_header.dart

@@ -0,0 +1,70 @@
+import 'package:flutter/material.dart';
+
+/// Panel header with configurable content alignment.
+///
+/// Left-side panels (Nav, Filter) should use [dockToBottom: true] to
+/// accommodate the logo bulge overlay. Right-side panels use default centering.
+///
+/// See UI_LAYOUT.md for panel taxonomy and layout specifications.
+class PanelHeader extends StatelessWidget {
+  const PanelHeader({
+    super.key,
+    required this.title,
+    required this.icon,
+    this.actions,
+    this.dockToBottom = false,
+    this.height = 56.0,
+  });
+
+  /// Panel title text.
+  final String title;
+
+  /// Leading icon for the panel.
+  final IconData icon;
+
+  /// Optional action widgets (e.g., refresh button).
+  final List<Widget>? actions;
+
+  /// Whether to dock content to bottom (for left-side panels under logo bulge).
+  final bool dockToBottom;
+
+  /// Header height (should match app header height).
+  final double height;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      height: height,
+      padding: EdgeInsets.only(
+        left: 16,
+        right: 8,
+        bottom: dockToBottom ? 8 : 0,
+      ),
+      alignment: dockToBottom ? Alignment.bottomCenter : Alignment.center,
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerHighest,
+        border: Border(
+          bottom: BorderSide(color: colorScheme.outlineVariant),
+        ),
+      ),
+      child: Row(
+        crossAxisAlignment:
+            dockToBottom ? CrossAxisAlignment.end : CrossAxisAlignment.center,
+        children: [
+          Icon(icon, color: colorScheme.primary),
+          const SizedBox(width: 12),
+          Text(
+            title,
+            style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                  fontWeight: FontWeight.w600,
+                ),
+          ),
+          const Spacer(),
+          if (actions != null) ...actions!,
+        ],
+      ),
+    );
+  }
+}

lib/shared/layouts/widgets/profile_dropdown.dart

@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:tatlock_ui/core/auth/auth_provider.dart';
+import 'package:tatlock_ui/routing/app_router.dart';
+
+/// Profile dropdown menu in the header.
+///
+/// Shows user info when authenticated, with Settings and Logout options.
+class ProfileDropdown extends ConsumerWidget {
+  const ProfileDropdown({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final authState = ref.watch(authProvider);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return authState.when(
+      data: (auth) => PopupMenuButton<String>(
+        offset: const Offset(0, 48),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8),
+        ),
+        child: Tooltip(
+          message: auth.isAuthenticated ? auth.userName ?? 'User' : 'Guest',
+          child: CircleAvatar(
+            radius: 18,
+            backgroundColor: colorScheme.primaryContainer,
+            child: auth.isAuthenticated
+                ? Text(
+                    _getInitials(auth.userName),
+                    style: TextStyle(
+                      color: colorScheme.onPrimaryContainer,
+                      fontWeight: FontWeight.w500,
+                    ),
+                  )
+                : Icon(
+                    Icons.person_outline,
+                    size: 20,
+                    color: colorScheme.onPrimaryContainer,
+                  ),
+          ),
+        ),
+        itemBuilder: (context) => [
+          // User info header (non-selectable)
+          PopupMenuItem<String>(
+            enabled: false,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  auth.isAuthenticated ? auth.userName ?? 'User' : 'Guest',
+                  style: Theme.of(context).textTheme.titleSmall,
+                ),
+                if (auth.userEmail != null)
+                  Text(
+                    auth.userEmail!,
+                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                          color: colorScheme.onSurfaceVariant,
+                        ),
+                  ),
+              ],
+            ),
+          ),
+          const PopupMenuDivider(),
+
+          // Settings
+          const PopupMenuItem<String>(
+            value: 'settings',
+            child: Row(
+              children: [
+                Icon(Icons.settings_outlined, size: 20),
+                SizedBox(width: 12),
+                Text('Settings'),
+              ],
+            ),
+          ),
+
+          // Logout (only if authenticated)
+          if (auth.isAuthenticated)
+            const PopupMenuItem<String>(
+              value: 'logout',
+              child: Row(
+                children: [
+                  Icon(Icons.logout, size: 20),
+                  SizedBox(width: 12),
+                  Text('Logout'),
+                ],
+              ),
+            ),
+        ],
+        onSelected: (value) {
+          switch (value) {
+            case 'settings':
+              context.go(AppRoutes.settings);
+            case 'logout':
+              ref.read(authProvider.notifier).signOut();
+          }
+        },
+      ),
+      loading: () => const CircleAvatar(
+        radius: 18,
+        child: SizedBox(
+          width: 16,
+          height: 16,
+          child: CircularProgressIndicator(strokeWidth: 2),
+        ),
+      ),
+      error: (err, stack) => CircleAvatar(
+        radius: 18,
+        backgroundColor: colorScheme.errorContainer,
+        child: Icon(
+          Icons.error_outline,
+          size: 20,
+          color: colorScheme.onErrorContainer,
+        ),
+      ),
+    );
+  }
+
+  String _getInitials(String? name) {
+    if (name == null || name.isEmpty) return '?';
+    final parts = name.trim().split(' ');
+    if (parts.length >= 2) {
+      return '${parts.first[0]}${parts.last[0]}'.toUpperCase();
+    }
+    return name[0].toUpperCase();
+  }
+}

lib/shared/layouts/widgets/top_header_bar.dart

@@ -0,0 +1,263 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+
+import 'profile_dropdown.dart';
+
+/// Top header bar with room navigation tabs and profile dropdown.
+/// Features a circular "bulge" extending below the header for the logo.
+class TopHeaderBar extends StatelessWidget {
+  const TopHeaderBar({
+    super.key,
+    required this.selectedIndex,
+    required this.onRoomSelected,
+  });
+
+  final int selectedIndex;
+  final ValueChanged<int> onRoomSelected;
+
+  // Header dimensions
+  static const double _headerHeight = 56.0;
+  static const double _logoSize = 120.0;
+  static const double _logoMargin = 4.0; // Equal margin top/bottom within bubble
+  static const double _logoCircleRadius = (_logoSize + _logoMargin * 2) / 2; // 64px
+  static const double _bulgeFraction = 0.20; // 20% of circle below header line
+
+  static const _rooms = [
+    _RoomDestination(
+      icon: Icons.door_front_door_outlined,
+      selectedIcon: Icons.door_front_door,
+      label: 'Front Hall',
+    ),
+    _RoomDestination(
+      icon: Icons.dns_outlined,
+      selectedIcon: Icons.dns,
+      label: 'Control Room',
+    ),
+    _RoomDestination(
+      icon: Icons.security_outlined,
+      selectedIcon: Icons.security,
+      label: 'Security',
+    ),
+    _RoomDestination(
+      icon: Icons.lightbulb_outline,
+      selectedIcon: Icons.lightbulb,
+      label: 'Parlor',
+    ),
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    // Calculate bulge: 20% of circle diameter extends below
+    final bulgeExtension = _logoCircleRadius * 2 * _bulgeFraction;
+
+    return SizedBox(
+      height: _headerHeight + bulgeExtension,
+      child: Stack(
+        clipBehavior: Clip.none,
+        children: [
+          // Main header bar with custom bottom shape
+          Positioned.fill(
+            child: CustomPaint(
+              painter: _HeaderPainter(
+                color: colorScheme.surface,
+                borderColor: colorScheme.outlineVariant,
+                circleRadius: _logoCircleRadius,
+                bulgeFraction: _bulgeFraction,
+                headerHeight: _headerHeight,
+                circleLeftOffset: 16 + _logoCircleRadius,
+              ),
+            ),
+          ),
+
+          // Logo centered in the visible bubble area (from top of header to bottom of bulge)
+          Positioned(
+            left: 16 + _logoMargin,
+            // Center logo in visible bubble: from y=0 to y=headerHeight+bulgeExtension
+            top: ((_headerHeight + bulgeExtension) - _logoSize) / 2,
+            child: Image.asset(
+              'assets/icons/logo.png',
+              height: _logoSize,
+              width: _logoSize,
+              errorBuilder: (context, error, stack) => Icon(
+                Icons.layers,
+                size: 32,
+                color: colorScheme.primary,
+              ),
+            ),
+          ),
+
+          // Header content (room tabs and profile)
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            height: _headerHeight,
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16),
+              child: Row(
+                children: [
+                  // Spacer for logo area
+                  SizedBox(width: _logoCircleRadius * 2 + 16),
+
+                  // Room tabs
+                  ..._buildRoomTabs(context),
+
+                  const Spacer(),
+
+                  // Profile dropdown
+                  const ProfileDropdown(),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  List<Widget> _buildRoomTabs(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return List.generate(_rooms.length, (index) {
+      final room = _rooms[index];
+      final isSelected = index == selectedIndex;
+
+      return Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 4),
+        child: Tooltip(
+          message: room.label,
+          child: IconButton(
+            icon: Icon(
+              isSelected ? room.selectedIcon : room.icon,
+              color: isSelected ? colorScheme.primary : colorScheme.onSurface,
+            ),
+            onPressed: () => onRoomSelected(index),
+            style: IconButton.styleFrom(
+              backgroundColor:
+                  isSelected ? colorScheme.primaryContainer : null,
+            ),
+          ),
+        ),
+      );
+    });
+  }
+}
+
+/// Custom painter for the header with a circular bulge for the logo.
+class _HeaderPainter extends CustomPainter {
+  _HeaderPainter({
+    required this.color,
+    required this.borderColor,
+    required this.circleRadius,
+    required this.bulgeFraction,
+    required this.headerHeight,
+    required this.circleLeftOffset,
+  });
+
+  final Color color;
+  final Color borderColor;
+  final double circleRadius;
+  final double bulgeFraction; // Fraction of circle below header (0.0 to 0.5)
+  final double headerHeight;
+  final double circleLeftOffset;
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = color
+      ..style = PaintingStyle.fill;
+
+    final borderPaint = Paint()
+      ..color = borderColor
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 1;
+
+    // Calculate circle center position
+    // bulgeFraction of the diameter should be below the header line
+    // bulgeAmount = bulgeFraction * 2 * radius (fraction of diameter)
+    final bulgeAmount = bulgeFraction * 2 * circleRadius;
+    // Center is positioned so that (radius - centerOffset) = bulgeAmount
+    // centerOffset = radius - bulgeAmount
+    final centerY = headerHeight - circleRadius + bulgeAmount;
+    final circleCenter = Offset(circleLeftOffset, centerY);
+
+    // Calculate the angle where circle intersects header line
+    // At y = headerHeight: distance from center = headerHeight - centerY
+    final distFromCenter = headerHeight - centerY;
+    // cos(angle) = distFromCenter / radius
+    final cosAngle = distFromCenter / circleRadius;
+    final angle = acos(cosAngle.clamp(-1.0, 1.0));
+
+    // Arc starts at (π/2 - angle) and ends at (π/2 + angle)
+    // In Flutter, 0 is at 3 o'clock, π/2 is at 6 o'clock
+    final startAngle = (3.14159 / 2) - angle;
+    final sweepAngle = angle * 2;
+
+    // Calculate where arc intersects header line
+    final halfChord = circleRadius * sin(angle);
+    final arcLeft = circleLeftOffset - halfChord;
+    final arcRight = circleLeftOffset + halfChord;
+
+    // Create path for header with bulge
+    final path = Path();
+
+    // Start from top-left
+    path.moveTo(0, 0);
+
+    // Top edge
+    path.lineTo(size.width, 0);
+
+    // Right edge down to header height
+    path.lineTo(size.width, headerHeight);
+
+    // Bottom edge - going right to left with curved bulge
+    path.lineTo(arcRight, headerHeight);
+
+    // Arc for the bulge
+    final arcRect = Rect.fromCircle(center: circleCenter, radius: circleRadius);
+    path.arcTo(arcRect, startAngle, sweepAngle, false);
+
+    // Continue to left edge
+    path.lineTo(0, headerHeight);
+
+    // Close path
+    path.close();
+
+    // Draw filled shape
+    canvas.drawPath(path, paint);
+
+    // Draw border along bottom edge only (with bulge)
+    final borderPath = Path();
+    borderPath.moveTo(0, headerHeight);
+    borderPath.lineTo(arcLeft, headerHeight);
+    borderPath.arcTo(arcRect, 3.14159 - startAngle, -sweepAngle, false);
+    borderPath.lineTo(size.width, headerHeight);
+
+    canvas.drawPath(borderPath, borderPaint);
+  }
+
+  @override
+  bool shouldRepaint(covariant _HeaderPainter oldDelegate) {
+    return color != oldDelegate.color ||
+        borderColor != oldDelegate.borderColor ||
+        circleRadius != oldDelegate.circleRadius ||
+        bulgeFraction != oldDelegate.bulgeFraction ||
+        headerHeight != oldDelegate.headerHeight ||
+        circleLeftOffset != oldDelegate.circleLeftOffset;
+  }
+}
+
+class _RoomDestination {
+  const _RoomDestination({
+    required this.icon,
+    required this.selectedIcon,
+    required this.label,
+  });
+
+  final IconData icon;
+  final IconData selectedIcon;
+  final String label;
+}

lib/shared/widgets/entity_form_dialog.dart

@@ -0,0 +1,288 @@
+import 'package:flutter/material.dart';
+import 'package:tatlock_ui/shared/widgets/entity_page.dart';
+
+/// A reusable dialog wrapper for entity create/edit forms.
+///
+/// Provides consistent styling across all Control Room sections:
+/// - Constrained max width/height
+/// - AppBar with title and close button
+/// - Scrollable content area
+///
+/// Usage:
+/// ```dart
+/// showEntityFormDialog(
+///   context: context,
+///   title: 'New Proxy Host',
+///   child: ProxyHostForm(
+///     onCancel: () => Navigator.of(context).pop(),
+///     onSaved: () {
+///       Navigator.of(context).pop();
+///       ref.invalidate(domainsProvider);
+///     },
+///   ),
+/// );
+/// ```
+void showEntityFormDialog({
+  required BuildContext context,
+  required String title,
+  required Widget child,
+  double maxWidth = 600,
+  double maxHeight = 700,
+}) {
+  showDialog(
+    context: context,
+    builder: (context) => EntityFormDialog(
+      title: title,
+      maxWidth: maxWidth,
+      maxHeight: maxHeight,
+      child: child,
+    ),
+  );
+}
+
+/// Dialog widget for entity forms.
+class EntityFormDialog extends StatelessWidget {
+  const EntityFormDialog({
+    super.key,
+    required this.title,
+    required this.child,
+    this.maxWidth = 600,
+    this.maxHeight = 700,
+  });
+
+  final String title;
+  final Widget child;
+  final double maxWidth;
+  final double maxHeight;
+
+  @override
+  Widget build(BuildContext context) {
+    return Dialog(
+      child: ConstrainedBox(
+        constraints: BoxConstraints(
+          maxWidth: maxWidth,
+          maxHeight: maxHeight,
+        ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            AppBar(
+              title: Text(title),
+              automaticallyImplyLeading: false,
+              actions: [
+                IconButton(
+                  icon: const Icon(Icons.close),
+                  onPressed: () => Navigator.of(context).pop(),
+                ),
+              ],
+            ),
+            Flexible(child: child),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// A standardized form wrapper with common patterns.
+///
+/// Handles:
+/// - Error display banner
+/// - Loading state on save button
+/// - Cancel/Save button row
+/// - Form key management
+/// - Create vs Edit mode awareness
+///
+/// Use [mode] to indicate whether this is a create or edit form.
+/// Child widgets can use [EntityFormScope.of(context)] to check the mode
+/// and disable fields that should only be editable during creation.
+class EntityForm extends StatelessWidget {
+  const EntityForm({
+    super.key,
+    required this.formKey,
+    required this.onCancel,
+    required this.onSave,
+    required this.isSaving,
+    required this.children,
+    this.mode = EntityPageMode.create,
+    this.error,
+    this.saveLabel,
+    this.cancelLabel = 'Cancel',
+  });
+
+  final GlobalKey<FormState> formKey;
+  final VoidCallback onCancel;
+  final VoidCallback onSave;
+  final bool isSaving;
+  final List<Widget> children;
+  final EntityPageMode mode;
+  final String? error;
+  final String? saveLabel;
+  final String cancelLabel;
+
+  bool get isCreating => mode == EntityPageMode.create;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final effectiveSaveLabel = saveLabel ?? (isCreating ? 'Create' : 'Save');
+
+    return EntityFormScope(
+      mode: mode,
+      child: Form(
+        key: formKey,
+        child: SingleChildScrollView(
+          padding: const EdgeInsets.all(24),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // Error banner
+              if (error != null)
+                Container(
+                  padding: const EdgeInsets.all(12),
+                  margin: const EdgeInsets.only(bottom: 16),
+                  decoration: BoxDecoration(
+                    color: colorScheme.errorContainer,
+                    borderRadius: BorderRadius.circular(8),
+                  ),
+                  child: Row(
+                    children: [
+                      Icon(Icons.error, color: colorScheme.onErrorContainer),
+                      const SizedBox(width: 8),
+                      Expanded(
+                        child: Text(
+                          error!,
+                          style: TextStyle(color: colorScheme.onErrorContainer),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+
+              // Form fields
+              ...children,
+
+              const SizedBox(height: 32),
+
+              // Action buttons
+              Row(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
+                  OutlinedButton(
+                    onPressed: isSaving ? null : onCancel,
+                    child: Text(cancelLabel),
+                  ),
+                  const SizedBox(width: 12),
+                  FilledButton.icon(
+                    onPressed: isSaving ? null : onSave,
+                    icon: isSaving
+                        ? const SizedBox(
+                            width: 16,
+                            height: 16,
+                            child: CircularProgressIndicator(strokeWidth: 2),
+                          )
+                        : const Icon(Icons.save),
+                    label: Text(effectiveSaveLabel),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+/// InheritedWidget to provide form mode to descendants.
+///
+/// Allows form fields to check if they're in create or edit mode
+/// and adjust their behavior accordingly (e.g., disable create-only fields).
+class EntityFormScope extends InheritedWidget {
+  const EntityFormScope({
+    super.key,
+    required this.mode,
+    required super.child,
+  });
+
+  final EntityPageMode mode;
+
+  bool get isCreating => mode == EntityPageMode.create;
+  bool get isEditing => mode == EntityPageMode.edit;
+
+  static EntityFormScope? maybeOf(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<EntityFormScope>();
+  }
+
+  static EntityFormScope of(BuildContext context) {
+    final scope = maybeOf(context);
+    assert(scope != null, 'No EntityFormScope found in context');
+    return scope!;
+  }
+
+  @override
+  bool updateShouldNotify(EntityFormScope oldWidget) => mode != oldWidget.mode;
+}
+
+/// A form field wrapper that can be marked as create-only.
+///
+/// When [createOnly] is true, the field will be disabled in edit mode.
+/// Shows a lock icon and tooltip to indicate the field is immutable.
+///
+/// Usage:
+/// ```dart
+/// CreateOnlyField(
+///   createOnly: true,
+///   child: TextFormField(
+///     controller: _nameController,
+///     decoration: InputDecoration(labelText: 'Name'),
+///   ),
+/// )
+/// ```
+class CreateOnlyField extends StatelessWidget {
+  const CreateOnlyField({
+    super.key,
+    required this.child,
+    this.createOnly = true,
+    this.disabledHint = 'This field cannot be changed after creation',
+  });
+
+  final Widget child;
+  final bool createOnly;
+  final String disabledHint;
+
+  @override
+  Widget build(BuildContext context) {
+    final scope = EntityFormScope.maybeOf(context);
+    final isEditing = scope?.isEditing ?? false;
+    final shouldDisable = createOnly && isEditing;
+
+    if (!shouldDisable) {
+      return child;
+    }
+
+    return Tooltip(
+      message: disabledHint,
+      child: AbsorbPointer(
+        absorbing: true,
+        child: Opacity(
+          opacity: 0.6,
+          child: Stack(
+            children: [
+              child,
+              Positioned(
+                right: 8,
+                top: 8,
+                child: Icon(
+                  Icons.lock,
+                  size: 16,
+                  color: Theme.of(context).colorScheme.outline,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/shared/widgets/entity_page.dart

@@ -0,0 +1,272 @@
+import 'package:flutter/material.dart';
+
+/// Reusable scaffold for entity pages (create, view, edit).
+///
+/// Provides consistent layout across all Control Room entity pages:
+/// - AppBar with back button, title, and customizable actions
+/// - Loading, error, and content states
+/// - Consistent padding and styling
+///
+/// Usage:
+/// ```dart
+/// EntityPageScaffold(
+///   title: 'Proxy Host Details',
+///   onBack: () => Navigator.pop(context),
+///   actions: [
+///     IconButton(icon: Icon(Icons.edit), onPressed: onEdit),
+///   ],
+///   child: MyContent(),
+/// )
+/// ```
+class EntityPageScaffold extends StatelessWidget {
+  const EntityPageScaffold({
+    super.key,
+    required this.title,
+    required this.child,
+    this.onBack,
+    this.actions,
+    this.floatingActionButton,
+  });
+
+  final String title;
+  final Widget child;
+  final VoidCallback? onBack;
+  final List<Widget>? actions;
+  final Widget? floatingActionButton;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: onBack != null
+            ? IconButton(
+                icon: const Icon(Icons.arrow_back),
+                onPressed: onBack,
+              )
+            : null,
+        title: Text(title),
+        actions: actions,
+      ),
+      body: child,
+      floatingActionButton: floatingActionButton,
+    );
+  }
+}
+
+/// Async content wrapper with loading, error, and data states.
+///
+/// Use with Riverpod AsyncValue for consistent loading/error handling.
+class EntityAsyncContent<T> extends StatelessWidget {
+  const EntityAsyncContent({
+    super.key,
+    required this.isLoading,
+    required this.error,
+    required this.data,
+    required this.onRetry,
+    required this.builder,
+  });
+
+  final bool isLoading;
+  final Object? error;
+  final T? data;
+  final VoidCallback onRetry;
+  final Widget Function(T data) builder;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    if (isLoading) {
+      return const Center(child: CircularProgressIndicator());
+    }
+
+    if (error != null) {
+      return Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(Icons.error_outline, size: 48, color: colorScheme.error),
+            const SizedBox(height: 16),
+            const Text('Failed to load'),
+            const SizedBox(height: 8),
+            Text(
+              error.toString(),
+              style: TextStyle(color: colorScheme.outline),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 16),
+            FilledButton.icon(
+              onPressed: onRetry,
+              icon: const Icon(Icons.refresh),
+              label: const Text('Retry'),
+            ),
+          ],
+        ),
+      );
+    }
+
+    if (data != null) {
+      return builder(data as T);
+    }
+
+    return const SizedBox.shrink();
+  }
+}
+
+/// Section header for entity detail pages.
+///
+/// Consistent styling for grouping related fields.
+class EntitySection extends StatelessWidget {
+  const EntitySection({
+    super.key,
+    required this.title,
+    required this.icon,
+    required this.child,
+    this.trailing,
+  });
+
+  final String title;
+  final IconData icon;
+  final Widget child;
+  final Widget? trailing;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          children: [
+            Icon(icon, size: 20, color: colorScheme.primary),
+            const SizedBox(width: 8),
+            Expanded(
+              child: Text(
+                title,
+                style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                      color: colorScheme.primary,
+                      fontWeight: FontWeight.w600,
+                    ),
+              ),
+            ),
+            if (trailing != null) trailing!,
+          ],
+        ),
+        const SizedBox(height: 8),
+        child,
+      ],
+    );
+  }
+}
+
+/// Row displaying a boolean setting with label and indicator.
+class EntitySettingRow extends StatelessWidget {
+  const EntitySettingRow({
+    super.key,
+    required this.label,
+    required this.value,
+    this.subtitle,
+  });
+
+  final String label;
+  final bool value;
+  final String? subtitle;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(label),
+              if (subtitle != null)
+                Text(
+                  subtitle!,
+                  style: TextStyle(
+                    fontSize: 12,
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                ),
+            ],
+          ),
+        ),
+        Icon(
+          value ? Icons.check_circle : Icons.cancel,
+          color: value ? Colors.green : Colors.grey,
+          size: 20,
+        ),
+      ],
+    );
+  }
+}
+
+/// Row displaying a key-value pair.
+class EntityInfoRow extends StatelessWidget {
+  const EntityInfoRow({
+    super.key,
+    required this.label,
+    required this.value,
+    this.monospace = false,
+  });
+
+  final String label;
+  final String value;
+  final bool monospace;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SizedBox(
+          width: 120,
+          child: Text(
+            label,
+            style: TextStyle(color: colorScheme.outline),
+          ),
+        ),
+        Expanded(
+          child: Text(
+            value,
+            style: monospace
+                ? const TextStyle(fontFamily: 'monospace')
+                : null,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+/// Enum for entity page modes.
+enum EntityPageMode {
+  create,
+  view,
+  edit,
+}
+
+/// Mixin for pages that support view/edit mode toggle.
+///
+/// Provides standard mode management for entity detail pages.
+mixin EntityPageModeMixin<T extends StatefulWidget> on State<T> {
+  EntityPageMode _mode = EntityPageMode.view;
+
+  EntityPageMode get mode => _mode;
+  set mode(EntityPageMode value) => _mode = value;
+
+  bool get isViewing => _mode == EntityPageMode.view;
+  bool get isEditing => _mode == EntityPageMode.edit;
+  bool get isCreating => _mode == EntityPageMode.create;
+
+  void setMode(EntityPageMode newMode) {
+    setState(() => _mode = newMode);
+  }
+
+  void startEditing() => setMode(EntityPageMode.edit);
+  void stopEditing() => setMode(EntityPageMode.view);
+}

linux/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,10 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
+  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
 }

linux/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  url_launcher_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

macos/Podfile

@@ -0,0 +1,42 @@
+platform :osx, '10.15'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_macos_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+
+  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_macos_build_settings(target)
+  end
+end

nginx.conf

@@ -0,0 +1,87 @@
+worker_processes auto;
+error_log /var/log/nginx/error.log warn;
+pid /var/run/nginx.pid;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log /var/log/nginx/access.log main;
+
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
+    types_hash_max_size 2048;
+
+    # Gzip compression
+    gzip on;
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_min_length 1000;
+    gzip_types
+        text/plain
+        text/css
+        text/javascript
+        application/javascript
+        application/json
+        application/x-javascript
+        application/xml
+        application/xml+rss
+        image/svg+xml
+        font/woff
+        font/woff2;
+
+    server {
+        listen 80;
+        server_name _;
+        root /usr/share/nginx/html;
+        index index.html;
+
+        # Security headers
+        add_header X-Frame-Options "SAMEORIGIN" always;
+        add_header X-Content-Type-Options "nosniff" always;
+        add_header X-XSS-Protection "1; mode=block" always;
+
+        # SPA routing: all routes fall back to index.html
+        location / {
+            try_files $uri $uri/ /index.html;
+        }
+
+        # No cache for index.html (ensures updates are picked up)
+        location = /index.html {
+            add_header Cache-Control "no-cache, no-store, must-revalidate";
+            add_header Pragma "no-cache";
+            add_header Expires "0";
+        }
+
+        # Long cache for Flutter assets (content-hash naming ensures freshness)
+        location ~* \.(js|css|woff|woff2|ttf|eot|ico|png|jpg|jpeg|gif|svg|webp)$ {
+            expires 1y;
+            add_header Cache-Control "public, immutable";
+            access_log off;
+        }
+
+        # Cache manifest and version files briefly
+        location ~* \.(json|webmanifest)$ {
+            expires 1h;
+            add_header Cache-Control "public";
+        }
+
+        # Health check endpoint
+        location /health {
+            access_log off;
+            return 200 "OK";
+            add_header Content-Type text/plain;
+        }
+    }
+}

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.3.0+1
+version: 0.3.1+1
 
 environment:
   sdk: ^3.10.4
@@ -32,20 +32,20 @@ dependencies:
     sdk: flutter
 
   # State Management
-  flutter_riverpod: ^2.6.1
-  riverpod_annotation: ^2.6.1
-  hooks_riverpod: ^2.6.1
-  flutter_hooks: ^0.20.5
+  flutter_riverpod: ^3.0.0
+  riverpod_annotation: ^4.0.0
+  hooks_riverpod: ^3.0.0
+  flutter_hooks: ^0.21.0
 
   # Code Generation Support
-  freezed_annotation: ^2.4.4
+  freezed_annotation: ^3.1.0
   json_annotation: ^4.9.0
 
   # Networking
   dio: ^5.7.0
 
   # Routing
-  go_router: ^14.6.2
+  go_router: ^17.0.1
 
   # Storage
   shared_preferences: ^2.3.3
@@ -54,29 +54,35 @@ dependencies:
   flex_color_scheme: ^8.1.0
   flutter_adaptive_scaffold: ^0.3.1
   flutter_markdown: ^0.7.4
-  fl_chart: ^0.69.2
+  fl_chart: ^1.1.1
 
   # Icons
   cupertino_icons: ^1.0.8
+  flutter_svg: ^2.0.10+1
+
+  # URL Launcher
+  url_launcher: ^6.3.1
+  flutter_code_editor: ^0.3.5
+  highlight: ^0.7.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
   # Linting
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
   # Code Generation
   build_runner: ^2.4.13
-  freezed: ^2.5.7
+  freezed: ^3.2.3
   json_serializable: ^6.8.0
-  riverpod_generator: ^2.6.3
+  riverpod_generator: ^4.0.0
 
   # Testing
   mocktail: ^1.0.4
 
   # Build tools
-  build: ^2.4.0
+  build: ^4.0.3
   yaml: ^3.1.0
 
 # For information on the generic Dart part of this file, see the
@@ -90,10 +96,9 @@ flutter:
   # the material Icons class.
   uses-material-design: true
 
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
+  # Assets
+  assets:
+    - assets/icons/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/to/resolution-aware-images

test/features/control_room/containers/data/models/container_model_test.dart

@@ -0,0 +1,458 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:tatlock_ui/features/control_room/containers/data/models/container_model.dart';
+import 'package:tatlock_ui/features/control_room/containers/domain/entities/container.dart';
+
+void main() {
+  group('ContainerModel', () {
+    group('fromJson', () {
+      test('deserializes minimal container', () {
+        final json = {
+          'Id': 'abc123def456',
+          'Names': ['/my-container'],
+          'Image': 'nginx:latest',
+          'State': 'running',
+          'Status': 'Up 2 hours',
+        };
+
+        final model = ContainerModel.fromJson(json);
+
+        expect(model.id, equals('abc123def456'));
+        expect(model.names, equals(['/my-container']));
+        expect(model.image, equals('nginx:latest'));
+        expect(model.state, equals('running'));
+        expect(model.status, equals('Up 2 hours'));
+      });
+
+      test('deserializes full container with all fields', () {
+        final json = {
+          'Id': 'abc123def456789xyz',
+          'Names': ['/my-container', '/alias'],
+          'Image': 'nginx:latest',
+          'State': 'running',
+          'Status': 'Up 2 hours',
+          'Labels': {
+            'com.docker.compose.project': 'mystack',
+            'maintainer': 'test@example.com',
+          },
+          'Ports': [
+            {'PrivatePort': 80, 'PublicPort': 8080, 'Type': 'tcp'},
+          ],
+          'Mounts': [
+            {
+              'Type': 'bind',
+              'Source': '/host/path',
+              'Destination': '/container/path',
+              'Mode': 'rw',
+              'RW': true,
+            },
+          ],
+          'NetworkSettings': {
+            'Networks': {'bridge': {}, 'custom': {}},
+          },
+          'Created': 1704067200, // 2024-01-01 00:00:00 UTC
+          'SizeRw': 1024,
+          'SizeRootFs': 2048,
+        };
+
+        final model = ContainerModel.fromJson(json);
+
+        expect(model.labels['com.docker.compose.project'], equals('mystack'));
+        expect(model.ports.length, equals(1));
+        expect(model.mounts.length, equals(1));
+        expect(model.networkSettings?.networks.length, equals(2));
+        expect(model.created, equals(1704067200));
+        expect(model.sizeRw, equals(1024));
+        expect(model.sizeRootFs, equals(2048));
+      });
+
+      test('handles empty lists and maps', () {
+        final json = {
+          'Id': 'abc123',
+          'Names': ['/container'],
+          'Image': 'alpine',
+          'State': 'exited',
+          'Status': 'Exited (0)',
+          'Labels': <String, String>{},
+          'Ports': <Map<String, dynamic>>[],
+          'Mounts': <Map<String, dynamic>>[],
+        };
+
+        final model = ContainerModel.fromJson(json);
+
+        expect(model.labels, isEmpty);
+        expect(model.ports, isEmpty);
+        expect(model.mounts, isEmpty);
+      });
+    });
+
+    group('toEntity', () {
+      test('converts to entity with truncated ID', () {
+        final model = ContainerModel(
+          id: 'abc123def456789xyz',
+          names: ['/my-container'],
+          image: 'nginx:latest',
+          state: 'running',
+          status: 'Up 2 hours',
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.id, equals('abc123def456')); // Truncated to 12 chars
+        expect(entity.fullId, equals('abc123def456789xyz'));
+      });
+
+      test('strips leading slash from container name', () {
+        final model = ContainerModel(
+          id: 'abc123def456',
+          names: ['/my-container'],
+          image: 'nginx:latest',
+          state: 'running',
+          status: 'Up 2 hours',
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.name, equals('my-container'));
+      });
+
+      test('uses ID as name when names list is empty', () {
+        final model = ContainerModel(
+          id: 'abc123def456',
+          names: [],
+          image: 'nginx:latest',
+          state: 'running',
+          status: 'Up 2 hours',
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.name, equals('abc123def456'));
+      });
+
+      test('extracts stack name from compose labels', () {
+        final model = ContainerModel(
+          id: 'abc123def456',
+          names: ['/container'],
+          image: 'nginx',
+          state: 'running',
+          status: 'Up',
+          labels: {'com.docker.compose.project': 'my-stack'},
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.stackName, equals('my-stack'));
+        expect(entity.stackId, equals('my-stack'));
+      });
+
+      test('handles missing stack labels', () {
+        final model = ContainerModel(
+          id: 'abc123def456',
+          names: ['/container'],
+          image: 'nginx',
+          state: 'running',
+          status: 'Up',
+          labels: {},
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.stackName, isNull);
+        expect(entity.stackId, isNull);
+      });
+
+      test('converts created timestamp to DateTime', () {
+        final model = ContainerModel(
+          id: 'abc123def456',
+          names: ['/container'],
+          image: 'nginx',
+          state: 'running',
+          status: 'Up',
+          created: 1704067200, // 2024-01-01 00:00:00 UTC
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.createdAt, isNotNull);
+        expect(entity.createdAt!.year, equals(2024));
+        expect(entity.createdAt!.month, equals(1));
+        expect(entity.createdAt!.day, equals(1));
+      });
+
+      test('handles null created timestamp', () {
+        final model = ContainerModel(
+          id: 'abc123def456',
+          names: ['/container'],
+          image: 'nginx',
+          state: 'running',
+          status: 'Up',
+          created: null,
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.createdAt, isNull);
+      });
+
+      test('extracts networks from network settings', () {
+        final model = ContainerModel(
+          id: 'abc123def456',
+          names: ['/container'],
+          image: 'nginx',
+          state: 'running',
+          status: 'Up',
+          networkSettings: const NetworkSettingsModel(
+            networks: {'bridge': {}, 'custom-network': {}},
+          ),
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.networks, containsAll(['bridge', 'custom-network']));
+      });
+
+      test('handles null network settings', () {
+        final model = ContainerModel(
+          id: 'abc123def456',
+          names: ['/container'],
+          image: 'nginx',
+          state: 'running',
+          status: 'Up',
+          networkSettings: null,
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.networks, isEmpty);
+      });
+    });
+
+    group('_parseState', () {
+      final testCases = {
+        'created': ContainerState.created,
+        'Created': ContainerState.created,
+        'CREATED': ContainerState.created,
+        'running': ContainerState.running,
+        'Running': ContainerState.running,
+        'RUNNING': ContainerState.running,
+        'paused': ContainerState.paused,
+        'Paused': ContainerState.paused,
+        'restarting': ContainerState.restarting,
+        'Restarting': ContainerState.restarting,
+        'removing': ContainerState.removing,
+        'Removing': ContainerState.removing,
+        'exited': ContainerState.exited,
+        'Exited': ContainerState.exited,
+        'dead': ContainerState.dead,
+        'Dead': ContainerState.dead,
+        'unknown': ContainerState.exited, // Unknown defaults to exited
+        '': ContainerState.exited, // Empty defaults to exited
+        'invalid': ContainerState.exited, // Invalid defaults to exited
+      };
+
+      testCases.forEach((input, expected) {
+        test('parses "$input" to ${expected.name}', () {
+          final model = ContainerModel(
+            id: 'abc123def456',
+            names: ['/container'],
+            image: 'nginx',
+            state: input,
+            status: 'Status',
+          );
+
+          final entity = model.toEntity();
+
+          expect(entity.state, equals(expected));
+        });
+      });
+    });
+  });
+
+  group('PortModel', () {
+    group('fromJson', () {
+      test('deserializes port with all fields', () {
+        final json = {
+          'IP': '0.0.0.0',
+          'PrivatePort': 80,
+          'PublicPort': 8080,
+          'Type': 'tcp',
+        };
+
+        final model = PortModel.fromJson(json);
+
+        expect(model.ip, equals('0.0.0.0'));
+        expect(model.privatePort, equals(80));
+        expect(model.publicPort, equals(8080));
+        expect(model.type, equals('tcp'));
+      });
+
+      test('deserializes port with minimal fields', () {
+        final json = {
+          'PrivatePort': 443,
+        };
+
+        final model = PortModel.fromJson(json);
+
+        expect(model.ip, isNull);
+        expect(model.privatePort, equals(443));
+        expect(model.publicPort, isNull);
+        expect(model.type, equals('tcp')); // Default
+      });
+
+      test('handles UDP type', () {
+        final json = {
+          'PrivatePort': 53,
+          'Type': 'udp',
+        };
+
+        final model = PortModel.fromJson(json);
+
+        expect(model.type, equals('udp'));
+      });
+    });
+
+    group('toEntity', () {
+      test('converts to PortMapping entity', () {
+        const model = PortModel(
+          ip: '127.0.0.1',
+          privatePort: 80,
+          publicPort: 8080,
+          type: 'tcp',
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.hostIp, equals('127.0.0.1'));
+        expect(entity.hostPort, equals(8080));
+        expect(entity.containerPort, equals(80));
+        expect(entity.protocol, equals('tcp'));
+      });
+
+      test('handles null public port', () {
+        const model = PortModel(
+          privatePort: 80,
+          publicPort: null,
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.hostPort, isNull);
+        expect(entity.containerPort, equals(80));
+      });
+    });
+  });
+
+  group('MountModel', () {
+    group('fromJson', () {
+      test('deserializes bind mount', () {
+        final json = {
+          'Type': 'bind',
+          'Source': '/host/path',
+          'Destination': '/container/path',
+          'Mode': 'rw',
+          'RW': true,
+        };
+
+        final model = MountModel.fromJson(json);
+
+        expect(model.type, equals('bind'));
+        expect(model.source, equals('/host/path'));
+        expect(model.destination, equals('/container/path'));
+        expect(model.mode, equals('rw'));
+        expect(model.rw, isTrue);
+      });
+
+      test('deserializes volume mount', () {
+        final json = {
+          'Type': 'volume',
+          'Source': 'my-volume',
+          'Destination': '/data',
+          'Mode': 'ro',
+          'RW': false,
+        };
+
+        final model = MountModel.fromJson(json);
+
+        expect(model.type, equals('volume'));
+        expect(model.rw, isFalse);
+      });
+
+      test('uses defaults for missing fields', () {
+        final json = {
+          'Type': 'bind',
+          'Source': '/src',
+          'Destination': '/dst',
+        };
+
+        final model = MountModel.fromJson(json);
+
+        expect(model.mode, equals('rw'));
+        expect(model.rw, isTrue);
+      });
+    });
+
+    group('toEntity', () {
+      test('converts read-write mount to entity', () {
+        const model = MountModel(
+          type: 'bind',
+          source: '/host',
+          destination: '/container',
+          rw: true,
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.type, equals('bind'));
+        expect(entity.source, equals('/host'));
+        expect(entity.destination, equals('/container'));
+        expect(entity.mode, equals('rw'));
+      });
+
+      test('converts read-only mount to entity', () {
+        const model = MountModel(
+          type: 'volume',
+          source: 'vol',
+          destination: '/data',
+          rw: false,
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.mode, equals('ro'));
+      });
+    });
+  });
+
+  group('NetworkSettingsModel', () {
+    test('deserializes network settings', () {
+      final json = {
+        'Networks': {
+          'bridge': {'IPAddress': '172.17.0.2'},
+          'custom': {'IPAddress': '10.0.0.5'},
+        },
+      };
+
+      final model = NetworkSettingsModel.fromJson(json);
+
+      expect(model.networks.keys, containsAll(['bridge', 'custom']));
+    });
+
+    test('handles empty networks', () {
+      final json = {
+        'Networks': <String, dynamic>{},
+      };
+
+      final model = NetworkSettingsModel.fromJson(json);
+
+      expect(model.networks, isEmpty);
+    });
+
+    test('uses empty map as default', () {
+      final json = <String, dynamic>{};
+
+      final model = NetworkSettingsModel.fromJson(json);
+
+      expect(model.networks, isEmpty);
+    });
+  });
+}

test/features/control_room/npm/data/models/proxy_host_model_test.dart

@@ -0,0 +1,335 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:tatlock_ui/features/control_room/npm/data/models/proxy_host_model.dart';
+
+void main() {
+  group('NullableIntOrBoolConverter', () {
+    const converter = NullableIntOrBoolConverter();
+
+    group('fromJson', () {
+      test('returns null for null input', () {
+        expect(converter.fromJson(null), isNull);
+      });
+
+      test('returns null for false input', () {
+        expect(converter.fromJson(false), isNull);
+      });
+
+      test('returns null for true input (treats as invalid)', () {
+        // true is not a valid ID, so we return null
+        expect(converter.fromJson(true), isNull);
+      });
+
+      test('returns int for int input', () {
+        expect(converter.fromJson(42), equals(42));
+      });
+
+      test('returns int for positive int', () {
+        expect(converter.fromJson(1), equals(1));
+      });
+
+      test('returns int for zero', () {
+        expect(converter.fromJson(0), equals(0));
+      });
+
+      test('converts double to int', () {
+        expect(converter.fromJson(42.0), equals(42));
+      });
+
+      test('converts double with decimals to int (truncates)', () {
+        expect(converter.fromJson(42.9), equals(42));
+      });
+
+      test('returns null for string input', () {
+        expect(converter.fromJson('42'), isNull);
+      });
+
+      test('returns null for empty string', () {
+        expect(converter.fromJson(''), isNull);
+      });
+    });
+
+    group('toJson', () {
+      test('returns null for null input', () {
+        expect(converter.toJson(null), isNull);
+      });
+
+      test('returns int for int input', () {
+        expect(converter.toJson(42), equals(42));
+      });
+
+      test('returns zero for zero input', () {
+        expect(converter.toJson(0), equals(0));
+      });
+    });
+  });
+
+  group('IntOrBoolConverter', () {
+    const converter = IntOrBoolConverter();
+
+    group('fromJson', () {
+      test('returns 0 for null input', () {
+        expect(converter.fromJson(null), equals(0));
+      });
+
+      test('returns 0 for false input', () {
+        expect(converter.fromJson(false), equals(0));
+      });
+
+      test('returns 1 for true input', () {
+        expect(converter.fromJson(true), equals(1));
+      });
+
+      test('returns int for int input', () {
+        expect(converter.fromJson(42), equals(42));
+      });
+
+      test('returns 0 for zero input', () {
+        expect(converter.fromJson(0), equals(0));
+      });
+
+      test('returns 1 for one input', () {
+        expect(converter.fromJson(1), equals(1));
+      });
+
+      test('converts double to int', () {
+        expect(converter.fromJson(42.0), equals(42));
+      });
+
+      test('converts double with decimals to int (truncates)', () {
+        expect(converter.fromJson(42.9), equals(42));
+      });
+
+      test('returns 0 for string input', () {
+        expect(converter.fromJson('42'), equals(0));
+      });
+
+      test('returns 0 for empty string', () {
+        expect(converter.fromJson(''), equals(0));
+      });
+
+      test('returns 0 for invalid types', () {
+        expect(converter.fromJson([1, 2, 3]), equals(0));
+        expect(converter.fromJson({'key': 'value'}), equals(0));
+      });
+    });
+
+    group('toJson', () {
+      test('returns int for int input', () {
+        expect(converter.toJson(42), equals(42));
+      });
+
+      test('returns 0 for zero input', () {
+        expect(converter.toJson(0), equals(0));
+      });
+
+      test('returns 1 for one input', () {
+        expect(converter.toJson(1), equals(1));
+      });
+    });
+  });
+
+  group('ProxyHostModel JSON serialization', () {
+    test('deserializes with boolean certificate_id (false)', () {
+      final json = {
+        'id': 1,
+        'domain_names': ['example.com'],
+        'forward_scheme': 'http',
+        'forward_host': 'localhost',
+        'forward_port': 8080,
+        'certificate_id': false, // NPM returns false for no certificate
+      };
+
+      final model = ProxyHostModel.fromJson(json);
+
+      expect(model.certificateId, isNull);
+    });
+
+    test('deserializes with int certificate_id', () {
+      final json = {
+        'id': 1,
+        'domain_names': ['example.com'],
+        'forward_scheme': 'http',
+        'forward_host': 'localhost',
+        'forward_port': 8080,
+        'certificate_id': 42,
+      };
+
+      final model = ProxyHostModel.fromJson(json);
+
+      expect(model.certificateId, equals(42));
+    });
+
+    test('deserializes with null certificate_id', () {
+      final json = {
+        'id': 1,
+        'domain_names': ['example.com'],
+        'forward_scheme': 'http',
+        'forward_host': 'localhost',
+        'forward_port': 8080,
+        'certificate_id': null,
+      };
+
+      final model = ProxyHostModel.fromJson(json);
+
+      expect(model.certificateId, isNull);
+    });
+
+    test('deserializes with boolean http2_support (true)', () {
+      final json = {
+        'id': 1,
+        'domain_names': ['example.com'],
+        'forward_scheme': 'http',
+        'forward_host': 'localhost',
+        'forward_port': 8080,
+        'http2_support': true, // NPM can return boolean
+      };
+
+      final model = ProxyHostModel.fromJson(json);
+
+      expect(model.http2Support, equals(1));
+    });
+
+    test('deserializes with boolean http2_support (false)', () {
+      final json = {
+        'id': 1,
+        'domain_names': ['example.com'],
+        'forward_scheme': 'http',
+        'forward_host': 'localhost',
+        'forward_port': 8080,
+        'http2_support': false,
+      };
+
+      final model = ProxyHostModel.fromJson(json);
+
+      expect(model.http2Support, equals(0));
+    });
+
+    test('deserializes with int http2_support', () {
+      final json = {
+        'id': 1,
+        'domain_names': ['example.com'],
+        'forward_scheme': 'http',
+        'forward_host': 'localhost',
+        'forward_port': 8080,
+        'http2_support': 1,
+      };
+
+      final model = ProxyHostModel.fromJson(json);
+
+      expect(model.http2Support, equals(1));
+    });
+
+    test('deserializes with all boolean flags', () {
+      final json = {
+        'id': 1,
+        'domain_names': ['example.com'],
+        'forward_scheme': 'https',
+        'forward_host': 'localhost',
+        'forward_port': 443,
+        'ssl_forced': true,
+        'certificate_id': false,
+        'enabled': true,
+        'http2_support': true,
+        'hsts_enabled': false,
+        'access_list_id': false,
+        'caching_enabled': true,
+        'block_exploits': true,
+        'allow_websocket_upgrade': false,
+      };
+
+      final model = ProxyHostModel.fromJson(json);
+
+      expect(model.sslForced, isTrue);
+      expect(model.certificateId, isNull);
+      expect(model.enabled, equals(1));
+      expect(model.http2Support, equals(1));
+      expect(model.hstsEnabled, equals(0));
+      expect(model.accessListId, isNull);
+      expect(model.cachingEnabled, equals(1));
+      expect(model.blockExploits, equals(1));
+      expect(model.allowWebsocketUpgrade, equals(0));
+    });
+
+    test('deserializes with all int flags', () {
+      final json = {
+        'id': 1,
+        'domain_names': ['example.com'],
+        'forward_scheme': 'https',
+        'forward_host': 'localhost',
+        'forward_port': 443,
+        'ssl_forced': false,
+        'certificate_id': 5,
+        'enabled': 1,
+        'http2_support': 1,
+        'hsts_enabled': 0,
+        'access_list_id': 3,
+        'caching_enabled': 1,
+        'block_exploits': 1,
+        'allow_websocket_upgrade': 0,
+      };
+
+      final model = ProxyHostModel.fromJson(json);
+
+      expect(model.sslForced, isFalse);
+      expect(model.certificateId, equals(5));
+      expect(model.enabled, equals(1));
+      expect(model.http2Support, equals(1));
+      expect(model.hstsEnabled, equals(0));
+      expect(model.accessListId, equals(3));
+      expect(model.cachingEnabled, equals(1));
+      expect(model.blockExploits, equals(1));
+      expect(model.allowWebsocketUpgrade, equals(0));
+    });
+
+    test('toEntity converts correctly', () {
+      final model = ProxyHostModel(
+        id: 1,
+        domainNames: ['example.com', 'www.example.com'],
+        forwardScheme: 'https',
+        forwardHost: 'backend',
+        forwardPort: 8080,
+        sslForced: true,
+        certificateId: 5,
+        enabled: 1,
+        http2Support: 1,
+        hstsEnabled: 1,
+        cachingEnabled: 0,
+        blockExploits: 1,
+        allowWebsocketUpgrade: 1,
+      );
+
+      final entity = model.toEntity();
+
+      expect(entity.id, equals(1));
+      expect(entity.domainNames, equals(['example.com', 'www.example.com']));
+      expect(entity.forwardScheme, equals('https'));
+      expect(entity.forwardHost, equals('backend'));
+      expect(entity.forwardPort, equals(8080));
+      expect(entity.forceSSL, isTrue);
+      expect(entity.sslEnabled, isTrue); // certificateId > 0
+      expect(entity.certificateId, equals(5));
+      expect(entity.enabled, isTrue);
+      expect(entity.http2Support, isTrue);
+      expect(entity.hstsEnabled, isTrue);
+      expect(entity.cacheAssets, isFalse);
+      expect(entity.blockExploits, isTrue);
+      expect(entity.websocketSupport, isTrue);
+    });
+
+    test('toEntity handles null certificateId correctly', () {
+      final model = ProxyHostModel(
+        id: 1,
+        domainNames: ['example.com'],
+        forwardScheme: 'http',
+        forwardHost: 'backend',
+        forwardPort: 80,
+        certificateId: null,
+      );
+
+      final entity = model.toEntity();
+
+      expect(entity.sslEnabled, isFalse);
+      expect(entity.certificateId, isNull);
+    });
+  });
+}

test/features/control_room/stacks/data/models/stack_model_test.dart

@@ -0,0 +1,395 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:tatlock_ui/features/control_room/stacks/data/models/stack_model.dart';
+import 'package:tatlock_ui/features/control_room/stacks/domain/entities/stack.dart';
+
+void main() {
+  group('StackModel', () {
+    group('fromJson', () {
+      test('deserializes minimal stack', () {
+        final json = {
+          'id': 'stack-123',
+          'name': 'my-stack',
+        };
+
+        final model = StackModel.fromJson(json);
+
+        expect(model.id, equals('stack-123'));
+        expect(model.name, equals('my-stack'));
+        expect(model.containerCount, equals(0)); // Default
+        expect(model.runningCount, equals(0)); // Default
+      });
+
+      test('deserializes full stack with all fields', () {
+        final json = {
+          'id': 'stack-456',
+          'name': 'production-stack',
+          'type': 'compose',
+          'status': 'active',
+          'container_count': 5,
+          'running_count': 5,
+          'compose_file': '/path/to/docker-compose.yml',
+          'environment': 'production',
+          'created_at': '2024-01-15T10:30:00Z',
+          'updated_at': '2024-01-20T15:45:00Z',
+        };
+
+        final model = StackModel.fromJson(json);
+
+        expect(model.id, equals('stack-456'));
+        expect(model.name, equals('production-stack'));
+        expect(model.typeString, equals('compose'));
+        expect(model.statusString, equals('active'));
+        expect(model.containerCount, equals(5));
+        expect(model.runningCount, equals(5));
+        expect(model.composeFile, equals('/path/to/docker-compose.yml'));
+        expect(model.environment, equals('production'));
+        expect(model.createdAt, equals('2024-01-15T10:30:00Z'));
+        expect(model.updatedAt, equals('2024-01-20T15:45:00Z'));
+      });
+
+      test('handles null optional fields', () {
+        final json = {
+          'id': 'stack-789',
+          'name': 'minimal-stack',
+          'type': null,
+          'status': null,
+          'compose_file': null,
+          'environment': null,
+          'created_at': null,
+          'updated_at': null,
+        };
+
+        final model = StackModel.fromJson(json);
+
+        expect(model.typeString, isNull);
+        expect(model.statusString, isNull);
+        expect(model.composeFile, isNull);
+        expect(model.environment, isNull);
+        expect(model.createdAt, isNull);
+        expect(model.updatedAt, isNull);
+      });
+
+      test('uses defaults for missing container counts', () {
+        final json = {
+          'id': 'stack-abc',
+          'name': 'test-stack',
+        };
+
+        final model = StackModel.fromJson(json);
+
+        expect(model.containerCount, equals(0));
+        expect(model.runningCount, equals(0));
+      });
+    });
+
+    group('toEntity', () {
+      test('converts to entity with all fields', () {
+        const model = StackModel(
+          id: 'stack-123',
+          name: 'my-stack',
+          typeString: 'compose',
+          statusString: 'active',
+          containerCount: 3,
+          runningCount: 2,
+          composeFile: '/compose.yml',
+          environment: 'staging',
+          createdAt: '2024-01-01T00:00:00Z',
+          updatedAt: '2024-01-02T12:00:00Z',
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.id, equals('stack-123'));
+        expect(entity.name, equals('my-stack'));
+        expect(entity.type, equals(StackType.compose));
+        expect(entity.status, equals(StackStatus.active));
+        expect(entity.containerCount, equals(3));
+        expect(entity.runningCount, equals(2));
+        expect(entity.composeFile, equals('/compose.yml'));
+        expect(entity.environment, equals('staging'));
+        expect(entity.createdAt, isNotNull);
+        expect(entity.updatedAt, isNotNull);
+      });
+
+      test('handles null timestamps', () {
+        const model = StackModel(
+          id: 'stack-123',
+          name: 'my-stack',
+          createdAt: null,
+          updatedAt: null,
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.createdAt, isNull);
+        expect(entity.updatedAt, isNull);
+      });
+
+      test('handles invalid timestamp format', () {
+        const model = StackModel(
+          id: 'stack-123',
+          name: 'my-stack',
+          createdAt: 'invalid-date',
+          updatedAt: 'not-a-date',
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.createdAt, isNull);
+        expect(entity.updatedAt, isNull);
+      });
+
+      test('parses valid ISO 8601 timestamps', () {
+        const model = StackModel(
+          id: 'stack-123',
+          name: 'my-stack',
+          createdAt: '2024-06-15T14:30:00.000Z',
+          updatedAt: '2024-06-16T09:15:30.500Z',
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.createdAt?.year, equals(2024));
+        expect(entity.createdAt?.month, equals(6));
+        expect(entity.createdAt?.day, equals(15));
+        expect(entity.updatedAt?.hour, equals(9));
+        expect(entity.updatedAt?.minute, equals(15));
+      });
+    });
+
+    group('_parseStackType', () {
+      final testCases = {
+        'compose': StackType.compose,
+        'Compose': StackType.compose,
+        'COMPOSE': StackType.compose,
+        'swarm': StackType.swarm,
+        'Swarm': StackType.swarm,
+        'SWARM': StackType.swarm,
+        'kubernetes': StackType.kubernetes,
+        'Kubernetes': StackType.kubernetes,
+        'KUBERNETES': StackType.kubernetes,
+        'k8s': StackType.kubernetes,
+        'K8S': StackType.kubernetes,
+        'K8s': StackType.kubernetes,
+        'unknown': StackType.compose, // Defaults to compose
+        '': StackType.compose, // Empty defaults to compose
+        'invalid': StackType.compose, // Invalid defaults to compose
+      };
+
+      testCases.forEach((input, expected) {
+        test('parses "$input" to ${expected.name}', () {
+          final model = StackModel(
+            id: 'stack-123',
+            name: 'test',
+            typeString: input,
+          );
+
+          final entity = model.toEntity();
+
+          expect(entity.type, equals(expected));
+        });
+      });
+
+      test('handles null type', () {
+        const model = StackModel(
+          id: 'stack-123',
+          name: 'test',
+          typeString: null,
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.type, equals(StackType.compose));
+      });
+    });
+
+    group('_parseStackStatus', () {
+      final testCases = {
+        'active': StackStatus.active,
+        'Active': StackStatus.active,
+        'ACTIVE': StackStatus.active,
+        'running': StackStatus.active,
+        'Running': StackStatus.active,
+        'RUNNING': StackStatus.active,
+        'inactive': StackStatus.inactive,
+        'Inactive': StackStatus.inactive,
+        'INACTIVE': StackStatus.inactive,
+        'stopped': StackStatus.inactive,
+        'Stopped': StackStatus.inactive,
+        'STOPPED': StackStatus.inactive,
+        'error': StackStatus.error,
+        'Error': StackStatus.error,
+        'ERROR': StackStatus.error,
+        'unknown': StackStatus.unknown, // Defaults to unknown
+        '': StackStatus.unknown, // Empty defaults to unknown
+        'invalid': StackStatus.unknown, // Invalid defaults to unknown
+      };
+
+      testCases.forEach((input, expected) {
+        test('parses "$input" to ${expected.name}', () {
+          final model = StackModel(
+            id: 'stack-123',
+            name: 'test',
+            statusString: input,
+          );
+
+          final entity = model.toEntity();
+
+          expect(entity.status, equals(expected));
+        });
+      });
+
+      test('handles null status', () {
+        const model = StackModel(
+          id: 'stack-123',
+          name: 'test',
+          statusString: null,
+        );
+
+        final entity = model.toEntity();
+
+        expect(entity.status, equals(StackStatus.unknown));
+      });
+    });
+  });
+
+  group('Stack entity', () {
+    group('isHealthy', () {
+      test('returns true when all containers are running', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'healthy-stack',
+          containerCount: 5,
+          runningCount: 5,
+        );
+
+        expect(stack.isHealthy, isTrue);
+      });
+
+      test('returns false when some containers are not running', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'partial-stack',
+          containerCount: 5,
+          runningCount: 3,
+        );
+
+        expect(stack.isHealthy, isFalse);
+      });
+
+      test('returns false when no containers are running', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'stopped-stack',
+          containerCount: 5,
+          runningCount: 0,
+        );
+
+        expect(stack.isHealthy, isFalse);
+      });
+
+      test('returns false when containerCount is zero', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'empty-stack',
+          containerCount: 0,
+          runningCount: 0,
+        );
+
+        expect(stack.isHealthy, isFalse);
+      });
+    });
+
+    group('hasRunningContainers', () {
+      test('returns true when some containers are running', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'running-stack',
+          containerCount: 5,
+          runningCount: 2,
+        );
+
+        expect(stack.hasRunningContainers, isTrue);
+      });
+
+      test('returns false when no containers are running', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'stopped-stack',
+          containerCount: 5,
+          runningCount: 0,
+        );
+
+        expect(stack.hasRunningContainers, isFalse);
+      });
+
+      test('returns true when all containers are running', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'healthy-stack',
+          containerCount: 3,
+          runningCount: 3,
+        );
+
+        expect(stack.hasRunningContainers, isTrue);
+      });
+    });
+
+    group('isPartial', () {
+      test('returns true when some but not all containers are running', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'partial-stack',
+          containerCount: 5,
+          runningCount: 3,
+        );
+
+        expect(stack.isPartial, isTrue);
+      });
+
+      test('returns false when all containers are running', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'healthy-stack',
+          containerCount: 5,
+          runningCount: 5,
+        );
+
+        expect(stack.isPartial, isFalse);
+      });
+
+      test('returns false when no containers are running', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'stopped-stack',
+          containerCount: 5,
+          runningCount: 0,
+        );
+
+        expect(stack.isPartial, isFalse);
+      });
+
+      test('returns false when containerCount is zero', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'empty-stack',
+          containerCount: 0,
+          runningCount: 0,
+        );
+
+        expect(stack.isPartial, isFalse);
+      });
+
+      test('returns true when only one of many containers is running', () {
+        const stack = Stack(
+          id: 'stack-1',
+          name: 'degraded-stack',
+          containerCount: 10,
+          runningCount: 1,
+        );
+
+        expect(stack.isPartial, isTrue);
+      });
+    });
+  });
+}

windows/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  url_launcher_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST