feat(cli): add compose passthrough command (#93 )

Adds `cf compose <stack> <command> [args...]` to run any docker compose command on a stack without needing dedicated wrappers. Useful for commands like top, images, exec, run, config, etc. Multi-host stacks require --host to specify which host to run on.
fix(web): service action buttons fixes and additions (#92 )
2026-02-09 00:39:54 +00:00 · 2025-12-20 21:26:05 -08:00 · 2025-12-20 21:11:44 -08:00 · 2025-12-20 20:56:48 -08:00 · 2025-12-20 20:47:34 -08:00 · 2025-12-20 20:41:26 -08:00
28 changed files with 653 additions and 81 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ compose-farm.yaml
 coverage.xml
 .env
 homepage/
+site/
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -116,10 +116,12 @@ CLI available as `cf` or `compose-farm`.
 |---------|-------------|
 | `up`    | Start stacks (`docker compose up -d`), auto-migrates if host changed |
 | `down`  | Stop stacks (`docker compose down`). Use `--orphaned` to stop stacks removed from config |
+| `stop`  | Stop services without removing containers (`docker compose stop`) |
 | `pull`  | Pull latest images |
 | `restart` | `down` + `up -d` |
 | `update` | `pull` + `build` + `down` + `up -d` |
 | `apply` | Make reality match config: migrate stacks + stop orphans. Use `--dry-run` to preview |
+| `compose` | Run any docker compose command on a stack (passthrough) |
 | `logs`  | Show stack logs |
 | `ps`    | Show status of all stacks |
 | `stats` | Show overview (hosts, stacks, pending migrations; `--live` for container counts) |
--- a/README.md
+++ b/README.md
@@ -12,6 +12,18 @@ A minimal CLI tool to run Docker Compose commands across multiple hosts via SSH.
 > [!NOTE]
 > Run `docker compose` commands across multiple hosts via SSH. One YAML maps stacks to hosts. Run `cf apply` and reality matches your config—stacks start, migrate, or stop as needed. No Kubernetes, no Swarm, no magic.

+## Quick Demo
+
+**CLI:**
+
+![CLI Demo](docs/assets/quickstart.gif)
+
+**Web UI:**
+
+![Web UI Demo](docs/assets/web-workflow.gif)
+
+## Table of Contents
+
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

@@ -143,7 +155,7 @@ If you need containers on different hosts to communicate seamlessly, you need Do

 ```bash
 # One-liner (installs uv if needed)
-curl -fsSL https://raw.githubusercontent.com/basnijholt/compose-farm/main/bootstrap.sh | sh
+curl -fsSL https://compose-farm.nijho.lt/install | sh

 # Or if you already have uv/pip
 uv tool install compose-farm
@@ -225,7 +237,7 @@ The keys will persist across restarts.

 ## Configuration

-Create `~/.config/compose-farm/compose-farm.yaml` (or `./compose-farm.yaml` in your working directory):
+Create `compose-farm.yaml` in the directory where you'll run commands (e.g., `/opt/stacks`). This keeps config near your stacks. Alternatively, use `~/.config/compose-farm/compose-farm.yaml` for a global config, or symlink from one to the other with `cf config symlink`.

 ### Single-host example

@@ -320,7 +332,8 @@ The CLI is available as both `compose-farm` and the shorter `cf` alias.
 |---------|-------------|
 | **`cf apply`** | **Make reality match config (start + migrate + stop orphans)** |
 | `cf up <stack>` | Start stack (auto-migrates if host changed) |
-| `cf down <stack>` | Stop stack |
+| `cf down <stack>` | Stop and remove stack containers |
+| `cf stop <stack>` | Stop stack without removing containers |
 | `cf restart <stack>` | down + up |
 | `cf update <stack>` | pull + build + down + up |
 | `cf pull <stack>` | Pull latest images |
@@ -413,10 +426,15 @@ Full `--help` output for each command. See the [Usage](#usage) table above for a
 │ up             Start stacks (docker compose up -d). Auto-migrates if host    │
 │                changed.                                                      │
 │ down           Stop stacks (docker compose down).                            │
+│ stop           Stop services without removing containers (docker compose     │
+│                stop).                                                        │
 │ pull           Pull latest images (docker compose pull).                     │
-│ restart        Restart stacks (down + up).                                   │
-│ update         Update stacks (pull + build + down + up).                     │
+│ restart        Restart stacks (down + up). With --service, restarts just     │
+│                that service.                                                 │
+│ update         Update stacks (pull + build + down + up). With --service,     │
+│                updates just that service.                                    │
 │ apply          Make reality match config (start, migrate, stop as needed).   │
+│ compose        Run any docker compose command on a stack.                    │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 ╭─ Configuration ──────────────────────────────────────────────────────────────╮
 │ traefik-file   Generate a Traefik file-provider fragment from compose        │
@@ -428,7 +446,8 @@ Full `--help` output for each command. See the [Usage](#usage) table above for a
 │ ssh            Manage SSH keys for passwordless authentication.              │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 ╭─ Monitoring ─────────────────────────────────────────────────────────────────╮
-│ logs           Show stack logs.                                              │
+│ logs           Show stack logs. With --service, shows logs for just that     │
+│                service.                                                      │
 │ ps             Show status of stacks.                                        │
 │ stats          Show overview statistics for hosts and stacks.                │
 ╰──────────────────────────────────────────────────────────────────────────────╯
@@ -467,10 +486,11 @@ Full `--help` output for each command. See the [Usage](#usage) table above for a
 │   stacks      [STACKS]...  Stacks to operate on                              │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 ╭─ Options ────────────────────────────────────────────────────────────────────╮
-│ --all     -a            Run on all stacks                                    │
-│ --host    -H      TEXT  Filter to stacks on this host                        │
-│ --config  -c      PATH  Path to config file                                  │
-│ --help    -h            Show this message and exit.                          │
+│ --all      -a            Run on all stacks                                   │
+│ --host     -H      TEXT  Filter to stacks on this host                       │
+│ --service  -s      TEXT  Target a specific service within the stack          │
+│ --config   -c      PATH  Path to config file                                 │
+│ --help     -h            Show this message and exit.                         │
 ╰──────────────────────────────────────────────────────────────────────────────╯

 ```
@@ -516,6 +536,41 @@ Full `--help` output for each command. See the [Usage](#usage) table above for a

 </details>

+<details>
+<summary>See the output of <code>cf stop --help</code></summary>
+
+<!-- CODE:BASH:START -->
+<!-- echo '```yaml' -->
+<!-- export NO_COLOR=1 -->
+<!-- export TERM=dumb -->
+<!-- export TERMINAL_WIDTH=90 -->
+<!-- cf stop --help -->
+<!-- echo '```' -->
+<!-- CODE:END -->
+<!-- OUTPUT:START -->
+<!-- ⚠️ This content is auto-generated by `markdown-code-runner`. -->
+```yaml
+
+ Usage: cf stop [OPTIONS] [STACKS]...
+
+ Stop services without removing containers (docker compose stop).
+
+╭─ Arguments ──────────────────────────────────────────────────────────────────╮
+│   stacks      [STACKS]...  Stacks to operate on                              │
+╰──────────────────────────────────────────────────────────────────────────────╯
+╭─ Options ────────────────────────────────────────────────────────────────────╮
+│ --all      -a            Run on all stacks                                   │
+│ --service  -s      TEXT  Target a specific service within the stack          │
+│ --config   -c      PATH  Path to config file                                 │
+│ --help     -h            Show this message and exit.                         │
+╰──────────────────────────────────────────────────────────────────────────────╯
+
+```
+
+<!-- OUTPUT:END -->
+
+</details>
+
 <details>
 <summary>See the output of <code>cf pull --help</code></summary>

@@ -539,9 +594,10 @@ Full `--help` output for each command. See the [Usage](#usage) table above for a
 │   stacks      [STACKS]...  Stacks to operate on                              │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 ╭─ Options ────────────────────────────────────────────────────────────────────╮
-│ --all     -a            Run on all stacks                                    │
-│ --config  -c      PATH  Path to config file                                  │
-│ --help    -h            Show this message and exit.                          │
+│ --all      -a            Run on all stacks                                   │
+│ --service  -s      TEXT  Target a specific service within the stack          │
+│ --config   -c      PATH  Path to config file                                 │
+│ --help     -h            Show this message and exit.                         │
 ╰──────────────────────────────────────────────────────────────────────────────╯

 ```
@@ -567,15 +623,16 @@ Full `--help` output for each command. See the [Usage](#usage) table above for a

 Usage: cf restart [OPTIONS] [STACKS]...

- Restart stacks (down + up).
+ Restart stacks (down + up). With --service, restarts just that service.

 ╭─ Arguments ──────────────────────────────────────────────────────────────────╮
 │   stacks      [STACKS]...  Stacks to operate on                              │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 ╭─ Options ────────────────────────────────────────────────────────────────────╮
-│ --all     -a            Run on all stacks                                    │
-│ --config  -c      PATH  Path to config file                                  │
-│ --help    -h            Show this message and exit.                          │
+│ --all      -a            Run on all stacks                                   │
+│ --service  -s      TEXT  Target a specific service within the stack          │
+│ --config   -c      PATH  Path to config file                                 │
+│ --help     -h            Show this message and exit.                         │
 ╰──────────────────────────────────────────────────────────────────────────────╯

 ```
@@ -601,15 +658,17 @@ Full `--help` output for each command. See the [Usage](#usage) table above for a

 Usage: cf update [OPTIONS] [STACKS]...

- Update stacks (pull + build + down + up).
+ Update stacks (pull + build + down + up). With --service, updates just that
+ service.

 ╭─ Arguments ──────────────────────────────────────────────────────────────────╮
 │   stacks      [STACKS]...  Stacks to operate on                              │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 ╭─ Options ────────────────────────────────────────────────────────────────────╮
-│ --all     -a            Run on all stacks                                    │
-│ --config  -c      PATH  Path to config file                                  │
-│ --help    -h            Show this message and exit.                          │
+│ --all      -a            Run on all stacks                                   │
+│ --service  -s      TEXT  Target a specific service within the stack          │
+│ --config   -c      PATH  Path to config file                                 │
+│ --help     -h            Show this message and exit.                         │
 ╰──────────────────────────────────────────────────────────────────────────────╯

 ```
@@ -663,6 +722,53 @@ Full `--help` output for each command. See the [Usage](#usage) table above for a

 </details>

+<details>
+<summary>See the output of <code>cf compose --help</code></summary>
+
+<!-- CODE:BASH:START -->
+<!-- echo '```yaml' -->
+<!-- export NO_COLOR=1 -->
+<!-- export TERM=dumb -->
+<!-- export TERMINAL_WIDTH=90 -->
+<!-- cf compose --help -->
+<!-- echo '```' -->
+<!-- CODE:END -->
+<!-- OUTPUT:START -->
+<!-- ⚠️ This content is auto-generated by `markdown-code-runner`. -->
+```yaml
+
+ Usage: cf compose [OPTIONS] STACK COMMAND [ARGS]...
+
+ Run any docker compose command on a stack.
+
+ Passthrough to docker compose for commands not wrapped by cf.
+ Options after COMMAND are passed to docker compose, not cf.
+
+ Examples:
+   cf compose mystack --help        - show docker compose help
+   cf compose mystack top           - view running processes
+   cf compose mystack images        - list images
+   cf compose mystack exec web bash - interactive shell
+   cf compose mystack config        - view parsed config
+
+╭─ Arguments ──────────────────────────────────────────────────────────────────╮
+│ *    stack        TEXT       Stack to operate on (use '.' for current dir)   │
+│                              [required]                                      │
+│ *    command      TEXT       Docker compose command [required]               │
+│      args         [ARGS]...  Additional arguments                            │
+╰──────────────────────────────────────────────────────────────────────────────╯
+╭─ Options ────────────────────────────────────────────────────────────────────╮
+│ --host    -H      TEXT  Filter to stacks on this host                        │
+│ --config  -c      PATH  Path to config file                                  │
+│ --help    -h            Show this message and exit.                          │
+╰──────────────────────────────────────────────────────────────────────────────╯
+
+```
+
+<!-- OUTPUT:END -->
+
+</details>
+
 **Configuration**

 <details>
@@ -900,19 +1006,20 @@ Full `--help` output for each command. See the [Usage](#usage) table above for a

 Usage: cf logs [OPTIONS] [STACKS]...

- Show stack logs.
+ Show stack logs. With --service, shows logs for just that service.

 ╭─ Arguments ──────────────────────────────────────────────────────────────────╮
 │   stacks      [STACKS]...  Stacks to operate on                              │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 ╭─ Options ────────────────────────────────────────────────────────────────────╮
-│ --all     -a               Run on all stacks                                 │
-│ --host    -H      TEXT     Filter to stacks on this host                     │
-│ --follow  -f               Follow logs                                       │
-│ --tail    -n      INTEGER  Number of lines (default: 20 for --all, 100       │
-│                            otherwise)                                        │
-│ --config  -c      PATH     Path to config file                               │
-│ --help    -h               Show this message and exit.                       │
+│ --all      -a               Run on all stacks                                │
+│ --host     -H      TEXT     Filter to stacks on this host                    │
+│ --service  -s      TEXT     Target a specific service within the stack       │
+│ --follow   -f               Follow logs                                      │
+│ --tail     -n      INTEGER  Number of lines (default: 20 for --all, 100      │
+│                             otherwise)                                       │
+│ --config   -c      PATH     Path to config file                              │
+│ --help     -h               Show this message and exit.                      │
 ╰──────────────────────────────────────────────────────────────────────────────╯

 ```
@@ -944,15 +1051,17 @@ Full `--help` output for each command. See the [Usage](#usage) table above for a
 Without arguments: shows all stacks (same as --all).
 With stack names: shows only those stacks.
 With --host: shows stacks on that host.
+ With --service: filters to a specific service within the stack.

 ╭─ Arguments ──────────────────────────────────────────────────────────────────╮
 │   stacks      [STACKS]...  Stacks to operate on                              │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 ╭─ Options ────────────────────────────────────────────────────────────────────╮
-│ --all     -a            Run on all stacks                                    │
-│ --host    -H      TEXT  Filter to stacks on this host                        │
-│ --config  -c      PATH  Path to config file                                  │
-│ --help    -h            Show this message and exit.                          │
+│ --all      -a            Run on all stacks                                   │
+│ --host     -H      TEXT  Filter to stacks on this host                       │
+│ --service  -s      TEXT  Target a specific service within the stack          │
+│ --config   -c      PATH  Path to config file                                 │
+│ --help     -h            Show this message and exit.                         │
 ╰──────────────────────────────────────────────────────────────────────────────╯

 ```
--- a/docs/assets/web-workflow.gif
+++ b/docs/assets/web-workflow.gif
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92ed41854fe852ae54aa5f05de8ceaf35c3ad8ef82b3034e67edf758d1acdf50
-size 13593713
+oid sha256:ff2e3ca5a46397efcd5f3a595e7d3c179266cc4f3f5f528b428f5ef2a423028e
+size 12649149
--- a/docs/assets/web-workflow.webm
+++ b/docs/assets/web-workflow.webm
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8507c61df25981dbe7e5bd2f9ed16c9a0befbca218947cad29f6679c77a695a7
-size 12451891
+oid sha256:2d739c5f77ddd9d90b609e31df620b35988081b7341fe225eb717d71a87caa88
+size 12284953
--- a/docs/demos/web/demo_themes.py
+++ b/docs/demos/web/demo_themes.py
@@ -63,7 +63,7 @@ def test_demo_themes(recording_page: Page, server_url: str) -> None:
    pause(page, 400)

    # Type to filter to a light theme (theme button pre-populates "theme:")
-    slow_type(page, "#cmd-input", " cup", delay=100)
+    slow_type(page, "#cmd-input", "cup", delay=100)
    pause(page, 500)
    page.keyboard.press("Enter")
    pause(page, 1000)
@@ -75,7 +75,7 @@ def test_demo_themes(recording_page: Page, server_url: str) -> None:
    page.wait_for_selector("#cmd-palette[open]", timeout=2000)
    pause(page, 300)

-    slow_type(page, "#cmd-input", " dark", delay=100)
+    slow_type(page, "#cmd-input", "dark", delay=100)
    pause(page, 400)
    page.keyboard.press("Enter")
    pause(page, 800)
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -24,7 +24,7 @@ Before you begin, ensure you have:
 ### One-liner (recommended)

 ```bash
-curl -fsSL https://raw.githubusercontent.com/basnijholt/compose-farm/main/bootstrap.sh | sh
+curl -fsSL https://compose-farm.nijho.lt/install | sh
 ```

 This installs [uv](https://docs.astral.sh/uv/) if needed, then installs compose-farm.
@@ -123,7 +123,21 @@ nas:/volume1/compose /opt/compose nfs defaults 0 0

 ### Create Config File

-Create `~/.config/compose-farm/compose-farm.yaml`:
+Create `compose-farm.yaml` in the directory where you'll run commands. For example, if your stacks are in `/opt/stacks`, place the config there too:
+
+```bash
+cd /opt/stacks
+cf config init
+```
+
+Alternatively, use `~/.config/compose-farm/compose-farm.yaml` for a global config. You can also symlink a working directory config to the global location:
+
+```bash
+# Create config in your stacks directory, symlink to ~/.config
+cf config symlink /opt/stacks/compose-farm.yaml
+```
+
+This way, `cf` commands work from anywhere while the config lives with your stacks.

 #### Single host example

--- a/docs/index.md
+++ b/docs/index.md
@@ -96,7 +96,7 @@ pip install compose-farm

 ### Configuration

-Create `~/.config/compose-farm/compose-farm.yaml`:
+Create `compose-farm.yaml` in the directory where you'll run commands (e.g., `/opt/stacks`), or in `~/.config/compose-farm/`:

 ```yaml
 compose_dir: /opt/compose
@@ -114,6 +114,8 @@ stacks:
  radarr: hp
 ```

+See [Configuration](configuration.md) for all options and the full search order.
+
 ### Usage

 ```bash
--- a/docs/install
+++ b/docs/install
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Compose Farm bootstrap script
-# Usage: curl -fsSL https://raw.githubusercontent.com/basnijholt/compose-farm/main/bootstrap.sh | sh
+# Usage: curl -fsSL https://compose-farm.nijho.lt/install | sh
 #
 # This script installs uv (if needed) and then installs compose-farm as a uv tool.

--- a/docs/javascripts/video-fix.js
+++ b/docs/javascripts/video-fix.js
@@ -0,0 +1,21 @@
+// Fix Safari video autoplay issues
+(function() {
+  function initVideos() {
+    document.querySelectorAll('video[autoplay]').forEach(function(video) {
+      video.load();
+      video.play().catch(function() {});
+    });
+  }
+
+  // For initial page load (needed for Chrome)
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', initVideos);
+  } else {
+    initVideos();
+  }
+
+  // For MkDocs instant navigation (needed for Safari)
+  if (typeof document$ !== 'undefined') {
+    document$.subscribe(initVideos);
+  }
+})();
--- a/src/compose_farm/cli/app.py
+++ b/src/compose_farm/cli/app.py
@@ -23,6 +23,7 @@ app = typer.Typer(
    help="Compose Farm - run docker compose commands across multiple hosts",
    no_args_is_help=True,
    context_settings={"help_option_names": ["-h", "--help"]},
+    rich_markup_mode="rich",
 )


--- a/src/compose_farm/cli/common.py
+++ b/src/compose_farm/cli/common.py
@@ -59,6 +59,10 @@ HostOption = Annotated[
    str | None,
    typer.Option("--host", "-H", help="Filter to stacks on this host"),
 ]
+ServiceOption = Annotated[
+    str | None,
+    typer.Option("--service", "-s", help="Target a specific service within the stack"),
+]

 # --- Constants (internal) ---
 _MISSING_PATH_PREVIEW_LIMIT = 2
--- a/src/compose_farm/cli/lifecycle.py
+++ b/src/compose_farm/cli/lifecycle.py
@@ -2,6 +2,7 @@

 from __future__ import annotations

+from pathlib import Path
 from typing import Annotated

 import typer
@@ -11,6 +12,7 @@ from compose_farm.cli.common import (
    AllOption,
    ConfigOption,
    HostOption,
+    ServiceOption,
    StacksArg,
    format_host,
    get_stacks,
@@ -18,9 +20,11 @@ from compose_farm.cli.common import (
    maybe_regenerate_traefik,
    report_results,
    run_async,
+    validate_host_for_stack,
+    validate_stacks,
 )
 from compose_farm.console import MSG_DRY_RUN, console, print_error, print_success
-from compose_farm.executor import run_on_stacks, run_sequential_on_stacks
+from compose_farm.executor import run_compose_on_host, run_on_stacks, run_sequential_on_stacks
 from compose_farm.operations import stop_orphaned_stacks, up_stacks
 from compose_farm.state import (
    get_orphaned_stacks,
@@ -36,11 +40,19 @@ def up(
    stacks: StacksArg = None,
    all_stacks: AllOption = False,
    host: HostOption = None,
+    service: ServiceOption = None,
    config: ConfigOption = None,
 ) -> None:
    """Start stacks (docker compose up -d). Auto-migrates if host changed."""
    stack_list, cfg = get_stacks(stacks or [], all_stacks, config, host=host)
-    results = run_async(up_stacks(cfg, stack_list, raw=True))
+    if service:
+        if len(stack_list) != 1:
+            print_error("--service requires exactly one stack")
+            raise typer.Exit(1)
+        # For service-level up, use run_on_stacks directly (no migration logic)
+        results = run_async(run_on_stacks(cfg, stack_list, f"up -d {service}", raw=True))
+    else:
+        results = run_async(up_stacks(cfg, stack_list, raw=True))
    maybe_regenerate_traefik(cfg, results)
    report_results(results)

@@ -98,16 +110,39 @@ def down(
    report_results(results)


+@app.command(rich_help_panel="Lifecycle")
+def stop(
+    stacks: StacksArg = None,
+    all_stacks: AllOption = False,
+    service: ServiceOption = None,
+    config: ConfigOption = None,
+) -> None:
+    """Stop services without removing containers (docker compose stop)."""
+    stack_list, cfg = get_stacks(stacks or [], all_stacks, config)
+    if service and len(stack_list) != 1:
+        print_error("--service requires exactly one stack")
+        raise typer.Exit(1)
+    cmd = f"stop {service}" if service else "stop"
+    raw = len(stack_list) == 1
+    results = run_async(run_on_stacks(cfg, stack_list, cmd, raw=raw))
+    report_results(results)
+
+
@app.command(rich_help_panel="Lifecycle")
 def pull(
    stacks: StacksArg = None,
    all_stacks: AllOption = False,
+    service: ServiceOption = None,
    config: ConfigOption = None,
 ) -> None:
    """Pull latest images (docker compose pull)."""
    stack_list, cfg = get_stacks(stacks or [], all_stacks, config)
+    if service and len(stack_list) != 1:
+        print_error("--service requires exactly one stack")
+        raise typer.Exit(1)
+    cmd = f"pull {service}" if service else "pull"
    raw = len(stack_list) == 1
-    results = run_async(run_on_stacks(cfg, stack_list, "pull", raw=raw))
+    results = run_async(run_on_stacks(cfg, stack_list, cmd, raw=raw))
    report_results(results)


@@ -115,12 +150,21 @@ def pull(
 def restart(
    stacks: StacksArg = None,
    all_stacks: AllOption = False,
+    service: ServiceOption = None,
    config: ConfigOption = None,
 ) -> None:
-    """Restart stacks (down + up)."""
+    """Restart stacks (down + up). With --service, restarts just that service."""
    stack_list, cfg = get_stacks(stacks or [], all_stacks, config)
-    raw = len(stack_list) == 1
-    results = run_async(run_sequential_on_stacks(cfg, stack_list, ["down", "up -d"], raw=raw))
+    if service:
+        if len(stack_list) != 1:
+            print_error("--service requires exactly one stack")
+            raise typer.Exit(1)
+        # For service-level restart, use docker compose restart (more efficient)
+        raw = True
+        results = run_async(run_on_stacks(cfg, stack_list, f"restart {service}", raw=raw))
+    else:
+        raw = len(stack_list) == 1
+        results = run_async(run_sequential_on_stacks(cfg, stack_list, ["down", "up -d"], raw=raw))
    maybe_regenerate_traefik(cfg, results)
    report_results(results)

@@ -129,16 +173,37 @@ def restart(
 def update(
    stacks: StacksArg = None,
    all_stacks: AllOption = False,
+    service: ServiceOption = None,
    config: ConfigOption = None,
 ) -> None:
-    """Update stacks (pull + build + down + up)."""
+    """Update stacks (pull + build + down + up). With --service, updates just that service."""
    stack_list, cfg = get_stacks(stacks or [], all_stacks, config)
-    raw = len(stack_list) == 1
-    results = run_async(
-        run_sequential_on_stacks(
-            cfg, stack_list, ["pull --ignore-buildable", "build", "down", "up -d"], raw=raw
+    if service:
+        if len(stack_list) != 1:
+            print_error("--service requires exactly one stack")
+            raise typer.Exit(1)
+        # For service-level update: pull + build + stop + up (stop instead of down)
+        raw = True
+        results = run_async(
+            run_sequential_on_stacks(
+                cfg,
+                stack_list,
+                [
+                    f"pull --ignore-buildable {service}",
+                    f"build {service}",
+                    f"stop {service}",
+                    f"up -d {service}",
+                ],
+                raw=raw,
+            )
+        )
+    else:
+        raw = len(stack_list) == 1
+        results = run_async(
+            run_sequential_on_stacks(
+                cfg, stack_list, ["pull --ignore-buildable", "build", "down", "up -d"], raw=raw
+            )
        )
-    )
    maybe_regenerate_traefik(cfg, results)
    report_results(results)

@@ -247,5 +312,62 @@ def apply(  # noqa: PLR0912 (multi-phase reconciliation needs these branches)
    report_results(all_results)


+@app.command(
+    rich_help_panel="Lifecycle",
+    context_settings={"allow_interspersed_args": False},
+)
+def compose(
+    stack: Annotated[str, typer.Argument(help="Stack to operate on (use '.' for current dir)")],
+    command: Annotated[str, typer.Argument(help="Docker compose command")],
+    args: Annotated[list[str] | None, typer.Argument(help="Additional arguments")] = None,
+    host: HostOption = None,
+    config: ConfigOption = None,
+) -> None:
+    """Run any docker compose command on a stack.
+
+    Passthrough to docker compose for commands not wrapped by cf.
+    Options after COMMAND are passed to docker compose, not cf.
+
+    Examples:
+      cf compose mystack --help        - show docker compose help
+      cf compose mystack top           - view running processes
+      cf compose mystack images        - list images
+      cf compose mystack exec web bash - interactive shell
+      cf compose mystack config        - view parsed config
+
+    """
+    cfg = load_config_or_exit(config)
+
+    # Resolve "." to current directory name
+    resolved_stack = Path.cwd().name if stack == "." else stack
+    validate_stacks(cfg, [resolved_stack])
+
+    # Handle multi-host stacks
+    hosts = cfg.get_hosts(resolved_stack)
+    if len(hosts) > 1:
+        if host is None:
+            print_error(
+                f"Stack [cyan]{resolved_stack}[/] runs on multiple hosts: {', '.join(hosts)}\n"
+                f"Use [bold]--host[/] to specify which host"
+            )
+            raise typer.Exit(1)
+        validate_host_for_stack(cfg, resolved_stack, host)
+        target_host = host
+    else:
+        target_host = hosts[0]
+
+    # Build the full compose command
+    full_cmd = command
+    if args:
+        full_cmd += " " + " ".join(args)
+
+    # Run with raw=True for proper TTY handling (progress bars, interactive)
+    result = run_async(run_compose_on_host(cfg, resolved_stack, target_host, full_cmd, raw=True))
+    print()  # Ensure newline after raw output
+
+    if not result.success:
+        raise typer.Exit(result.exit_code)
+
+
 # Alias: cf a = cf apply
 app.command("a", hidden=True)(apply)
--- a/src/compose_farm/cli/monitoring.py
+++ b/src/compose_farm/cli/monitoring.py
@@ -14,6 +14,7 @@ from compose_farm.cli.common import (
    AllOption,
    ConfigOption,
    HostOption,
+    ServiceOption,
    StacksArg,
    get_stacks,
    load_config_or_exit,
@@ -21,7 +22,7 @@ from compose_farm.cli.common import (
    run_async,
    run_parallel_with_progress,
 )
-from compose_farm.console import console
+from compose_farm.console import console, print_error
 from compose_farm.executor import run_command, run_on_stacks
 from compose_farm.state import get_stacks_needing_migration, group_stacks_by_host, load_state

@@ -118,6 +119,7 @@ def logs(
    stacks: StacksArg = None,
    all_stacks: AllOption = False,
    host: HostOption = None,
+    service: ServiceOption = None,
    follow: Annotated[bool, typer.Option("--follow", "-f", help="Follow logs")] = False,
    tail: Annotated[
        int | None,
@@ -125,8 +127,11 @@ def logs(
    ] = None,
    config: ConfigOption = None,
 ) -> None:
-    """Show stack logs."""
+    """Show stack logs. With --service, shows logs for just that service."""
    stack_list, cfg = get_stacks(stacks or [], all_stacks, config, host=host)
+    if service and len(stack_list) != 1:
+        print_error("--service requires exactly one stack")
+        raise typer.Exit(1)

    # Default to fewer lines when showing multiple stacks
    many_stacks = all_stacks or host is not None or len(stack_list) > 1
@@ -134,6 +139,8 @@ def logs(
    cmd = f"logs --tail {effective_tail}"
    if follow:
        cmd += " -f"
+    if service:
+        cmd += f" {service}"
    results = run_async(run_on_stacks(cfg, stack_list, cmd))
    report_results(results)

@@ -143,6 +150,7 @@ def ps(
    stacks: StacksArg = None,
    all_stacks: AllOption = False,
    host: HostOption = None,
+    service: ServiceOption = None,
    config: ConfigOption = None,
 ) -> None:
    """Show status of stacks.
@@ -150,9 +158,14 @@ def ps(
    Without arguments: shows all stacks (same as --all).
    With stack names: shows only those stacks.
    With --host: shows stacks on that host.
+    With --service: filters to a specific service within the stack.
    """
    stack_list, cfg = get_stacks(stacks or [], all_stacks, config, host=host, default_all=True)
-    results = run_async(run_on_stacks(cfg, stack_list, "ps"))
+    if service and len(stack_list) != 1:
+        print_error("--service requires exactly one stack")
+        raise typer.Exit(1)
+    cmd = f"ps {service}" if service else "ps"
+    results = run_async(run_on_stacks(cfg, stack_list, cmd))
    report_results(results)


--- a/src/compose_farm/web/app.py
+++ b/src/compose_farm/web/app.py
@@ -3,6 +3,7 @@
 from __future__ import annotations

 import asyncio
+import logging
 import sys
 from contextlib import asynccontextmanager, suppress
 from typing import TYPE_CHECKING
@@ -10,11 +11,22 @@ from typing import TYPE_CHECKING
 from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 from pydantic import ValidationError
+from rich.logging import RichHandler

 from compose_farm.web.deps import STATIC_DIR, get_config
 from compose_farm.web.routes import actions, api, pages
 from compose_farm.web.streaming import TASK_TTL_SECONDS, cleanup_stale_tasks

+# Configure logging with Rich handler for compose_farm.web modules
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(message)s",
+    datefmt="[%X]",
+    handlers=[RichHandler(rich_tracebacks=True, show_path=False)],
+)
+# Set our web modules to INFO level (uvicorn handles its own logging)
+logging.getLogger("compose_farm.web").setLevel(logging.INFO)
+
 if TYPE_CHECKING:
    from collections.abc import AsyncGenerator

--- a/src/compose_farm/web/routes/actions.py
+++ b/src/compose_farm/web/routes/actions.py
@@ -33,12 +33,15 @@ def _start_task(coro_factory: Callable[[str], Coroutine[Any, Any, None]]) -> str


 # Allowed stack commands
-ALLOWED_COMMANDS = {"up", "down", "restart", "pull", "update", "logs"}
+ALLOWED_COMMANDS = {"up", "down", "restart", "pull", "update", "logs", "stop"}
+
+# Allowed service-level commands (no 'down' - use 'stop' for individual services)
+ALLOWED_SERVICE_COMMANDS = {"logs", "pull", "restart", "up", "stop"}


@router.post("/stack/{name}/{command}")
 async def stack_action(name: str, command: str) -> dict[str, Any]:
-    """Run a compose command for a stack (up, down, restart, pull, update, logs)."""
+    """Run a compose command for a stack (up, down, restart, pull, update, logs, stop)."""
    if command not in ALLOWED_COMMANDS:
        raise HTTPException(status_code=404, detail=f"Unknown command '{command}'")

@@ -50,6 +53,23 @@ async def stack_action(name: str, command: str) -> dict[str, Any]:
    return {"task_id": task_id, "stack": name, "command": command}


+@router.post("/stack/{name}/service/{service}/{command}")
+async def service_action(name: str, service: str, command: str) -> dict[str, Any]:
+    """Run a compose command for a specific service within a stack."""
+    if command not in ALLOWED_SERVICE_COMMANDS:
+        raise HTTPException(status_code=404, detail=f"Unknown command '{command}'")
+
+    config = get_config()
+    if name not in config.stacks:
+        raise HTTPException(status_code=404, detail=f"Stack '{name}' not found")
+
+    # Use --service flag to target specific service
+    task_id = _start_task(
+        lambda tid: run_compose_streaming(config, name, f"{command} --service {service}", tid)
+    )
+    return {"task_id": task_id, "stack": name, "service": service, "command": command}
+
+
@router.post("/apply")
 async def apply_all() -> dict[str, Any]:
    """Run cf apply to reconcile all stacks."""
@@ -64,3 +84,19 @@ async def refresh_state() -> dict[str, Any]:
    config = get_config()
    task_id = _start_task(lambda tid: run_cli_streaming(config, ["refresh"], tid))
    return {"task_id": task_id, "command": "refresh"}
+
+
+@router.post("/pull-all")
+async def pull_all() -> dict[str, Any]:
+    """Pull latest images for all stacks."""
+    config = get_config()
+    task_id = _start_task(lambda tid: run_cli_streaming(config, ["pull", "--all"], tid))
+    return {"task_id": task_id, "command": "pull --all"}
+
+
+@router.post("/update-all")
+async def update_all() -> dict[str, Any]:
+    """Update all stacks (pull + build + down + up)."""
+    config = get_config()
+    task_id = _start_task(lambda tid: run_cli_streaming(config, ["update", "--all"], tid))
+    return {"task_id": task_id, "command": "update --all"}
--- a/src/compose_farm/web/routes/api.py
+++ b/src/compose_farm/web/routes/api.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 import asyncio
 import contextlib
 import json
+import logging
 import shlex
 from datetime import UTC, datetime
 from pathlib import Path
@@ -23,6 +24,8 @@ from compose_farm.paths import find_config_path
 from compose_farm.state import load_state
 from compose_farm.web.deps import get_config, get_templates

+logger = logging.getLogger(__name__)
+
 router = APIRouter(tags=["api"])


@@ -144,6 +147,12 @@ async def _get_container_states(
        config, stack, host_name, "ps -a --format json", stream=False
    )
    if not result.success:
+        logger.warning(
+            "Failed to get container states for %s on %s: %s",
+            stack,
+            host_name,
+            result.stderr or result.stdout,
+        )
        return containers

    # Build state map: name -> (state, exit_code)
@@ -350,6 +359,7 @@ async def read_console_file(
    except PermissionError:
        raise HTTPException(status_code=403, detail=f"Permission denied: {path}") from None
    except Exception as e:
+        logger.exception("Failed to read file %s from host %s", path, host)
        raise HTTPException(status_code=500, detail=str(e)) from e


@@ -373,4 +383,5 @@ async def write_console_file(
    except PermissionError:
        raise HTTPException(status_code=403, detail=f"Permission denied: {path}") from None
    except Exception as e:
+        logger.exception("Failed to write file %s to host %s", path, host)
        raise HTTPException(status_code=500, detail=str(e)) from e
--- a/src/compose_farm/web/static/app.css
+++ b/src/compose_farm/web/static/app.css
@@ -1,3 +1,9 @@
+/* Tooltips - ensure they appear above sidebar and other elements */
+.tooltip::before,
+.tooltip::after {
+    z-index: 1000;
+}
+
 /* Sidebar inputs - remove focus outline (DaisyUI 5 uses outline + outline-offset) */
 #sidebar .input:focus,
 #sidebar .input:focus-within,
--- a/src/compose_farm/web/static/app.js
+++ b/src/compose_farm/web/static/app.js
@@ -601,7 +601,9 @@ function playFabIntro() {
    }

    function filter() {
-        const q = input.value.toLowerCase();
+        // Normalize: collapse spaces and ensure space after colon for matching
+        // This allows "theme:dark", "theme: dark", "theme:  dark" to all match "theme: dark"
+        const q = input.value.toLowerCase().replace(/\s+/g, ' ').replace(/:(\S)/g, ': $1');
        filtered = commands.filter(c => c.name.toLowerCase().includes(q));
        selected = Math.max(0, Math.min(selected, filtered.length - 1));
    }
@@ -634,7 +636,7 @@ function playFabIntro() {
        input.value = initialFilter;
        filter();
        // If opening theme picker, select current theme
-        if (initialFilter === 'theme:') {
+        if (initialFilter.startsWith('theme:')) {
            const currentIdx = filtered.findIndex(c => c.themeId === originalTheme);
            if (currentIdx >= 0) selected = currentIdx;
        }
@@ -759,9 +761,14 @@ function initPage() {

 /**
 * Attempt to reconnect to an active task from localStorage
+ * @param {string} [path] - Optional path to use for task key lookup.
+ *                          If not provided, uses current window.location.pathname.
+ *                          This is important for HTMX navigation where pushState
+ *                          hasn't happened yet when htmx:afterSwap fires.
 */
-function tryReconnectToTask() {
-    const taskId = localStorage.getItem(getTaskKey());
+function tryReconnectToTask(path) {
+    const taskKey = TASK_KEY_PREFIX + (path || window.location.pathname);
+    const taskId = localStorage.getItem(taskKey);
    if (!taskId) return;

    whenXtermReady(() => {
@@ -784,8 +791,12 @@ document.addEventListener('DOMContentLoaded', function() {
 document.body.addEventListener('htmx:afterSwap', function(evt) {
    if (evt.detail.target.id === 'main-content') {
        initPage();
-        // Try to reconnect when navigating back to dashboard
-        tryReconnectToTask();
+        // Try to reconnect to task for the TARGET page, not current URL.
+        // When using command palette navigation (htmx.ajax + manual pushState),
+        // window.location.pathname still reflects the OLD page at this point.
+        // Use pathInfo.requestPath to get the correct target path.
+        const targetPath = evt.detail.pathInfo?.requestPath?.split('?')[0] || window.location.pathname;
+        tryReconnectToTask(targetPath);
    }
 });

--- a/src/compose_farm/web/templates/base.html
+++ b/src/compose_farm/web/templates/base.html
@@ -39,7 +39,7 @@
                <span class="font-semibold rainbow-hover">Compose Farm</span>
            </header>

-            <main id="main-content" class="flex-1 p-6 overflow-y-auto">
+            <main id="main-content" class="flex-1 p-6">
                {% block content %}{% endblock %}
            </main>
        </div>
--- a/src/compose_farm/web/templates/index.html
+++ b/src/compose_farm/web/templates/index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% from "partials/components.html" import page_header, collapse, stat_card, table, action_btn %}
-{% from "partials/icons.html" import check, refresh_cw, save, settings, server, database %}
+{% from "partials/icons.html" import check, refresh_cw, save, settings, server, database, cloud_download, rotate_cw %}
 {% block title %}Dashboard - Compose Farm{% endblock %}

 {% block content %}
@@ -17,7 +17,9 @@
    <div class="flex flex-wrap gap-2 mb-6">
        {{ action_btn("Apply", "/api/apply", "primary", "Make reality match config", check()) }}
        {{ action_btn("Refresh", "/api/refresh", "outline", "Update state from reality", refresh_cw()) }}
-        <button id="save-config-btn" class="btn btn-outline">{{ save() }} Save Config</button>
+        {{ action_btn("Pull All", "/api/pull-all", "outline", "Pull latest images for all stacks", cloud_download()) }}
+        {{ action_btn("Update All", "/api/update-all", "outline", "Update all stacks (pull + build + down + up)", rotate_cw()) }}
+        <div class="tooltip" data-tip="Save compose-farm.yaml config file"><button id="save-config-btn" class="btn btn-outline">{{ save() }} Save Config</button></div>
    </div>

    {% include "partials/terminal.html" %}
--- a/src/compose_farm/web/templates/partials/components.html
+++ b/src/compose_farm/web/templates/partials/components.html
@@ -25,12 +25,13 @@

 {# Action button with htmx #}
 {% macro action_btn(label, url, style="outline", title=None, icon=None) %}
+{% if title %}<div class="tooltip" data-tip="{{ title }}">{% endif %}
 <button hx-post="{{ url }}"
        hx-swap="none"
-        class="btn btn-{{ style }}"
-        {% if title %}title="{{ title }}"{% endif %}>
+        class="btn btn-{{ style }}">
    {% if icon %}{{ icon }}{% endif %}{{ label }}
 </button>
+{% if title %}</div>{% endif %}
 {% endmacro %}

 {# Stat card for dashboard #}
--- a/src/compose_farm/web/templates/partials/containers.html
+++ b/src/compose_farm/web/templates/partials/containers.html
@@ -1,5 +1,5 @@
 {# Container list for a stack on a single host #}
-{% from "partials/icons.html" import terminal %}
+{% from "partials/icons.html" import terminal, rotate_ccw, scroll_text, square, play, cloud_download %}
 {% macro container_row(stack, container, host) %}
 <div class="flex items-center gap-2 mb-2">
    {% if container.State == "running" %}
@@ -18,10 +18,49 @@
        <span class="badge badge-warning">{{ container.State }}</span>
    {% endif %}
    <code class="text-sm flex-1">{{ container.Name }}</code>
-    <button class="btn btn-sm btn-outline"
-            onclick="initExecTerminal('{{ stack }}', '{{ container.Name }}', '{{ host }}')">
-        {{ terminal() }} Shell
-    </button>
+    <div class="join">
+        <div class="tooltip tooltip-top" data-tip="View logs">
+            <button class="btn btn-sm btn-outline join-item"
+                    hx-post="/api/stack/{{ stack }}/service/{{ container.Service }}/logs"
+                    hx-swap="none">
+                {{ scroll_text() }}
+            </button>
+        </div>
+        <div class="tooltip tooltip-top" data-tip="Restart service">
+            <button class="btn btn-sm btn-outline join-item"
+                    hx-post="/api/stack/{{ stack }}/service/{{ container.Service }}/restart"
+                    hx-swap="none">
+                {{ rotate_ccw() }}
+            </button>
+        </div>
+        <div class="tooltip tooltip-top" data-tip="Pull image">
+            <button class="btn btn-sm btn-outline join-item"
+                    hx-post="/api/stack/{{ stack }}/service/{{ container.Service }}/pull"
+                    hx-swap="none">
+                {{ cloud_download() }}
+            </button>
+        </div>
+        <div class="tooltip tooltip-top" data-tip="Start service">
+            <button class="btn btn-sm btn-outline join-item"
+                    hx-post="/api/stack/{{ stack }}/service/{{ container.Service }}/up"
+                    hx-swap="none">
+                {{ play() }}
+            </button>
+        </div>
+        <div class="tooltip tooltip-top" data-tip="Stop service">
+            <button class="btn btn-sm btn-outline join-item"
+                    hx-post="/api/stack/{{ stack }}/service/{{ container.Service }}/stop"
+                    hx-swap="none">
+                {{ square() }}
+            </button>
+        </div>
+        <div class="tooltip tooltip-top" data-tip="Open shell">
+            <button class="btn btn-sm btn-outline join-item"
+                    onclick="initExecTerminal('{{ stack }}', '{{ container.Name }}', '{{ host }}')">
+                {{ terminal() }}
+            </button>
+        </div>
+    </div>
 </div>
 {% endmacro %}

--- a/src/compose_farm/web/templates/partials/icons.html
+++ b/src/compose_farm/web/templates/partials/icons.html
@@ -43,6 +43,18 @@
 </svg>
 {% endmacro %}

+{% macro rotate_ccw(size=16) %}
+<svg xmlns="http://www.w3.org/2000/svg" width="{{ size }}" height="{{ size }}" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+    <path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/>
+</svg>
+{% endmacro %}
+
+{% macro scroll_text(size=16) %}
+<svg xmlns="http://www.w3.org/2000/svg" width="{{ size }}" height="{{ size }}" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+    <path d="M15 12h-5"/><path d="M15 8h-5"/><path d="M19 17V5a2 2 0 0 0-2-2H4"/><path d="M8 21h12a2 2 0 0 0 2-2v-1a1 1 0 0 0-1-1H11a1 1 0 0 0-1 1v1a2 2 0 1 1-4 0V5a2 2 0 1 0-4 0v2a1 1 0 0 0 1 1h3"/>
+</svg>
+{% endmacro %}
+
 {% macro download(size=16) %}
 <svg xmlns="http://www.w3.org/2000/svg" width="{{ size }}" height="{{ size }}" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
    <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" x2="12" y1="15" y2="3"/>
--- a/src/compose_farm/web/templates/stack.html
+++ b/src/compose_farm/web/templates/stack.html
@@ -30,7 +30,7 @@
        <!-- Other -->
        {{ action_btn("Pull", "/api/stack/" ~ name ~ "/pull", "outline", "Pull latest images (no restart)", cloud_download()) }}
        {{ action_btn("Logs", "/api/stack/" ~ name ~ "/logs", "outline", "Show recent logs", file_text()) }}
-        <button id="save-btn" class="btn btn-outline">{{ save() }} Save All</button>
+        <div class="tooltip" data-tip="Save compose and .env files"><button id="save-btn" class="btn btn-outline">{{ save() }} Save All</button></div>
    </div>

    {% call collapse("Compose File", badge=compose_path, icon=file_code()) %}
--- a/src/compose_farm/web/ws.py
+++ b/src/compose_farm/web/ws.py
@@ -6,6 +6,7 @@ import asyncio
 import contextlib
 import fcntl
 import json
+import logging
 import os
 import pty
 import shlex
@@ -21,6 +22,8 @@ from compose_farm.executor import is_local, ssh_connect_kwargs
 from compose_farm.web.deps import get_config
 from compose_farm.web.streaming import CRLF, DIM, GREEN, RED, RESET, tasks

+logger = logging.getLogger(__name__)
+
 # Shell command to prefer bash over sh
 SHELL_FALLBACK = "command -v bash >/dev/null && exec bash || exec sh"

@@ -214,6 +217,7 @@ async def exec_websocket(
    except WebSocketDisconnect:
        pass
    except Exception as e:
+        logger.exception("WebSocket exec error for %s on %s", container, host)
        with contextlib.suppress(Exception):
            await websocket.send_text(f"{RED}Error: {e}{RESET}{CRLF}")
    finally:
@@ -258,6 +262,7 @@ async def shell_websocket(
    except WebSocketDisconnect:
        pass
    except Exception as e:
+        logger.exception("WebSocket shell error for host %s", host)
        with contextlib.suppress(Exception):
            await websocket.send_text(f"{RED}Error: {e}{RESET}{CRLF}")
    finally:
--- a/tests/web/test_htmx_browser.py
+++ b/tests/web/test_htmx_browser.py
@@ -1879,3 +1879,138 @@ class TestThemeSwitcher:
        # Theme should still be dark
        final = page.locator("html").get_attribute("data-theme")
        assert final == "dark", f"Expected dark after executing Dashboard, got {final}"
+
+
+class TestTerminalNavigationIsolation:
+    """Test that terminal connections are properly isolated per page.
+
+    Regression tests for a bug where navigating away from a stack page via
+    command palette would cause the new page to reconnect to the old page's
+    terminal task because history.pushState hadn't updated the URL yet when
+    tryReconnectToTask() ran.
+    """
+
+    def test_stack_terminal_not_reconnected_on_dashboard(self, page: Page, server_url: str) -> None:
+        """Terminal started on stack page should NOT reconnect when navigating to dashboard.
+
+        Bug scenario:
+        1. On /stack/plex, click Update → terminal connects, task stored at cf_task:/stack/plex
+        2. Navigate to dashboard via command palette
+        3. Dashboard loads, htmx:afterSwap fires
+        4. tryReconnectToTask() runs but window.location.pathname is still /stack/plex
+           (because pushState hasn't run yet)
+        5. Bug: Dashboard reconnects to plex's terminal task
+
+        Expected: Dashboard should NOT have any task_id in its localStorage key (cf_task:/)
+        """
+        page.goto(server_url)
+        page.wait_for_selector("#sidebar-stacks a", timeout=5000)
+
+        # Navigate to plex stack
+        page.locator("#sidebar-stacks a", has_text="plex").click()
+        page.wait_for_url("**/stack/plex", timeout=5000)
+
+        # Clear any existing task state
+        page.evaluate("localStorage.clear()")
+
+        # Track WebSocket connections to see which terminals are opened
+        ws_urls: list[str] = []
+
+        def handle_ws(ws: WebSocket) -> None:
+            ws_urls.append(ws.url)
+
+        page.on("websocket", handle_ws)
+
+        # Mock Update API to return a task ID
+        page.route(
+            "**/api/stack/plex/update",
+            lambda route: route.fulfill(
+                status=200,
+                content_type="application/json",
+                body='{"task_id": "plex-update-task-123", "stack": "plex", "command": "update"}',
+            ),
+        )
+
+        # Wait for xterm to load
+        page.wait_for_function("typeof Terminal !== 'undefined'", timeout=5000)
+
+        # Click Update button on plex stack page
+        page.locator("button", has_text="Update").click()
+
+        # Wait for terminal to connect
+        page.wait_for_selector("#terminal-output .xterm", timeout=5000)
+        page.wait_for_timeout(500)
+
+        # Verify task was stored for /stack/plex
+        plex_task = page.evaluate("localStorage.getItem('cf_task:/stack/plex')")
+        assert plex_task == "plex-update-task-123", (
+            f"Expected task stored at /stack/plex, got {plex_task}"
+        )
+
+        # Dashboard should have NO task yet
+        dashboard_task_before = page.evaluate("localStorage.getItem('cf_task:/')")
+        assert dashboard_task_before is None, (
+            f"Dashboard should have no task before navigation, got {dashboard_task_before}"
+        )
+
+        # Count current WebSocket connections
+        ws_count_before = len(ws_urls)
+
+        # Navigate to dashboard via command palette (this triggers the bug)
+        page.keyboard.press("Control+k")
+        page.wait_for_selector("#cmd-palette[open]", timeout=2000)
+        page.locator("#cmd-input").fill("Dashboard")
+        page.keyboard.press("Enter")
+
+        # Wait for navigation to complete
+        page.wait_for_url(server_url, timeout=5000)
+        page.wait_for_selector("#stats-cards", timeout=5000)
+
+        # Give time for any erroneous reconnection attempts
+        page.wait_for_timeout(1000)
+
+        # CRITICAL ASSERTION: Dashboard should NOT have a task in localStorage
+        dashboard_task_after = page.evaluate("localStorage.getItem('cf_task:/')")
+        assert dashboard_task_after is None, (
+            f"Bug detected: Dashboard incorrectly has task '{dashboard_task_after}' in localStorage. "
+            "This means tryReconnectToTask() ran before pushState updated the URL."
+        )
+
+        # CRITICAL ASSERTION: No new WebSocket should have been opened for the plex task
+        # after navigating to dashboard
+        new_ws_urls = ws_urls[ws_count_before:]
+        plex_reconnect_attempts = [url for url in new_ws_urls if "plex-update-task-123" in url]
+        assert len(plex_reconnect_attempts) == 0, (
+            f"Bug detected: Dashboard attempted to reconnect to plex task. "
+            f"New WebSocket URLs after navigation: {new_ws_urls}"
+        )
+
+    def test_dashboard_terminal_not_shown_after_stack_navigation(
+        self, page: Page, server_url: str
+    ) -> None:
+        """Dashboard's terminal should remain collapsed when navigating away and back.
+
+        This tests that navigating from dashboard → stack → dashboard doesn't
+        cause the terminal to expand unexpectedly.
+        """
+        page.goto(server_url)
+        page.wait_for_selector("#sidebar-stacks", timeout=5000)
+
+        # Terminal should be collapsed on dashboard
+        terminal_toggle = page.locator("#terminal-toggle")
+        assert not terminal_toggle.is_checked(), "Terminal should be collapsed initially"
+
+        # Navigate to a stack
+        page.locator("#sidebar-stacks a", has_text="plex").click()
+        page.wait_for_url("**/stack/plex", timeout=5000)
+
+        # Navigate back to dashboard via command palette
+        page.keyboard.press("Control+k")
+        page.wait_for_selector("#cmd-palette[open]", timeout=2000)
+        page.locator("#cmd-input").fill("Dashboard")
+        page.keyboard.press("Enter")
+        page.wait_for_url(server_url, timeout=5000)
+
+        # Terminal should still be collapsed (no task to reconnect to)
+        terminal_toggle = page.locator("#terminal-toggle")
+        assert not terminal_toggle.is_checked(), "Terminal should remain collapsed after navigation"
--- a/zensical.toml
+++ b/zensical.toml
@@ -11,6 +11,7 @@ copyright = "Copyright &copy; 2025 Bas Nijholt"
 repo_url = "https://github.com/basnijholt/compose-farm"
 repo_name = "GitHub"
 edit_uri = "edit/main/docs"
+extra_javascript = ["javascripts/video-fix.js"]

 nav = [
  { "Home" = "index.md" },
@@ -48,16 +49,25 @@ features = [
 ]

 [[project.theme.palette]]
+media = "(prefers-color-scheme)"
+toggle.icon = "lucide/sun-moon"
+toggle.name = "Switch to light mode"
+
+[[project.theme.palette]]
+media = "(prefers-color-scheme: light)"
 scheme = "default"
-primary = "teal"
+primary = "indigo"
+accent = "indigo"
 toggle.icon = "lucide/sun"
 toggle.name = "Switch to dark mode"

 [[project.theme.palette]]
+media = "(prefers-color-scheme: dark)"
 scheme = "slate"
-primary = "teal"
-toggle.icon = "lucide/moon"
-toggle.name = "Switch to light mode"
+primary = "indigo"
+accent = "orange"
+toggle.icon = "lucide/moon-star"
+toggle.name = "Switch to system preference"

 [project.theme.font]
 text = "Inter"
@@ -67,6 +77,9 @@ code = "JetBrains Mono"
 logo = "lucide/server"
 repo = "lucide/github"

+[project.extra]
+generator = false
+
 [[project.extra.social]]
 icon = "fontawesome/brands/github"
 link = "https://github.com/basnijholt/compose-farm"
Author	SHA1	Message	Date
Bas Nijholt	3fbae630f9	feat(cli): add compose passthrough command (#93 ) Adds `cf compose <stack> <command> [args...]` to run any docker compose command on a stack without needing dedicated wrappers. Useful for commands like top, images, exec, run, config, etc. Multi-host stacks require --host to specify which host to run on.	2025-12-20 21:26:05 -08:00
Bas Nijholt	3e3c919714	fix(web): service action buttons fixes and additions (#92 ) * fix(web): use --service flag in service action endpoint * feat(web): add Start button to service actions * feat(web): add Pull button to service actions	2025-12-20 21:11:44 -08:00
Bas Nijholt	59b797a89d	feat: add service-level commands with --service flag (#91 ) Add support for targeting specific services within a stack: CLI: - New `stop` command for stopping services without removing containers - Add `--service` / `-s` flag to: up, pull, restart, update, stop, logs, ps - Service flag requires exactly one stack to be specified Web API: - Add `stop` to allowed stack commands - New endpoint: POST /api/stack/{name}/service/{service}/{command} - Supports: logs, pull, restart, up, stop Web UI: - Add action buttons to container rows: logs, restart, stop, shell - Add rotate_ccw and scroll_text icons for new buttons	2025-12-20 20:56:48 -08:00
Bas Nijholt	7caf006e07	feat(web): add Rich logging for better error debugging (#90 ) Add structured logging with Rich tracebacks to web UI components: - Configure RichHandler in app.py for formatted output - Log SSH/file operation failures in API routes with full tracebacks - Log WebSocket exec/shell errors for connection issues - Add warning logs for failed container state queries Errors now show detailed tracebacks in container logs instead of just returning 500 status codes.	2025-12-20 20:47:34 -08:00
Bas Nijholt	45040b75f1	feat(web): add Pull All and Update All buttons to dashboard (#89 ) - Add "Pull All" and "Update All" buttons to dashboard for bulk operations - Switch from native `title` attribute to DaisyUI tooltips for instant, styled tooltips - Add tooltips to save buttons clarifying what they save - Add tooltip to container shell button - Fix tooltip z-index so they appear above sidebar - Fix tooltip clipping by removing `overflow-y-auto` from main content - Position container shell tooltip to the left to avoid clipping	2025-12-20 20:41:26 -08:00
Bas Nijholt	fa1c5c1044	docs: update theme to indigo with system preference support (#88 ) Switch from teal to indigo primary color to match Zensical docs theme. Add system preference detection and orange accent for dark mode.	2025-12-20 20:18:28 -08:00
Bas Nijholt	67e832f687	docs: clarify config file locations and update install URL (#86 )	2025-12-20 20:12:06 -08:00
Bas Nijholt	da986fab6a	fix: improve command palette theme filtering (#87 ) - Normalize spaces after colons so "theme:dark" matches "theme: dark" - Also handles multiple spaces like "theme: dark"	2025-12-20 20:03:16 -08:00
Bas Nijholt	5dd6e2ca05	fix: improve theme picker usability in command palette (#85 )	2025-12-20 20:00:05 -08:00
Bas Nijholt	16435065de	fix: video autoplay for Safari and Chrome with instant navigation (#84 )	2025-12-20 19:49:05 -08:00
Bas Nijholt	5921b5e405	docs: update web-workflow demo recording (#83 )	2025-12-20 18:09:24 -08:00
Bas Nijholt	f0cd85b5f5	fix: prevent terminal reconnection to wrong page after navigation (#81 )	2025-12-20 16:41:28 -08:00
Bas Nijholt	fe95443733	fix: Safari video autoplay on first page load (#82 )	2025-12-20 16:41:04 -08:00
Bas Nijholt	8df9288156	docs: add Quick Demo GIFs to README (#80 ) * docs: add Quick Demo GIFs to README Add the same CLI and Web UI demo GIFs that appear on the docs homepage. * docs: add Table of Contents header	2025-12-20 16:20:42 -08:00