devcoach 0.3.5__tar.gz → 0.3.6__tar.gz

devcoach-0.3.6/.github/scripts/take_screenshots.py

@@ -0,0 +1,110 @@
+"""Take devcoach UI screenshots for documentation.
+
+Flow:
+  1. Restore DB from .github/scripts/fixtures/devcoach-backup.zip via `devcoach restore`
+  2. Start `devcoach ui` on a fixed port
+  3. Capture light + dark screenshots of each page
+  4. Stop the server
+"""
+
+import signal
+import subprocess
+import sys
+import time
+import urllib.request
+from pathlib import Path
+
+SCREENSHOTS_DIR = Path("docs/screenshots")
+FIXTURES_DIR = Path(".github/scripts/fixtures")
+BACKUP_ZIP = FIXTURES_DIR / "devcoach-backup.zip"
+PORT = 7862
+BASE_URL = f"http://localhost:{PORT}"
+VIEWPORT = {"width": 1440, "height": 900}
+
+PAGES = [
+    ("knowledge-map", "/"),
+    ("lessons", "/lessons"),
+    ("settings", "/settings"),
+]
+
+def restore_db() -> None:
+    result = subprocess.run(
+        ["devcoach", "restore", str(BACKUP_ZIP)],
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+    print(result.stdout.strip())
+
+
+def wait_for_server(url: str, timeout: int = 30) -> None:
+    for _ in range(timeout):
+        try:
+            urllib.request.urlopen(url, timeout=1)
+            return
+        except Exception:
+            time.sleep(1)
+    raise TimeoutError(f"Server at {url} did not start within {timeout}s")
+
+
+def take_screenshots(server_proc: subprocess.Popen) -> None:
+    from playwright.sync_api import sync_playwright
+
+    SCREENSHOTS_DIR.mkdir(parents=True, exist_ok=True)
+
+    with sync_playwright() as pw:
+        browser = pw.chromium.launch()
+
+        ctx = browser.new_context(viewport=VIEWPORT, color_scheme="light")
+        page = ctx.new_page()
+        for name, path in PAGES:
+            page.goto(f"{BASE_URL}{path}")
+            page.wait_for_load_state("networkidle")
+            out = SCREENSHOTS_DIR / f"{name}-light.png"
+            page.screenshot(path=str(out))
+            print(f"  saved {out}")
+        ctx.close()
+
+        ctx = browser.new_context(viewport=VIEWPORT, color_scheme="dark")
+        page = ctx.new_page()
+        for name, path in PAGES:
+            page.goto(f"{BASE_URL}{path}")
+            page.wait_for_load_state("networkidle")
+            out = SCREENSHOTS_DIR / f"{name}-dark.png"
+            page.screenshot(path=str(out))
+            print(f"  saved {out}")
+        ctx.close()
+
+        browser.close()
+
+    server_proc.send_signal(signal.SIGTERM)
+    server_proc.wait(timeout=10)
+
+
+def main() -> None:
+    if not BACKUP_ZIP.exists():
+        sys.exit(f"Backup not found: {BACKUP_ZIP}")
+
+    print(f"Restoring DB from {BACKUP_ZIP}…")
+    restore_db()
+
+    print(f"Starting devcoach UI on port {PORT}…")
+    proc = subprocess.Popen(
+        ["devcoach", "ui", "--port", str(PORT)],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )
+
+    try:
+        wait_for_server(BASE_URL)
+        print("Taking screenshots…")
+        take_screenshots(proc)
+    except Exception:
+        proc.terminate()
+        raise
+
+    print("Done.")
+
+
+if __name__ == "__main__":
+    main()

{devcoach-0.3.5 → devcoach-0.3.6}/.github/workflows/ci.yml

@@ -1,8 +1,17 @@
 name: CI
 
+run-name: >-
+  ${{ github.event_name == 'workflow_dispatch'
+    && format('CI — New release ({0})', inputs.version != '' && inputs.version || inputs.bump)
+    || (startsWith(github.ref, 'refs/tags/v')
+    && format('CI — New release ({0})', github.ref_name)
+    || (github.event_name == 'pull_request'
+    && format('CI - PR {0}', github.event.pull_request.title)
+    || format('CI — {0}', github.event.head_commit.message))) }}
+
 # Covers three scenarios:
 #
-#  1. Push to main / pull request  →  lint + test + build
+#  1. Push to main / pull request  →  lint + test + build + sonar + pages
 #  2. Tag push (v*)                →  lint + test + build + publish + GitHub Release
 #  3. workflow_dispatch (Release)  →  bump version → tag → lint + test + build + publish + GitHub Release
 #
@@ -70,12 +79,14 @@ jobs:
           echo "version=$NEXT" >> "$GITHUB_OUTPUT"
           echo "tag=v$NEXT"    >> "$GITHUB_OUTPUT"
 
-      - name: Bump version in pyproject.toml
-        run: sed -i 's/^version = ".*"/version = "${{ steps.ver.outputs.version }}"/' pyproject.toml
+      - name: Bump version in pyproject.toml and sonar-project.properties
+        run: |
+          sed -i 's/^version = ".*"/version = "${{ steps.ver.outputs.version }}"/' pyproject.toml
+          sed -i 's/^sonar.projectVersion=.*/sonar.projectVersion=${{ steps.ver.outputs.version }}/' sonar-project.properties
 
       - name: Commit and tag
         run: |
-          git add pyproject.toml
+          git add pyproject.toml sonar-project.properties
           git commit -m "chore: bump version to ${{ steps.ver.outputs.version }}"
           git tag "${{ steps.ver.outputs.tag }}"
           git push --atomic origin main "${{ steps.ver.outputs.tag }}"
@@ -115,7 +126,8 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - run: uv sync --group dev
-      - run: uv run pytest tests/ -v --tb=short
+      - name: Run tests
+        run: uv run pytest tests/ -v --tb=short
 
   # ── Build ───────────────────────────────────────────────────────────────
   build:
@@ -137,6 +149,62 @@ jobs:
           path: dist/
           retention-days: 7
 
+  # ── SonarCloud scan + quality gate ─────────────────────────────────────
+  # CI-based analysis: feeds coverage.xml to SonarCloud and blocks PR merge
+  # if the quality gate fails. Requires Automatic Analysis to be DISABLED on
+  # sonarcloud.io (Administration → Analysis Method).
+  sonar:
+    name: SonarCloud scan
+    needs: [bump, test]
+    if: always() && (needs.bump.result == 'success' || needs.bump.result == 'skipped') && needs.test.result == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ needs.bump.outputs.tag || github.ref }}
+          fetch-depth: 0
+      - uses: astral-sh/setup-uv@v7
+        with:
+          python-version: "3.12"
+      - run: uv sync --group dev
+      - name: Run tests with coverage
+        run: uv run pytest tests/ -v --tb=short --cov=src/devcoach --cov-report=xml
+      - uses: sonarsource/sonarqube-scan-action@v6
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      - uses: sonarsource/sonarqube-quality-gate-action@v1
+        if: github.event_name == 'pull_request'
+        timeout-minutes: 5
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+  # ── GitHub Pages ────────────────────────────────────────────────────────
+  # Builds MkDocs site and deploys to GitHub Pages on every push to main.
+  pages:
+    name: Deploy docs to GitHub Pages
+    needs: [bump, build]
+    if: always() && needs.build.result == 'success' && github.ref == 'refs/heads/main' && github.event_name == 'push'
+    runs-on: ubuntu-latest
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deploy.outputs.page_url }}
+    steps:
+      - uses: actions/checkout@v6
+      - uses: astral-sh/setup-uv@v7
+        with:
+          python-version: "3.12"
+      - run: uv sync --group docs
+      - run: uv run mkdocs build
+      - uses: actions/upload-pages-artifact@v3
+        with:
+          path: site/
+      - name: Deploy to GitHub Pages
+        id: deploy
+        uses: actions/deploy-pages@v4
+
   # ── Publish ─────────────────────────────────────────────────────────────
   # Runs when a tag is present: either created by the bump job (workflow_dispatch)
   # or pushed directly (git push origin v1.2.3).

devcoach-0.3.6/.github/workflows/update-screenshots.yml

@@ -0,0 +1,39 @@
+name: Update documentation screenshots (GitHub Pages)
+
+on:
+  workflow_dispatch:
+
+jobs:
+  screenshots:
+    name: Take and commit screenshots
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: astral-sh/setup-uv@v7
+        with:
+          python-version: "3.12"
+
+      - name: Install devcoach
+        run: uv sync
+
+      - name: Install Playwright + Chromium
+        run: |
+          uv pip install playwright
+          uv run playwright install chromium --with-deps
+
+      - name: Restore DB and take screenshots
+        run: uv run python .github/scripts/take_screenshots.py
+
+      - name: Commit screenshots
+        run: |
+          git config user.name  "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add docs/screenshots/
+          git diff --staged --quiet && echo "No changes." || (
+            git commit -m "docs: update screenshots [skip ci]" &&
+            git push
+          )

{devcoach-0.3.5 → devcoach-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devcoach
-Version: 0.3.5
+Version: 0.3.6
 Summary: A local MCP server that acts as a progressive technical coach for Claude Code and Claude Desktop
 Project-URL: Homepage, https://github.com/UltimaPhoenix/dev-coach
 Project-URL: Repository, https://github.com/UltimaPhoenix/dev-coach
@@ -235,6 +235,9 @@ Description-Content-Type: text/markdown
 [![PyPI](https://img.shields.io/github/v/release/UltimaPhoenix/dev-coach?label=PyPI)](https://pypi.org/project/devcoach/)
 [![Python](https://img.shields.io/badge/python-3.11%2B-blue)](https://pypi.org/project/devcoach/)
 [![CI](https://github.com/UltimaPhoenix/dev-coach/actions/workflows/ci.yml/badge.svg)](https://github.com/UltimaPhoenix/dev-coach/actions/workflows/ci.yml)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=UltimaPhoenix_dev-coach&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=UltimaPhoenix_dev-coach)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=UltimaPhoenix_dev-coach&metric=coverage)](https://sonarcloud.io/summary/new_code?id=UltimaPhoenix_dev-coach)
+[![Docs](https://img.shields.io/badge/docs-GitHub%20Pages-purple)](https://ultimaphoenix.github.io/dev-coach/)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue)](LICENSE)
 
 **Progressive technical coaching, directly in Claude.** After every task you complete with Claude Code or Claude Desktop, devcoach delivers a short, targeted lesson based on what you already know — no generic tutorials, no repeated topics.
@@ -254,6 +257,14 @@ Everything runs **locally**. No data leaves your machine. One SQLite file at `~/
 
 ---
 
+## Screenshots
+
+| Knowledge map | Lesson history | Settings |
+|:---:|:---:|:---:|
+| ![Knowledge map](docs/screenshots/knowledge-map-light.png) | ![Lessons](docs/screenshots/lessons-dark.png) | ![Settings](docs/screenshots/settings-dark.png) |
+
+---
+
 ## Installation
 
 ### Recommended — no permanent install needed

{devcoach-0.3.5 → devcoach-0.3.6}/README.md

@@ -3,6 +3,9 @@
 [![PyPI](https://img.shields.io/github/v/release/UltimaPhoenix/dev-coach?label=PyPI)](https://pypi.org/project/devcoach/)
 [![Python](https://img.shields.io/badge/python-3.11%2B-blue)](https://pypi.org/project/devcoach/)
 [![CI](https://github.com/UltimaPhoenix/dev-coach/actions/workflows/ci.yml/badge.svg)](https://github.com/UltimaPhoenix/dev-coach/actions/workflows/ci.yml)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=UltimaPhoenix_dev-coach&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=UltimaPhoenix_dev-coach)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=UltimaPhoenix_dev-coach&metric=coverage)](https://sonarcloud.io/summary/new_code?id=UltimaPhoenix_dev-coach)
+[![Docs](https://img.shields.io/badge/docs-GitHub%20Pages-purple)](https://ultimaphoenix.github.io/dev-coach/)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue)](LICENSE)
 
 **Progressive technical coaching, directly in Claude.** After every task you complete with Claude Code or Claude Desktop, devcoach delivers a short, targeted lesson based on what you already know — no generic tutorials, no repeated topics.
@@ -22,6 +25,14 @@ Everything runs **locally**. No data leaves your machine. One SQLite file at `~/
 
 ---
 
+## Screenshots
+
+| Knowledge map | Lesson history | Settings |
+|:---:|:---:|:---:|
+| ![Knowledge map](docs/screenshots/knowledge-map-light.png) | ![Lessons](docs/screenshots/lessons-dark.png) | ![Settings](docs/screenshots/settings-dark.png) |
+
+---
+
 ## Installation
 
 ### Recommended — no permanent install needed

devcoach-0.3.6/docs/favicon.svg

@@ -0,0 +1 @@
+../src/devcoach/web/static/favicon.svg

devcoach-0.3.6/docs/index.md

@@ -0,0 +1,55 @@
+# devcoach
+
+**Progressive technical coaching, directly in Claude.** After every task you complete with Claude Code or Claude Desktop, devcoach delivers a short, targeted lesson based on what you already know — no generic tutorials, no repeated topics.
+
+Everything runs **locally**. No data leaves your machine. One SQLite file at `~/.devcoach/coaching.db`.
+
+---
+
+## How it works
+
+| Step | What happens |
+|------|-------------|
+| You complete a task with Claude | Claude finishes the work as normal |
+| devcoach checks your knowledge map | Finds a topic where you have room to grow, related to what you just did |
+| A lesson appears at the end of the response | Calibrated to your level (junior / mid / senior), never repeated |
+| You mark it know / don't know | Confidence scores update, shaping future lessons |
+
+---
+
+## Screenshots
+
+### Knowledge map
+
+=== "Dark"
+    ![Knowledge map – dark theme](screenshots/knowledge-map-dark.png)
+
+=== "Light"
+    ![Knowledge map – light theme](screenshots/knowledge-map-light.png)
+
+### Lesson history
+
+=== "Dark"
+    ![Lessons – dark theme](screenshots/lessons-dark.png)
+
+=== "Light"
+    ![Lessons – light theme](screenshots/lessons-light.png)
+
+### Settings
+
+=== "Dark"
+    ![Settings – dark theme](screenshots/settings-dark.png)
+
+=== "Light"
+    ![Settings – light theme](screenshots/settings-dark.png)
+
+---
+
+## Quick install
+
+```bash
+uv tool install devcoach
+devcoach install   # registers with Claude Code / Claude Desktop
+```
+
+Restart Claude and you're ready. See [Getting started](getting-started.md) for the full onboarding walkthrough.

devcoach-0.3.6/mkdocs.yml

@@ -0,0 +1,54 @@
+site_name: devcoach
+site_description: Progressive technical coaching, directly in Claude
+site_url: https://ultimaphoenix.github.io/dev-coach/
+repo_url: https://github.com/UltimaPhoenix/dev-coach
+repo_name: UltimaPhoenix/dev-coach
+edit_uri: edit/main/docs/
+
+theme:
+  name: material
+  favicon: favicon.svg
+  logo: favicon.svg
+  palette:
+    - scheme: slate
+      primary: deep purple
+      accent: purple
+      toggle:
+        icon: material/brightness-4
+        name: Switch to light mode
+    - scheme: default
+      primary: deep purple
+      accent: purple
+      toggle:
+        icon: material/brightness-7
+        name: Switch to dark mode
+  features:
+    - navigation.top
+    - navigation.indexes
+    - search.highlight
+    - content.code.copy
+    - toc.integrate
+  icon:
+    repo: fontawesome/brands/github
+
+nav:
+  - Home: index.md
+  - Getting started: getting-started.md
+  - CLI reference: cli.md
+  - MCP server: mcp-server.md
+  - Web UI: web-ui.md
+  - Configuration: configuration.md
+
+plugins:
+  - search
+
+markdown_extensions:
+  - admonition
+  - pymdownx.highlight:
+      anchor_linenums: true
+  - pymdownx.superfences
+  - pymdownx.tabbed:
+      alternate_style: true
+  - tables
+  - attr_list
+  - md_in_html

{devcoach-0.3.5 → devcoach-0.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "devcoach"
-version = "0.3.5"
+version = "0.3.6"
 description = "A local MCP server that acts as a progressive technical coach for Claude Code and Claude Desktop"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -49,9 +49,14 @@ packages = ["src/devcoach"]
 [dependency-groups]
 dev = [
     "pytest>=8.0",
+    "pytest-cov>=5.0",
     "httpx>=0.27",
     "ruff>=0.4",
 ]
+docs = [
+    "mkdocs>=1.6",
+    "mkdocs-material>=9.5",
+]
 
 [tool.ruff]
 line-length = 100
@@ -63,3 +68,10 @@ ignore = ["E501"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
+
+[tool.coverage.run]
+source = ["src/devcoach"]
+omit = ["tests/*"]
+
+[tool.coverage.report]
+omit = ["tests/*"]

devcoach-0.3.6/sonar-project.properties

@@ -0,0 +1,11 @@
+sonar.projectKey=UltimaPhoenix_dev-coach
+sonar.organization=ultimaphoenix
+
+sonar.projectName=devcoach
+sonar.projectVersion=0.3.6
+
+sonar.sources=src
+sonar.tests=tests
+sonar.python.version=3.11
+
+sonar.python.coverage.reportPaths=coverage.xml

{devcoach-0.3.5 → devcoach-0.3.6}/src/devcoach/core/db.py

@@ -49,6 +49,7 @@ DEFAULT_SETTINGS: dict[str, str] = {
     "max_per_day": "2",
     "min_gap_minutes": "240",  # replaces min_hours_between
     "onboarding_completed": "0",
+    "ui_theme": "system",
 }
 
 # Ordered category → topic list mapping for the knowledge map UI.
@@ -287,6 +288,9 @@ def count_filtered_lessons(
 
 
 _SORT_COLUMNS = frozenset({"timestamp", "level", "topic_id", "title", "feedback"})
+_METADATA_COLUMNS = frozenset(
+    {"project", "repository", "branch", "commit_hash", "repository_platform"}
+)
 
 
 def get_lessons(
@@ -475,6 +479,8 @@ def restore_backup_zip(conn: sqlite3.Connection, data: bytes) -> dict[str, int]:
                 set_setting(conn, "max_per_day", str(s["max_per_day"]))
             if "min_gap_minutes" in s:
                 set_setting(conn, "min_gap_minutes", str(s["min_gap_minutes"]))
+            if s.get("ui_theme") in ("system", "dark", "light"):
+                set_setting(conn, "ui_theme", s["ui_theme"])
             result["settings"] = 1
 
         if "knowledge.json" in names:
@@ -518,8 +524,10 @@ def restore_backup_zip(conn: sqlite3.Connection, data: bytes) -> dict[str, int]:
 
 def get_distinct_column(conn: sqlite3.Connection, column: str) -> list[str]:
     """Return sorted distinct non-null values for a metadata column."""
+    if column not in _METADATA_COLUMNS:
+        raise ValueError(f"Column not allowed: {column!r}")
     rows = conn.execute(
-        f"SELECT DISTINCT {column} FROM lessons WHERE {column} IS NOT NULL ORDER BY {column}"
+        f"SELECT DISTINCT {column} FROM lessons WHERE {column} IS NOT NULL ORDER BY {column}"  # noqa: S608
     ).fetchall()
     return [row[0] for row in rows]
 
@@ -684,9 +692,12 @@ def get_settings(conn: sqlite3.Connection) -> Settings:
         gap = int(data["min_hours_between"]) * 60  # migrate hours → minutes
     else:
         gap = int(DEFAULT_SETTINGS["min_gap_minutes"])
+    raw_theme = data.get("ui_theme", DEFAULT_SETTINGS["ui_theme"])
+    theme = raw_theme if raw_theme in ("system", "dark", "light") else "system"
     return Settings(
         max_per_day=int(data.get("max_per_day", DEFAULT_SETTINGS["max_per_day"])),
         min_gap_minutes=gap,
+        ui_theme=theme,  # type: ignore[arg-type]
     )
 
 
@@ -715,8 +726,12 @@ def get_usage_defaults(conn: sqlite3.Connection) -> dict[str, str | None]:
     """
     result: dict[str, str | None] = {}
     for col in ("project", "repository", "branch", "repository_platform"):
+        # col is from a hardcoded tuple above — allowlist-check is a belt-and-suspenders guard
+        if col not in _METADATA_COLUMNS:
+            result[col] = None
+            continue
         row = conn.execute(
-            f"SELECT {col}, COUNT(*) c FROM lessons "
+            f"SELECT {col}, COUNT(*) c FROM lessons "  # noqa: S608
             f"WHERE {col} IS NOT NULL GROUP BY {col} ORDER BY c DESC LIMIT 1"
         ).fetchone()
         result[col] = row[0] if row else None

{devcoach-0.3.5 → devcoach-0.3.6}/src/devcoach/core/models.py

@@ -88,6 +88,7 @@ class Settings(BaseModel):
 
     max_per_day: int = 2
     min_gap_minutes: int = 240  # replaces min_hours_between (4h default)
+    ui_theme: Literal["system", "dark", "light"] = "system"
 
 
 class KnowledgeUpdate(BaseModel):

{devcoach-0.3.5 → devcoach-0.3.6}/src/devcoach/web/app.py

@@ -16,6 +16,21 @@ from devcoach.core.models import KnowledgeEntry
 app = FastAPI(title="devcoach", docs_url=None, redoc_url=None)
 
 _HERE = Path(__file__).parent
+
+
+def _safe_redirect(url: str, default: str = "/lessons") -> str:
+    """Return url only if it is a safe relative path; otherwise return default.
+
+    Prevents open-redirect attacks where a form-supplied ``next`` parameter
+    could point to an external site (e.g. ``next=https://evil.com``).
+    A valid relative path starts with ``/`` but not ``//`` (which browsers
+    treat as protocol-relative, i.e. an external URL).
+    """
+    if url.startswith("/") and not url.startswith("//"):
+        return url
+    return default
+
+
 templates = Jinja2Templates(directory=str(_HERE / "templates"))
 app.mount("/static", StaticFiles(directory=str(_HERE / "static")), name="static")
 
@@ -124,7 +139,12 @@ async def export_lessons_route() -> Response:
 @app.post("/lessons/import")
 async def import_lessons_route(file: UploadFile = File(...)) -> RedirectResponse:
     content = await file.read()
-    records = json.loads(content)
+    try:
+        records = json.loads(content)
+    except (json.JSONDecodeError, ValueError):
+        return RedirectResponse(url="/settings?imported=0&skipped=0&invalid=1", status_code=303)
+    if not isinstance(records, list):
+        return RedirectResponse(url="/settings?imported=0&skipped=0&invalid=1", status_code=303)
     with db.connection() as conn:
         inserted, duplicated, invalid = db.import_lessons(conn, records)
     return RedirectResponse(
@@ -189,6 +209,7 @@ async def lessons_page(
         all_repositories = db.get_distinct_column(conn, "repository")
         all_branches = db.get_distinct_column(conn, "branch")
         all_commits = db.get_distinct_column(conn, "commit_hash")
+        settings = db.get_settings(conn)
 
     import math
 
@@ -223,6 +244,7 @@ async def lessons_page(
             "per_page": _PER_PAGE,
             "total": total,
             "total_pages": total_pages,
+            "settings": settings,
         },
     )
 
@@ -231,7 +253,7 @@ async def lessons_page(
 async def star_lesson(lesson_id: str, next: str = Form(default="/lessons")) -> RedirectResponse:
     with db.connection() as conn:
         db.toggle_star(conn, lesson_id)
-    return RedirectResponse(url=next, status_code=303)
+    return RedirectResponse(url=_safe_redirect(next), status_code=303)
 
 
 @app.post("/lessons/{lesson_id}/feedback")
@@ -243,19 +265,20 @@ async def submit_feedback(
     feedback_value = None if feedback in ("", "clear") else feedback
     with db.connection() as conn:
         coach.record_feedback(conn, lesson_id, feedback_value)
-    return RedirectResponse(url=next, status_code=303)
+    return RedirectResponse(url=_safe_redirect(next), status_code=303)
 
 
 @app.get("/lessons/{lesson_id}", response_class=HTMLResponse)
 async def lesson_detail_page(request: Request, lesson_id: str) -> HTMLResponse:
     with db.connection() as conn:
         lesson = db.get_lesson_by_id(conn, lesson_id)
+        settings = db.get_settings(conn)
     if lesson is None:
         return HTMLResponse("<h1>Lesson not found</h1>", status_code=404)
     return templates.TemplateResponse(
         request,
         "lesson_detail.html",
-        {"lesson": lesson},
+        {"lesson": lesson, "settings": settings},
     )
 
 
@@ -288,10 +311,14 @@ async def settings_page(
 async def update_settings(
     max_per_day: int = Form(...),
     min_gap_minutes: int = Form(...),
+    ui_theme: str = Form("system"),
 ) -> RedirectResponse:
+    if ui_theme not in ("system", "dark", "light"):
+        ui_theme = "system"
     with db.connection() as conn:
         db.set_setting(conn, "max_per_day", str(max_per_day))
         db.set_setting(conn, "min_gap_minutes", str(min_gap_minutes))
+        db.set_setting(conn, "ui_theme", ui_theme)
     return RedirectResponse(url="/settings", status_code=303)