From b4a9bb8bae02b896aed57695546f73d9df88d9c4 Mon Sep 17 00:00:00 2001
From: Jer Miller <jeremie.miller@gmail.com>
Date: Mon, 6 Jul 2026 19:55:40 -0600
Subject: [PATCH] feat(convey): tear down the Jinja shell; guard against its
 return
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The SPA conversion (L1–L6) flipped all 22 owner apps to the static
shell (convey/static/shell.html). This capstone removes the now-dead
Jinja container and makes shell-serving unconditional:

- Delete the unrendered Jinja shell: templates/{app.html, menu_bar,
  date_nav, status_pane, diagnostic_console, chat_bar}.html. Only the
  static, construct-free init.html remains under convey/templates/.
- Retire the transitional `spa` app flag end-to-end: drop the App
  dataclass field, its parse, all 22 app.json entries, and the
  /api/shell payload key. The injected index route now always serves
  shell.html and the workspace fragment route serves unconditionally;
  workspace_url is non-null for every app.
- Remove the orphaned App.get_workspace_template (get_background_template
  is retained and unchanged).
- Add an AST-based CI guard to scripts/check_api_conventions.py: flag any
  flask render_template(...) call under solstone/apps + solstone/convey
  (excluding tests), resolved by import binding so the local
  provider_readiness._render_template helper is not matched. The two PDF
  routes (news, reflections) are the only allowlisted call sites. A
  construct-free guard asserts convey/templates/ carries no Jinja markers.
  Executable negative controls prove both guards fire.

No app's rendered output changes — this is dead-code removal plus an
anti-regression guard. Docs (CONVEY-FRONTEND.md, APPS.md, CONVEY.md)
updated to retire the flag and note the guard.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 docs/APPS.md                                  |  23 ++-
 docs/CONVEY-FRONTEND.md                       |  21 +--
 docs/CONVEY.md                                |   5 +-
 scripts/check_api_conventions.py              | 105 ++++++++++-
 solstone/apps/__init__.py                     |  30 +---
 solstone/apps/activities/app.json             |   1 -
 solstone/apps/backup/app.json                 |   3 +-
 solstone/apps/backup/tests/test_routes.py     |   5 -
 solstone/apps/chat/app.json                   |   3 +-
 solstone/apps/curation/app.json               |   1 -
 solstone/apps/curation/tests/test_routes.py   |   1 -
 solstone/apps/entities/app.json               |   3 +-
 solstone/apps/health/app.json                 |   3 +-
 .../health/tests/test_workspace_template.py   |   2 -
 solstone/apps/home/app.json                   |   3 +-
 solstone/apps/home/tests/test_spa.py          |   3 -
 solstone/apps/import/app.json                 |   3 +-
 solstone/apps/network/app.json                |   1 -
 solstone/apps/news/app.json                   |   1 -
 solstone/apps/observer/app.json               |   1 -
 solstone/apps/reflections/app.json            |   1 -
 solstone/apps/search/app.json                 |   3 +-
 solstone/apps/settings/app.json               |   3 +-
 solstone/apps/sol/app.json                    |   1 -
 solstone/apps/speakers/app.json               |   1 -
 solstone/apps/stats/app.json                  |   1 -
 .../stats/tests/test_workspace_template.py    |   6 -
 solstone/apps/support/app.json                |   1 -
 solstone/apps/thinking/app.json               |   1 -
 solstone/apps/timeline/app.json               |   1 -
 solstone/apps/tokens/app.json                 |   1 -
 solstone/apps/transcripts/app.json            |   1 -
 solstone/convey/shell_data.py                 |   5 +-
 solstone/convey/templates/app.html            | 170 ------------------
 solstone/convey/templates/chat_bar.html       |  61 -------
 solstone/convey/templates/date_nav.html       | 127 -------------
 .../convey/templates/diagnostic_console.html  |  24 ---
 solstone/convey/templates/menu_bar.html       |  26 ---
 solstone/convey/templates/status_pane.html    |  43 -----
 solstone/convey/tests/test_static_cache.py    |  12 --
 tests/test_app_news.py                        |   1 -
 tests/test_app_reflections.py                 |   1 -
 tests/test_check_api_conventions.py           |  47 ++++-
 tests/test_convey_apps.py                     |  60 +------
 tests/test_convey_spa_shell.py                |  20 ++-
 45 files changed, 191 insertions(+), 645 deletions(-)
 delete mode 100644 solstone/convey/templates/app.html
 delete mode 100644 solstone/convey/templates/chat_bar.html
 delete mode 100644 solstone/convey/templates/date_nav.html
 delete mode 100644 solstone/convey/templates/diagnostic_console.html
 delete mode 100644 solstone/convey/templates/menu_bar.html
 delete mode 100644 solstone/convey/templates/status_pane.html

diff --git a/docs/APPS.md b/docs/APPS.md
index c698d316b..c3b1f7005 100644
--- a/docs/APPS.md
+++ b/docs/APPS.md
@@ -88,7 +88,8 @@ See `solstone/apps/__init__.py` for discovery logic and route injection.
 
 ### 1. `workspace.html` - Main Content
 
-The workspace template is included inside the app container (`app.html`).
+The workspace fragment is served verbatim and mounted into the static shell
+(`convey/static/shell.html`) at `/app/{name}/`.
 
 **Available Template Context:**
 - `app` - Current app name (auto-injected from URL)
@@ -148,14 +149,12 @@ Override default icon, label, and other app settings.
 - `date_nav` - Show date navigation bar (default: false)
 - `app_bar` - Show the universal chat bar (default: true)
 - `allow_future_dates` - Allow clicking future dates in month picker (default: false)
-- `spa` - Transitional opt-in for the static shell and `/workspace` fragment route (default: false)
 
 **When to disable facets:** Set `"facets": false` for apps that don't use facet-based organization (e.g., system settings, dev tools).
 
-**Static shell default:** New apps should use `"spa": true` with a
-construct-free `workspace.html`: no `{{`, `{%`, or `{#` Jinja constructs.
-SPA apps serve `convey/static/shell.html` at `/app/{name}/` and their workspace
-bytes at `/app/{name}/workspace`.
+**Static shell:** Every app serves `convey/static/shell.html` at `/app/{name}/`
+and its `workspace.html` bytes at `/app/{name}/workspace`. Keep
+`workspace.html` construct-free — no `{{`, `{%`, or `{#`.
 
 **Examples:** Browse `solstone/apps/*/app.json` for reference configurations.
 
@@ -634,7 +633,7 @@ See [talent/journal/SKILL.md](../talent/journal/SKILL.md), [CORTEX.md](CORTEX.md
 
 ### Global Variables
 
-Defined in `solstone/convey/templates/app.html`:
+Set up by the shell runtime (`solstone/convey/static/app.js`):
 - `window.facetsData` - Array of facet objects `[{name, title, color, emoji}, ...]`
 - `window.selectedFacet` - Current facet name or null (see Facet Selection below)
 - `window.appFacetCounts` - Badge counts for current app `{"work": 5, "personal": 3}` (set via route's `facet_counts`)
@@ -766,12 +765,10 @@ See `solstone/apps/entities/routes.py` POST handlers - Shows request parsing, va
 See `solstone/apps/entities/routes.py` - Loads data per-facet when selected, or all facets when null.
 
 ### Facet Pill Badges
-Pass `facet_counts` dict to `render_template()` to show initial badge counts on facet pills:
-```python
-facet_counts = {"work": 5, "personal": 3}
-return render_template("app.html", facet_counts=facet_counts)
+Use the shell runtime to show or update facet pill counts:
+```javascript
+AppServices.badges.facet.set(facetName, count);
 ```
-For client-side updates, use `AppServices.badges.facet.set(facetName, count)`.
 
 Apps with per-facet counts should compute them from already-loaded data before rendering, or update them client-side as data changes.
 
@@ -836,7 +833,7 @@ Browse `solstone/apps/*/` directories for reference implementations. Apps range
 
 - **`solstone/apps/__init__.py`** - App discovery and registry implementation
 - **`solstone/convey/apps.py`** - Context processors and vendor library helper
-- **`solstone/convey/templates/app.html`** - Main app container template
+- **`solstone/convey/static/shell.html`** - Static SPA shell served for every app
 - **`solstone/convey/static/app.js`** - AppServices framework
 - **`solstone/convey/static/websocket.js`** - WebSocket event system
 - [../AGENTS.md](../AGENTS.md) - Project development guidelines and standards
diff --git a/docs/CONVEY-FRONTEND.md b/docs/CONVEY-FRONTEND.md
index ae9b6ec83..26f2e15e9 100644
--- a/docs/CONVEY-FRONTEND.md
+++ b/docs/CONVEY-FRONTEND.md
@@ -11,11 +11,9 @@ server.
 
 ## Architecture: static shell + per-app workspaces
 
-- **One static shell** (`convey/static/shell.html`) is served for every
-  `/app/{name}` route. The client derives the current app from
-  `location.pathname` and boots from `GET /api/shell`. During the transitional
-  conversion, apps opt into this path with `"spa": true` in `app.json`;
-  unflagged apps continue through the legacy Jinja shell.
+- **One static shell** (`convey/static/shell.html`) is served unconditionally for
+  every `/app/{name}` route. The client derives the current app from
+  `location.pathname` and boots from `GET /api/shell`.
 - **Per-app workspace fragments** stay one file per app
   (`apps/{name}/workspace.html`): markup + `<style>` + `<script>`, served
   verbatim as a static asset — zero server-side template processing. The shell
@@ -62,8 +60,7 @@ them in HTML.
       "date_nav": false,
       "app_bar": true,
       "allow_future_dates": false,
-      "spa": false,
-      "workspace_url": null,
+      "workspace_url": "/app/home/workspace",
       "background_url": null
     }
   ],
@@ -83,9 +80,9 @@ Notes:
 - `apps` is **ordered** (owner's configured order, starred handling applied
   server-side, agent-chosen `sol` label already resolved). The menu renders
   the list as given.
-- `workspace_url`/`background_url` point at the static fragment routes. During
-  transitional opt-in, `workspace_url` is `null` for non-`spa` apps, and a
-  `null` `background_url` means the app registers no background service.
+- `workspace_url` always points at the static workspace fragment route.
+  `background_url` points at the static background fragment route when present;
+  a `null` `background_url` means the app registers no background service.
 - The shell endpoint carries **state the chrome needs on every page**, nothing
   app-specific. App state never rides on `/api/shell`.
 
@@ -138,5 +135,5 @@ Every workspace must be honest about what it knows:
   `convey/static/tests/` — keep them green, add pages for new shared helpers
   (the mount helper, render helpers).
 - Route-level behavior is unit-tested per app (`apps/{name}/tests/`).
-- A CI guard enforces the architecture: no Jinja constructs in served HTML,
-  no `render_template` outside the PDF modules.
+- A CI guard enforces the architecture: no Jinja constructs in served templates,
+  and no flask `render_template` outside the PDF modules.
diff --git a/docs/CONVEY.md b/docs/CONVEY.md
index 8ea0321cd..6da45be31 100644
--- a/docs/CONVEY.md
+++ b/docs/CONVEY.md
@@ -28,10 +28,7 @@ convey/
   utils.py           - shared helpers (format_date, spawn_agent, etc.)
   root.py            - access gate, setup routes, and root redirect
   templates/
-      app.html       - main app container template
-      menu_bar.html  - dynamic left sidebar menu
-      status_pane.html - WebSocket status indicator
-      macros.html    - Jinja macros
+      init.html      - static setup/onboarding page (pre-journal)
   static/            - shared CSS and JavaScript
       app.css        - app system styles
       app.js         - facet pills, services, notification center
diff --git a/scripts/check_api_conventions.py b/scripts/check_api_conventions.py
index 2530a2730..1cb1fdd27 100644
--- a/scripts/check_api_conventions.py
+++ b/scripts/check_api_conventions.py
@@ -18,6 +18,9 @@ escape hatches the conventions forbid:
     sanctioned ``error_response`` / ``error_response_with_reason`` helpers.
   - ``bare-array``   — returning a bare top-level list
     (``jsonify([...])`` / ``jsonify(<list-var>)`` / ``return [...]``).
+  - ``render-template`` — a Flask ``render_template(...)`` call anywhere under
+    the scanned source scopes, excluding tests. The only allowed instances are
+    the PDF helpers in the ``news`` and ``reflections`` apps.
 
 A handler is **JSON-governed** when any of its return paths produces a JSON
 body: it calls ``jsonify(...)``, returns one of the response helpers
@@ -80,6 +83,8 @@ ROUTE_DECORATORS: frozenset[str] = frozenset(
 # count as occurrences are fixed; never raise one to admit a new violation.
 ALLOWLIST: dict[tuple[str, str], int] = {
     ("solstone/apps/network/routes.py", "abort"): 1,
+    ("solstone/apps/news/routes.py", "render-template"): 1,
+    ("solstone/apps/reflections/routes.py", "render-template"): 1,
 }
 
 
@@ -261,6 +266,65 @@ def discover_modules(root: Path) -> list[Path]:
     return found
 
 
+def _flask_render_template_names(tree: ast.AST) -> tuple[set[str], set[str]]:
+    """Local names bound to flask.render_template.
+
+    Returns (direct, modules): ``direct`` are names from
+    ``from flask import render_template [as X]`` (module- OR function-scoped);
+    ``modules`` are names bound to the flask module via ``import flask [as X]``,
+    whose ``.render_template`` attribute is the same callable.
+    """
+    direct: set[str] = set()
+    modules: set[str] = set()
+    for node in ast.walk(tree):
+        if isinstance(node, ast.ImportFrom) and node.module == "flask":
+            for alias in node.names:
+                if alias.name == "render_template":
+                    direct.add(alias.asname or alias.name)
+        elif isinstance(node, ast.Import):
+            for alias in node.names:
+                if alias.name == "flask":
+                    modules.add(alias.asname or "flask")
+    return direct, modules
+
+
+def scan_render_templates(source: str, filename: str = "<source>") -> list[int]:
+    """Line numbers of flask ``render_template(...)`` calls in a module source."""
+    tree = ast.parse(source, filename=filename)
+    direct, modules = _flask_render_template_names(tree)
+    if not direct and not modules:
+        return []
+    linenos: list[int] = []
+    for node in ast.walk(tree):
+        if not isinstance(node, ast.Call):
+            continue
+        func = node.func
+        if isinstance(func, ast.Name) and func.id in direct:
+            linenos.append(node.lineno)
+        elif (
+            isinstance(func, ast.Attribute)
+            and func.attr == "render_template"
+            and isinstance(func.value, ast.Name)
+            and func.value.id in modules
+        ):
+            linenos.append(node.lineno)
+    return sorted(linenos)
+
+
+def discover_all_modules(root: Path) -> list[Path]:
+    """Posix-relative paths of ALL non-test ``*.py`` modules under the scopes."""
+    found: list[Path] = []
+    for scope in SCAN_SCOPES:
+        scope_dir = root / scope
+        if not scope_dir.is_dir():
+            continue
+        for path in sorted(scope_dir.rglob("*.py")):
+            if "__pycache__" in path.parts or "tests" in path.parts:
+                continue
+            found.append(path.relative_to(root))
+    return found
+
+
 def scan_source(source: str, filename: str = "<source>") -> list[tuple[int, str, str]]:
     """Return ``(lineno, kind, function_name)`` violations for a module source."""
     tree = ast.parse(source, filename=filename)
@@ -286,9 +350,33 @@ def count_violations(root: Path) -> dict[tuple[str, str], int]:
     for rel in discover_modules(root):
         for _lineno, kind, _func in scan_file(root / rel):
             counts[(rel.as_posix(), kind)] = counts.get((rel.as_posix(), kind), 0) + 1
+    for rel in discover_all_modules(root):
+        linenos = scan_render_templates(
+            (root / rel).read_text(encoding="utf-8"), str(rel)
+        )
+        if linenos:
+            key = (rel.as_posix(), "render-template")
+            counts[key] = counts.get(key, 0) + len(linenos)
     return counts
 
 
+def _account(
+    new: list[str],
+    tracked: list[str],
+    rel_str: str,
+    kind: str,
+    linenos: list[int],
+    allowlist: dict[tuple[str, str], int],
+) -> None:
+    count = len(linenos)
+    allowed = allowlist.get((rel_str, kind), 0)
+    if count > allowed:
+        lines = ", ".join(str(n) for n in sorted(linenos))
+        new.append(f"{rel_str}: {count} {kind} (allowed {allowed}) at line(s) {lines}")
+    elif allowed:
+        tracked.append(f"{rel_str}: {count}/{allowed} {kind} (allowlisted)")
+
+
 def evaluate(
     root: Path,
     allowlist: dict[tuple[str, str], int],
@@ -303,15 +391,14 @@ def evaluate(
         for lineno, kind, _func in findings:
             by_kind.setdefault(kind, []).append(lineno)
         for kind, linenos in sorted(by_kind.items()):
-            count = len(linenos)
-            allowed = allowlist.get((rel_str, kind), 0)
-            if count > allowed:
-                lines = ", ".join(str(n) for n in sorted(linenos))
-                new.append(
-                    f"{rel_str}: {count} {kind} (allowed {allowed}) at line(s) {lines}"
-                )
-            elif allowed:
-                tracked.append(f"{rel_str}: {count}/{allowed} {kind} (allowlisted)")
+            _account(new, tracked, rel_str, kind, linenos, allowlist)
+    for rel in discover_all_modules(root):
+        rel_str = rel.as_posix()
+        linenos = scan_render_templates(
+            (root / rel).read_text(encoding="utf-8"), str(rel)
+        )
+        if linenos:
+            _account(new, tracked, rel_str, "render-template", linenos, allowlist)
     return new, tracked
 
 
diff --git a/solstone/apps/__init__.py b/solstone/apps/__init__.py
index 4da34bfd0..5dbc80e48 100644
--- a/solstone/apps/__init__.py
+++ b/solstone/apps/__init__.py
@@ -30,7 +30,6 @@ app.json fields (all optional):
       "date_nav": true,        # Show date navigation bar (default: false)
       "app_bar": false,        # Hide the universal chat bar on this app (default: true)
       "allow_future_dates": true, # Allow future dates in month picker (default: false)
-      "spa": true              # Serve static shell + workspace fragment (default: false)
     }
 
     See the App dataclass below for the complete field list with types and defaults.
@@ -82,9 +81,6 @@ class App:
     # Allow apps to opt into clicking future dates in the month picker.
     allow_future_dates: bool = False
 
-    # Serve this app through the static SPA shell.
-    spa: bool = False
-
     def facets_enabled(self) -> bool:
         """Check if facets are enabled for this app."""
         return not self.facets_config.get("disabled", False)
@@ -97,10 +93,6 @@ class App:
         """Return Flask Blueprint with app routes, or None if app has no custom routes."""
         return self.blueprint
 
-    def get_workspace_template(self) -> str:
-        """Return path to workspace template."""
-        return self.workspace_template
-
     def get_background_template(self) -> Optional[str]:
         """Return path to background service template, or None."""
         return self.background_template
@@ -240,9 +232,6 @@ class AppRegistry:
         # Allow future dates in month picker
         allow_future_dates = metadata.get("allow_future_dates", False)
 
-        # Static shell opt-in
-        spa = bool(metadata.get("spa", False))
-
         # Import routes module and get blueprint (optional)
         blueprint = None
         routes_module = None
@@ -279,7 +268,6 @@ class AppRegistry:
             date_nav=date_nav,
             app_bar=app_bar,
             allow_future_dates=allow_future_dates,
-            spa=spa,
         )
 
     def _load_metadata(self, app_path: Path) -> dict[str, Any]:
@@ -324,7 +312,7 @@ class AppRegistry:
         """Inject default index route if app doesn't define one.
 
         Checks if routes module has an 'index' function. If not, adds a
-        default index route that renders app.html using blueprint.record()
+        default index route that serves the static SPA shell using blueprint.record()
         to support multiple app registrations.
 
         Args:
@@ -351,15 +339,11 @@ class AppRegistry:
             if not blueprint._got_registered_once and not getattr(
                 blueprint, "_solstone_default_index_injected", False
             ):
-                registry = self
 
-                def index(app_name=app_name, registry=registry):
-                    from flask import current_app, render_template
+                def index():
+                    from flask import current_app
 
-                    if registry.apps[app_name].spa:
-                        return current_app.send_static_file("shell.html")
-
-                    return render_template("app.html")
+                    return current_app.send_static_file("shell.html")
 
                 def setup_index(state):
                     """Deferred setup function called when blueprint is registered."""
@@ -384,11 +368,9 @@ class AppRegistry:
 
         registry = self
 
-        def workspace_fragment(app_name=app_name, registry=registry, app_path=app_path):
-            from flask import abort, send_from_directory
+        def workspace_fragment(app_path=app_path):
+            from flask import send_from_directory
 
-            if not registry.apps[app_name].spa:
-                abort(404)
             return send_from_directory(app_path, "workspace.html")
 
         def background_fragment(
diff --git a/solstone/apps/activities/app.json b/solstone/apps/activities/app.json
index b9c2790e7..8424a0225 100644
--- a/solstone/apps/activities/app.json
+++ b/solstone/apps/activities/app.json
@@ -1,7 +1,6 @@
 {
   "icon": "📅",
   "label": "activities",
-  "spa": true,
   "date_nav": true,
   "allow_future_dates": true
 }
diff --git a/solstone/apps/backup/app.json b/solstone/apps/backup/app.json
index 3df682db7..8cb019948 100644
--- a/solstone/apps/backup/app.json
+++ b/solstone/apps/backup/app.json
@@ -1,6 +1,5 @@
 {
   "icon": "🛡️",
   "label": "backup",
-  "facets": {"disabled": true},
-  "spa": true
+  "facets": {"disabled": true}
 }
diff --git a/solstone/apps/backup/tests/test_routes.py b/solstone/apps/backup/tests/test_routes.py
index fd135a365..bf4b03f30 100644
--- a/solstone/apps/backup/tests/test_routes.py
+++ b/solstone/apps/backup/tests/test_routes.py
@@ -131,7 +131,6 @@ def test_backup_app_discovered_and_auto_appended_for_saved_order(backup_env) ->
     names = [app["name"] for app in apps]
     backup = next(app for app in apps if app["name"] == "backup")
     assert "backup" in names
-    assert backup["spa"] is True
     assert backup["workspace_url"] == "/app/backup/workspace"
     assert "backup" not in DEFAULT_APP_ORDER
 
@@ -142,14 +141,10 @@ def test_backup_spa_shell_workspace_and_route_resolution(backup_env) -> None:
     routes_source = Path("solstone/apps/backup/routes.py").read_text(encoding="utf-8")
     workspace = workspace_path.read_text(encoding="utf-8")
     js = Path("solstone/apps/backup/static/backup.js").read_text(encoding="utf-8")
-    app_json = json.loads(
-        Path("solstone/apps/backup/app.json").read_text(encoding="utf-8")
-    )
 
     index_response = env.client.get("/app/backup/")
     workspace_response = env.client.get("/app/backup/workspace")
 
-    assert app_json["spa"] is True
     assert index_response.status_code == 200
     assert b'data-solstone-shell="spa"' in index_response.data
     assert workspace_response.status_code == 200
diff --git a/solstone/apps/chat/app.json b/solstone/apps/chat/app.json
index b08cb51c3..52397d67b 100644
--- a/solstone/apps/chat/app.json
+++ b/solstone/apps/chat/app.json
@@ -2,6 +2,5 @@
   "icon": "💬",
   "label": "chat",
   "date_nav": true,
-  "allow_future_dates": false,
-  "spa": true
+  "allow_future_dates": false
 }
diff --git a/solstone/apps/curation/app.json b/solstone/apps/curation/app.json
index 63c7fa5e4..7e58f14a7 100644
--- a/solstone/apps/curation/app.json
+++ b/solstone/apps/curation/app.json
@@ -1,7 +1,6 @@
 {
   "icon": "✨",
   "label": "curation",
-  "spa": true,
   "facets": {
     "disabled": true
   }
diff --git a/solstone/apps/curation/tests/test_routes.py b/solstone/apps/curation/tests/test_routes.py
index df50c60ba..f640215a9 100644
--- a/solstone/apps/curation/tests/test_routes.py
+++ b/solstone/apps/curation/tests/test_routes.py
@@ -497,7 +497,6 @@ def test_app_metadata_exists():
 
     assert metadata["label"] == "curation"
     assert metadata["facets"]["disabled"] is True
-    assert metadata["spa"] is True
 
 
 def test_curation_index_serves_spa_shell(curation_env):
diff --git a/solstone/apps/entities/app.json b/solstone/apps/entities/app.json
index adb5e9442..2554e8792 100644
--- a/solstone/apps/entities/app.json
+++ b/solstone/apps/entities/app.json
@@ -1,5 +1,4 @@
 {
   "icon": "📇",
-  "label": "entities",
-  "spa": true
+  "label": "entities"
 }
diff --git a/solstone/apps/health/app.json b/solstone/apps/health/app.json
index 3f6d5034f..053ed52b0 100644
--- a/solstone/apps/health/app.json
+++ b/solstone/apps/health/app.json
@@ -1,6 +1,5 @@
 {
   "icon": "🩺",
   "label": "health",
-  "facets": {"disabled": true},
-  "spa": true
+  "facets": {"disabled": true}
 }
diff --git a/solstone/apps/health/tests/test_workspace_template.py b/solstone/apps/health/tests/test_workspace_template.py
index 467394f44..e8248173f 100644
--- a/solstone/apps/health/tests/test_workspace_template.py
+++ b/solstone/apps/health/tests/test_workspace_template.py
@@ -100,14 +100,12 @@ def _copy(key: str, *, pending=None, stuck=None) -> str:
 
 def test_health_spa_shell_workspace_and_route_resolution(health_env):
     env = health_env()
-    app_json = json.loads((APP_ROOT / "app.json").read_text(encoding="utf-8"))
     routes_source = (APP_ROOT / "routes.py").read_text(encoding="utf-8")
     workspace = _workspace()
 
     index_response = env.client.get("/app/health/")
     workspace_response = env.client.get("/app/health/workspace")
 
-    assert app_json["spa"] is True
     assert index_response.status_code == 200
     assert b'data-solstone-shell="spa"' in index_response.data
     assert workspace_response.status_code == 200
diff --git a/solstone/apps/home/app.json b/solstone/apps/home/app.json
index 73d89421f..404f8f3d0 100644
--- a/solstone/apps/home/app.json
+++ b/solstone/apps/home/app.json
@@ -1,6 +1,5 @@
 {
   "icon": "🏠",
   "label": "home",
-  "facets": {"disabled": true},
-  "spa": true
+  "facets": {"disabled": true}
 }
diff --git a/solstone/apps/home/tests/test_spa.py b/solstone/apps/home/tests/test_spa.py
index b5b3a5ff5..85393c25d 100644
--- a/solstone/apps/home/tests/test_spa.py
+++ b/solstone/apps/home/tests/test_spa.py
@@ -3,7 +3,6 @@
 
 from __future__ import annotations
 
-import json
 import shutil
 import subprocess
 from datetime import datetime
@@ -24,14 +23,12 @@ def _home_js() -> str:
 
 def test_home_spa_shell_workspace_and_route_resolution(home_env):
     env = home_env()
-    app_json = json.loads((APP_ROOT / "app.json").read_text(encoding="utf-8"))
     routes_source = (APP_ROOT / "routes.py").read_text(encoding="utf-8")
     workspace = _workspace()
 
     index_response = env.client.get("/app/home/")
     workspace_response = env.client.get("/app/home/workspace")
 
-    assert app_json["spa"] is True
     assert index_response.status_code == 200
     assert b'data-solstone-shell="spa"' in index_response.data
     assert workspace_response.status_code == 200
diff --git a/solstone/apps/import/app.json b/solstone/apps/import/app.json
index b59931cd4..9f0ec90c9 100644
--- a/solstone/apps/import/app.json
+++ b/solstone/apps/import/app.json
@@ -1,5 +1,4 @@
 {
   "icon": "📥",
-  "label": "import",
-  "spa": true
+  "label": "import"
 }
diff --git a/solstone/apps/network/app.json b/solstone/apps/network/app.json
index 4c48908fa..1a6b76e1b 100644
--- a/solstone/apps/network/app.json
+++ b/solstone/apps/network/app.json
@@ -1,6 +1,5 @@
 {
   "icon": "🔗",
   "label": "network",
-  "spa": true,
   "facets": {"disabled": true}
 }
diff --git a/solstone/apps/news/app.json b/solstone/apps/news/app.json
index 4f3d6e513..b6c039b4d 100644
--- a/solstone/apps/news/app.json
+++ b/solstone/apps/news/app.json
@@ -1,7 +1,6 @@
 {
   "icon": "📰",
   "label": "newsletters",
-  "spa": true,
   "date_nav": false,
   "facets": {
     "disabled": true
diff --git a/solstone/apps/observer/app.json b/solstone/apps/observer/app.json
index b49cf3daa..51320a238 100644
--- a/solstone/apps/observer/app.json
+++ b/solstone/apps/observer/app.json
@@ -1,6 +1,5 @@
 {
   "icon": "📡",
   "label": "observers",
-  "spa": true,
   "facets": {"disabled": true}
 }
diff --git a/solstone/apps/reflections/app.json b/solstone/apps/reflections/app.json
index 719b75993..427480c50 100644
--- a/solstone/apps/reflections/app.json
+++ b/solstone/apps/reflections/app.json
@@ -1,7 +1,6 @@
 {
   "icon": "🌙",
   "label": "reflections",
-  "spa": true,
   "date_nav": true,
   "allow_future_dates": false,
   "facets": {
diff --git a/solstone/apps/search/app.json b/solstone/apps/search/app.json
index c60107f4a..ab229509d 100644
--- a/solstone/apps/search/app.json
+++ b/solstone/apps/search/app.json
@@ -1,5 +1,4 @@
 {
   "icon": "🔍",
-  "label": "search",
-  "spa": true
+  "label": "search"
 }
diff --git a/solstone/apps/settings/app.json b/solstone/apps/settings/app.json
index e46c6f345..b173a3d1d 100644
--- a/solstone/apps/settings/app.json
+++ b/solstone/apps/settings/app.json
@@ -1,5 +1,4 @@
 {
   "icon": "⚙️",
-  "label": "settings",
-  "spa": true
+  "label": "settings"
 }
diff --git a/solstone/apps/sol/app.json b/solstone/apps/sol/app.json
index 4e2b37d26..8451a707a 100644
--- a/solstone/apps/sol/app.json
+++ b/solstone/apps/sol/app.json
@@ -1,6 +1,5 @@
 {
   "icon": "🦾",
   "label": "sol",
-  "spa": true,
   "date_nav": true
 }
diff --git a/solstone/apps/speakers/app.json b/solstone/apps/speakers/app.json
index 30c57405d..cc64dd435 100644
--- a/solstone/apps/speakers/app.json
+++ b/solstone/apps/speakers/app.json
@@ -1,7 +1,6 @@
 {
   "icon": "🎙️",
   "label": "speakers",
-  "spa": true,
   "date_nav": true,
   "facets": {
     "disabled": true
diff --git a/solstone/apps/stats/app.json b/solstone/apps/stats/app.json
index cb6f4cb15..7e92bd64a 100644
--- a/solstone/apps/stats/app.json
+++ b/solstone/apps/stats/app.json
@@ -1,6 +1,5 @@
 {
   "icon": "📊",
   "label": "stats",
-  "spa": true,
   "facets": {"disabled": true}
 }
diff --git a/solstone/apps/stats/tests/test_workspace_template.py b/solstone/apps/stats/tests/test_workspace_template.py
index e9dcfbcdc..9385c9c71 100644
--- a/solstone/apps/stats/tests/test_workspace_template.py
+++ b/solstone/apps/stats/tests/test_workspace_template.py
@@ -227,11 +227,5 @@ def test_stats_routes_resolve(stats_env):
         assert matched == endpoint
 
 
-def test_stats_app_metadata_is_spa():
-    metadata = json.loads((APP_ROOT / "app.json").read_text(encoding="utf-8"))
-
-    assert metadata["spa"] is True
-
-
 def test_stats_routes_do_not_use_render_template():
     assert "render_template" not in (APP_ROOT / "routes.py").read_text(encoding="utf-8")
diff --git a/solstone/apps/support/app.json b/solstone/apps/support/app.json
index fe7bb6672..1f321ce48 100644
--- a/solstone/apps/support/app.json
+++ b/solstone/apps/support/app.json
@@ -1,6 +1,5 @@
 {
   "icon": "🛟",
   "label": "support",
-  "spa": true,
   "facets": false
 }
diff --git a/solstone/apps/thinking/app.json b/solstone/apps/thinking/app.json
index b73708920..85870e1eb 100644
--- a/solstone/apps/thinking/app.json
+++ b/solstone/apps/thinking/app.json
@@ -1,7 +1,6 @@
 {
   "icon": "🧠",
   "label": "thinking",
-  "spa": true,
   "facets": {
     "disabled": true
   }
diff --git a/solstone/apps/timeline/app.json b/solstone/apps/timeline/app.json
index 0abb1e429..3170491c2 100644
--- a/solstone/apps/timeline/app.json
+++ b/solstone/apps/timeline/app.json
@@ -1,7 +1,6 @@
 {
   "icon": "🕰️",
   "label": "timeline",
-  "spa": true,
   "facets": {"disabled": true},
   "date_nav": true,
   "allow_future_dates": false
diff --git a/solstone/apps/tokens/app.json b/solstone/apps/tokens/app.json
index f449b9859..c54926901 100644
--- a/solstone/apps/tokens/app.json
+++ b/solstone/apps/tokens/app.json
@@ -1,7 +1,6 @@
 {
   "icon": "💰",
   "label": "tokens",
-  "spa": true,
   "date_nav": true,
   "facets": {"disabled": true}
 }
diff --git a/solstone/apps/transcripts/app.json b/solstone/apps/transcripts/app.json
index c6f6315b5..0d00ca540 100644
--- a/solstone/apps/transcripts/app.json
+++ b/solstone/apps/transcripts/app.json
@@ -1,7 +1,6 @@
 {
   "icon": "📜",
   "label": "transcripts",
-  "spa": true,
   "date_nav": true,
   "facets": {"disabled": true}
 }
diff --git a/solstone/convey/shell_data.py b/solstone/convey/shell_data.py
index 6a3ce34c4..8cacf0c32 100644
--- a/solstone/convey/shell_data.py
+++ b/solstone/convey/shell_data.py
@@ -261,10 +261,7 @@ def _build_apps(registry: AppRegistry, config: dict[str, Any]) -> list[dict[str,
             "date_nav": app_instance.date_nav_enabled(),
             "app_bar": app_instance.app_bar,
             "allow_future_dates": app_instance.allow_future_dates,
-            "spa": app_instance.spa,
-            "workspace_url": (
-                f"/app/{app_instance.name}/workspace" if app_instance.spa else None
-            ),
+            "workspace_url": f"/app/{app_instance.name}/workspace",
             "background_url": (
                 f"/app/{app_instance.name}/background"
                 if app_instance.get_background_template()
diff --git a/solstone/convey/templates/app.html b/solstone/convey/templates/app.html
deleted file mode 100644
index 0bb8da436..000000000
--- a/solstone/convey/templates/app.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>{% if request.args.get('__pt_capture') %}
-<script>
-  // Test-only: capture parse-time + runtime errors before deferred scripts load.
-  window.__pt_errors = [];
-  window.addEventListener('error', function (e) { window.__pt_errors.push(String(e.message || e.error || e)); });
-  window.addEventListener('unhandledrejection', function (e) { window.__pt_errors.push('unhandledrejection: ' + String(e.reason)); });
-  window.onerror = function (msg, src, line, col, err) { window.__pt_errors.push(String(err || msg)); };
-  var __origConsoleError = console.error;
-  console.error = function () { window.__pt_errors.push('console.error: ' + Array.prototype.join.call(arguments, ' ')); return __origConsoleError.apply(console, arguments); };
-</script>
-{% endif %}
-  <meta charset="utf-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1"/>
-  <title>{{ app_registry.apps[app].label }} - journal</title>
-  <link rel="stylesheet" href="{{ url_for('root.static', filename='tokens.css') }}">
-  <link rel="stylesheet" href="{{ url_for('root.static', filename='app.css') }}">
-
-  <!-- Error handling FIRST - catches all subsequent errors -->
-  <script src="{{ url_for('root.static', filename='error-handler.js') }}" defer></script>
-  <script src="{{ url_for('root.static', filename='relative-time.js') }}" defer></script>
-  <script src="{{ url_for('root.static', filename='sol_initiated_constants.js') }}" defer></script>
-  <script src="{{ url_for('root.static', filename='convey_copy.js') }}" defer></script>
-  <script src="{{ url_for('root.static', filename='shell_gate.js') }}"></script>
-  <script src="{{ url_for('root.static', filename='diagnostic-console.js') }}" defer></script>
-  <script src="{{ url_for('root.static', filename='chat_reasons.js') }}" defer></script>
-  <script src="{{ url_for('root.static', filename='chat_copy.js') }}" defer></script>
-  <script src="{{ url_for('root.static', filename='activities_copy.js') }}" defer></script>
-  <script src="{{ url_for('root.static', filename='participation_render.js') }}" defer></script>
-
-  <!-- Embed facets data for immediate client-side access -->
-  <script>
-    window.facetsData = {{ facets|tojson|safe }};
-    window.selectedFacet = {% if app_registry.apps[app].facets_enabled() %}{{ selected_facet|tojson|safe }}{% else %}null{% endif %};
-    window.appFacetCounts = {{ facet_counts|default({})|tojson|safe }};
-  </script>
-  <script>
-    window.CONVEY_SETTINGS = {reportingEnabled: {{ convey_settings.reporting_enabled|tojson }}};
-    window.resolveSolShellReady({source: 'jinja'});
-  </script>
-
-  <!-- SSE connection for Callosum events -->
-  <script src="{{ url_for('root.static', filename='websocket.js') }}" defer></script>
-  <script src="{{ url_for('root.static', filename='api.js') }}" defer></script>
-  <!-- App JavaScript (includes AppServices framework) -->
-  <script src="{{ url_for('root.static', filename='app.js') }}" defer></script>
-  <script src="{{ url_for('root.static', filename='report-error.js') }}" defer></script>
-  <!-- Markdown rendering deps (marked + DOMPurify). Must load before workspace include. -->
-  <script src="{{ vendor_lib('marked') }}" defer></script>
-  <script src="{{ vendor_lib('dompurify') }}" defer></script>
-
-  <!-- Apply facet theme immediately to prevent flash -->
-  {% if selected_facet and app_registry.apps[app].facets_enabled() %}
-  {% set selected_facet_data = facets|selectattr("name", "equalto", selected_facet)|first %}
-  {% if selected_facet_data and selected_facet_data.color %}
-  <style id="facet-theme">
-    :root {
-      --facet-color: {{ selected_facet_data.color }};
-      --facet-bg: {{ selected_facet_data.color }}1a;  /* 10% opacity */
-      --facet-border: {{ selected_facet_data.color }};
-    }
-  </style>
-  {% endif %}
-  {% endif %}
-</head>
-{% set body_classes = [] %}
-{% if app_registry.apps[app].app_bar %}{% set _ = body_classes.append('has-app-bar') %}{% endif %}
-{% if app_registry.apps[app].date_nav_enabled() and day %}{% set _ = body_classes.append('has-date-nav') %}{% endif %}
-<body{% if body_classes %} class="{{ body_classes|join(' ') }}"{% endif %}>
-<script src="{{ url_for('root.static', filename='menu_state.js') }}"></script>
-<script src="{{ url_for('root.static', filename='presentation_mode.js') }}"></script>
-<a href="#main-content" class="skip-link">skip to content</a>
-<!-- Corner Tags (screen region detection) -->
-<div class="corner-tags" aria-hidden="true">
-  <div class="corner-tag corner-tag-tl" aria-hidden="true"></div>
-  <div class="corner-tag corner-tag-tr" aria-hidden="true"></div>
-  <div class="corner-tag corner-tag-bl" aria-hidden="true"></div>
-  <div class="corner-tag corner-tag-br" aria-hidden="true"></div>
-</div>
-
-<!-- Menu Bar -->
-{% include "menu_bar.html" %}
-
-<!-- Facet Bar (top) -->
-<nav class="facet-bar{% if not app_registry.apps[app].facets_enabled() %} facets-disabled{% endif %}" aria-label="facets">
-  <button id="hamburger" aria-label="toggle navigation" aria-expanded="false">☰</button>
-  <div class="facet-pills-container"></div>
-  <button class="status-icon" aria-expanded="false" aria-controls="status-pane" aria-label="system status: connecting"><img class="status-indicator status-indicator--connecting" src="/static/sol-status/active.svg" width="22" height="22" alt="" aria-hidden="true"><span id="quiet-notif-badge" class="quiet-notif-badge" style="display:none"></span></button>
-  <span id="status-live-region" role="status" class="visually-hidden"></span>
-</nav>
-
-<!-- Date Nav (centered below facet bar) -->
-{% if app_registry.apps[app].date_nav_enabled() and day %}
-  {% include "date_nav.html" %}
-{% endif %}
-
-<!-- Status Pane -->
-{% include "status_pane.html" %}
-{% include "diagnostic_console.html" %}
-
-<!-- Notification Center -->
-<div class="notification-center" id="notification-center" role="log" aria-live="polite" aria-label="notifications"></div>
-
-<div id="talentViewModal" class="talent-view-modal" role="dialog" aria-modal="true" aria-hidden="true" aria-labelledby="talentViewTitle" hidden>
-  <div class="talent-view-backdrop" data-action="close"></div>
-  <div class="talent-view-panel">
-    <header class="talent-view-header">
-      <h2 id="talentViewTitle" class="talent-view-title"></h2>
-      <span id="talentViewStatus" class="talent-view-status" data-status=""></span>
-      <button type="button" class="talent-view-close" data-action="close" aria-label="close">&times;</button>
-    </header>
-    <div id="talentViewTimeline" class="talent-view-timeline" role="region" aria-label="talent timeline"></div>
-  </div>
-</div>
-
-<!-- Universal Chat Bar -->
-{% if app_registry.apps[app].app_bar %}
-  {% include "chat_bar.html" %}
-{% endif %}
-
-<!-- Main Content -->
-<main id="main-content" class="workspace">
-  {% block workspace_content %}
-  <h1 class="visually-hidden">{{ app_registry.apps[app].label }}</h1>
-  {% include app_registry.apps[app].get_workspace_template() %}
-  {% endblock %}
-</main>
-
-<script src="{{ url_for('root.static', filename='chat_chrome.js') }}"></script>
-
-<!-- Load all app background scripts -->
-{% for app_name, app_instance in app_registry.apps.items() %}
-  {% set background_tpl = app_instance.get_background_template() %}
-  {% if background_tpl %}
-<!-- Background script: {{ app_name }} -->
-<script>
-(function() {
-  function initBackgroundService() {
-    try {
-      {% set blueprint = app_instance.get_blueprint() %}
-      {% with current_app = app_name %}
-      {% include background_tpl %}
-      {% endwith %}
-    } catch (err) {
-      window.AppServices?.markBackgroundFailing?.('{{ app_name }}', err);
-      window.logError?.(err, { context: 'app-bg-register', app: '{{ app_name }}' });
-    }
-  }
-
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', initBackgroundService);
-  } else {
-    initBackgroundService();
-  }
-})();
-</script>
-  {% endif %}
-{% endfor %}
-
-<!-- Error Modal -->
-<div id="errorModal" class="modal">
-  <div class="modal-content">
-    <button class="close" aria-label="close">&times;</button>
-    <pre id="errorMessage"></pre>
-  </div>
-</div>
-
-</body>
-</html>
diff --git a/solstone/convey/templates/chat_bar.html b/solstone/convey/templates/chat_bar.html
deleted file mode 100644
index 2ba95e545..000000000
--- a/solstone/convey/templates/chat_bar.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<div id="appBar" class="app-bar" role="region" aria-label="chat">
-  <div id="chatBarCapacity" class="chat-bar-capacity" aria-live="polite" hidden>
-    <span class="chat-bar-capacity-dot" aria-hidden="true"></span>
-    <span class="chat-bar-capacity-route"><span class="cap-from"></span><span class="cap-arrow" aria-hidden="true">→</span><span class="cap-to"></span></span>
-    <span class="chat-bar-capacity-sub"></span>
-  </div>
-  <div id="chatBarOffer" class="chat-bar-offer" aria-live="polite" hidden>
-    <span class="offer-text"></span>
-    <span class="offer-actions">
-      <button id="chatBarOfferYes" type="button" class="offer-btn offer-btn--yes"></button>
-      <button id="chatBarOfferNo" type="button" class="offer-btn offer-btn--no"></button>
-    </span>
-  </div>
-  <div id="chatBarDraft" class="chat-bar-draft" aria-live="polite" hidden>
-    <div class="chat-bar-draft-card" role="group" aria-label="">
-      <div class="chat-bar-draft-header">
-        <span class="chat-bar-draft-dot" aria-hidden="true"></span>
-        <span class="chat-bar-draft-title"></span>
-        <span class="chat-bar-draft-route">
-          <span class="chat-bar-draft-route-from"></span>
-          <span class="chat-bar-draft-route-arrow" aria-hidden="true">→</span>
-          <span class="chat-bar-draft-route-to"></span>
-        </span>
-      </div>
-      <div class="chat-bar-draft-body"></div>
-      <div class="chat-bar-draft-actions">
-        <button id="chatBarDraftSubmit" type="button" class="chat-bar-draft-btn chat-bar-draft-btn--submit"></button>
-        <button id="chatBarDraftCancel" type="button" class="chat-bar-draft-btn chat-bar-draft-btn--cancel"></button>
-        <span class="chat-bar-draft-floor"></span>
-      </div>
-    </div>
-  </div>
-  <div id="chatBarResult" class="chat-bar-result" aria-live="polite" hidden></div>
-  <div id="chatBarStatus" class="chat-bar-status" aria-live="polite">
-    <span id="chatBarSolPingDot" class="chat-bar-sol-ping-dot" aria-hidden="true" hidden></span>
-    <span id="chatBarStatusText"></span>
-    <button
-      id="chatBarSolPingDismiss"
-      type="button"
-      class="chat-bar-sol-ping-dismiss"
-      aria-label="dismiss sol-ping"
-      hidden
-    >&times;</button>
-  </div>
-  <div id="chatBarTalents" class="chat-bar-talents" aria-label="active talents"></div>
-  <form id="chatBarForm" class="chat-bar-form">
-    <textarea
-      id="chatBarInput"
-      class="chat-bar-input"
-      rows="1"
-      placeholder="{{ chat_bar_placeholder }}"
-      aria-label="chat input"
-    ></textarea>
-    <button id="chatBarSend" type="submit" class="chat-bar-send" aria-label="send">send</button>
-  </form>
-  <div id="chatBarQueue" class="chat-bar-queue" aria-live="polite" hidden></div>
-</div>
-<script>
-  window.solChatBarSeed = {{ chat_bar_sol_request | tojson | safe }};
-  window.solChatBarAttention = {{ chat_bar_attention | tojson | safe }};
-</script>
diff --git a/solstone/convey/templates/date_nav.html b/solstone/convey/templates/date_nav.html
deleted file mode 100644
index de0b59cb9..000000000
--- a/solstone/convey/templates/date_nav.html
+++ /dev/null
@@ -1,127 +0,0 @@
-{# Date Nav - renders below facet bar when app has date_nav enabled #}
-{# Both day and app are auto-extracted from URL by context processor #}
-{% if day %}
-<div class="date-nav">
-  <div class="date-nav-left">
-    <button class="date-nav-arrow" id="date-nav-prev" title="previous (←)">‹</button>
-  </div>
-  <button class="date-nav-label" id="date-nav-label" title="open month picker" aria-label="open month picker">{{ day|format_date_short }}</button>
-  <div class="date-nav-right">
-    <button class="date-nav-today" id="date-nav-today" title="jump to today (t)" aria-label="go to today">T</button>
-    <button class="date-nav-arrow" id="date-nav-next" title="next (→)">›</button>
-  </div>
-  <div class="month-picker"></div>
-</div>
-
-<script src="{{ url_for('root.static', filename='month-picker.js') }}"></script>
-<script>
-(function() {
-  const currentDay = '{{ day }}';
-  const app = '{{ app }}';
-  const baseUrl = `/app/${app}/`;
-
-  function adjustDay(day, delta) {
-    const year = parseInt(day.substring(0, 4));
-    const month = parseInt(day.substring(4, 6)) - 1;
-    const dayNum = parseInt(day.substring(6, 8));
-    const date = new Date(year, month, dayNum);
-    date.setDate(date.getDate() + delta);
-    return date.getFullYear() +
-      String(date.getMonth() + 1).padStart(2, '0') +
-      String(date.getDate()).padStart(2, '0');
-  }
-
-  function navigate(day) {
-    window.location.href = `${baseUrl}${day}`;
-  }
-
-  // Auto-register provider for current app using convention:
-  // Apps with date_nav:true must provide /app/{app}/api/stats/{month}
-  // Response format is auto-detected:
-  //   - Facet-aware: {day: {facet: count}} - filtered by selected facet
-  //   - Simple: {day: count} - returned as-is
-  MonthPicker.registerDataProvider(app, async (month, facet) => {
-    try {
-      const raw = await window.apiJson(`${baseUrl}api/stats/${month}`);
-
-      // Auto-detect format: if first value is an object, it's facet-aware
-      const values = Object.values(raw);
-      if (values.length > 0 && typeof values[0] === 'object' && values[0] !== null) {
-        // Facet-aware: {day: {facet: count}}
-        const result = {};
-        for (const [day, facetCounts] of Object.entries(raw)) {
-          result[day] = facet
-            ? (facetCounts[facet] || 0)
-            : Object.values(facetCounts).reduce((a, b) => a + b, 0);
-        }
-        return { data: result, error: null };
-      }
-      return { data: raw, error: null };
-    } catch (err) {
-      return { data: null, error: err };
-    }
-  });
-
-  // Initialize month picker
-  MonthPicker.init({
-    app: app,
-    currentDay: currentDay,
-    container: '.month-picker',
-    allowFutureDates: {{ app_registry.apps[app].allow_future_dates|tojson }}
-  });
-
-  // Click label to toggle month picker
-  document.getElementById('date-nav-label').addEventListener('click', () => {
-    MonthPicker.toggle();
-  });
-
-  // Arrow buttons: day nav when closed, month nav when open
-  document.getElementById('date-nav-prev').addEventListener('click', () => {
-    if (MonthPicker.isOpen()) {
-      MonthPicker.navigateMonth(-1);
-    } else {
-      navigate(adjustDay(currentDay, -1));
-    }
-  });
-
-  document.getElementById('date-nav-next').addEventListener('click', () => {
-    if (MonthPicker.isOpen()) {
-      MonthPicker.navigateMonth(1);
-    } else {
-      navigate(adjustDay(currentDay, 1));
-    }
-  });
-
-  // Today button
-  document.getElementById('date-nav-today').addEventListener('click', () => {
-    navigate(MonthPicker.getToday());
-  });
-
-  // Keyboard shortcuts
-  document.addEventListener('keydown', (e) => {
-    if (e.target.matches('input, textarea, select')) return;
-
-    if (e.key === 'ArrowLeft') {
-      e.preventDefault();
-      if (MonthPicker.isOpen()) {
-        MonthPicker.navigateMonth(-1);
-      } else {
-        navigate(adjustDay(currentDay, -1));
-      }
-    }
-    if (e.key === 'ArrowRight') {
-      e.preventDefault();
-      if (MonthPicker.isOpen()) {
-        MonthPicker.navigateMonth(1);
-      } else {
-        navigate(adjustDay(currentDay, 1));
-      }
-    }
-    if (e.key === 't' || e.key === 'T') {
-      e.preventDefault();
-      navigate(MonthPicker.getToday());
-    }
-  });
-})();
-</script>
-{% endif %}
diff --git a/solstone/convey/templates/diagnostic_console.html b/solstone/convey/templates/diagnostic_console.html
deleted file mode 100644
index 65276a101..000000000
--- a/solstone/convey/templates/diagnostic_console.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<aside id="diagnostic-console" class="diagnostic-console" tabindex="-1" aria-hidden="true" aria-labelledby="diagnostic-console-title">
-  <div class="diagnostic-console-content">
-    <header class="diagnostic-console-header">
-      <h3 id="diagnostic-console-title">{{ CONVEY_COPY.CONSOLE_HEADING }}</h3>
-      <div class="diagnostic-console-actions">
-        <button type="button" data-diagnostic-action="clear">{{ CONVEY_COPY.CONSOLE_ACTION_CLEAR }}</button>
-        <button type="button" data-diagnostic-action="send-all">{{ CONVEY_COPY.CONSOLE_ACTION_SEND_ALL }}</button>
-        <button type="button" class="diagnostic-console-close" data-diagnostic-action="close" aria-label="{{ CONVEY_COPY.CONSOLE_ACTION_CLOSE }}">&times;</button>
-      </div>
-    </header>
-
-    <p class="diagnostic-console-reporting-off" data-diagnostic-reporting-off hidden>{{ CONVEY_COPY.CONSOLE_REPORTING_OFF }}</p>
-
-    <div class="diagnostic-console-tabs" role="tablist" aria-label="{{ CONVEY_COPY.CONSOLE_HEADING }}">
-      <button type="button" data-diagnostic-filter="all" aria-selected="true">{{ CONVEY_COPY.CONSOLE_TAB_ALL }} <span data-diagnostic-count="all">0</span></button>
-      <button type="button" data-diagnostic-filter="error" aria-selected="false">{{ CONVEY_COPY.CONSOLE_TAB_ERRORS }} <span data-diagnostic-count="error">0</span></button>
-      <button type="button" data-diagnostic-filter="warning" aria-selected="false">{{ CONVEY_COPY.CONSOLE_TAB_WARNINGS }} <span data-diagnostic-count="warning">0</span></button>
-      <button type="button" data-diagnostic-filter="info" aria-selected="false">{{ CONVEY_COPY.CONSOLE_TAB_INFO }} <span data-diagnostic-count="info">0</span></button>
-    </div>
-
-    <div id="diagnostic-console-list" class="diagnostic-console-list"></div>
-    <p id="diagnostic-console-empty" class="diagnostic-console-empty" hidden>{{ CONVEY_COPY.CONSOLE_EMPTY }}</p>
-  </div>
-</aside>
diff --git a/solstone/convey/templates/menu_bar.html b/solstone/convey/templates/menu_bar.html
deleted file mode 100644
index b9114e622..000000000
--- a/solstone/convey/templates/menu_bar.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- Menu Bar Component (left sidebar) -->
-<nav class="menu-bar" aria-label="app navigation">
-  <ul class="menu-items">
-  {%- set app_names = apps.keys() | list -%}
-  {%- set last_starred_index = -1 -%}
-  {%- for i in range(app_names | length) -%}
-    {%- if app_names[i] in starred_apps -%}
-      {%- set last_starred_index = i -%}
-    {%- endif -%}
-  {%- endfor -%}
-
-  {% for app_name, app_data in apps.items() %}
-  {%- set is_starred = app_name in starred_apps -%}
-  {%- set is_last_starred = loop.index0 == last_starred_index and starred_apps | length > 0 -%}
-  <li class="menu-item{% if app == app_name %} current{% endif %}{% if is_last_starred %} last-starred{% endif %}" data-app-name="{{ app_name }}" data-starred="{{ 'true' if is_starred else 'false' }}">
-    <a href="/app/{{ app_name }}" class="menu-item-link"{% if app == app_name %} aria-current="page"{% endif %} tabindex="{% if app == app_name %}0{% else %}-1{% endif %}">
-      <span class="icon">{% if app_data['icon_svg'] %}{{ app_data['icon_svg']|safe }}{% else %}{{ app_data['icon'] }}{% endif %}</span>
-      <span class="label">{{ app_data['label'] }}</span>
-    </a>
-    <button class="star-toggle" type="button" tabindex="-1" data-app-name="{{ app_name }}" aria-label="star {{ app_data['label'] }}" aria-pressed="{{ 'true' if is_starred else 'false' }}">{{ '★' if is_starred else '☆' }}</button>
-    <button class="drag-handle" type="button" tabindex="-1" draggable="true" aria-label="reorder {{ app_data['label'] }}">⋮</button>
-  </li>
-  {% endfor %}
-  </ul>
-  <button class="menu-expander" type="button" aria-label="show all apps" aria-expanded="false">›</button>
-</nav>
diff --git a/solstone/convey/templates/status_pane.html b/solstone/convey/templates/status_pane.html
deleted file mode 100644
index c7e92b479..000000000
--- a/solstone/convey/templates/status_pane.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- Status Pane Component -->
-<aside id="status-pane" class="status-pane" tabindex="-1" aria-label="status">
-  <div class="status-pane-content">
-    <h3 id="status-sentence">connecting&hellip;</h3>
-    <div class="status-pane-detail" style="display: flex; flex-direction: column; gap: 4px;">
-      <span id="status-detail"></span>
-    </div>
-    <details class="status-pane-technical" style="margin-top: 12px;">
-      <summary style="cursor: pointer; user-select: none;">technical details</summary>
-      <div class="status-pane-technical" style="display: flex; flex-direction: column; gap: 4px; margin-top: 8px;">
-        <div><strong>state:</strong> <span id="ws-status-raw">connecting</span></div>
-        <div><strong>uptime:</strong> <span id="ws-uptime-raw">-</span></div>
-        <div><strong>last message:</strong> <span id="ws-last-message-raw">-</span></div>
-      </div>
-    </details>
-
-    <div id="capture-status-section" style="margin-top: 12px; display: none;">
-      <h4 style="margin: 0 0 4px 0; font-size: 13px; font-weight: 600;">observer status</h4>
-      <span id="capture-status-text" style="font-size: 13px;"></span>
-    </div>
-
-    <div id="version-section" style="margin-top: 12px; display: none;">
-      <h4 style="margin: 0 0 4px 0; font-size: 13px; font-weight: 600;">version</h4>
-      <span id="version-text" style="font-size: 13px;"></span>
-    </div>
-
-    <div id="quiet-notifs-section" style="display:none; margin-top: 16px;">
-      <h3 style="margin-bottom: 8px;">quiet notifications</h3>
-      <div id="quiet-notifs-list" style="display: flex; flex-direction: column; gap: 4px; font-size: 13px;"></div>
-    </div>
-
-    <h3 style="margin-top: 16px;">recent activity <button id="notif-bell" title="enable browser notifications" aria-label="enable browser notifications">🔔</button></h3>
-    <div id="notification-history" style="display: flex; flex-direction: column; gap: 4px; font-size: 13px;">
-      <span style="color: #9ca3af;">no recent activity</span>
-    </div>
-
-    <div class="status-pane-footer">
-      <a href="#" id="status-pane-console-link" class="status-pane-footer-link" aria-label="{{ CONVEY_COPY.CONSOLE_LINK_LABEL }}">{{ CONVEY_COPY.CONSOLE_LINK_LABEL }}</a>
-    </div>
-  </div>
-</aside>
-
-<script src="{{ url_for('root.static', filename='status_pane.js') }}"></script>
diff --git a/solstone/convey/tests/test_static_cache.py b/solstone/convey/tests/test_static_cache.py
index 38f483342..c06b7667b 100644
--- a/solstone/convey/tests/test_static_cache.py
+++ b/solstone/convey/tests/test_static_cache.py
@@ -1,9 +1,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 # Copyright (c) 2026 sol pbc
 
-import re
 from datetime import timedelta
-from pathlib import Path
 
 
 def test_send_file_max_age_default_configured(convey_env):
@@ -20,13 +18,3 @@ def test_static_asset_carries_max_age_and_etag(convey_env):
     assert resp.status_code == 200
     assert "max-age=300" in resp.headers["Cache-Control"]
     assert resp.headers.get("ETag")
-
-
-def test_head_scripts_all_deferred():
-    app_html = Path(__file__).resolve().parents[1] / "templates" / "app.html"
-    text = app_html.read_text(encoding="utf-8")
-
-    script_tags = re.findall(r"<script src=[^>]+>", text)
-
-    assert len(script_tags) == 15
-    assert all("defer" in tag or "async" in tag for tag in script_tags)
diff --git a/tests/test_app_news.py b/tests/test_app_news.py
index 254062762..0c5ce1db1 100644
--- a/tests/test_app_news.py
+++ b/tests/test_app_news.py
@@ -46,7 +46,6 @@ def test_news_app_json_icon_and_label():
     data = json.loads(Path("solstone/apps/news/app.json").read_text())
     assert data["icon"] == "📰"
     assert data["label"] == "newsletters"
-    assert data["spa"] is True
 
 
 def test_news_sidebar_adjacent_to_reflections(journal_copy):
diff --git a/tests/test_app_reflections.py b/tests/test_app_reflections.py
index e12d8cdc3..d7be4c2e7 100644
--- a/tests/test_app_reflections.py
+++ b/tests/test_app_reflections.py
@@ -202,7 +202,6 @@ def test_reflections_app_json_icon_is_moon():
     data = json.loads(Path("solstone/apps/reflections/app.json").read_text())
 
     assert data["icon"] == "🌙"
-    assert data["spa"] is True
 
 
 def test_reflections_detail_canonicalizes_to_sunday_in_api(journal_copy):
diff --git a/tests/test_check_api_conventions.py b/tests/test_check_api_conventions.py
index 006c36e14..2e52b6b03 100644
--- a/tests/test_check_api_conventions.py
+++ b/tests/test_check_api_conventions.py
@@ -37,11 +37,11 @@ cac = _load_checker()
 
 
 # A clean route module: collections through respond_collection, creates through
-# created, errors through error_response, pages through render_template/redirect.
+# created, errors through error_response, pages through plain HTML/redirect.
 GOOD_ROUTES = """\
 # SPDX-License-Identifier: AGPL-3.0-only
 # Copyright (c) 2026 sol pbc
-from flask import Blueprint, render_template, redirect
+from flask import Blueprint, redirect
 from solstone.convey.utils import respond_collection, created, error_response
 from solstone.convey.reasons import INVALID_DAY
 
@@ -69,7 +69,7 @@ def get_item(item_id):
 def page(day):
     if not day:
         return "", 404
-    return render_template("app.html")
+    return "<html></html>"
 
 
 @good_bp.route("/old")
@@ -117,7 +117,7 @@ def page(day):
     # Page route: render_template + bare "", 404 -> must NOT be flagged.
     if not day:
         return "", 404
-    return render_template("app.html")
+    return render_template("page.html")
 
 
 @bad_bp.route("/api/thing/<thing_id>")
@@ -192,6 +192,45 @@ def test_classifier_flags_non_api_json_array(bad_root):
     assert kinds_by_func["get_thing"] == {"abort", "bare-return", "inline-error"}
 
 
+def test_render_template_scan_flags_flask_binding_forms():
+    sources = [
+        "from flask import render_template\n\n"
+        "def v():\n"
+        "    return render_template('x.html')\n",
+        "from flask import render_template as rt\n\n"
+        "def v():\n"
+        "    return rt('x.html')\n",
+        "import flask\n\ndef v():\n    return flask.render_template('x.html')\n",
+    ]
+
+    for source in sources:
+        assert cac.scan_render_templates(source)
+
+
+def test_render_template_scan_ignores_local_helper():
+    source = """
+def _render_template(template, provider):
+    return template.replace("{provider}", provider)
+
+
+def v():
+    return _render_template("a", "b")
+"""
+
+    assert cac.scan_render_templates(source) == []
+
+
+def test_render_template_allowlist_wires_real_tree():
+    new, tracked = cac.evaluate(cac.ROOT, cac.ALLOWLIST)
+
+    assert new == []
+    assert "solstone/apps/news/routes.py: 1/1 render-template (allowlisted)" in tracked
+    assert (
+        "solstone/apps/reflections/routes.py: 1/1 render-template (allowlisted)"
+        in tracked
+    )
+
+
 def test_ratchet_by_file_kind_count(bad_root):
     # No allowlist -> every violation is new.
     new, tracked = cac.evaluate(bad_root, {})
diff --git a/tests/test_convey_apps.py b/tests/test_convey_apps.py
index 4ea1e9bc5..3f5b50d21 100644
--- a/tests/test_convey_apps.py
+++ b/tests/test_convey_apps.py
@@ -3,11 +3,8 @@
 
 """Tests for convey app placeholder and attention behavior."""
 
-from pathlib import Path
-
 import pytest
-from flask import Flask, render_template
-from jinja2 import ChoiceLoader, FileSystemLoader
+from flask import Flask
 
 from solstone.apps import AppRegistry
 from solstone.convey.apps import register_app_context
@@ -15,10 +12,6 @@ from solstone.convey.chat_stream import append_chat_event
 from solstone.convey.icons import lucide_svg
 from solstone.convey.sol_initiated.copy import CATEGORIES, KIND_SOL_CHAT_REQUEST
 
-REPO_ROOT = Path(__file__).resolve().parents[1]
-CONVEY_TEMPLATES = REPO_ROOT / "solstone" / "convey" / "templates"
-APPS_ROOT = REPO_ROOT / "solstone" / "apps"
-
 
 @pytest.fixture(autouse=True)
 def _temp_journal(monkeypatch, tmp_path):
@@ -71,57 +64,6 @@ def _append_request(request_id: str = "req", *, ts: int | None = None) -> None:
     append_chat_event(KIND_SOL_CHAT_REQUEST, **fields)
 
 
-def _template_app() -> Flask:
-    app = Flask(__name__, template_folder=str(CONVEY_TEMPLATES))
-    app.jinja_loader = ChoiceLoader(
-        [
-            FileSystemLoader(str(CONVEY_TEMPLATES)),
-            FileSystemLoader(str(APPS_ROOT)),
-        ]
-    )
-    return app
-
-
-def test_menu_bar_renders_discovered_app_lucide_svg(monkeypatch, tmp_path):
-    import solstone.convey.state as convey_state
-
-    app = _template_app()
-    registry = AppRegistry()
-    registry.discover()
-    monkeypatch.setattr(convey_state, "journal_root", str(tmp_path))
-    monkeypatch.setattr("solstone.convey.shell_data._get_facets_data", lambda: [])
-    monkeypatch.setattr("solstone.convey.shell_data._get_selected_facet", lambda: None)
-    monkeypatch.setattr("solstone.think.awareness.get_current", lambda: {})
-    monkeypatch.setattr("solstone.think.utils.day_dirs", lambda: {})
-    register_app_context(app, registry)
-
-    with app.test_request_context("/"):
-        context: dict = {}
-        app.update_template_context(context)
-        html = render_template("menu_bar.html", **context)
-
-    home_start = html.index('data-app-name="home"')
-    home_end = html.index("</li>", home_start)
-    home_item = html[home_start:home_end]
-    assert '<span class="icon"><svg' in home_item
-    assert "&lt;svg" not in home_item
-
-
-def test_menu_bar_falls_back_to_emoji_without_icon_svg():
-    app = _template_app()
-
-    with app.test_request_context("/"):
-        html = render_template(
-            "menu_bar.html",
-            app=None,
-            apps={"edge": {"icon_svg": None, "icon": "📦", "label": "edge"}},
-            starred_apps=[],
-        )
-
-    assert "📦" in html
-    assert "<svg" not in html
-
-
 def test_get_facets_data_adds_icon_svg_and_preserves_emoji(monkeypatch):
     from solstone.convey.shell_data import _get_facets_data
 
diff --git a/tests/test_convey_spa_shell.py b/tests/test_convey_spa_shell.py
index 79df7a17f..5ef6e1a88 100644
--- a/tests/test_convey_spa_shell.py
+++ b/tests/test_convey_spa_shell.py
@@ -66,9 +66,7 @@ def test_api_shell_shape_ordering_label_and_backgrounds(client, journal_copy):
         "search",
     ]
     assert by_name["sol"]["label"] == "Ada"
-    assert by_name["search"]["spa"] is True
     assert by_name["search"]["workspace_url"] == "/app/search/workspace"
-    assert by_name["network"]["spa"] is True
     assert by_name["network"]["workspace_url"] == "/app/network/workspace"
     assert by_name["timeline"]["background_url"] == "/app/timeline/background"
     assert by_name["support"]["background_url"] == "/app/support/background"
@@ -143,14 +141,28 @@ def test_construct_free_spa_workspaces_backgrounds_and_shell_boot_path():
     registry = AppRegistry()
     registry.discover()
     for app in registry.apps.values():
-        if app.spa:
-            _assert_construct_free(APPS_ROOT / app.name / "workspace.html")
+        _assert_construct_free(APPS_ROOT / app.name / "workspace.html")
     for path in APPS_ROOT.glob("*/background.html"):
         _assert_construct_free(path)
     for path in BOOT_PATH_FILES:
         _assert_construct_free(path)
 
 
+def test_convey_templates_dir_is_construct_free():
+    templates_dir = REPO_ROOT / "solstone" / "convey" / "templates"
+    files = sorted(p for p in templates_dir.iterdir() if p.is_file())
+    assert files, "convey/templates/ should not be empty"
+    for path in files:
+        _assert_construct_free(path)
+
+
+def test_assert_construct_free_flags_jinja(tmp_path):
+    bad = tmp_path / "bad.html"
+    bad.write_text("<div>{{ x }}</div>", encoding="utf-8")
+    with pytest.raises(AssertionError):
+        _assert_construct_free(bad)
+
+
 def test_init_template_construct_free_and_state_matches(client, journal_copy):
     _assert_construct_free(
         REPO_ROOT / "solstone" / "convey" / "templates" / "init.html"
-- 
2.51.2