Delete 391 dead Jinja templates replaced by sx_components/defpage

All app-level templates have been replaced by native sx component builders
and defpage declarative routes. Removes ~15,200 lines of dead HTML.

Kept: shared/browser templates (errors, ap_social, macros, root layout),
account + federation _email/magic_link, federation profile.html chain.

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

.claude/plans/glittery-discovering-kahn.md

@@ -0,0 +1,177 @@
+# Sexp Fragment Protocol: Component Defs Between Services
+
+## Context
+
+Fragment endpoints return raw sexp source (e.g., `(~blog-nav-wrapper :items ...)`). The consuming service embeds this in its page sexp, which the client evaluates. But blog-specific components like `~blog-nav-wrapper` are only in blog's `_COMPONENT_ENV` — not in market's. So market's `client_components_tag()` never sends them to the client, causing "Unknown component" errors.
+
+The fix: transfer component definitions alongside fragments. Services tell the provider what they already have; the provider sends only what's missing. The consuming service registers received defs into its `_COMPONENT_ENV` so they're included in `client_components_tag()` output for the client.
+
+## Approach: Structured Sexp Request/Response
+
+Replace the current GET + `X-Fragment-Request` header protocol with POST + sexp body. This aligns with the vision in `docs/sexpr-internal-protocol-first.md`.
+
+### Request format (POST body)
+```scheme
+(fragment-request
+  :type "nav-tree"
+  :params (:app-name "market" :path "/")
+  :components (~blog-nav-wrapper ~blog-nav-item-link ~header-row-sx ...))
+```
+
+`:components` lists component names already in the consumer's `_COMPONENT_ENV`. Provider skips these.
+
+### Response format
+```scheme
+(fragment-response
+  :defs ((defcomp ~blog-nav-wrapper (&key ...) ...) (defcomp ~blog-nav-item-link ...))
+  :content (~blog-nav-wrapper :items ...))
+```
+
+`:defs` contains only components the consumer doesn't have. `:content` is the fragment sexp (same as current response body).
+
+## Changes
+
+### 1. `shared/infrastructure/fragments.py` — Client side
+
+**`fetch_fragment()`**: Switch from GET to POST with sexp body.
+
+- Build request body using `sexp_call`:
+  ```python
+  from shared.sexp.helpers import sexp_call, SexpExpr
+  from shared.sexp.jinja_bridge import _COMPONENT_ENV
+
+  comp_names = [k for k in _COMPONENT_ENV if k.startswith("~")]
+  body = sexp_call("fragment-request",
+      type=fragment_type,
+      params=params or {},
+      components=SexpExpr("(" + " ".join(comp_names) + ")"))
+  ```
+- POST to same URL, body as `text/sexp`, keep `X-Fragment-Request` header for backward compat
+- Parse response: extract `:defs` and `:content` from the sexp response
+- Register defs into `_COMPONENT_ENV` via `register_components()`
+- Return `:content` wrapped as `SexpExpr`
+
+**New helper `_parse_fragment_response(text)`**:
+- `parse()` the response sexp
+- Extract keyword args (reuse the keyword-extraction pattern from `evaluator.py`)
+- Return `(defs_source, content_source)` tuple
+
+### 2. `shared/sexp/helpers.py` — Response builder
+
+**New `fragment_response(content, request_text)`**:
+
+```python
+def fragment_response(content: str, request_text: str) -> str:
+    """Build a structured fragment response with missing component defs."""
+    from .parser import parse, serialize
+    from .types import Keyword, Component
+    from .jinja_bridge import _COMPONENT_ENV
+
+    # Parse request to get :components list
+    req = parse(request_text)
+    loaded = set()
+    # extract :components keyword value
+    ...
+
+    # Diff against _COMPONENT_ENV, serialize missing defs
+    defs_parts = []
+    for key, val in _COMPONENT_ENV.items():
+        if not isinstance(val, Component):
+            continue
+        if key in loaded or f"~{val.name}" in loaded:
+            continue
+        defs_parts.append(_serialize_defcomp(val))
+
+    defs_sexp = "(" + " ".join(defs_parts) + ")" if defs_parts else "nil"
+    return sexp_call("fragment-response",
+        defs=SexpExpr(defs_sexp),
+        content=SexpExpr(content))
+```
+
+### 3. Fragment endpoints — All services
+
+**Generic change in each `bp/fragments/routes.py`**: Update the route handler to accept POST, read sexp body, use `fragment_response()` for the response.
+
+The `get_fragment` handler becomes:
+```python
+@bp.route("/<fragment_type>", methods=["GET", "POST"])
+async def get_fragment(fragment_type: str):
+    handler = _handlers.get(fragment_type)
+    if handler is None:
+        return Response("", status=200, content_type="text/sexp")
+    content = await handler()
+
+    # Structured sexp protocol (POST with sexp body)
+    request_body = await request.get_data(as_text=True)
+    if request_body and request.content_type == "text/sexp":
+        from shared.sexp.helpers import fragment_response
+        body = fragment_response(content, request_body)
+        return Response(body, status=200, content_type="text/sexp")
+
+    # Legacy GET fallback
+    return Response(content, status=200, content_type="text/sexp")
+```
+
+Since all fragment endpoints follow the identical `_handlers` + `get_fragment` pattern, we can extract this into a shared helper in `fragments.py` or a new `shared/infrastructure/fragment_endpoint.py`.
+
+### 4. Extract shared fragment endpoint helper
+
+To avoid touching every service's fragment routes, create a shared blueprint factory:
+
+**`shared/infrastructure/fragment_endpoint.py`**:
+```python
+def create_fragment_blueprint(handlers: dict) -> Blueprint:
+    """Create a fragment endpoint blueprint with sexp protocol support."""
+    bp = Blueprint("fragments", __name__, url_prefix="/internal/fragments")
+
+    @bp.before_request
+    async def _require_fragment_header():
+        if not request.headers.get(FRAGMENT_HEADER):
+            return Response("", status=403)
+
+    @bp.route("/<fragment_type>", methods=["GET", "POST"])
+    async def get_fragment(fragment_type: str):
+        handler = handlers.get(fragment_type)
+        if handler is None:
+            return Response("", status=200, content_type="text/sexp")
+        content = await handler()
+
+        # Sexp protocol: POST with structured request/response
+        if request.method == "POST" and request.content_type == "text/sexp":
+            request_body = await request.get_data(as_text=True)
+            from shared.sexp.helpers import fragment_response
+            body = fragment_response(content, request_body)
+            return Response(body, status=200, content_type="text/sexp")
+
+        return Response(content, status=200, content_type="text/sexp")
+
+    return bp
+```
+
+Then each service's `register()` just returns `create_fragment_blueprint(_handlers)`. This is a small refactor since they all duplicate the same boilerplate today.
+
+## Files to modify
+
+| File | Change |
+|------|--------|
+| `shared/infrastructure/fragments.py` | POST sexp body, parse response, register defs |
+| `shared/sexp/helpers.py` | `fragment_response()` builder, `_serialize_defcomp()` |
+| `shared/infrastructure/fragment_endpoint.py` | **New** — shared blueprint factory |
+| `blog/bp/fragments/routes.py` | Use `create_fragment_blueprint` |
+| `market/bp/fragments/routes.py` | Use `create_fragment_blueprint` |
+| `events/bp/fragments/routes.py` | Use `create_fragment_blueprint` |
+| `cart/bp/fragments/routes.py` | Use `create_fragment_blueprint` |
+| `account/bp/fragments/routes.py` | Use `create_fragment_blueprint` |
+| `orders/bp/fragments/routes.py` | Use `create_fragment_blueprint` |
+| `federation/bp/fragments/routes.py` | Use `create_fragment_blueprint` |
+| `relations/bp/fragments/routes.py` | Use `create_fragment_blueprint` |
+
+## Verification
+
+1. Start blog + market services: `./dev.sh blog market`
+2. Load market page — should fetch nav-tree from blog with sexp protocol
+3. Check market logs: no "Unknown component" errors
+4. Inspect page source: `client_components_tag()` output includes `~blog-nav-wrapper` etc.
+5. Cross-domain sx-get navigation (blog → market) works without reload
+6. Run sexp tests: `python3 -m pytest shared/sexp/tests/ -x -q`
+7. Second page load: `:components` list in request includes blog nav components, response `:defs` is empty

.claude/plans/hazy-sniffing-sphinx.md

@@ -0,0 +1,325 @@
+# Split Cart into Microservices
+
+## Context
+The cart app currently owns too much: CartItem, Order/OrderItem, PageConfig, ContainerRelation, plus all checkout/payment logic. We're splitting it into 4 pieces:
+
+1. **Relations service** — internal only, owns ContainerRelation
+2. **Likes service** — internal only, unified generic likes replacing ProductLike + PostLike
+3. **PageConfig → blog** — move to blog (which already owns pages)
+4. **Orders service** — public (orders.rose-ash.com), owns Order/OrderItem + SumUp checkout
+
+After the split, cart becomes a thin CartItem CRUD + inbox service.
+
+---
+
+## Phase 1: Relations Service (internal only)
+
+### 1.1 Scaffold `relations/`
+Create minimal internal-only app (no templates, no context_fn):
+
+| File | Notes |
+|------|-------|
+| `relations/__init__.py` | Empty |
+| `relations/path_setup.py` | Copy from cart |
+| `relations/app.py` | `create_base_app("relations")`, register data + actions BPs only |
+| `relations/services/__init__.py` | Empty `register_domain_services()` |
+| `relations/models/__init__.py` | `from shared.models.container_relation import ContainerRelation` |
+| `relations/bp/__init__.py` | Export `register_data`, `register_actions` |
+| `relations/bp/data/routes.py` | Move `get-children` handler from `cart/bp/data/routes.py:175-198` |
+| `relations/bp/actions/routes.py` | Move `attach-child` + `detach-child` from `cart/bp/actions/routes.py:112-153` |
+| `relations/alembic.ini` | Copy from cart, adjust path |
+| `relations/alembic/env.py` | MODELS=`["shared.models.container_relation"]`, TABLES=`{"container_relations"}` |
+| `relations/alembic/versions/0001_initial.py` | Create `container_relations` table |
+| `relations/Dockerfile` | Follow cart pattern, `COPY relations/ ./` |
+| `relations/entrypoint.sh` | Standard pattern, db=`db_relations` |
+
+### 1.2 Retarget callers (`"cart"` → `"relations"`)
+
+| File | Lines | Change |
+|------|-------|--------|
+| `events/bp/calendars/services/calendars.py` | 74, 111, 121 | `call_action("cart", ...)` → `call_action("relations", ...)` |
+| `blog/bp/menu_items/services/menu_items.py` | 83, 137, 141, 157 | Same |
+| `shared/services/market_impl.py` | 96, 109, 133 | Same |
+
+### 1.3 Clean up cart
+- Remove `get-children` from `cart/bp/data/routes.py:175-198`
+- Remove `attach-child`, `detach-child` from `cart/bp/actions/routes.py:112-153`
+- Remove `"shared.models.container_relation"` and `"container_relations"` from `cart/alembic/env.py`
+
+---
+
+## Phase 2: Likes Service (internal only)
+
+### 2.1 New unified model
+Single `likes` table in `db_likes`:
+
+```python
+class Like(Base):
+    __tablename__ = "likes"
+    id: Mapped[int] (pk)
+    user_id: Mapped[int] (not null, indexed)
+    target_type: Mapped[str] (String 32, not null)  # "product" or "post"
+    target_slug: Mapped[str | None] (String 255)     # for products
+    target_id: Mapped[int | None] (Integer)           # for posts
+    created_at, updated_at, deleted_at
+
+    UniqueConstraint("user_id", "target_type", "target_slug")
+    UniqueConstraint("user_id", "target_type", "target_id")
+    Index("ix_likes_target", "target_type", "target_slug")
+```
+
+Products use `target_type="product"`, `target_slug=slug`. Posts use `target_type="post"`, `target_id=post.id`.
+
+### 2.2 Scaffold `likes/`
+
+| File | Notes |
+|------|-------|
+| `likes/__init__.py` | Empty |
+| `likes/path_setup.py` | Standard |
+| `likes/app.py` | Internal-only, `create_base_app("likes")`, data + actions BPs |
+| `likes/services/__init__.py` | Empty `register_domain_services()` |
+| `likes/models/__init__.py` | Import Like |
+| `likes/models/like.py` | Generic Like model (above) |
+| `likes/bp/__init__.py` | Export register functions |
+| `likes/bp/data/routes.py` | `is-liked`, `liked-slugs`, `liked-ids` |
+| `likes/bp/actions/routes.py` | `toggle` action |
+| `likes/alembic.ini` | Standard |
+| `likes/alembic/env.py` | MODELS=`["likes.models.like"]`, TABLES=`{"likes"}` |
+| `likes/alembic/versions/0001_initial.py` | Create `likes` table |
+| `likes/Dockerfile` | Standard pattern |
+| `likes/entrypoint.sh` | Standard, db=`db_likes` |
+
+### 2.3 Data endpoints (`likes/bp/data/routes.py`)
+- `is-liked`: params `user_id, target_type, target_slug/target_id` → `{"liked": bool}`
+- `liked-slugs`: params `user_id, target_type` → `["slug1", "slug2"]`
+- `liked-ids`: params `user_id, target_type` → `[1, 2, 3]`
+
+### 2.4 Action endpoints (`likes/bp/actions/routes.py`)
+- `toggle`: payload `{user_id, target_type, target_slug?, target_id?}` → `{"liked": bool}`
+
+### 2.5 Retarget market app
+
+**`market/bp/product/routes.py`** (like_toggle, ~line 119):
+Replace `toggle_product_like(g.s, user_id, product_slug)` with:
+```python
+result = await call_action("likes", "toggle", payload={
+    "user_id": user_id, "target_type": "product", "target_slug": product_slug
+})
+liked = result["liked"]
+```
+
+**`market/bp/browse/services/db_backend.py`** (most complex):
+- `db_product_full` / `db_product_full_id`: Replace `ProductLike` subquery with `fetch_data("likes", "is-liked", ...)`. Annotate `is_liked` after query.
+- `db_products_nocounts` / `db_products_counts`: Fetch `liked_slugs` once via `fetch_data("likes", "liked-slugs", ...)`, filter `Product.slug.in_(liked_slugs)` for `?liked=true`, annotate `is_liked` post-query.
+
+**Delete**: `toggle_product_like` from `market/bp/product/services/product_operations.py`
+
+### 2.6 Retarget blog app
+
+**`blog/bp/post/routes.py`** (like_toggle):
+Replace `toggle_post_like(g.s, user_id, post_id)` with `call_action("likes", "toggle", payload={...})`.
+
+**Delete**: `toggle_post_like` from `blog/bp/post/services/post_operations.py`
+
+### 2.7 Remove old like models
+- Remove `ProductLike` from `shared/models/market.py` (lines 118-131) + `Product.likes` relationship (lines 110-114)
+- Remove `PostLike` from `shared/models/ghost_content.py` + `Post.likes` relationship
+- Remove `product_likes` from market alembic TABLES
+- Remove `post_likes` from blog alembic TABLES
+
+---
+
+## Phase 3: PageConfig → Blog
+
+### 3.1 Replace blog proxy endpoints with direct DB queries
+
+**`blog/bp/data/routes.py`** (lines 77-102): Replace the 3 proxy handlers that currently call `fetch_data("cart", ...)` with direct DB queries. Copy logic from `cart/bp/data/routes.py`:
+- `page-config` (cart lines 114-134)
+- `page-config-by-id` (cart lines 136-149)
+- `page-configs-batch` (cart lines 151-172)
+- `page-config-ensure` (cart lines 49-81) — add new
+
+Also add the `_page_config_dict` helper (cart lines 203-213).
+
+### 3.2 Move action to blog
+
+**`blog/bp/actions/routes.py`** (~line 40): Replace `call_action("cart", "update-page-config", ...)` proxy with direct handler. Copy logic from `cart/bp/actions/routes.py:51-110`.
+
+### 3.3 Blog callers become local
+
+| File | Current | After |
+|------|---------|-------|
+| `blog/bp/post/admin/routes.py:34` | `fetch_data("cart", "page-config", ...)` | Direct DB query (blog now owns table) |
+| `blog/bp/post/admin/routes.py:87,132` | `call_action("cart", "update-page-config", ...)` | Direct call to local handler |
+| `blog/bp/post/services/markets.py:44` | `fetch_data("cart", "page-config", ...)` | Direct DB query |
+| `blog/bp/blog/ghost_db.py:295` | `fetch_data("cart", "page-configs-batch", ...)` | Direct DB query |
+
+### 3.4 Retarget cross-service callers (`"cart"` → `"blog"`)
+
+| File | Change |
+|------|--------|
+| `cart/bp/cart/services/page_cart.py:181` | `fetch_data("cart", "page-configs-batch", ...)` → `fetch_data("blog", "page-configs-batch", ...)` |
+| `cart/bp/cart/global_routes.py:274` | `fetch_data("cart", "page-config-by-id", ...)` → `fetch_data("blog", "page-config-by-id", ...)` |
+
+(Note: `checkout.py:117` and `cart/app.py:177` already target `"blog"`)
+
+### 3.5 Update blog alembic
+**`blog/alembic/env.py`**: Add `"shared.models.page_config"` to MODELS and `"page_configs"` to TABLES.
+
+### 3.6 Clean up cart
+- Remove all `page-config*` handlers from `cart/bp/data/routes.py` (lines 49-172)
+- Remove `update-page-config` from `cart/bp/actions/routes.py` (lines 50-110)
+- Remove `"shared.models.page_config"` and `"page_configs"` from `cart/alembic/env.py`
+
+---
+
+## Phase 4: Orders Service (public, orders.rose-ash.com)
+
+### 4.1 Scaffold `orders/`
+
+| File | Notes |
+|------|-------|
+| `orders/__init__.py` | Empty |
+| `orders/path_setup.py` | Standard |
+| `orders/app.py` | Public app with `context_fn`, templates, fragments, page slug hydration |
+| `orders/services/__init__.py` | `register_domain_services()` |
+| `orders/models/__init__.py` | `from shared.models.order import Order, OrderItem` |
+| `orders/bp/__init__.py` | Export all BPs |
+| `orders/bp/order/` | Move from `cart/bp/order/` (single order: detail, pay, recheck) |
+| `orders/bp/orders/` | Move from `cart/bp/orders/` (order list + pagination) |
+| `orders/bp/checkout/routes.py` | Webhook + return routes from `cart/bp/cart/global_routes.py` |
+| `orders/bp/data/routes.py` | Minimal |
+| `orders/bp/actions/routes.py` | `create-order` action (called by cart during checkout) |
+| `orders/bp/fragments/routes.py` | `account-nav-item` fragment (orders link) |
+| `orders/templates/` | Move `_types/order/`, `_types/orders/`, checkout templates from cart |
+| `orders/alembic.ini` | Standard |
+| `orders/alembic/env.py` | MODELS=`["shared.models.order"]`, TABLES=`{"orders", "order_items"}` |
+| `orders/alembic/versions/0001_initial.py` | Create `orders` + `order_items` tables |
+| `orders/Dockerfile` | Standard, public-facing |
+| `orders/entrypoint.sh` | Standard, db=`db_orders` |
+
+### 4.2 Move checkout services to orders
+
+**Move to `orders/services/`:**
+- `checkout.py` — from `cart/bp/cart/services/checkout.py` (move: `create_order_from_cart`, `resolve_page_config`, `build_sumup_*`, `get_order_with_details`. Keep `find_or_create_cart_item` in cart.)
+- `check_sumup_status.py` — from `cart/bp/cart/services/check_sumup_status.py`
+
+**`clear_cart_for_order`** stays in cart as new action:
+- Add `clear-cart-for-order` to `cart/bp/actions/routes.py`
+- Orders calls `call_action("cart", "clear-cart-for-order", payload={user_id, session_id, page_post_id})`
+
+### 4.3 `create-order` action endpoint (`orders/bp/actions/routes.py`)
+Cart's `POST /checkout/` calls this:
+```
+Payload: {cart_items: [{product_id, product_title, product_slug, product_image,
+           product_special_price, product_regular_price, product_price_currency,
+           quantity, market_place_container_id}],
+          calendar_entries, tickets, user_id, session_id,
+          product_total, calendar_total, ticket_total,
+          page_post_id, redirect_url, webhook_base_url}
+Returns: {order_id, sumup_hosted_url, page_config_id, sumup_reference, description}
+```
+
+### 4.4 Refactor cart's checkout route
+`cart/bp/cart/global_routes.py` `POST /checkout/`:
+1. Load local cart data (get_cart, calendar entries, tickets, totals)
+2. Serialize cart items to dicts
+3. `result = await call_action("orders", "create-order", payload={...})`
+4. Redirect to `result["sumup_hosted_url"]`
+
+Same for page-scoped checkout in `cart/bp/cart/page_routes.py`.
+
+### 4.5 Move webhook + return routes to orders
+- `POST /checkout/webhook/<order_id>/` → `orders/bp/checkout/routes.py`
+- `GET /checkout/return/<order_id>/` → `orders/bp/checkout/routes.py`
+- SumUp redirect/webhook URLs must now point to orders.rose-ash.com
+
+### 4.6 Move order list/detail routes
+- `cart/bp/order/` → `orders/bp/order/`
+- `cart/bp/orders/` → `orders/bp/orders/`
+
+### 4.7 Move startup reconciliation
+`_reconcile_pending_orders` from `cart/app.py:209-265` → `orders/app.py`
+
+### 4.8 Clean up cart
+- Remove `cart/bp/order/`, `cart/bp/orders/`
+- Remove checkout webhook/return from `cart/bp/cart/global_routes.py`
+- Remove `_reconcile_pending_orders` from `cart/app.py`
+- Remove order templates from `cart/templates/`
+- Remove `"shared.models.order"` and `"orders", "order_items"` from `cart/alembic/env.py`
+
+---
+
+## Phase 5: Infrastructure (applies to all new services)
+
+### 5.1 docker-compose.yml
+Add 3 new services (relations, likes, orders) with own DATABASE_URL (db_relations, db_likes, db_orders), own REDIS_URL (Redis DB 7, 8, 9).
+
+Add to `x-app-env`:
+```yaml
+INTERNAL_URL_RELATIONS: http://relations:8000
+INTERNAL_URL_LIKES: http://likes:8000
+INTERNAL_URL_ORDERS: http://orders:8000
+APP_URL_ORDERS: https://orders.rose-ash.com
+```
+
+### 5.2 docker-compose.dev.yml
+Add all 3 services with dev volumes (ports 8008, 8009, 8010).
+Add to `x-sibling-models` for all 3 new services.
+
+### 5.3 deploy.sh
+Add `relations likes orders` to APPS list.
+
+### 5.4 Caddyfile (`/root/caddy/Caddyfile`)
+Add only orders (public):
+```
+orders.rose-ash.com { reverse_proxy rose-ash-dev-orders-1:8000 }
+```
+
+### 5.5 shared/infrastructure/factory.py
+Add to model import loop: `"relations.models", "likes.models", "orders.models"`
+
+### 5.6 shared/infrastructure/urls.py
+Add `orders_url(path)` helper.
+
+### 5.7 All existing Dockerfiles
+Add sibling model COPY lines for the 3 new services to every existing Dockerfile (blog, market, cart, events, federation, account).
+
+### 5.8 CLAUDE.md
+Update project structure and add notes about the new services.
+
+---
+
+## Data Migration (one-time, run before code switch)
+
+1. `container_relations` from `db_cart` → `db_relations`
+2. `product_likes` from `db_market` + `post_likes` from `db_blog` → `db_likes.likes`
+3. `page_configs` from `db_cart` → `db_blog`
+4. `orders` + `order_items` from `db_cart` → `db_orders`
+
+Use `pg_dump`/`pg_restore` or direct SQL for migration.
+
+---
+
+## Post-Split Cart State
+
+After all 4 phases, cart owns only:
+- **Model**: CartItem (table in db_cart)
+- **Alembic**: `cart_items` only
+- **Data endpoints**: `cart-summary`, `cart-items`
+- **Action endpoints**: `adopt-cart-for-user`, `clear-cart-for-order` (new)
+- **Inbox handlers**: Add/Remove/Update `rose:CartItem`
+- **Public routes**: cart overview, page cart, add-to-cart, quantity, delete
+- **Fragments**: `cart-mini`
+- **Checkout**: POST /checkout/ (creates order via `call_action("orders", "create-order")`, redirects to SumUp)
+
+---
+
+## Verification
+1. **Relations**: Blog attach/detach marketplace to page; events attach/detach calendar
+2. **Likes**: Toggle product like on market page; toggle post like on blog; `?liked=true` filter
+3. **PageConfig**: Blog admin page config update; cart checkout resolves page config from blog
+4. **Orders**: Add to cart → checkout → SumUp redirect → webhook → order paid; order list/detail on orders.rose-ash.com
+5. No remaining `call_action("cart", "attach-child|detach-child|update-page-config")`
+6. No remaining `fetch_data("cart", "page-config*|get-children")`
+7. Cart alembic only manages `cart_items` table

.gitea/workflows/ci.yml

@@ -58,13 +58,22 @@ jobs:
               fi
             fi
 
-            for app in blog market cart events federation account relations likes orders; do
+            # Map compose service name to source directory
+            app_dir() {
+              case \"\$1\" in
+                sx_docs) echo \"sx\" ;;
+                *) echo \"\$1\" ;;
+              esac
+            }
+
+            for app in blog market cart events federation account relations likes orders test sx_docs; do
+              dir=\$(app_dir \"\$app\")
               IMAGE_EXISTS=\$(docker image ls -q ${{ env.REGISTRY }}/\$app:latest 2>/dev/null)
-              if [ \"\$REBUILD_ALL\" = true ] || echo \"\$CHANGED\" | grep -q \"^\$app/\" || [ -z \"\$IMAGE_EXISTS\" ]; then
+              if [ \"\$REBUILD_ALL\" = true ] || echo \"\$CHANGED\" | grep -q \"^\$dir/\" || [ -z \"\$IMAGE_EXISTS\" ]; then
                 echo \"Building \$app...\"
                 docker build \
                   --build-arg CACHEBUST=\$(date +%s) \
-                  -f \$app/Dockerfile \
+                  -f \$dir/Dockerfile \
                   -t ${{ env.REGISTRY }}/\$app:latest \
                   -t ${{ env.REGISTRY }}/\$app:${{ github.sha }} \
                   .

_config/app-config.yaml

@@ -16,6 +16,9 @@ app_urls:
   events: "https://events.rose-ash.com"
   federation: "https://federation.rose-ash.com"
   account: "https://account.rose-ash.com"
+  sx: "https://sx.rose-ash.com"
+  test: "https://test.rose-ash.com"
+  orders: "https://orders.rose-ash.com"
 cache:
   fs_root: /app/_snapshot  # <- absolute path to your snapshot dir
 categories:

account/alembic/versions/0003_add_user_profile_fields.py

@@ -0,0 +1,43 @@
+"""Add author profile fields to users table.
+
+Merges Ghost Author profile data into User — bio, profile_image, cover_image,
+website, location, facebook, twitter, slug, is_admin.
+
+Revision ID: 0003
+Revises: 0002_hash_oauth_tokens
+"""
+from alembic import op
+import sqlalchemy as sa
+
+revision = "acct_0003"
+down_revision = "acct_0002"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column("users", sa.Column("slug", sa.String(191), nullable=True))
+    op.add_column("users", sa.Column("bio", sa.Text(), nullable=True))
+    op.add_column("users", sa.Column("profile_image", sa.Text(), nullable=True))
+    op.add_column("users", sa.Column("cover_image", sa.Text(), nullable=True))
+    op.add_column("users", sa.Column("website", sa.Text(), nullable=True))
+    op.add_column("users", sa.Column("location", sa.Text(), nullable=True))
+    op.add_column("users", sa.Column("facebook", sa.Text(), nullable=True))
+    op.add_column("users", sa.Column("twitter", sa.Text(), nullable=True))
+    op.add_column("users", sa.Column(
+        "is_admin", sa.Boolean(), nullable=False, server_default=sa.text("false"),
+    ))
+    op.create_index("ix_users_slug", "users", ["slug"], unique=True)
+
+
+def downgrade():
+    op.drop_index("ix_users_slug")
+    op.drop_column("users", "is_admin")
+    op.drop_column("users", "twitter")
+    op.drop_column("users", "facebook")
+    op.drop_column("users", "location")
+    op.drop_column("users", "website")
+    op.drop_column("users", "cover_image")
+    op.drop_column("users", "profile_image")
+    op.drop_column("users", "bio")
+    op.drop_column("users", "slug")

account/app.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 import path_setup  # noqa: F401  # adds shared/ to sys.path
-import sexp.sexp_components as sexp_components  # noqa: F401  # ensure Hypercorn --reload watches this file
+import sx.sx_components as sx_components  # noqa: F401  # ensure Hypercorn --reload watches this file
 from pathlib import Path
 
 from quart import g, request
@@ -44,14 +44,14 @@ async def account_context() -> dict:
     if ident["session_id"] is not None:
         cart_params["session_id"] = ident["session_id"]
 
-    cart_mini_html, auth_menu_html, nav_tree_html = await fetch_fragments([
+    cart_mini, auth_menu, nav_tree = await fetch_fragments([
         ("cart", "cart-mini", cart_params or None),
         ("account", "auth-menu", {"email": user.email} if user else None),
         ("blog", "nav-tree", {"app_name": "account", "path": request.path}),
     ])
-    ctx["cart_mini_html"] = cart_mini_html
-    ctx["auth_menu_html"] = auth_menu_html
-    ctx["nav_tree_html"] = nav_tree_html
+    ctx["cart_mini"] = cart_mini
+    ctx["auth_menu"] = auth_menu
+    ctx["nav_tree"] = nav_tree
 
     return ctx
 
@@ -72,9 +72,19 @@ def create_app() -> "Quart":
         app.jinja_loader,
     ])
 
+    # Setup defpage routes
+    import sx.sx_components  # noqa: F811 — ensure components loaded
+    from sxc.pages import setup_account_pages
+    setup_account_pages()
+
     # --- blueprints ---
     app.register_blueprint(register_auth_bp())
-    app.register_blueprint(register_account_bp())
+
+    account_bp = register_account_bp()
+    from shared.sx.pages import mount_pages
+    mount_pages(account_bp, "account")
+    app.register_blueprint(account_bp)
+
     app.register_blueprint(register_fragments())
 
     from bp.actions.routes import register as register_actions

account/bp/account/routes.py

@@ -1,14 +1,13 @@
 """Account pages blueprint.
 
 Moved from federation/bp/auth — newsletters, fragment pages (tickets, bookings).
-Mounted at root /.
+Mounted at root /. GET page handlers replaced by defpage.
 """
 from __future__ import annotations
 
 from quart import (
     Blueprint,
     request,
-    make_response,
     redirect,
     g,
 )
@@ -18,86 +17,64 @@ from shared.models import UserNewsletter
 from shared.models.ghost_membership_entities import GhostNewsletter
 from shared.infrastructure.urls import login_url
 from shared.infrastructure.fragments import fetch_fragment, fetch_fragments
-
-oob = {
-    "oob_extends": "oob_elements.html",
-    "extends": "_types/root/_index.html",
-    "parent_id": "root-header-child",
-    "child_id": "auth-header-child",
-    "header": "_types/auth/header/_header.html",
-    "parent_header": "_types/root/header/_header.html",
-    "nav": "_types/auth/_nav.html",
-    "main": "_types/auth/_main_panel.html",
-}
+from shared.sx.helpers import sx_response
 
 
 def register(url_prefix="/"):
     account_bp = Blueprint("account", __name__, url_prefix=url_prefix)
 
-    @account_bp.context_processor
-    async def context():
+    @account_bp.before_request
+    async def _prepare_page_data():
+        """Fetch account_nav fragments and load data for defpage routes."""
+        # Fetch account nav items for layout (was in context_processor)
         events_nav, cart_nav, artdag_nav = await fetch_fragments([
             ("events", "account-nav-item", {}),
             ("cart", "account-nav-item", {}),
             ("artdag", "nav-item", {}),
         ], required=False)
-        return {"oob": oob, "account_nav_html": events_nav + cart_nav + artdag_nav}
+        g.account_nav = events_nav + cart_nav + artdag_nav
 
-    @account_bp.get("/")
-    async def account():
-        from shared.browser.app.utils.htmx import is_htmx_request
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_account_page, render_account_oob
+        if request.method != "GET":
+            return
 
-        if not g.get("user"):
-            return redirect(login_url("/"))
+        endpoint = request.endpoint or ""
 
-        ctx = await get_template_context()
-        if not is_htmx_request():
-            html = await render_account_page(ctx)
-        else:
-            html = await render_account_oob(ctx)
-
-        return await make_response(html)
-
-    @account_bp.get("/newsletters/")
-    async def newsletters():
-        from shared.browser.app.utils.htmx import is_htmx_request
-
-        if not g.get("user"):
-            return redirect(login_url("/newsletters/"))
-
-        result = await g.s.execute(
-            select(GhostNewsletter).order_by(GhostNewsletter.name)
-        )
-        all_newsletters = result.scalars().all()
-
-        sub_result = await g.s.execute(
-            select(UserNewsletter).where(
-                UserNewsletter.user_id == g.user.id,
+        # Newsletters page — load newsletter data
+        if endpoint.endswith("defpage_newsletters"):
+            result = await g.s.execute(
+                select(GhostNewsletter).order_by(GhostNewsletter.name)
             )
-        )
-        user_subs = {un.newsletter_id: un for un in sub_result.scalars().all()}
+            all_newsletters = result.scalars().all()
 
-        newsletter_list = []
-        for nl in all_newsletters:
-            un = user_subs.get(nl.id)
-            newsletter_list.append({
-                "newsletter": nl,
-                "un": un,
-                "subscribed": un.subscribed if un else False,
-            })
+            sub_result = await g.s.execute(
+                select(UserNewsletter).where(
+                    UserNewsletter.user_id == g.user.id,
+                )
+            )
+            user_subs = {un.newsletter_id: un for un in sub_result.scalars().all()}
 
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_newsletters_page, render_newsletters_oob
+            newsletter_list = []
+            for nl in all_newsletters:
+                un = user_subs.get(nl.id)
+                newsletter_list.append({
+                    "newsletter": nl,
+                    "un": un,
+                    "subscribed": un.subscribed if un else False,
+                })
+            g.newsletters_data = newsletter_list
 
-        ctx = await get_template_context()
-        if not is_htmx_request():
-            html = await render_newsletters_page(ctx, newsletter_list)
-        else:
-            html = await render_newsletters_oob(ctx, newsletter_list)
-
-        return await make_response(html)
+        # Fragment page — load fragment from events service
+        elif endpoint.endswith("defpage_fragment_page"):
+            slug = request.view_args.get("slug")
+            if slug and g.get("user"):
+                fragment_html = await fetch_fragment(
+                    "events", "account-page",
+                    params={"slug": slug, "user_id": str(g.user.id)},
+                )
+                if not fragment_html:
+                    from quart import abort
+                    abort(404)
+                g.fragment_page_data = fragment_html
 
     @account_bp.post("/newsletter/<int:newsletter_id>/toggle/")
     async def toggle_newsletter(newsletter_id: int):
@@ -124,34 +101,7 @@ def register(url_prefix="/"):
 
         await g.s.flush()
 
-        from sexp.sexp_components import render_newsletter_toggle
-        return render_newsletter_toggle(un)
-
-    # Catch-all for fragment-provided pages — must be last
-    @account_bp.get("/<slug>/")
-    async def fragment_page(slug):
-        from shared.browser.app.utils.htmx import is_htmx_request
-        from quart import abort
-
-        if not g.get("user"):
-            return redirect(login_url(f"/{slug}/"))
-
-        fragment_html = await fetch_fragment(
-            "events", "account-page",
-            params={"slug": slug, "user_id": str(g.user.id)},
-        )
-        if not fragment_html:
-            abort(404)
-
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_fragment_page, render_fragment_oob
-
-        ctx = await get_template_context()
-        if not is_htmx_request():
-            html = await render_fragment_page(ctx, fragment_html)
-        else:
-            html = await render_fragment_oob(ctx, fragment_html)
-
-        return await make_response(html)
+        from sx.sx_components import render_newsletter_toggle
+        return sx_response(render_newsletter_toggle(un))
 
     return account_bp

account/bp/auth/routes.py

@@ -44,7 +44,7 @@ from .services import (
 SESSION_USER_KEY = "uid"
 ACCOUNT_SESSION_KEY = "account_sid"
 
-ALLOWED_CLIENTS = {"blog", "market", "cart", "events", "federation", "orders", "test", "artdag", "artdag_l2"}
+ALLOWED_CLIENTS = {"blog", "market", "cart", "events", "federation", "orders", "test", "sx", "artdag", "artdag_l2"}
 
 
 def register(url_prefix="/auth"):
@@ -275,8 +275,8 @@ def register(url_prefix="/auth"):
             redirect_url = pop_login_redirect_target()
             return redirect(redirect_url)
 
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_login_page
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_login_page
         ctx = await get_template_context()
         return await render_login_page(ctx)
 
@@ -291,8 +291,8 @@ def register(url_prefix="/auth"):
 
         is_valid, email = validate_email(email_input)
         if not is_valid:
-            from shared.sexp.page import get_template_context
-            from sexp.sexp_components import render_login_page
+            from shared.sx.page import get_template_context
+            from sx.sx_components import render_login_page
             ctx = await get_template_context(error="Please enter a valid email address.", email=email_input)
             return await render_login_page(ctx), 400
 
@@ -301,8 +301,8 @@ def register(url_prefix="/auth"):
         try:
             allowed, _ = await _check_rate_limit(f"magic_email:{email}", 5, 900)
             if not allowed:
-                from shared.sexp.page import get_template_context
-                from sexp.sexp_components import render_check_email_page
+                from shared.sx.page import get_template_context
+                from sx.sx_components import render_check_email_page
                 ctx = await get_template_context(email=email, email_error=None)
                 return await render_check_email_page(ctx), 200
         except Exception:
@@ -324,8 +324,8 @@ def register(url_prefix="/auth"):
                 "Please try again in a moment."
             )
 
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_check_email_page
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_check_email_page
         ctx = await get_template_context(email=email, email_error=email_error)
         return await render_check_email_page(ctx)
 
@@ -340,15 +340,15 @@ def register(url_prefix="/auth"):
                     user, error = await validate_magic_link(s, token)
 
                     if error:
-                        from shared.sexp.page import get_template_context
-                        from sexp.sexp_components import render_login_page
+                        from shared.sx.page import get_template_context
+                        from sx.sx_components import render_login_page
                         ctx = await get_template_context(error=error)
                         return await render_login_page(ctx), 400
                     user_id = user.id
 
         except Exception:
-            from shared.sexp.page import get_template_context
-            from sexp.sexp_components import render_login_page
+            from shared.sx.page import get_template_context
+            from sx.sx_components import render_login_page
             ctx = await get_template_context(error="Could not sign you in right now. Please try again.")
             return await render_login_page(ctx), 502
 
@@ -679,8 +679,8 @@ def register(url_prefix="/auth"):
     @auth_bp.get("/device/")
     async def device_form():
         """Browser form where user enters the code displayed in terminal."""
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_device_page
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_device_page
         code = request.args.get("code", "")
         ctx = await get_template_context(code=code)
         return await render_device_page(ctx)
@@ -693,8 +693,8 @@ def register(url_prefix="/auth"):
         user_code = (form.get("code") or "").strip().replace("-", "").upper()
 
         if not user_code or len(user_code) != 8:
-            from shared.sexp.page import get_template_context
-            from sexp.sexp_components import render_device_page
+            from shared.sx.page import get_template_context
+            from sx.sx_components import render_device_page
             ctx = await get_template_context(error="Please enter a valid 8-character code.", code=form.get("code", ""))
             return await render_device_page(ctx), 400
 
@@ -703,8 +703,8 @@ def register(url_prefix="/auth"):
         r = await get_auth_redis()
         device_code = await r.get(f"devflow_uc:{user_code}")
         if not device_code:
-            from shared.sexp.page import get_template_context
-            from sexp.sexp_components import render_device_page
+            from shared.sx.page import get_template_context
+            from sx.sx_components import render_device_page
             ctx = await get_template_context(error="Code not found or expired. Please try again.", code=form.get("code", ""))
             return await render_device_page(ctx), 400
 
@@ -720,13 +720,13 @@ def register(url_prefix="/auth"):
         # Logged in — approve immediately
         ok = await _approve_device(device_code, g.user)
         if not ok:
-            from shared.sexp.page import get_template_context
-            from sexp.sexp_components import render_device_page
+            from shared.sx.page import get_template_context
+            from sx.sx_components import render_device_page
             ctx = await get_template_context(error="Code expired or already used.")
             return await render_device_page(ctx), 400
 
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_device_approved_page
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_device_approved_page
         ctx = await get_template_context()
         return await render_device_approved_page(ctx)
 
@@ -734,8 +734,8 @@ def register(url_prefix="/auth"):
     @auth_bp.get("/device/complete/")
     async def device_complete():
         """Post-login redirect — completes approval after magic link auth."""
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_device_page, render_device_approved_page
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_device_page, render_device_approved_page
 
         device_code = request.args.get("code", "")
 

account/bp/fragments/routes.py

@@ -1,10 +1,10 @@
 """Account app fragment endpoints.
 
-Exposes HTML fragments at ``/internal/fragments/<type>`` for consumption
+Exposes sx fragments at ``/internal/fragments/<type>`` for consumption
 by other coop apps via the fragment client.
 
-Fragments:
-  auth-menu   Desktop + mobile auth menu (sign-in or user link)
+All handlers are defined declaratively in .sx files under
+``account/sx/handlers/`` and dispatched via the sx handler registry.
 """
 
 from __future__ import annotations
@@ -12,33 +12,12 @@ from __future__ import annotations
 from quart import Blueprint, Response, request
 
 from shared.infrastructure.fragments import FRAGMENT_HEADER
+from shared.sx.handlers import get_handler, execute_handler
 
 
 def register():
     bp = Blueprint("fragments", __name__, url_prefix="/internal/fragments")
 
-    # ---------------------------------------------------------------
-    # Fragment handlers
-    # ---------------------------------------------------------------
-
-    async def _auth_menu():
-        from shared.infrastructure.urls import account_url
-        from shared.sexp.jinja_bridge import sexp as render_sexp
-
-        user_email = request.args.get("email", "")
-        return render_sexp(
-            '(~auth-menu :user-email user-email :account-url account-url)',
-            **{"user-email": user_email or None, "account-url": account_url("")},
-        )
-
-    _handlers = {
-        "auth-menu": _auth_menu,
-    }
-
-    # ---------------------------------------------------------------
-    # Routing
-    # ---------------------------------------------------------------
-
     @bp.before_request
     async def _require_fragment_header():
         if not request.headers.get(FRAGMENT_HEADER):
@@ -46,10 +25,12 @@ def register():
 
     @bp.get("/<fragment_type>")
     async def get_fragment(fragment_type: str):
-        handler = _handlers.get(fragment_type)
-        if handler is None:
-            return Response("", status=200, content_type="text/html")
-        html = await handler()
-        return Response(html, status=200, content_type="text/html")
+        handler_def = get_handler("account", fragment_type)
+        if handler_def is not None:
+            result = await execute_handler(
+                handler_def, "account", args=dict(request.args),
+            )
+            return Response(result, status=200, content_type="text/sx")
+        return Response("", status=200, content_type="text/sx")
 
     return bp

account/entrypoint.sh

@@ -54,6 +54,7 @@ fi
 RELOAD_FLAG=""
 if [[ "${RELOAD:-}" == "true" ]]; then
   RELOAD_FLAG="--reload"
+  python3 -m shared.dev_watcher &
   echo "Starting Hypercorn (${APP_MODULE:-app:app}) with auto-reload..."
 else
   echo "Starting Hypercorn (${APP_MODULE:-app:app})..."

account/sexp/auth.sexpr

@@ -1,58 +0,0 @@
-;; Auth page components (login, device, check email)
-
-(defcomp ~account-login-error (&key error)
-  (when error
-    (div :class "bg-red-50 border border-red-200 text-red-700 p-3 rounded mb-4"
-      (raw! error))))
-
-(defcomp ~account-login-form (&key error-html action csrf-token email)
-  (div :class "py-8 max-w-md mx-auto"
-    (h1 :class "text-2xl font-bold mb-6" "Sign in")
-    (raw! error-html)
-    (form :method "post" :action action :class "space-y-4"
-      (input :type "hidden" :name "csrf_token" :value csrf-token)
-      (div
-        (label :for "email" :class "block text-sm font-medium mb-1" "Email address")
-        (input :type "email" :name "email" :id "email" :value email :required true :autofocus true
-          :class "w-full border border-stone-300 rounded px-3 py-2 focus:outline-none focus:ring-2 focus:ring-stone-500"))
-      (button :type "submit"
-        :class "w-full bg-stone-800 text-white py-2 px-4 rounded hover:bg-stone-700 transition"
-        "Send magic link"))))
-
-(defcomp ~account-device-error (&key error)
-  (when error
-    (div :class "bg-red-50 border border-red-200 text-red-700 p-3 rounded mb-4"
-      (raw! error))))
-
-(defcomp ~account-device-form (&key error-html action csrf-token code)
-  (div :class "py-8 max-w-md mx-auto"
-    (h1 :class "text-2xl font-bold mb-6" "Authorize device")
-    (p :class "text-stone-600 mb-4" "Enter the code shown in your terminal to sign in.")
-    (raw! error-html)
-    (form :method "post" :action action :class "space-y-4"
-      (input :type "hidden" :name "csrf_token" :value csrf-token)
-      (div
-        (label :for "code" :class "block text-sm font-medium mb-1" "Device code")
-        (input :type "text" :name "code" :id "code" :value code :placeholder "XXXX-XXXX"
-          :required true :autofocus true :maxlength "9" :autocomplete "off" :spellcheck "false"
-          :class "w-full border border-stone-300 rounded px-3 py-3 text-center text-2xl tracking-widest font-mono uppercase focus:outline-none focus:ring-2 focus:ring-stone-500"))
-      (button :type "submit"
-        :class "w-full bg-stone-800 text-white py-2 px-4 rounded hover:bg-stone-700 transition"
-        "Authorize"))))
-
-(defcomp ~account-device-approved ()
-  (div :class "py-8 max-w-md mx-auto text-center"
-    (h1 :class "text-2xl font-bold mb-4" "Device authorized")
-    (p :class "text-stone-600" "You can close this window and return to your terminal.")))
-
-(defcomp ~account-check-email-error (&key error)
-  (when error
-    (div :class "bg-yellow-50 border border-yellow-200 text-yellow-700 p-3 rounded mt-4"
-      (raw! error))))
-
-(defcomp ~account-check-email (&key email error-html)
-  (div :class "py-8 max-w-md mx-auto text-center"
-    (h1 :class "text-2xl font-bold mb-4" "Check your email")
-    (p :class "text-stone-600 mb-2" "We sent a sign-in link to " (strong (raw! email)) ".")
-    (p :class "text-stone-500 text-sm" "Click the link in the email to sign in. The link expires in 15 minutes.")
-    (raw! error-html)))

account/sexp/newsletters.sexpr

@@ -1,37 +0,0 @@
-;; Newsletter management components
-
-(defcomp ~account-newsletter-desc (&key description)
-  (when description
-    (p :class "text-xs text-stone-500 mt-0.5 truncate" (raw! description))))
-
-(defcomp ~account-newsletter-toggle (&key id url hdrs target cls checked knob-cls)
-  (div :id id :class "flex items-center"
-    (button :hx-post url :hx-headers hdrs :hx-target target :hx-swap "outerHTML"
-      :class cls :role "switch" :aria-checked checked
-      (span :class knob-cls))))
-
-(defcomp ~account-newsletter-toggle-off (&key id url hdrs target)
-  (div :id id :class "flex items-center"
-    (button :hx-post url :hx-headers hdrs :hx-target target :hx-swap "outerHTML"
-      :class "relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-offset-2 bg-stone-300"
-      :role "switch" :aria-checked "false"
-      (span :class "inline-block h-4 w-4 rounded-full bg-white shadow transform transition-transform translate-x-1"))))
-
-(defcomp ~account-newsletter-item (&key name desc-html toggle-html)
-  (div :class "flex items-center justify-between py-4 first:pt-0 last:pb-0"
-    (div :class "min-w-0 flex-1"
-      (p :class "text-sm font-medium text-stone-800" (raw! name))
-      (raw! desc-html))
-    (div :class "ml-4 flex-shrink-0" (raw! toggle-html))))
-
-(defcomp ~account-newsletter-list (&key items-html)
-  (div :class "divide-y divide-stone-100" (raw! items-html)))
-
-(defcomp ~account-newsletter-empty ()
-  (p :class "text-sm text-stone-500" "No newsletters available."))
-
-(defcomp ~account-newsletters-panel (&key list-html)
-  (div :class "w-full max-w-3xl mx-auto px-4 py-6"
-    (div :class "bg-white/70 backdrop-blur rounded-2xl shadow border border-stone-200 p-6 sm:p-8 space-y-6"
-      (h1 :class "text-xl font-semibold tracking-tight" "Newsletters")
-      (raw! list-html))))

account/sexp/sexp_components.py

@@ -1,385 +0,0 @@
-"""
-Account service s-expression page components.
-
-Renders account dashboard, newsletters, fragment pages, login, and device
-auth pages.  Called from route handlers in place of ``render_template()``.
-"""
-from __future__ import annotations
-
-import os
-from typing import Any
-
-from shared.sexp.jinja_bridge import render, load_service_components
-from shared.sexp.helpers import (
-    call_url, root_header_html, search_desktop_html,
-    search_mobile_html, full_page, oob_page,
-)
-
-# Load account-specific .sexpr components at import time
-load_service_components(os.path.dirname(os.path.dirname(__file__)))
-
-
-# ---------------------------------------------------------------------------
-# Header helpers
-# ---------------------------------------------------------------------------
-
-def _auth_nav_html(ctx: dict) -> str:
-    """Auth section desktop nav items."""
-    html = render(
-        "nav-link",
-        href=call_url(ctx, "account_url", "/newsletters/"),
-        label="newsletters",
-        select_colours=ctx.get("select_colours", ""),
-    )
-    account_nav_html = ctx.get("account_nav_html", "")
-    if account_nav_html:
-        html += account_nav_html
-    return html
-
-
-def _auth_header_html(ctx: dict, *, oob: bool = False) -> str:
-    """Build the account section header row."""
-    return render(
-        "menu-row",
-        id="auth-row", level=1, colour="sky",
-        link_href=call_url(ctx, "account_url", "/"),
-        link_label="account", icon="fa-solid fa-user",
-        nav_html=_auth_nav_html(ctx),
-        child_id="auth-header-child", oob=oob,
-    )
-
-
-def _auth_nav_mobile_html(ctx: dict) -> str:
-    """Mobile nav menu for auth section."""
-    html = render(
-        "nav-link",
-        href=call_url(ctx, "account_url", "/newsletters/"),
-        label="newsletters",
-        select_colours=ctx.get("select_colours", ""),
-    )
-    account_nav_html = ctx.get("account_nav_html", "")
-    if account_nav_html:
-        html += account_nav_html
-    return html
-
-
-# ---------------------------------------------------------------------------
-# Account dashboard (GET /)
-# ---------------------------------------------------------------------------
-
-def _account_main_panel_html(ctx: dict) -> str:
-    """Account info panel with user details and logout."""
-    from quart import g
-    from shared.browser.app.csrf import generate_csrf_token
-
-    user = getattr(g, "user", None)
-    error = ctx.get("error", "")
-
-    error_html = render("account-error-banner", error=error) if error else ""
-
-    user_email_html = ""
-    user_name_html = ""
-    if user:
-        user_email_html = render("account-user-email", email=user.email)
-        if user.name:
-            user_name_html = render("account-user-name", name=user.name)
-
-    logout_html = render("account-logout-form", csrf_token=generate_csrf_token())
-
-    labels_html = ""
-    if user and hasattr(user, "labels") and user.labels:
-        label_items = "".join(
-            render("account-label-item", name=label.name)
-            for label in user.labels
-        )
-        labels_html = render("account-labels-section", items_html=label_items)
-
-    return render(
-        "account-main-panel",
-        error_html=error_html, email_html=user_email_html,
-        name_html=user_name_html, logout_html=logout_html,
-        labels_html=labels_html,
-    )
-
-
-# ---------------------------------------------------------------------------
-# Newsletters (GET /newsletters/)
-# ---------------------------------------------------------------------------
-
-def _newsletter_toggle_html(un: Any, account_url_fn: Any, csrf_token: str) -> str:
-    """Render a single newsletter toggle switch."""
-    nid = un.newsletter_id
-    toggle_url = account_url_fn(f"/newsletter/{nid}/toggle/")
-    if un.subscribed:
-        bg = "bg-emerald-500"
-        translate = "translate-x-6"
-        checked = "true"
-    else:
-        bg = "bg-stone-300"
-        translate = "translate-x-1"
-        checked = "false"
-    return render(
-        "account-newsletter-toggle",
-        id=f"nl-{nid}", url=toggle_url,
-        hdrs=f'{{"X-CSRFToken": "{csrf_token}"}}',
-        target=f"#nl-{nid}",
-        cls=f"relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-offset-2 {bg}",
-        checked=checked,
-        knob_cls=f"inline-block h-4 w-4 rounded-full bg-white shadow transform transition-transform {translate}",
-    )
-
-
-def _newsletter_toggle_off_html(nid: int, toggle_url: str, csrf_token: str) -> str:
-    """Render an unsubscribed newsletter toggle (no subscription record yet)."""
-    return render(
-        "account-newsletter-toggle-off",
-        id=f"nl-{nid}", url=toggle_url,
-        hdrs=f'{{"X-CSRFToken": "{csrf_token}"}}',
-        target=f"#nl-{nid}",
-    )
-
-
-def _newsletters_panel_html(ctx: dict, newsletter_list: list) -> str:
-    """Newsletters management panel."""
-    from shared.browser.app.csrf import generate_csrf_token
-
-    account_url_fn = ctx.get("account_url") or (lambda p: p)
-    csrf = generate_csrf_token()
-
-    if newsletter_list:
-        items = []
-        for item in newsletter_list:
-            nl = item["newsletter"]
-            un = item.get("un")
-
-            desc_html = render(
-                "account-newsletter-desc", description=nl.description
-            ) if nl.description else ""
-
-            if un:
-                toggle = _newsletter_toggle_html(un, account_url_fn, csrf)
-            else:
-                toggle_url = account_url_fn(f"/newsletter/{nl.id}/toggle/")
-                toggle = _newsletter_toggle_off_html(nl.id, toggle_url, csrf)
-
-            items.append(render(
-                "account-newsletter-item",
-                name=nl.name, desc_html=desc_html, toggle_html=toggle,
-            ))
-        list_html = render(
-            "account-newsletter-list",
-            items_html="".join(items),
-        )
-    else:
-        list_html = render("account-newsletter-empty")
-
-    return render("account-newsletters-panel", list_html=list_html)
-
-
-# ---------------------------------------------------------------------------
-# Auth pages (login, device, check_email)
-# ---------------------------------------------------------------------------
-
-def _login_page_content(ctx: dict) -> str:
-    """Login form content."""
-    from shared.browser.app.csrf import generate_csrf_token
-    from quart import url_for
-
-    error = ctx.get("error", "")
-    email = ctx.get("email", "")
-    action = url_for("auth.start_login")
-
-    error_html = render("account-login-error", error=error) if error else ""
-
-    return render(
-        "account-login-form",
-        error_html=error_html, action=action,
-        csrf_token=generate_csrf_token(), email=email,
-    )
-
-
-def _device_page_content(ctx: dict) -> str:
-    """Device authorization form content."""
-    from shared.browser.app.csrf import generate_csrf_token
-    from quart import url_for
-
-    error = ctx.get("error", "")
-    code = ctx.get("code", "")
-    action = url_for("auth.device_submit")
-
-    error_html = render("account-device-error", error=error) if error else ""
-
-    return render(
-        "account-device-form",
-        error_html=error_html, action=action,
-        csrf_token=generate_csrf_token(), code=code,
-    )
-
-
-def _device_approved_content() -> str:
-    """Device approved success content."""
-    return render("account-device-approved")
-
-
-# ---------------------------------------------------------------------------
-# Public API: Account dashboard
-# ---------------------------------------------------------------------------
-
-async def render_account_page(ctx: dict) -> str:
-    """Full page: account dashboard."""
-    main = _account_main_panel_html(ctx)
-
-    hdr = root_header_html(ctx)
-    hdr += render("account-header-child", inner_html=_auth_header_html(ctx))
-
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=main,
-                     menu_html=_auth_nav_mobile_html(ctx))
-
-
-async def render_account_oob(ctx: dict) -> str:
-    """OOB response for account dashboard."""
-    main = _account_main_panel_html(ctx)
-
-    oobs = (
-        _auth_header_html(ctx, oob=True)
-        + root_header_html(ctx, oob=True)
-    )
-
-    return oob_page(ctx, oobs_html=oobs,
-                    content_html=main,
-                    menu_html=_auth_nav_mobile_html(ctx))
-
-
-# ---------------------------------------------------------------------------
-# Public API: Newsletters
-# ---------------------------------------------------------------------------
-
-async def render_newsletters_page(ctx: dict, newsletter_list: list) -> str:
-    """Full page: newsletters."""
-    main = _newsletters_panel_html(ctx, newsletter_list)
-
-    hdr = root_header_html(ctx)
-    hdr += render("account-header-child", inner_html=_auth_header_html(ctx))
-
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=main,
-                     menu_html=_auth_nav_mobile_html(ctx))
-
-
-async def render_newsletters_oob(ctx: dict, newsletter_list: list) -> str:
-    """OOB response for newsletters."""
-    main = _newsletters_panel_html(ctx, newsletter_list)
-
-    oobs = (
-        _auth_header_html(ctx, oob=True)
-        + root_header_html(ctx, oob=True)
-    )
-
-    return oob_page(ctx, oobs_html=oobs,
-                    content_html=main,
-                    menu_html=_auth_nav_mobile_html(ctx))
-
-
-# ---------------------------------------------------------------------------
-# Public API: Fragment pages
-# ---------------------------------------------------------------------------
-
-async def render_fragment_page(ctx: dict, page_fragment_html: str) -> str:
-    """Full page: fragment-provided content."""
-    hdr = root_header_html(ctx)
-    hdr += render("account-header-child", inner_html=_auth_header_html(ctx))
-
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=page_fragment_html,
-                     menu_html=_auth_nav_mobile_html(ctx))
-
-
-async def render_fragment_oob(ctx: dict, page_fragment_html: str) -> str:
-    """OOB response for fragment pages."""
-    oobs = (
-        _auth_header_html(ctx, oob=True)
-        + root_header_html(ctx, oob=True)
-    )
-
-    return oob_page(ctx, oobs_html=oobs,
-                    content_html=page_fragment_html,
-                    menu_html=_auth_nav_mobile_html(ctx))
-
-
-# ---------------------------------------------------------------------------
-# Public API: Auth pages (login, device)
-# ---------------------------------------------------------------------------
-
-async def render_login_page(ctx: dict) -> str:
-    """Full page: login form."""
-    hdr = root_header_html(ctx)
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=_login_page_content(ctx),
-                     meta_html='<title>Login \u2014 Rose Ash</title>')
-
-
-async def render_device_page(ctx: dict) -> str:
-    """Full page: device authorization form."""
-    hdr = root_header_html(ctx)
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=_device_page_content(ctx),
-                     meta_html='<title>Authorize Device \u2014 Rose Ash</title>')
-
-
-async def render_device_approved_page(ctx: dict) -> str:
-    """Full page: device approved."""
-    hdr = root_header_html(ctx)
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=_device_approved_content(),
-                     meta_html='<title>Device Authorized \u2014 Rose Ash</title>')
-
-
-# ---------------------------------------------------------------------------
-# Public API: Check email page (POST /start/ success)
-# ---------------------------------------------------------------------------
-
-def _check_email_content(email: str, email_error: str | None = None) -> str:
-    """Check email confirmation content."""
-    from markupsafe import escape
-
-    error_html = render(
-        "account-check-email-error", error=str(escape(email_error))
-    ) if email_error else ""
-
-    return render(
-        "account-check-email",
-        email=str(escape(email)), error_html=error_html,
-    )
-
-
-async def render_check_email_page(ctx: dict) -> str:
-    """Full page: check email after magic link sent."""
-    email = ctx.get("email", "")
-    email_error = ctx.get("email_error")
-    hdr = root_header_html(ctx)
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=_check_email_content(email, email_error),
-                     meta_html='<title>Check your email \u2014 Rose Ash</title>')
-
-
-# ---------------------------------------------------------------------------
-# Public API: Fragment renderers for POST handlers
-# ---------------------------------------------------------------------------
-
-def render_newsletter_toggle_html(un) -> str:
-    """Render a newsletter toggle switch for POST response."""
-    from shared.browser.app.csrf import generate_csrf_token
-    return _newsletter_toggle_html(un, lambda p: f"/newsletter/{un.newsletter_id}/toggle/" if "/toggle/" in p else p,
-                                   generate_csrf_token())
-
-
-def render_newsletter_toggle(un) -> str:
-    """Render a newsletter toggle switch for POST response (uses account_url)."""
-    from shared.browser.app.csrf import generate_csrf_token
-    from quart import g
-    account_url_fn = getattr(g, "_account_url", None)
-    if account_url_fn is None:
-        from shared.infrastructure.urls import account_url
-        account_url_fn = account_url
-    return _newsletter_toggle_html(un, account_url_fn, generate_csrf_token())

account/sx/auth.sx

@@ -0,0 +1,29 @@
+;; Auth page components (device auth — account-specific)
+;; Login and check-email components are shared: see shared/sx/templates/auth.sx
+
+(defcomp ~account-device-error (&key error)
+  (when error
+    (div :class "bg-red-50 border border-red-200 text-red-700 p-3 rounded mb-4"
+      error)))
+
+(defcomp ~account-device-form (&key error action csrf-token code)
+  (div :class "py-8 max-w-md mx-auto"
+    (h1 :class "text-2xl font-bold mb-6" "Authorize device")
+    (p :class "text-stone-600 mb-4" "Enter the code shown in your terminal to sign in.")
+    error
+    (form :method "post" :action action :class "space-y-4"
+      (input :type "hidden" :name "csrf_token" :value csrf-token)
+      (div
+        (label :for "code" :class "block text-sm font-medium mb-1" "Device code")
+        (input :type "text" :name "code" :id "code" :value code :placeholder "XXXX-XXXX"
+          :required true :autofocus true :maxlength "9" :autocomplete "off" :spellcheck "false"
+          :class "w-full border border-stone-300 rounded px-3 py-3 text-center text-2xl tracking-widest font-mono uppercase focus:outline-none focus:ring-2 focus:ring-stone-500"))
+      (button :type "submit"
+        :class "w-full bg-stone-800 text-white py-2 px-4 rounded hover:bg-stone-700 transition"
+        "Authorize"))))
+
+(defcomp ~account-device-approved ()
+  (div :class "py-8 max-w-md mx-auto text-center"
+    (h1 :class "text-2xl font-bold mb-4" "Device authorized")
+    (p :class "text-stone-600" "You can close this window and return to your terminal.")))
+

account/sx/dashboard.sx

@@ -3,15 +3,15 @@
 (defcomp ~account-error-banner (&key error)
   (when error
     (div :class "rounded-lg border border-red-200 bg-red-50 text-red-800 px-4 py-3 text-sm"
-      (raw! error))))
+      error)))
 
 (defcomp ~account-user-email (&key email)
   (when email
-    (p :class "text-sm text-stone-500 mt-1" (raw! email))))
+    (p :class "text-sm text-stone-500 mt-1" email)))
 
 (defcomp ~account-user-name (&key name)
   (when name
-    (p :class "text-sm text-stone-600" (raw! name))))
+    (p :class "text-sm text-stone-600" name)))
 
 (defcomp ~account-logout-form (&key csrf-token)
   (form :action "/auth/logout/" :method "post"
@@ -22,27 +22,22 @@
 
 (defcomp ~account-label-item (&key name)
   (span :class "inline-flex items-center rounded-full border border-stone-200 px-3 py-1 text-xs font-medium bg-white/60"
-    (raw! name)))
+    name))
 
-(defcomp ~account-labels-section (&key items-html)
-  (when items-html
+(defcomp ~account-labels-section (&key items)
+  (when items
     (div
       (h2 :class "text-base font-semibold tracking-tight mb-3" "Labels")
-      (div :class "flex flex-wrap gap-2" (raw! items-html)))))
+      (div :class "flex flex-wrap gap-2" items))))
 
-(defcomp ~account-main-panel (&key error-html email-html name-html logout-html labels-html)
+(defcomp ~account-main-panel (&key error email name logout labels)
   (div :class "w-full max-w-3xl mx-auto px-4 py-6"
     (div :class "bg-white/70 backdrop-blur rounded-2xl shadow border border-stone-200 p-6 sm:p-8 space-y-8"
-      (raw! error-html)
+      error
       (div :class "flex items-center justify-between"
         (div
           (h1 :class "text-xl font-semibold tracking-tight" "Account")
-          (raw! email-html)
-          (raw! name-html))
-        (raw! logout-html))
-      (raw! labels-html))))
-
-;; Header child wrapper
-(defcomp ~account-header-child (&key inner-html)
-  (div :id "root-header-child" :class "flex flex-col w-full items-center"
-    (raw! inner-html)))
+          email
+          name)
+        logout)
+      labels)))

account/sx/handlers/auth-menu.sx

@@ -0,0 +1,8 @@
+;; Account auth-menu fragment handler
+;;
+;; Renders the desktop + mobile auth menu (sign-in or user link).
+
+(defhandler auth-menu (&key email)
+  (~auth-menu
+    :user-email (when email email)
+    :account-url (app-url "account" "")))

account/sx/newsletters.sx

@@ -0,0 +1,31 @@
+;; Newsletter management components
+
+(defcomp ~account-newsletter-desc (&key description)
+  (when description
+    (p :class "text-xs text-stone-500 mt-0.5 truncate" description)))
+
+(defcomp ~account-newsletter-toggle (&key id url hdrs target cls checked knob-cls)
+  (div :id id :class "flex items-center"
+    (button :sx-post url :sx-headers hdrs :sx-target target :sx-swap "outerHTML"
+      :class cls :role "switch" :aria-checked checked
+      (span :class knob-cls))))
+
+
+(defcomp ~account-newsletter-item (&key name desc toggle)
+  (div :class "flex items-center justify-between py-4 first:pt-0 last:pb-0"
+    (div :class "min-w-0 flex-1"
+      (p :class "text-sm font-medium text-stone-800" name)
+      desc)
+    (div :class "ml-4 flex-shrink-0" toggle)))
+
+(defcomp ~account-newsletter-list (&key items)
+  (div :class "divide-y divide-stone-100" items))
+
+(defcomp ~account-newsletter-empty ()
+  (p :class "text-sm text-stone-500" "No newsletters available."))
+
+(defcomp ~account-newsletters-panel (&key list)
+  (div :class "w-full max-w-3xl mx-auto px-4 py-6"
+    (div :class "bg-white/70 backdrop-blur rounded-2xl shadow border border-stone-200 p-6 sm:p-8 space-y-6"
+      (h1 :class "text-xl font-semibold tracking-tight" "Newsletters")
+      list)))

account/sx/sx_components.py

@@ -0,0 +1,339 @@
+"""
+Account service s-expression page components.
+
+Renders account dashboard, newsletters, fragment pages, login, and device
+auth pages.  Called from route handlers in place of ``render_template()``.
+"""
+from __future__ import annotations
+
+import os
+from typing import Any
+
+from shared.sx.jinja_bridge import load_service_components
+from shared.sx.helpers import (
+    call_url, sx_call, SxExpr,
+    root_header_sx, full_page_sx,
+)
+
+# Load account-specific .sx components + handlers at import time
+load_service_components(os.path.dirname(os.path.dirname(__file__)),
+                        service_name="account")
+
+
+# ---------------------------------------------------------------------------
+# Header helpers
+# ---------------------------------------------------------------------------
+
+def _auth_nav_sx(ctx: dict) -> str:
+    """Auth section desktop nav items."""
+    parts = [
+        sx_call("nav-link",
+            href=call_url(ctx, "account_url", "/newsletters/"),
+            label="newsletters",
+            select_colours=ctx.get("select_colours", ""),
+        )
+    ]
+    account_nav = ctx.get("account_nav")
+    if account_nav:
+        parts.append(account_nav)
+    return "(<> " + " ".join(parts) + ")"
+
+
+def _auth_header_sx(ctx: dict, *, oob: bool = False) -> str:
+    """Build the account section header row."""
+    return sx_call(
+        "menu-row-sx",
+        id="auth-row", level=1, colour="sky",
+        link_href=call_url(ctx, "account_url", "/"),
+        link_label="account", icon="fa-solid fa-user",
+        nav=SxExpr(_auth_nav_sx(ctx)),
+        child_id="auth-header-child", oob=oob,
+    )
+
+
+def _auth_nav_mobile_sx(ctx: dict) -> str:
+    """Mobile nav menu for auth section."""
+    parts = [
+        sx_call("nav-link",
+            href=call_url(ctx, "account_url", "/newsletters/"),
+            label="newsletters",
+            select_colours=ctx.get("select_colours", ""),
+        )
+    ]
+    account_nav = ctx.get("account_nav")
+    if account_nav:
+        parts.append(account_nav)
+    return "(<> " + " ".join(parts) + ")"
+
+
+# ---------------------------------------------------------------------------
+# Account dashboard (GET /)
+# ---------------------------------------------------------------------------
+
+def _account_main_panel_sx(ctx: dict) -> str:
+    """Account info panel with user details and logout."""
+    from quart import g
+    from shared.browser.app.csrf import generate_csrf_token
+
+    user = getattr(g, "user", None)
+    error = ctx.get("error", "")
+
+    error_sx = sx_call("account-error-banner", error=error) if error else ""
+
+    user_email_sx = ""
+    user_name_sx = ""
+    if user:
+        user_email_sx = sx_call("account-user-email", email=user.email)
+        if user.name:
+            user_name_sx = sx_call("account-user-name", name=user.name)
+
+    logout_sx = sx_call("account-logout-form", csrf_token=generate_csrf_token())
+
+    labels_sx = ""
+    if user and hasattr(user, "labels") and user.labels:
+        label_items = " ".join(
+            sx_call("account-label-item", name=label.name)
+            for label in user.labels
+        )
+        labels_sx = sx_call("account-labels-section",
+                                items=SxExpr("(<> " + label_items + ")"))
+
+    return sx_call(
+        "account-main-panel",
+        error=SxExpr(error_sx) if error_sx else None,
+        email=SxExpr(user_email_sx) if user_email_sx else None,
+        name=SxExpr(user_name_sx) if user_name_sx else None,
+        logout=SxExpr(logout_sx),
+        labels=SxExpr(labels_sx) if labels_sx else None,
+    )
+
+
+# ---------------------------------------------------------------------------
+# Newsletters (GET /newsletters/)
+# ---------------------------------------------------------------------------
+
+def _newsletter_toggle_sx(un: Any, account_url_fn: Any, csrf_token: str) -> str:
+    """Render a single newsletter toggle switch."""
+    nid = un.newsletter_id
+    toggle_url = account_url_fn(f"/newsletter/{nid}/toggle/")
+    if un.subscribed:
+        bg = "bg-emerald-500"
+        translate = "translate-x-6"
+        checked = "true"
+    else:
+        bg = "bg-stone-300"
+        translate = "translate-x-1"
+        checked = "false"
+    return sx_call(
+        "account-newsletter-toggle",
+        id=f"nl-{nid}", url=toggle_url,
+        hdrs=f'{{"X-CSRFToken": "{csrf_token}"}}',
+        target=f"#nl-{nid}",
+        cls=f"relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-offset-2 {bg}",
+        checked=checked,
+        knob_cls=f"inline-block h-4 w-4 rounded-full bg-white shadow transform transition-transform {translate}",
+    )
+
+
+def _newsletter_toggle_off_sx(nid: int, toggle_url: str, csrf_token: str) -> str:
+    """Render an unsubscribed newsletter toggle (no subscription record yet)."""
+    return sx_call(
+        "account-newsletter-toggle",
+        id=f"nl-{nid}", url=toggle_url,
+        hdrs=f'{{"X-CSRFToken": "{csrf_token}"}}',
+        target=f"#nl-{nid}",
+        cls="relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-offset-2 bg-stone-300",
+        checked="false",
+        knob_cls="inline-block h-4 w-4 rounded-full bg-white shadow transform transition-transform translate-x-1",
+    )
+
+
+def _newsletters_panel_sx(ctx: dict, newsletter_list: list) -> str:
+    """Newsletters management panel."""
+    from shared.browser.app.csrf import generate_csrf_token
+
+    account_url_fn = ctx.get("account_url") or (lambda p: p)
+    csrf = generate_csrf_token()
+
+    if newsletter_list:
+        items = []
+        for item in newsletter_list:
+            nl = item["newsletter"]
+            un = item.get("un")
+
+            desc_sx = sx_call(
+                "account-newsletter-desc", description=nl.description
+            ) if nl.description else ""
+
+            if un:
+                toggle = _newsletter_toggle_sx(un, account_url_fn, csrf)
+            else:
+                toggle_url = account_url_fn(f"/newsletter/{nl.id}/toggle/")
+                toggle = _newsletter_toggle_off_sx(nl.id, toggle_url, csrf)
+
+            items.append(sx_call(
+                "account-newsletter-item",
+                name=nl.name,
+                desc=SxExpr(desc_sx) if desc_sx else None,
+                toggle=SxExpr(toggle),
+            ))
+        list_sx = sx_call(
+            "account-newsletter-list",
+            items=SxExpr("(<> " + " ".join(items) + ")"),
+        )
+    else:
+        list_sx = sx_call("account-newsletter-empty")
+
+    return sx_call("account-newsletters-panel", list=SxExpr(list_sx))
+
+
+# ---------------------------------------------------------------------------
+# Auth pages (login, device, check_email)
+# ---------------------------------------------------------------------------
+
+def _login_page_content(ctx: dict) -> str:
+    """Login form content."""
+    from shared.browser.app.csrf import generate_csrf_token
+    from quart import url_for
+
+    error = ctx.get("error", "")
+    email = ctx.get("email", "")
+    action = url_for("auth.start_login")
+
+    error_sx = sx_call("auth-error-banner", error=error) if error else ""
+
+    return sx_call(
+        "auth-login-form",
+        error=SxExpr(error_sx) if error_sx else None,
+        action=action,
+        csrf_token=generate_csrf_token(), email=email,
+    )
+
+
+def _device_page_content(ctx: dict) -> str:
+    """Device authorization form content."""
+    from shared.browser.app.csrf import generate_csrf_token
+    from quart import url_for
+
+    error = ctx.get("error", "")
+    code = ctx.get("code", "")
+    action = url_for("auth.device_submit")
+
+    error_sx = sx_call("account-device-error", error=error) if error else ""
+
+    return sx_call(
+        "account-device-form",
+        error=SxExpr(error_sx) if error_sx else None,
+        action=action,
+        csrf_token=generate_csrf_token(), code=code,
+    )
+
+
+def _device_approved_content() -> str:
+    """Device approved success content."""
+    return sx_call("account-device-approved")
+
+
+# ---------------------------------------------------------------------------
+# Public API: Account dashboard
+# ---------------------------------------------------------------------------
+
+
+
+
+
+def _fragment_content(frag: object) -> str:
+    """Convert a fragment response to sx content string.
+
+    SxExpr (from text/sx responses) is embedded as-is; plain strings
+    (from text/html) are wrapped in ``~rich-text``.
+    """
+    from shared.sx.parser import SxExpr
+    if isinstance(frag, SxExpr):
+        return frag.source
+    s = str(frag) if frag else ""
+    if not s:
+        return ""
+    return f'(~rich-text :html "{_sx_escape(s)}")'
+
+
+# ---------------------------------------------------------------------------
+# Public API: Auth pages (login, device)
+# ---------------------------------------------------------------------------
+
+async def render_login_page(ctx: dict) -> str:
+    """Full page: login form."""
+    hdr = root_header_sx(ctx)
+    return full_page_sx(ctx, header_rows=hdr,
+                          content=_login_page_content(ctx),
+                          meta_html='<title>Login \u2014 Rose Ash</title>')
+
+
+async def render_device_page(ctx: dict) -> str:
+    """Full page: device authorization form."""
+    hdr = root_header_sx(ctx)
+    return full_page_sx(ctx, header_rows=hdr,
+                          content=_device_page_content(ctx),
+                          meta_html='<title>Authorize Device \u2014 Rose Ash</title>')
+
+
+async def render_device_approved_page(ctx: dict) -> str:
+    """Full page: device approved."""
+    hdr = root_header_sx(ctx)
+    return full_page_sx(ctx, header_rows=hdr,
+                          content=_device_approved_content(),
+                          meta_html='<title>Device Authorized \u2014 Rose Ash</title>')
+
+
+# ---------------------------------------------------------------------------
+# Public API: Check email page (POST /start/ success)
+# ---------------------------------------------------------------------------
+
+def _check_email_content(email: str, email_error: str | None = None) -> str:
+    """Check email confirmation content."""
+    from markupsafe import escape
+
+    error_sx = sx_call(
+        "auth-check-email-error", error=str(escape(email_error))
+    ) if email_error else ""
+
+    return sx_call(
+        "auth-check-email",
+        email=str(escape(email)),
+        error=SxExpr(error_sx) if error_sx else None,
+    )
+
+
+async def render_check_email_page(ctx: dict) -> str:
+    """Full page: check email after magic link sent."""
+    email = ctx.get("email", "")
+    email_error = ctx.get("email_error")
+    hdr = root_header_sx(ctx)
+    return full_page_sx(ctx, header_rows=hdr,
+                          content=_check_email_content(email, email_error),
+                          meta_html='<title>Check your email \u2014 Rose Ash</title>')
+
+
+# ---------------------------------------------------------------------------
+# Public API: Fragment renderers for POST handlers
+# ---------------------------------------------------------------------------
+
+
+def render_newsletter_toggle(un) -> str:
+    """Render a newsletter toggle switch for POST response (uses account_url)."""
+    from shared.browser.app.csrf import generate_csrf_token
+    from quart import g
+    account_url_fn = getattr(g, "_account_url", None)
+    if account_url_fn is None:
+        from shared.infrastructure.urls import account_url
+        account_url_fn = account_url
+    return _newsletter_toggle_sx(un, account_url_fn, generate_csrf_token())
+
+
+# ---------------------------------------------------------------------------
+# Internal helpers
+# ---------------------------------------------------------------------------
+
+def _sx_escape(s: str) -> str:
+    """Escape a string for embedding in sx string literals."""
+    return s.replace("\\", "\\\\").replace('"', '\\"')

account/sxc/pages/__init__.py

@@ -0,0 +1,105 @@
+"""Account defpage setup — registers layouts, page helpers, and loads .sx pages."""
+from __future__ import annotations
+
+from typing import Any
+
+
+def setup_account_pages() -> None:
+    """Register account-specific layouts, page helpers, and load page definitions."""
+    _register_account_layouts()
+    _register_account_helpers()
+    _load_account_page_files()
+
+
+def _load_account_page_files() -> None:
+    import os
+    from shared.sx.pages import load_page_dir
+    load_page_dir(os.path.dirname(__file__), "account")
+
+
+# ---------------------------------------------------------------------------
+# Layouts
+# ---------------------------------------------------------------------------
+
+def _register_account_layouts() -> None:
+    from shared.sx.layouts import register_custom_layout
+    register_custom_layout("account", _account_full, _account_oob, _account_mobile)
+
+
+def _account_full(ctx: dict, **kw: Any) -> str:
+    from shared.sx.helpers import root_header_sx, header_child_sx
+    from sx.sx_components import _auth_header_sx
+
+    root_hdr = root_header_sx(ctx)
+    hdr_child = header_child_sx(_auth_header_sx(ctx))
+    return "(<> " + root_hdr + " " + hdr_child + ")"
+
+
+def _account_oob(ctx: dict, **kw: Any) -> str:
+    from shared.sx.helpers import root_header_sx
+    from sx.sx_components import _auth_header_sx
+
+    return "(<> " + _auth_header_sx(ctx, oob=True) + " " + root_header_sx(ctx, oob=True) + ")"
+
+
+def _account_mobile(ctx: dict, **kw: Any) -> str:
+    from shared.sx.helpers import mobile_menu_sx, mobile_root_nav_sx, sx_call, SxExpr
+    from sx.sx_components import _auth_nav_mobile_sx
+    ctx = _inject_account_nav(ctx)
+    auth_section = sx_call("mobile-menu-section",
+        label="account", href="/", level=1, colour="sky",
+        items=SxExpr(_auth_nav_mobile_sx(ctx)))
+    return mobile_menu_sx(auth_section, mobile_root_nav_sx(ctx))
+
+
+def _inject_account_nav(ctx: dict) -> dict:
+    """Ensure account_nav is in ctx from g.account_nav."""
+    if "account_nav" not in ctx:
+        from quart import g
+        ctx = dict(ctx)
+        ctx["account_nav"] = getattr(g, "account_nav", "")
+    return ctx
+
+
+# ---------------------------------------------------------------------------
+# Page helpers
+# ---------------------------------------------------------------------------
+
+def _register_account_helpers() -> None:
+    from shared.sx.pages import register_page_helpers
+
+    register_page_helpers("account", {
+        "account-content": _h_account_content,
+        "newsletters-content": _h_newsletters_content,
+        "fragment-content": _h_fragment_content,
+    })
+
+
+def _h_account_content():
+    from sx.sx_components import _account_main_panel_sx
+    return _account_main_panel_sx({})
+
+
+def _h_newsletters_content():
+    from quart import g
+    d = getattr(g, "newsletters_data", None)
+    if not d:
+        from shared.sx.helpers import sx_call
+        return sx_call("account-newsletter-empty")
+    from shared.sx.page import get_template_context_sync
+    from sx.sx_components import _newsletters_panel_sx
+    # Build a minimal ctx with account_url
+    ctx = {"account_url": getattr(g, "_account_url", None)}
+    if ctx["account_url"] is None:
+        from shared.infrastructure.urls import account_url
+        ctx["account_url"] = account_url
+    return _newsletters_panel_sx(ctx, d)
+
+
+def _h_fragment_content():
+    from quart import g
+    frag = getattr(g, "fragment_page_data", None)
+    if not frag:
+        return ""
+    from sx.sx_components import _fragment_content
+    return _fragment_content(frag)

account/sxc/pages/account.sx

@@ -0,0 +1,31 @@
+;; Account app — declarative page definitions
+
+;; ---------------------------------------------------------------------------
+;; Account dashboard
+;; ---------------------------------------------------------------------------
+
+(defpage account-dashboard
+  :path "/"
+  :auth :login
+  :layout :account
+  :content (account-content))
+
+;; ---------------------------------------------------------------------------
+;; Newsletters
+;; ---------------------------------------------------------------------------
+
+(defpage newsletters
+  :path "/newsletters/"
+  :auth :login
+  :layout :account
+  :content (newsletters-content))
+
+;; ---------------------------------------------------------------------------
+;; Fragment pages (tickets, bookings, etc. from events service)
+;; ---------------------------------------------------------------------------
+
+(defpage fragment-page
+  :path "/<slug>/"
+  :auth :login
+  :layout :account
+  :content (fragment-content))

account/templates/_types/auth/_bookings_panel.html

@@ -1,44 +0,0 @@
-<div class="w-full max-w-3xl mx-auto px-4 py-6">
-  <div class="bg-white/70 backdrop-blur rounded-2xl shadow border border-stone-200 p-6 sm:p-8 space-y-6">
-
-    <h1 class="text-xl font-semibold tracking-tight">Bookings</h1>
-
-    {% if bookings %}
-      <div class="divide-y divide-stone-100">
-        {% for booking in bookings %}
-          <div class="py-4 first:pt-0 last:pb-0">
-            <div class="flex items-start justify-between gap-4">
-              <div class="min-w-0 flex-1">
-                <p class="text-sm font-medium text-stone-800">{{ booking.name }}</p>
-                <div class="mt-1 flex flex-wrap items-center gap-x-3 gap-y-1 text-xs text-stone-500">
-                  <span>{{ booking.start_at.strftime('%d %b %Y, %H:%M') }}</span>
-                  {% if booking.end_at %}
-                    <span>&ndash; {{ booking.end_at.strftime('%H:%M') }}</span>
-                  {% endif %}
-                  {% if booking.calendar_name %}
-                    <span>&middot; {{ booking.calendar_name }}</span>
-                  {% endif %}
-                  {% if booking.cost %}
-                    <span>&middot; &pound;{{ booking.cost }}</span>
-                  {% endif %}
-                </div>
-              </div>
-              <div class="flex-shrink-0">
-                {% if booking.state == 'confirmed' %}
-                  <span class="inline-flex items-center rounded-full bg-emerald-50 border border-emerald-200 px-2.5 py-0.5 text-xs font-medium text-emerald-700">confirmed</span>
-                {% elif booking.state == 'provisional' %}
-                  <span class="inline-flex items-center rounded-full bg-amber-50 border border-amber-200 px-2.5 py-0.5 text-xs font-medium text-amber-700">provisional</span>
-                {% else %}
-                  <span class="inline-flex items-center rounded-full bg-stone-50 border border-stone-200 px-2.5 py-0.5 text-xs font-medium text-stone-600">{{ booking.state }}</span>
-                {% endif %}
-              </div>
-            </div>
-          </div>
-        {% endfor %}
-      </div>
-    {% else %}
-      <p class="text-sm text-stone-500">No bookings yet.</p>
-    {% endif %}
-
-  </div>
-</div>

account/templates/_types/auth/_fragment_panel.html

@@ -1 +0,0 @@
-{{ page_fragment_html | safe }}

account/templates/_types/auth/_main_panel.html

@@ -1,49 +0,0 @@
-<div class="w-full max-w-3xl mx-auto px-4 py-6">
-  <div class="bg-white/70 backdrop-blur rounded-2xl shadow border border-stone-200 p-6 sm:p-8 space-y-8">
-
-    {% if error %}
-      <div class="rounded-lg border border-red-200 bg-red-50 text-red-800 px-4 py-3 text-sm">
-        {{ error }}
-      </div>
-    {% endif %}
-
-    {# Account header #}
-    <div class="flex items-center justify-between">
-      <div>
-        <h1 class="text-xl font-semibold tracking-tight">Account</h1>
-        {% if g.user %}
-          <p class="text-sm text-stone-500 mt-1">{{ g.user.email }}</p>
-          {% if g.user.name %}
-            <p class="text-sm text-stone-600">{{ g.user.name }}</p>
-          {% endif %}
-        {% endif %}
-      </div>
-      <form action="/auth/logout/" method="post">
-        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-        <button
-          type="submit"
-          class="inline-flex items-center gap-2 rounded-full border border-stone-300 px-4 py-2 text-sm font-medium text-stone-700 hover:bg-stone-50 transition"
-        >
-          <i class="fa-solid fa-right-from-bracket text-xs"></i>
-          Sign out
-        </button>
-      </form>
-    </div>
-
-    {# Labels #}
-    {% set labels = g.user.labels if g.user is defined and g.user.labels is defined else [] %}
-    {% if labels %}
-      <div>
-        <h2 class="text-base font-semibold tracking-tight mb-3">Labels</h2>
-        <div class="flex flex-wrap gap-2">
-          {% for label in labels %}
-            <span class="inline-flex items-center rounded-full border border-stone-200 px-3 py-1 text-xs font-medium bg-white/60">
-              {{ label.name }}
-            </span>
-          {% endfor %}
-        </div>
-      </div>
-    {% endif %}
-
-  </div>
-</div>

account/templates/_types/auth/_nav.html

@@ -1,7 +0,0 @@
-{% import 'macros/links.html' as links %}
-{% call links.link(account_url('/newsletters/'), hx_select_search, select_colours, True, aclass=styles.nav_button) %}
-  newsletters
-{% endcall %}
-{% if account_nav_html %}
-  {{ account_nav_html | safe }}
-{% endif %}

account/templates/_types/auth/_newsletter_toggle.html

@@ -1,17 +0,0 @@
-<div id="nl-{{ un.newsletter_id }}" class="flex items-center">
-  <button
-    hx-post="{{ account_url('/newsletter/' ~ un.newsletter_id ~ '/toggle/') }}"
-    hx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
-    hx-target="#nl-{{ un.newsletter_id }}"
-    hx-swap="outerHTML"
-    class="relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-offset-2
-      {% if un.subscribed %}bg-emerald-500{% else %}bg-stone-300{% endif %}"
-    role="switch"
-    aria-checked="{{ 'true' if un.subscribed else 'false' }}"
-  >
-    <span
-      class="inline-block h-4 w-4 rounded-full bg-white shadow transform transition-transform
-        {% if un.subscribed %}translate-x-6{% else %}translate-x-1{% endif %}"
-    ></span>
-  </button>
-</div>

account/templates/_types/auth/_newsletters_panel.html

@@ -1,46 +0,0 @@
-<div class="w-full max-w-3xl mx-auto px-4 py-6">
-  <div class="bg-white/70 backdrop-blur rounded-2xl shadow border border-stone-200 p-6 sm:p-8 space-y-6">
-
-    <h1 class="text-xl font-semibold tracking-tight">Newsletters</h1>
-
-    {% if newsletter_list %}
-      <div class="divide-y divide-stone-100">
-        {% for item in newsletter_list %}
-          <div class="flex items-center justify-between py-4 first:pt-0 last:pb-0">
-            <div class="min-w-0 flex-1">
-              <p class="text-sm font-medium text-stone-800">{{ item.newsletter.name }}</p>
-              {% if item.newsletter.description %}
-                <p class="text-xs text-stone-500 mt-0.5 truncate">{{ item.newsletter.description }}</p>
-              {% endif %}
-            </div>
-            <div class="ml-4 flex-shrink-0">
-              {% if item.un %}
-                {% with un=item.un %}
-                  {% include "_types/auth/_newsletter_toggle.html" %}
-                {% endwith %}
-              {% else %}
-                {# No subscription row yet — show an off toggle that will create one #}
-                <div id="nl-{{ item.newsletter.id }}" class="flex items-center">
-                  <button
-                    hx-post="{{ account_url('/newsletter/' ~ item.newsletter.id ~ '/toggle/') }}"
-                    hx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
-                    hx-target="#nl-{{ item.newsletter.id }}"
-                    hx-swap="outerHTML"
-                    class="relative inline-flex h-6 w-11 items-center rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-offset-2 bg-stone-300"
-                    role="switch"
-                    aria-checked="false"
-                  >
-                    <span class="inline-block h-4 w-4 rounded-full bg-white shadow transform transition-transform translate-x-1"></span>
-                  </button>
-                </div>
-              {% endif %}
-            </div>
-          </div>
-        {% endfor %}
-      </div>
-    {% else %}
-      <p class="text-sm text-stone-500">No newsletters available.</p>
-    {% endif %}
-
-  </div>
-</div>

account/templates/_types/auth/_oob_elements.html

@@ -1,29 +0,0 @@
-{% extends 'oob_elements.html' %}
-
-{# OOB elements for HTMX navigation - all elements that need updating #}
-
-{# Import shared OOB macros #}
-{% from '_types/root/_oob_menu.html' import mobile_menu with context %}
-
-{# Header with app title - includes cart-mini, navigation, and market-specific header #}
-
-{% block oobs %}
-
-  {% from '_types/root/_n/macros.html' import oob_header with context %}
-  {{oob_header('root-header-child', 'auth-header-child', '_types/auth/header/_header.html')}}
-
-  {% from '_types/root/header/_header.html' import header_row with context %}
-  {{ header_row(oob=True) }}
-{% endblock %}
-
-
-{% block mobile_menu %}
-  {% include '_types/auth/_nav.html' %}
-{% endblock %}
-
-
-{% block content %}
-    {% include oob.main %}
-{% endblock %}
-
-

account/templates/_types/auth/_tickets_panel.html

@@ -1,44 +0,0 @@
-<div class="w-full max-w-3xl mx-auto px-4 py-6">
-  <div class="bg-white/70 backdrop-blur rounded-2xl shadow border border-stone-200 p-6 sm:p-8 space-y-6">
-
-    <h1 class="text-xl font-semibold tracking-tight">Tickets</h1>
-
-    {% if tickets %}
-      <div class="divide-y divide-stone-100">
-        {% for ticket in tickets %}
-          <div class="py-4 first:pt-0 last:pb-0">
-            <div class="flex items-start justify-between gap-4">
-              <div class="min-w-0 flex-1">
-                <a href="{{ events_url('/tickets/' ~ ticket.code ~ '/') }}"
-                   class="text-sm font-medium text-stone-800 hover:text-emerald-700 transition">
-                  {{ ticket.entry_name }}
-                </a>
-                <div class="mt-1 flex flex-wrap items-center gap-x-3 gap-y-1 text-xs text-stone-500">
-                  <span>{{ ticket.entry_start_at.strftime('%d %b %Y, %H:%M') }}</span>
-                  {% if ticket.calendar_name %}
-                    <span>&middot; {{ ticket.calendar_name }}</span>
-                  {% endif %}
-                  {% if ticket.ticket_type_name %}
-                    <span>&middot; {{ ticket.ticket_type_name }}</span>
-                  {% endif %}
-                </div>
-              </div>
-              <div class="flex-shrink-0">
-                {% if ticket.state == 'checked_in' %}
-                  <span class="inline-flex items-center rounded-full bg-blue-50 border border-blue-200 px-2.5 py-0.5 text-xs font-medium text-blue-700">checked in</span>
-                {% elif ticket.state == 'confirmed' %}
-                  <span class="inline-flex items-center rounded-full bg-emerald-50 border border-emerald-200 px-2.5 py-0.5 text-xs font-medium text-emerald-700">confirmed</span>
-                {% else %}
-                  <span class="inline-flex items-center rounded-full bg-amber-50 border border-amber-200 px-2.5 py-0.5 text-xs font-medium text-amber-700">{{ ticket.state }}</span>
-                {% endif %}
-              </div>
-            </div>
-          </div>
-        {% endfor %}
-      </div>
-    {% else %}
-      <p class="text-sm text-stone-500">No tickets yet.</p>
-    {% endif %}
-
-  </div>
-</div>

account/templates/_types/auth/check_email.html

@@ -1,33 +0,0 @@
-{% extends "_types/root/index.html" %}
-{% block content %}
-  <div class="w-full max-w-md">
-    <div class="bg-white/70 dark:bg-neutral-900/70 backdrop-blur rounded-2xl shadow p-6 sm:p-8 border border-neutral-200 dark:border-neutral-800">
-      <h1 class="text-2xl font-semibold tracking-tight">Check your email</h1>
-
-      <p class="text-base text-stone-700 dark:text-stone-300 mt-3">
-        If an account exists for
-        <strong class="text-stone-900 dark:text-white">{{ email }}</strong>,
-        you’ll receive a link to sign in. It expires in 15 minutes.
-      </p>
-
-      {% if email_error %}
-        <div
-          class="mt-4 rounded-lg border border-red-300 bg-red-50 text-red-700 text-sm px-3 py-2 flex items-start gap-2"
-          role="alert"
-        >
-          <span class="font-medium">Heads up:</span>
-          <span>{{ email_error }}</span>
-        </div>
-      {% endif %}
-
-      <p class="mt-6 text-sm">
-        <a
-          href="{{ blog_url('/auth/login/') }}"
-          class="text-stone-600 dark:text-stone-300 hover:underline"
-        >
-          ← Back
-        </a>
-      </p>
-    </div>
-  </div>
-{% endblock %}

account/templates/_types/auth/header/_header.html

@@ -1,12 +0,0 @@
-{% import 'macros/links.html' as links %}
-{% macro header_row(oob=False) %}
-  {% call links.menu_row(id='auth-row', oob=oob) %}
-    {% call links.link(account_url('/'), hx_select_search  ) %}
-      <i class="fa-solid fa-user"></i>
-      <div>account</div>
-    {% endcall %}
-    {% call links.desktop_nav() %}    
-     {% include "_types/auth/_nav.html" %}
-    {% endcall %}
-  {% endcall %}
-{% endmacro %}

account/templates/_types/auth/index copy.html

@@ -1,18 +0,0 @@
-{% extends "_types/root/_index.html" %}
-
-
-{% block root_header_child %}
-  {% from '_types/root/_n/macros.html' import index_row with context %}
-  {% call index_row('auth-header-child', '_types/auth/header/_header.html') %}
-    {% block auth_header_child %}
-    {% endblock %}
-  {% endcall %}
-{% endblock %}
-
-{% block _main_mobile_menu %}
-  {% include "_types/auth/_nav.html" %}
-{% endblock %}
-
-{% block content %}
-  {% include '_types/auth/_main_panel.html' %}
-{% endblock %}

account/templates/_types/auth/index.html

@@ -1,18 +0,0 @@
-{% extends oob.extends %}
-
-
-{% block root_header_child %}
-  {% from '_types/root/_n/macros.html' import index_row with context %}
-  {% call index_row(oob.child_id, oob.header) %}
-    {% block auth_header_child %}
-    {% endblock %}
-  {% endcall %}
-{% endblock %}
-
-{% block _main_mobile_menu %}
-  {% include oob.nav %}
-{% endblock %}
-
-{% block content %}
-  {% include oob.main %}
-{% endblock %}

account/templates/_types/auth/login.html

@@ -1,46 +0,0 @@
-{% extends "_types/root/index.html" %}
-{% block content %}
-    <div class="w-full max-w-md">
-      <div class="bg-white/70 dark:bg-neutral-900/70 backdrop-blur rounded-2xl shadow p-6 sm:p-8 border border-neutral-200 dark:border-neutral-800">
-        <h1 class="text-2xl font-semibold tracking-tight">Sign in</h1>
-        <p class="mt-2 text-sm text-neutral-600 dark:text-neutral-400">
-          Enter your email and we’ll email you a one-time sign-in link.
-        </p>
-
-        {% if error %}
-          <div class="mt-4 rounded-lg border border-red-200 bg-red-50 text-red-800 dark:border-red-900/40 dark:bg-red-950/40 dark:text-red-200 px-4 py-3 text-sm">
-            {{ error }}
-          </div>
-        {% endif %}
-
-        <form
-          method="post" action="{{ blog_url('/auth/start/') }}"
-          class="mt-6 space-y-5"
-        >
-          <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-          <div>
-            <label for="email" class="block text-sm font-medium text-neutral-700 dark:text-neutral-300">
-              Email
-            </label>
-            <input
-              type="email"
-              id="email"
-              name="email"
-              value="{{ email or '' }}"
-              required
-              class="mt-2 block w-full rounded-lg border border-neutral-300 dark:border-neutral-700 bg-white dark:bg-neutral-900 px-3 py-2 text-neutral-900 dark:text-neutral-100 shadow-sm focus:outline-none focus:ring-2 focus:ring-offset-0 focus:ring-neutral-900 dark:focus:ring-neutral-200"
-              autocomplete="email"
-              inputmode="email"
-            >
-          </div>
-
-          <button
-            type="submit"
-            class="inline-flex w-full items-center justify-center rounded-lg bg-neutral-900 px-4 py-2.5 text-sm font-medium text-white hover:bg-neutral-800 focus:outline-none focus:ring-2 focus:ring-neutral-900 disabled:opacity-50 dark:bg-neutral-50 dark:text-neutral-900 dark:hover:bg-white"
-          >
-            Send link
-          </button>
-        </form>
-      </div>
-    </div>
-{% endblock %}

account/templates/auth/check_email.html

@@ -1,19 +0,0 @@
-{% extends "_types/root/_index.html" %}
-{% block meta %}{% endblock %}
-{% block title %}Check your email — Rose Ash{% endblock %}
-{% block content %}
-<div class="py-8 max-w-md mx-auto text-center">
-  <h1 class="text-2xl font-bold mb-4">Check your email</h1>
-  <p class="text-stone-600 mb-2">
-    We sent a sign-in link to <strong>{{ email }}</strong>.
-  </p>
-  <p class="text-stone-500 text-sm">
-    Click the link in the email to sign in. The link expires in 15 minutes.
-  </p>
-  {% if email_error %}
-    <div class="bg-yellow-50 border border-yellow-200 text-yellow-700 p-3 rounded mt-4">
-      {{ email_error }}
-    </div>
-  {% endif %}
-</div>
-{% endblock %}

account/templates/auth/device.html

@@ -1,41 +0,0 @@
-{% extends "_types/root/_index.html" %}
-{% block meta %}{% endblock %}
-{% block title %}Authorize Device — Rose Ash{% endblock %}
-{% block content %}
-<div class="py-8 max-w-md mx-auto">
-  <h1 class="text-2xl font-bold mb-6">Authorize device</h1>
-  <p class="text-stone-600 mb-4">Enter the code shown in your terminal to sign in.</p>
-
-  {% if error %}
-    <div class="bg-red-50 border border-red-200 text-red-700 p-3 rounded mb-4">
-      {{ error }}
-    </div>
-  {% endif %}
-
-  <form method="post" action="{{ url_for('auth.device_submit') }}" class="space-y-4">
-    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-    <div>
-      <label for="code" class="block text-sm font-medium mb-1">Device code</label>
-      <input
-        type="text"
-        name="code"
-        id="code"
-        value="{{ code | default('') }}"
-        placeholder="XXXX-XXXX"
-        required
-        autofocus
-        maxlength="9"
-        autocomplete="off"
-        spellcheck="false"
-        class="w-full border border-stone-300 rounded px-3 py-3 text-center text-2xl tracking-widest font-mono uppercase focus:outline-none focus:ring-2 focus:ring-stone-500"
-      >
-    </div>
-    <button
-      type="submit"
-      class="w-full bg-stone-800 text-white py-2 px-4 rounded hover:bg-stone-700 transition"
-    >
-      Authorize
-    </button>
-  </form>
-</div>
-{% endblock %}

account/templates/auth/device_approved.html

@@ -1,9 +0,0 @@
-{% extends "_types/root/_index.html" %}
-{% block meta %}{% endblock %}
-{% block title %}Device Authorized — Rose Ash{% endblock %}
-{% block content %}
-<div class="py-8 max-w-md mx-auto text-center">
-  <h1 class="text-2xl font-bold mb-4">Device authorized</h1>
-  <p class="text-stone-600">You can close this window and return to your terminal.</p>
-</div>
-{% endblock %}

account/templates/auth/login.html

@@ -1,36 +0,0 @@
-{% extends "_types/root/_index.html" %}
-{% block meta %}{% endblock %}
-{% block title %}Login — Rose Ash{% endblock %}
-{% block content %}
-<div class="py-8 max-w-md mx-auto">
-  <h1 class="text-2xl font-bold mb-6">Sign in</h1>
-
-  {% if error %}
-    <div class="bg-red-50 border border-red-200 text-red-700 p-3 rounded mb-4">
-      {{ error }}
-    </div>
-  {% endif %}
-
-  <form method="post" action="{{ url_for('auth.start_login') }}" class="space-y-4">
-    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-    <div>
-      <label for="email" class="block text-sm font-medium mb-1">Email address</label>
-      <input
-        type="email"
-        name="email"
-        id="email"
-        value="{{ email | default('') }}"
-        required
-        autofocus
-        class="w-full border border-stone-300 rounded px-3 py-2 focus:outline-none focus:ring-2 focus:ring-stone-500"
-      >
-    </div>
-    <button
-      type="submit"
-      class="w-full bg-stone-800 text-white py-2 px-4 rounded hover:bg-stone-700 transition"
-    >
-      Send magic link
-    </button>
-  </form>
-</div>
-{% endblock %}

blog/alembic/env.py

@@ -2,7 +2,7 @@ from alembic import context
 from shared.db.alembic_env import run_alembic
 
 MODELS = [
-    "shared.models.ghost_content",
+    "blog.models.content",
     "shared.models.kv",
     "shared.models.menu_item",
     "shared.models.menu_node",
@@ -13,6 +13,7 @@ MODELS = [
 
 TABLES = frozenset({
     "posts", "authors", "post_authors", "tags", "post_tags",
+    "post_users",
     "snippets", "tag_groups", "tag_group_tags",
     "menu_items", "menu_nodes", "kv",
     "page_configs",

blog/alembic/versions/0004_ghost_id_nullable_and_defaults.py

@@ -0,0 +1,67 @@
+"""Make ghost_id nullable, add defaults, create post_users M2M table.
+
+Revision ID: 0004
+Revises: 0003_add_page_configs
+"""
+from alembic import op
+import sqlalchemy as sa
+
+revision = "blog_0004"
+down_revision = "blog_0003"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Make ghost_id nullable
+    op.alter_column("posts", "ghost_id", existing_type=sa.String(64), nullable=True)
+    op.alter_column("authors", "ghost_id", existing_type=sa.String(64), nullable=True)
+    op.alter_column("tags", "ghost_id", existing_type=sa.String(64), nullable=True)
+
+    # Add server defaults for Post
+    op.alter_column(
+        "posts", "uuid",
+        existing_type=sa.String(64),
+        server_default=sa.text("gen_random_uuid()"),
+    )
+    op.alter_column(
+        "posts", "updated_at",
+        existing_type=sa.DateTime(timezone=True),
+        server_default=sa.text("now()"),
+    )
+    op.alter_column(
+        "posts", "created_at",
+        existing_type=sa.DateTime(timezone=True),
+        server_default=sa.text("now()"),
+    )
+
+    # Create post_users M2M table (replaces post_authors for new posts)
+    op.create_table(
+        "post_users",
+        sa.Column("post_id", sa.Integer, sa.ForeignKey("posts.id", ondelete="CASCADE"), primary_key=True),
+        sa.Column("user_id", sa.Integer, primary_key=True),
+        sa.Column("sort_order", sa.Integer, nullable=False, server_default="0"),
+    )
+    op.create_index("ix_post_users_user_id", "post_users", ["user_id"])
+
+    # Backfill post_users from post_authors for posts that already have user_id.
+    # This maps each post's authors to the post's user_id (primary author).
+    # Multi-author mapping requires the full sync script.
+    op.execute("""
+        INSERT INTO post_users (post_id, user_id, sort_order)
+        SELECT p.id, p.user_id, 0
+        FROM posts p
+        WHERE p.user_id IS NOT NULL
+          AND p.deleted_at IS NULL
+        ON CONFLICT DO NOTHING
+    """)
+
+
+def downgrade():
+    op.drop_table("post_users")
+    op.alter_column("posts", "created_at", existing_type=sa.DateTime(timezone=True), server_default=None)
+    op.alter_column("posts", "updated_at", existing_type=sa.DateTime(timezone=True), server_default=None)
+    op.alter_column("posts", "uuid", existing_type=sa.String(64), server_default=None)
+    op.alter_column("tags", "ghost_id", existing_type=sa.String(64), nullable=False)
+    op.alter_column("authors", "ghost_id", existing_type=sa.String(64), nullable=False)
+    op.alter_column("posts", "ghost_id", existing_type=sa.String(64), nullable=False)

blog/alembic/versions/0005_add_sx_content.py

@@ -0,0 +1,20 @@
+"""Add sx_content column to posts table.
+
+Revision ID: blog_0005
+Revises: blog_0004
+"""
+from alembic import op
+import sqlalchemy as sa
+
+revision = "blog_0005"
+down_revision = "blog_0004"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column("posts", sa.Column("sx_content", sa.Text(), nullable=True))
+
+
+def downgrade():
+    op.drop_column("posts", "sx_content")

blog/app.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 import path_setup  # noqa: F401  # adds shared/ to sys.path
-import sexp.sexp_components as sexp_components  # noqa: F401  # ensure Hypercorn --reload watches this file
+import sx.sx_components as sx_components  # noqa: F401  # ensure Hypercorn --reload watches this file
 from pathlib import Path
 
 from quart import g, request
@@ -20,6 +20,7 @@ from bp import (
     register_data,
     register_actions,
 )
+from sxc.pages import setup_blog_pages
 
 
 async def blog_context() -> dict:
@@ -27,7 +28,7 @@ async def blog_context() -> dict:
     Blog app context processor.
 
     - cart_count/cart_total: via cart service (shared DB)
-    - cart_mini_html / auth_menu_html / nav_tree_html: pre-fetched fragments
+    - cart_mini / auth_menu / nav_tree: pre-fetched fragments
     """
     from shared.infrastructure.context import base_context
     from shared.services.navigation import get_navigation_tree
@@ -65,14 +66,14 @@ async def blog_context() -> dict:
     auth_params = {"email": user.email} if user else {}
     nav_params = {"app_name": "blog", "path": request.path}
 
-    cart_mini_html, auth_menu_html, nav_tree_html = await fetch_fragments([
+    cart_mini, auth_menu, nav_tree = await fetch_fragments([
         ("cart", "cart-mini", cart_params or None),
         ("account", "auth-menu", auth_params or None),
         ("blog", "nav-tree", nav_params),
     ])
-    ctx["cart_mini_html"] = cart_mini_html
-    ctx["auth_menu_html"] = auth_menu_html
-    ctx["nav_tree_html"] = nav_tree_html
+    ctx["cart_mini"] = cart_mini
+    ctx["auth_menu"] = auth_menu
+    ctx["nav_tree"] = nav_tree
 
     return ctx
 
@@ -80,6 +81,8 @@ async def blog_context() -> dict:
 def create_app() -> "Quart":
     from services import register_domain_services
 
+    setup_blog_pages()
+
     app = create_base_app(
         "blog",
         context_fn=blog_context,
@@ -134,7 +137,7 @@ def create_app() -> "Quart":
     async def oembed():
         from urllib.parse import urlparse
         from quart import jsonify
-        from shared.services.registry import services
+        from services import blog_service
         from shared.infrastructure.urls import blog_url
         from shared.infrastructure.oembed import build_oembed_response
 
@@ -147,7 +150,7 @@ def create_app() -> "Quart":
         if not slug:
             return jsonify({"error": "could not extract slug"}), 404
 
-        post = await services.blog.get_post_by_slug(g.s, slug)
+        post = await blog_service.get_post_by_slug(g.s, slug)
         if not post:
             return jsonify({"error": "not found"}), 404
 

blog/bp/admin/routes.py

@@ -14,6 +14,7 @@ from quart import (
 from shared.browser.app.redis_cacher import clear_all_cache
 from shared.browser.app.authz import require_admin
 from shared.browser.app.utils.htmx import is_htmx_request
+from shared.sx.helpers import sx_response
 from shared.config import config
 from datetime import datetime
 
@@ -26,32 +27,22 @@ def register(url_prefix):
         "base_title": f"{config()['title']} settings",
       }
 
-    @bp.get("/")
-    @require_admin
-    async def home():
-      from shared.sexp.page import get_template_context
-      from sexp.sexp_components import render_settings_page, render_settings_oob
+    @bp.before_request
+    async def _prepare_page_data():
+        ep = request.endpoint or ""
+        if "defpage_settings_home" in ep:
+            from shared.sx.page import get_template_context
+            from sx.sx_components import _settings_main_panel_sx
+            tctx = await get_template_context()
+            g.settings_content = _settings_main_panel_sx(tctx)
+        elif "defpage_cache_page" in ep:
+            from shared.sx.page import get_template_context
+            from sx.sx_components import _cache_main_panel_sx
+            tctx = await get_template_context()
+            g.cache_content = _cache_main_panel_sx(tctx)
 
-      tctx = await get_template_context()
-      if not is_htmx_request():
-          html = await render_settings_page(tctx)
-      else:
-          html = await render_settings_oob(tctx)
-
-      return await make_response(html)
-
-    @bp.get("/cache/")
-    @require_admin
-    async def cache():
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_cache_page, render_cache_oob
-
-        tctx = await get_template_context()
-        if not is_htmx_request():
-            html = await render_cache_page(tctx)
-        else:
-            html = await render_cache_oob(tctx)
-        return await make_response(html)
+    from shared.sx.pages import mount_pages
+    mount_pages(bp, "blog", names=["settings-home", "cache-page"])
 
     @bp.post("/cache_clear/")
     @require_admin
@@ -59,11 +50,11 @@ def register(url_prefix):
         await clear_all_cache()
         if is_htmx_request():
             now = datetime.now()
-            from shared.sexp.jinja_bridge import render as render_comp
+            from shared.sx.jinja_bridge import render as render_comp
             html = render_comp("cache-cleared", time_str=now.strftime("%H:%M:%S"))
-            return html
+            return sx_response(html)
 
-        return redirect(url_for("settings.cache"))
+        return redirect(url_for("settings.defpage_cache_page"))
     return bp
 
 

blog/bp/blog/admin/routes.py

@@ -15,6 +15,7 @@ from sqlalchemy import select, delete
 from shared.browser.app.authz import require_admin
 from shared.browser.app.utils.htmx import is_htmx_request
 from shared.browser.app.redis_cacher import invalidate_tag_cache
+from shared.sx.helpers import sx_response
 
 from models.tag_group import TagGroup, TagGroupTag
 from models.ghost_content import Tag
@@ -45,27 +46,52 @@ async def _unassigned_tags(session):
 def register():
     bp = Blueprint("tag_groups_admin", __name__, url_prefix="/settings/tag-groups")
 
-    @bp.get("/")
-    @require_admin
-    async def index():
-        groups = list(
-            (await g.s.execute(
-                select(TagGroup).order_by(TagGroup.sort_order, TagGroup.name)
-            )).scalars()
-        )
-        unassigned = await _unassigned_tags(g.s)
+    @bp.before_request
+    async def _prepare_page_data():
+        ep = request.endpoint or ""
+        if "defpage_tag_groups_page" in ep:
+            groups = list(
+                (await g.s.execute(
+                    select(TagGroup).order_by(TagGroup.sort_order, TagGroup.name)
+                )).scalars()
+            )
+            unassigned = await _unassigned_tags(g.s)
+            from shared.sx.page import get_template_context
+            from sx.sx_components import _tag_groups_main_panel_sx
+            tctx = await get_template_context()
+            tctx.update({"groups": groups, "unassigned_tags": unassigned})
+            g.tag_groups_content = _tag_groups_main_panel_sx(tctx)
+        elif "defpage_tag_group_edit" in ep:
+            tag_id = (request.view_args or {}).get("id")
+            tg = await g.s.get(TagGroup, tag_id)
+            if not tg:
+                from quart import abort
+                abort(404)
+            assigned_rows = list(
+                (await g.s.execute(
+                    select(TagGroupTag.tag_id).where(TagGroupTag.tag_group_id == tag_id)
+                )).scalars()
+            )
+            all_tags = list(
+                (await g.s.execute(
+                    select(Tag).where(
+                        Tag.deleted_at.is_(None),
+                        (Tag.visibility == "public") | (Tag.visibility.is_(None)),
+                    ).order_by(Tag.name)
+                )).scalars()
+            )
+            from shared.sx.page import get_template_context
+            from sx.sx_components import _tag_groups_edit_main_panel_sx
+            tctx = await get_template_context()
+            tctx.update({
+                "group": tg,
+                "all_tags": all_tags,
+                "assigned_tag_ids": set(assigned_rows),
+            })
+            g.tag_group_edit_content = _tag_groups_edit_main_panel_sx(tctx)
 
-        ctx = {"groups": groups, "unassigned_tags": unassigned}
-
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_tag_groups_page, render_tag_groups_oob
-
-        tctx = await get_template_context()
-        tctx.update(ctx)
-        if not is_htmx_request():
-            return await make_response(await render_tag_groups_page(tctx))
-        else:
-            return await make_response(await render_tag_groups_oob(tctx))
+    from shared.sx.pages import mount_pages
+    mount_pages(bp, "blog", names=["tag-groups-page", "tag-group-edit"])
 
     @bp.post("/")
     @require_admin
@@ -73,7 +99,7 @@ def register():
         form = await request.form
         name = (form.get("name") or "").strip()
         if not name:
-            return redirect(url_for("blog.tag_groups_admin.index"))
+            return redirect(url_for("blog.tag_groups_admin.defpage_tag_groups_page"))
 
         slug = _slugify(name)
         feature_image = (form.get("feature_image") or "").strip() or None
@@ -89,55 +115,14 @@ def register():
         await g.s.flush()
 
         await invalidate_tag_cache("blog")
-        return redirect(url_for("blog.tag_groups_admin.index"))
-
-    @bp.get("/<int:id>/")
-    @require_admin
-    async def edit(id: int):
-        tg = await g.s.get(TagGroup, id)
-        if not tg:
-            return redirect(url_for("blog.tag_groups_admin.index"))
-
-        # Assigned tag IDs for this group
-        assigned_rows = list(
-            (await g.s.execute(
-                select(TagGroupTag.tag_id).where(TagGroupTag.tag_group_id == id)
-            )).scalars()
-        )
-        assigned_tag_ids = set(assigned_rows)
-
-        # All public, non-deleted tags
-        all_tags = list(
-            (await g.s.execute(
-                select(Tag).where(
-                    Tag.deleted_at.is_(None),
-                    (Tag.visibility == "public") | (Tag.visibility.is_(None)),
-                ).order_by(Tag.name)
-            )).scalars()
-        )
-
-        ctx = {
-            "group": tg,
-            "all_tags": all_tags,
-            "assigned_tag_ids": assigned_tag_ids,
-        }
-
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_tag_group_edit_page, render_tag_group_edit_oob
-
-        tctx = await get_template_context()
-        tctx.update(ctx)
-        if not is_htmx_request():
-            return await make_response(await render_tag_group_edit_page(tctx))
-        else:
-            return await make_response(await render_tag_group_edit_oob(tctx))
+        return redirect(url_for("blog.tag_groups_admin.defpage_tag_groups_page"))
 
     @bp.post("/<int:id>/")
     @require_admin
     async def save(id: int):
         tg = await g.s.get(TagGroup, id)
         if not tg:
-            return redirect(url_for("blog.tag_groups_admin.index"))
+            return redirect(url_for("blog.tag_groups_admin.defpage_tag_groups_page"))
 
         form = await request.form
         name = (form.get("name") or "").strip()
@@ -168,7 +153,7 @@ def register():
         await g.s.flush()
 
         await invalidate_tag_cache("blog")
-        return redirect(url_for("blog.tag_groups_admin.edit", id=id))
+        return redirect(url_for("blog.tag_groups_admin.defpage_tag_group_edit", id=id))
 
     @bp.post("/<int:id>/delete/")
     @require_admin
@@ -178,6 +163,6 @@ def register():
             await g.s.delete(tg)
             await g.s.flush()
             await invalidate_tag_cache("blog")
-        return redirect(url_for("blog.tag_groups_admin.index"))
+        return redirect(url_for("blog.tag_groups_admin.defpage_tag_groups_page"))
 
     return bp

blog/bp/blog/ghost/lexical_to_sx.py

@@ -0,0 +1,445 @@
+"""
+Lexical JSON → s-expression converter.
+
+Mirrors lexical_renderer.py's registry/dispatch pattern but produces sx source
+instead of HTML. Used for backfilling existing posts and on-the-fly conversion
+when editing pre-migration posts in the SX editor.
+
+Public API
+----------
+    lexical_to_sx(doc)  – Lexical JSON (dict or string) → sx source string
+"""
+from __future__ import annotations
+
+import json
+from typing import Callable
+
+import mistune
+
+from shared.sx.html_to_sx import html_to_sx
+
+
+# ---------------------------------------------------------------------------
+# Registry
+# ---------------------------------------------------------------------------
+
+_CONVERTERS: dict[str, Callable[[dict], str]] = {}
+
+
+def _converter(node_type: str):
+    """Decorator — register a function as the converter for *node_type*."""
+    def decorator(fn: Callable[[dict], str]) -> Callable[[dict], str]:
+        _CONVERTERS[node_type] = fn
+        return fn
+    return decorator
+
+
+# ---------------------------------------------------------------------------
+# Public entry point
+# ---------------------------------------------------------------------------
+
+def lexical_to_sx(doc: dict | str) -> str:
+    """Convert a Lexical JSON document to an sx source string."""
+    if isinstance(doc, str):
+        doc = json.loads(doc)
+    root = doc.get("root", doc)
+    children = root.get("children", [])
+    parts = [_convert_node(c) for c in children]
+    parts = [p for p in parts if p]
+    if not parts:
+        return '(<> (p ""))'
+    if len(parts) == 1:
+        return parts[0]
+    return "(<>\n  " + "\n  ".join(parts) + ")"
+
+
+# ---------------------------------------------------------------------------
+# Core dispatch
+# ---------------------------------------------------------------------------
+
+def _convert_node(node: dict) -> str:
+    node_type = node.get("type", "")
+    converter = _CONVERTERS.get(node_type)
+    if converter:
+        return converter(node)
+    return ""
+
+
+def _convert_children(children: list[dict]) -> str:
+    """Convert children to inline sx content (for text nodes)."""
+    parts = [_convert_node(c) for c in children]
+    return " ".join(p for p in parts if p)
+
+
+def _esc(s: str) -> str:
+    """Escape a string for sx double-quoted literals."""
+    return s.replace("\\", "\\\\").replace('"', '\\"')
+
+
+# ---------------------------------------------------------------------------
+# Text format bitmask
+# ---------------------------------------------------------------------------
+
+_FORMAT_BOLD = 1
+_FORMAT_ITALIC = 2
+_FORMAT_STRIKETHROUGH = 4
+_FORMAT_UNDERLINE = 8
+_FORMAT_CODE = 16
+_FORMAT_SUBSCRIPT = 32
+_FORMAT_SUPERSCRIPT = 64
+
+_FORMAT_WRAPPERS: list[tuple[int, str]] = [
+    (_FORMAT_BOLD,          "strong"),
+    (_FORMAT_ITALIC,        "em"),
+    (_FORMAT_STRIKETHROUGH, "s"),
+    (_FORMAT_UNDERLINE,     "u"),
+    (_FORMAT_CODE,          "code"),
+    (_FORMAT_SUBSCRIPT,     "sub"),
+    (_FORMAT_SUPERSCRIPT,   "sup"),
+]
+
+
+def _wrap_format(text_sx: str, fmt: int) -> str:
+    for mask, tag in _FORMAT_WRAPPERS:
+        if fmt & mask:
+            text_sx = f"({tag} {text_sx})"
+    return text_sx
+
+
+# ---------------------------------------------------------------------------
+# Tier 1 — text nodes
+# ---------------------------------------------------------------------------
+
+@_converter("text")
+def _text(node: dict) -> str:
+    text = node.get("text", "")
+    if not text:
+        return ""
+    sx = f'"{_esc(text)}"'
+    fmt = node.get("format", 0)
+    if isinstance(fmt, int) and fmt:
+        sx = _wrap_format(sx, fmt)
+    return sx
+
+
+@_converter("linebreak")
+def _linebreak(_node: dict) -> str:
+    return '"\\n"'
+
+
+@_converter("tab")
+def _tab(_node: dict) -> str:
+    return '"\\t"'
+
+
+@_converter("paragraph")
+def _paragraph(node: dict) -> str:
+    inner = _convert_children(node.get("children", []))
+    if not inner:
+        inner = '""'
+    return f"(p {inner})"
+
+
+@_converter("extended-text")
+def _extended_text(node: dict) -> str:
+    # extended-text can be block-level (with children) or inline (with text).
+    # When it has a "text" field, treat it as a plain text node.
+    if "text" in node:
+        return _text(node)
+    return _paragraph(node)
+
+
+@_converter("heading")
+def _heading(node: dict) -> str:
+    tag = node.get("tag", "h2")
+    inner = _convert_children(node.get("children", []))
+    if not inner:
+        inner = '""'
+    return f"({tag} {inner})"
+
+
+@_converter("extended-heading")
+def _extended_heading(node: dict) -> str:
+    if "text" in node:
+        return _text(node)
+    return _heading(node)
+
+
+@_converter("quote")
+def _quote(node: dict) -> str:
+    inner = _convert_children(node.get("children", []))
+    return f"(blockquote {inner})" if inner else '(blockquote "")'
+
+
+@_converter("extended-quote")
+def _extended_quote(node: dict) -> str:
+    if "text" in node:
+        return _text(node)
+    return _quote(node)
+
+
+@_converter("link")
+def _link(node: dict) -> str:
+    href = node.get("url", "")
+    inner = _convert_children(node.get("children", []))
+    if not inner:
+        inner = f'"{_esc(href)}"'
+    return f'(a :href "{_esc(href)}" {inner})'
+
+
+@_converter("autolink")
+def _autolink(node: dict) -> str:
+    return _link(node)
+
+
+@_converter("at-link")
+def _at_link(node: dict) -> str:
+    return _link(node)
+
+
+@_converter("list")
+def _list(node: dict) -> str:
+    tag = "ol" if node.get("listType") == "number" else "ul"
+    inner = _convert_children(node.get("children", []))
+    return f"({tag} {inner})" if inner else f"({tag})"
+
+
+@_converter("listitem")
+def _listitem(node: dict) -> str:
+    inner = _convert_children(node.get("children", []))
+    return f"(li {inner})" if inner else '(li "")'
+
+
+@_converter("horizontalrule")
+def _horizontalrule(_node: dict) -> str:
+    return "(hr)"
+
+
+@_converter("code")
+def _code(node: dict) -> str:
+    inner = _convert_children(node.get("children", []))
+    return f"(code {inner})" if inner else ""
+
+
+@_converter("codeblock")
+def _codeblock(node: dict) -> str:
+    lang = node.get("language", "")
+    code = node.get("code", "")
+    lang_attr = f' :class "language-{_esc(lang)}"' if lang else ""
+    return f'(pre (code{lang_attr} "{_esc(code)}"))'
+
+
+@_converter("code-highlight")
+def _code_highlight(node: dict) -> str:
+    text = node.get("text", "")
+    return f'"{_esc(text)}"' if text else ""
+
+
+# ---------------------------------------------------------------------------
+# Tier 2 — common cards
+# ---------------------------------------------------------------------------
+
+@_converter("image")
+def _image(node: dict) -> str:
+    src = node.get("src", "")
+    alt = node.get("alt", "")
+    caption = node.get("caption", "")
+    width = node.get("cardWidth", "") or node.get("width", "")
+    href = node.get("href", "")
+
+    parts = [f':src "{_esc(src)}"']
+    if alt:
+        parts.append(f':alt "{_esc(alt)}"')
+    if caption:
+        parts.append(f":caption {html_to_sx(caption)}")
+    if width:
+        parts.append(f':width "{_esc(width)}"')
+    if href:
+        parts.append(f':href "{_esc(href)}"')
+    return "(~kg-image " + " ".join(parts) + ")"
+
+
+@_converter("gallery")
+def _gallery(node: dict) -> str:
+    images = node.get("images", [])
+    if not images:
+        return ""
+
+    # Group images into rows of 3 (matching lexical_renderer.py)
+    rows = []
+    for i in range(0, len(images), 3):
+        row_imgs = images[i:i + 3]
+        row_items = []
+        for img in row_imgs:
+            item_parts = [f'"src" "{_esc(img.get("src", ""))}"']
+            if img.get("alt"):
+                item_parts.append(f'"alt" "{_esc(img["alt"])}"')
+            if img.get("caption"):
+                item_parts.append(f'"caption" {html_to_sx(img["caption"])}')
+            row_items.append("(dict " + " ".join(item_parts) + ")")
+        rows.append("(list " + " ".join(row_items) + ")")
+
+    images_sx = "(list " + " ".join(rows) + ")"
+    caption = node.get("caption", "")
+    caption_attr = f" :caption {html_to_sx(caption)}" if caption else ""
+    return f"(~kg-gallery :images {images_sx}{caption_attr})"
+
+
+@_converter("html")
+def _html_card(node: dict) -> str:
+    raw = node.get("html", "")
+    inner = html_to_sx(raw)
+    return f"(~kg-html {inner})"
+
+
+@_converter("embed")
+def _embed(node: dict) -> str:
+    embed_html = node.get("html", "")
+    caption = node.get("caption", "")
+    parts = [f':html "{_esc(embed_html)}"']
+    if caption:
+        parts.append(f":caption {html_to_sx(caption)}")
+    return "(~kg-embed " + " ".join(parts) + ")"
+
+
+@_converter("bookmark")
+def _bookmark(node: dict) -> str:
+    url = node.get("url", "")
+    meta = node.get("metadata", {})
+    parts = [f':url "{_esc(url)}"']
+
+    title = meta.get("title", "") or node.get("title", "")
+    if title:
+        parts.append(f':title "{_esc(title)}"')
+    desc = meta.get("description", "") or node.get("description", "")
+    if desc:
+        parts.append(f':description "{_esc(desc)}"')
+    icon = meta.get("icon", "") or node.get("icon", "")
+    if icon:
+        parts.append(f':icon "{_esc(icon)}"')
+    author = meta.get("author", "") or node.get("author", "")
+    if author:
+        parts.append(f':author "{_esc(author)}"')
+    publisher = meta.get("publisher", "") or node.get("publisher", "")
+    if publisher:
+        parts.append(f':publisher "{_esc(publisher)}"')
+    thumbnail = meta.get("thumbnail", "") or node.get("thumbnail", "")
+    if thumbnail:
+        parts.append(f':thumbnail "{_esc(thumbnail)}"')
+    caption = node.get("caption", "")
+    if caption:
+        parts.append(f":caption {html_to_sx(caption)}")
+
+    return "(~kg-bookmark " + " ".join(parts) + ")"
+
+
+@_converter("callout")
+def _callout(node: dict) -> str:
+    color = node.get("backgroundColor", "grey")
+    emoji = node.get("calloutEmoji", "")
+    inner = _convert_children(node.get("children", []))
+
+    parts = [f':color "{_esc(color)}"']
+    if emoji:
+        parts.append(f':emoji "{_esc(emoji)}"')
+    if inner:
+        parts.append(f':content {inner}')
+    return "(~kg-callout " + " ".join(parts) + ")"
+
+
+@_converter("button")
+def _button(node: dict) -> str:
+    text = node.get("buttonText", "")
+    url = node.get("buttonUrl", "")
+    alignment = node.get("alignment", "center")
+    return f'(~kg-button :url "{_esc(url)}" :text "{_esc(text)}" :alignment "{_esc(alignment)}")'
+
+
+@_converter("toggle")
+def _toggle(node: dict) -> str:
+    heading = node.get("heading", "")
+    inner = _convert_children(node.get("children", []))
+    content_attr = f" :content {inner}" if inner else ""
+    return f'(~kg-toggle :heading "{_esc(heading)}"{content_attr})'
+
+
+@_converter("audio")
+def _audio(node: dict) -> str:
+    src = node.get("src", "")
+    title = node.get("title", "")
+    duration = node.get("duration", 0)
+    thumbnail = node.get("thumbnailSrc", "")
+
+    duration_min = int(duration) // 60
+    duration_sec = int(duration) % 60
+    duration_str = f"{duration_min}:{duration_sec:02d}"
+
+    parts = [f':src "{_esc(src)}"']
+    if title:
+        parts.append(f':title "{_esc(title)}"')
+    parts.append(f':duration "{duration_str}"')
+    if thumbnail:
+        parts.append(f':thumbnail "{_esc(thumbnail)}"')
+    return "(~kg-audio " + " ".join(parts) + ")"
+
+
+@_converter("video")
+def _video(node: dict) -> str:
+    src = node.get("src", "")
+    caption = node.get("caption", "")
+    width = node.get("cardWidth", "")
+    thumbnail = node.get("thumbnailSrc", "") or node.get("customThumbnailSrc", "")
+    loop = node.get("loop", False)
+
+    parts = [f':src "{_esc(src)}"']
+    if caption:
+        parts.append(f":caption {html_to_sx(caption)}")
+    if width:
+        parts.append(f':width "{_esc(width)}"')
+    if thumbnail:
+        parts.append(f':thumbnail "{_esc(thumbnail)}"')
+    if loop:
+        parts.append(":loop true")
+    return "(~kg-video " + " ".join(parts) + ")"
+
+
+@_converter("file")
+def _file(node: dict) -> str:
+    src = node.get("src", "")
+    filename = node.get("fileName", "")
+    title = node.get("title", "") or filename
+    file_size = node.get("fileSize", 0)
+    caption = node.get("caption", "")
+
+    # Format size
+    size_str = ""
+    if file_size:
+        kb = file_size / 1024
+        if kb < 1024:
+            size_str = f"{kb:.0f} KB"
+        else:
+            size_str = f"{kb / 1024:.1f} MB"
+
+    parts = [f':src "{_esc(src)}"']
+    if filename:
+        parts.append(f':filename "{_esc(filename)}"')
+    if title:
+        parts.append(f':title "{_esc(title)}"')
+    if size_str:
+        parts.append(f':filesize "{size_str}"')
+    if caption:
+        parts.append(f":caption {html_to_sx(caption)}")
+    return "(~kg-file " + " ".join(parts) + ")"
+
+
+@_converter("paywall")
+def _paywall(_node: dict) -> str:
+    return "(~kg-paywall)"
+
+
+@_converter("markdown")
+def _markdown(node: dict) -> str:
+    md_text = node.get("markdown", "")
+    rendered = mistune.html(md_text)
+    inner = html_to_sx(rendered)
+    return f"(~kg-md {inner})"

blog/bp/blog/ghost_db.py

@@ -63,6 +63,7 @@ def _post_to_public(p: Post) -> Dict[str, Any]:
         "slug": p.slug,
         "title": p.title,
         "html": p.html,
+        "sx_content": p.sx_content,
         "is_page": p.is_page,
         "excerpt": p.custom_excerpt or p.excerpt,
         "custom_excerpt": p.custom_excerpt,

blog/bp/blog/routes.py

@@ -14,7 +14,6 @@ from quart import (
     url_for,
 )
 from .ghost_db import DBClient  # adjust import path
-from shared.db.session import get_session
 from .filters.qs import makeqs_factory, decode
 from .services.posts_data import posts_data
 from .services.pages_data import pages_data
@@ -22,6 +21,7 @@ from .services.pages_data import pages_data
 from shared.browser.app.redis_cacher import cache_page, invalidate_tag_cache
 from shared.browser.app.utils.htmx import is_htmx_request
 from shared.browser.app.authz import require_admin
+from shared.sx.helpers import sx_response
 from shared.utils import host_url
 
 def register(url_prefix, title):
@@ -46,39 +46,24 @@ def register(url_prefix, title):
 
     @blogs_bp.before_app_serving
     async def init():
-      from .ghost.ghost_sync import sync_all_content_from_ghost
-      from sqlalchemy import text
-      import logging
-      logger = logging.getLogger(__name__)
-
-      # Advisory lock prevents multiple Hypercorn workers from
-      # running the sync concurrently (which causes PK conflicts).
-      async with get_session() as s:
-        got_lock = await s.scalar(text("SELECT pg_try_advisory_lock(900001)"))
-        if not got_lock:
-            await s.rollback()  # clean up before returning connection to pool
-            return
-        try:
-            await sync_all_content_from_ghost(s)
-            await s.commit()
-        except Exception:
-            logger.exception("Ghost sync failed — will retry on next deploy")
-            try:
-                await s.rollback()
-            except Exception:
-                pass
-        finally:
-            try:
-                await s.execute(text("SELECT pg_advisory_unlock(900001)"))
-                await s.commit()
-            except Exception:
-                pass  # lock auto-releases when session closes
+      # Ghost startup sync disabled (Phase 1) — blog service owns content
+      # directly. The final_ghost_sync.py script was run before cutover.
+      pass
 
     @blogs_bp.before_request
-    def route():
+    async def route():
       g.makeqs_factory = makeqs_factory
+      ep = request.endpoint or ""
+      if "defpage_new_post" in ep:
+          from sx.sx_components import render_editor_panel
+          g.editor_content = render_editor_panel()
+      elif "defpage_new_page" in ep:
+          from sx.sx_components import render_editor_panel
+          g.editor_page_content = render_editor_panel(is_page=True)
+
+    from shared.sx.pages import mount_pages
+    mount_pages(blogs_bp, "blog", names=["new-post", "new-page"])
 
-    
     @blogs_bp.context_processor
     async def inject_root():
       return {
@@ -117,7 +102,7 @@ def register(url_prefix, title):
       post_slug = p_data["post"]["slug"]
 
       # Fetch container nav from relations service
-      container_nav_html = await fetch_fragment("relations", "container-nav", params={
+      container_nav = await fetch_fragment("relations", "container-nav", params={
           "container_type": "page",
           "container_id": str(db_post_id),
           "post_slug": post_slug,
@@ -126,7 +111,7 @@ def register(url_prefix, title):
       ctx = {
           **p_data,
           "base_title": get_config()["title"],
-          "container_nav_html": container_nav_html,
+          "container_nav": container_nav,
       }
 
       # Page cart badge via HTTP
@@ -142,16 +127,17 @@ def register(url_prefix, title):
           ctx["page_cart_count"] = page_summary.count + page_summary.calendar_count + page_summary.ticket_count
           ctx["page_cart_total"] = float(page_summary.total + page_summary.calendar_total + page_summary.ticket_total)
 
-      from shared.sexp.page import get_template_context
-      from sexp.sexp_components import render_home_page, render_home_oob
+      from shared.sx.page import get_template_context
+      from sx.sx_components import render_home_page, render_home_oob
 
       tctx = await get_template_context()
       tctx.update(ctx)
       if not is_htmx_request():
           html = await render_home_page(tctx)
+          return await make_response(html)
       else:
-          html = await render_home_oob(tctx)
-      return await make_response(html)
+          sx_src = await render_home_oob(tctx)
+          return sx_response(sx_src)
 
     @blogs_bp.get("/index")
     @blogs_bp.get("/index/")
@@ -179,18 +165,20 @@ def register(url_prefix, title):
               "tag_groups": [],
               "posts": data.get("pages", []),
           }
-          from shared.sexp.page import get_template_context
-          from sexp.sexp_components import render_blog_page, render_blog_oob, render_blog_page_cards
+          from shared.sx.page import get_template_context
+          from sx.sx_components import render_blog_page, render_blog_oob, render_blog_page_cards
 
           tctx = await get_template_context()
           tctx.update(context)
           if not is_htmx_request():
               html = await render_blog_page(tctx)
+              return await make_response(html)
           elif q.page > 1:
-              html = await render_blog_page_cards(tctx)
+              sx_src = await render_blog_page_cards(tctx)
+              return sx_response(sx_src)
           else:
-              html = await render_blog_oob(tctx)
-          return await make_response(html)
+              sx_src = await render_blog_oob(tctx)
+              return sx_response(sx_src)
 
       # Default: posts listing
       # Drafts filter requires login; ignore if not logged in
@@ -220,40 +208,27 @@ def register(url_prefix, title):
           "drafts": q.drafts if show_drafts else None,
       }
 
-      from shared.sexp.page import get_template_context
-      from sexp.sexp_components import render_blog_page, render_blog_oob, render_blog_cards
+      from shared.sx.page import get_template_context
+      from sx.sx_components import render_blog_page, render_blog_oob, render_blog_cards
 
       tctx = await get_template_context()
       tctx.update(context)
       if not is_htmx_request():
           html = await render_blog_page(tctx)
+          return await make_response(html)
       elif q.page > 1:
-          html = await render_blog_cards(tctx)
+          # Sx wire format — client renders blog cards
+          sx_src = await render_blog_cards(tctx)
+          return sx_response(sx_src)
       else:
-          html = await render_blog_oob(tctx)
-
-      return await make_response(html)
-
-    @blogs_bp.get("/new/")
-    @require_admin
-    async def new_post():
-      from shared.sexp.page import get_template_context
-      from sexp.sexp_components import render_new_post_page, render_new_post_oob, render_editor_panel
-
-      tctx = await get_template_context()
-      tctx["editor_html"] = render_editor_panel()
-      if not is_htmx_request():
-        html = await render_new_post_page(tctx)
-      else:
-        html = await render_new_post_oob(tctx)
-      return await make_response(html)
+          sx_src = await render_blog_oob(tctx)
+          return sx_response(sx_src)
 
     @blogs_bp.post("/new/")
     @require_admin
     async def new_post_save():
-      from .ghost.ghost_posts import create_post
       from .ghost.lexical_validator import validate_lexical
-      from .ghost.ghost_sync import sync_single_post
+      from services.post_writer import create_post as writer_create
 
       form = await request.form
       title = form.get("title", "").strip() or "Untitled"
@@ -267,8 +242,8 @@ def register(url_prefix, title):
       try:
         lexical_doc = json.loads(lexical_raw)
       except (json.JSONDecodeError, TypeError):
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_new_post_page, render_editor_panel
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_new_post_page, render_editor_panel
         tctx = await get_template_context()
         tctx["editor_html"] = render_editor_panel(save_error="Invalid JSON in editor content.")
         html = await render_new_post_page(tctx)
@@ -276,65 +251,40 @@ def register(url_prefix, title):
 
       ok, reason = validate_lexical(lexical_doc)
       if not ok:
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_new_post_page, render_editor_panel
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_new_post_page, render_editor_panel
         tctx = await get_template_context()
         tctx["editor_html"] = render_editor_panel(save_error=reason)
         html = await render_new_post_page(tctx)
         return await make_response(html, 400)
 
-      # Create in Ghost
-      ghost_post = await create_post(
+      # Create directly in db_blog
+      sx_content_raw = form.get("sx_content", "").strip() or None
+      post = await writer_create(
+          g.s,
           title=title,
           lexical_json=lexical_raw,
           status=status,
+          user_id=g.user.id,
           feature_image=feature_image or None,
           custom_excerpt=custom_excerpt or None,
           feature_image_caption=feature_image_caption or None,
+          sx_content=sx_content_raw,
       )
-
-      # Sync to local DB
-      await sync_single_post(g.s, ghost_post["id"])
       await g.s.flush()
 
-      # Set user_id on the newly created post
-      from models.ghost_content import Post
-      from sqlalchemy import select
-      local_post = (await g.s.execute(
-          select(Post).where(Post.ghost_id == ghost_post["id"])
-      )).scalar_one_or_none()
-      if local_post and local_post.user_id is None:
-          local_post.user_id = g.user.id
-          await g.s.flush()
-
       # Clear blog listing cache
       await invalidate_tag_cache("blog")
 
-      # Redirect to the edit page (post is likely a draft, so public detail would 404)
-      return redirect(host_url(url_for("blog.post.admin.edit", slug=ghost_post["slug"])))
+      # Redirect to the edit page
+      return redirect(host_url(url_for("blog.post.admin.defpage_post_edit", slug=post.slug)))
 
 
-    @blogs_bp.get("/new-page/")
-    @require_admin
-    async def new_page():
-      from shared.sexp.page import get_template_context
-      from sexp.sexp_components import render_new_post_page, render_new_post_oob, render_editor_panel
-
-      tctx = await get_template_context()
-      tctx["editor_html"] = render_editor_panel(is_page=True)
-      tctx["is_page"] = True
-      if not is_htmx_request():
-        html = await render_new_post_page(tctx)
-      else:
-        html = await render_new_post_oob(tctx)
-      return await make_response(html)
-
     @blogs_bp.post("/new-page/")
     @require_admin
     async def new_page_save():
-      from .ghost.ghost_posts import create_page
       from .ghost.lexical_validator import validate_lexical
-      from .ghost.ghost_sync import sync_single_page
+      from services.post_writer import create_page as writer_create_page
 
       form = await request.form
       title = form.get("title", "").strip() or "Untitled"
@@ -348,8 +298,8 @@ def register(url_prefix, title):
       try:
         lexical_doc = json.loads(lexical_raw)
       except (json.JSONDecodeError, TypeError):
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_new_post_page, render_editor_panel
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_new_post_page, render_editor_panel
         tctx = await get_template_context()
         tctx["editor_html"] = render_editor_panel(save_error="Invalid JSON in editor content.", is_page=True)
         tctx["is_page"] = True
@@ -358,43 +308,34 @@ def register(url_prefix, title):
 
       ok, reason = validate_lexical(lexical_doc)
       if not ok:
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_new_post_page, render_editor_panel
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_new_post_page, render_editor_panel
         tctx = await get_template_context()
         tctx["editor_html"] = render_editor_panel(save_error=reason, is_page=True)
         tctx["is_page"] = True
         html = await render_new_post_page(tctx)
         return await make_response(html, 400)
 
-      # Create in Ghost (as page)
-      ghost_page = await create_page(
+      # Create directly in db_blog
+      sx_content_raw = form.get("sx_content", "").strip() or None
+      page = await writer_create_page(
+          g.s,
           title=title,
           lexical_json=lexical_raw,
           status=status,
+          user_id=g.user.id,
           feature_image=feature_image or None,
           custom_excerpt=custom_excerpt or None,
           feature_image_caption=feature_image_caption or None,
+          sx_content=sx_content_raw,
       )
-
-      # Sync to local DB (uses pages endpoint)
-      await sync_single_page(g.s, ghost_page["id"])
       await g.s.flush()
 
-      # Set user_id on the newly created page
-      from models.ghost_content import Post
-      from sqlalchemy import select
-      local_post = (await g.s.execute(
-          select(Post).where(Post.ghost_id == ghost_page["id"])
-      )).scalar_one_or_none()
-      if local_post and local_post.user_id is None:
-          local_post.user_id = g.user.id
-          await g.s.flush()
-
       # Clear blog listing cache
       await invalidate_tag_cache("blog")
 
       # Redirect to the page admin
-      return redirect(host_url(url_for("blog.post.admin.edit", slug=ghost_page["slug"])))
+      return redirect(host_url(url_for("blog.post.admin.defpage_post_edit", slug=page.slug)))
 
 
     @blogs_bp.get("/drafts/")

blog/bp/blog/web_hooks/routes.py

@@ -1,15 +1,11 @@
-# suma_browser/webhooks.py
+# Ghost webhooks — neutered (Phase 1).
+#
+# Post/page/author/tag handlers return 204 no-op.
+# Member webhook remains active (membership sync handled by account service).
 from __future__ import annotations
 import os
-from quart import Blueprint, request, abort, Response, g
+from quart import Blueprint, request, abort, Response
 
-from ..ghost.ghost_sync import (
-    sync_single_page,
-    sync_single_post,
-    sync_single_author,
-    sync_single_tag,
-)
-from shared.browser.app.redis_cacher import clear_cache
 from shared.browser.app.csrf import csrf_exempt
 
 ghost_webhooks = Blueprint("ghost_webhooks", __name__, url_prefix="/__ghost-webhook")
@@ -32,6 +28,7 @@ def _extract_id(data: dict, key: str) -> str | None:
 @csrf_exempt
 @ghost_webhooks.route("/member/", methods=["POST"])
 async def webhook_member() -> Response:
+    """Member webhook still active — delegates to account service."""
     _check_secret(request)
 
     data = await request.get_json(force=True, silent=True) or {}
@@ -39,7 +36,6 @@ async def webhook_member() -> Response:
     if not ghost_id:
         abort(400, "no member id")
 
-    # Delegate to account service (membership data lives in db_account)
     from shared.infrastructure.actions import call_action
     try:
         await call_action(
@@ -52,61 +48,25 @@ async def webhook_member() -> Response:
         logging.getLogger(__name__).error("Member sync via account failed: %s", e)
     return Response(status=204)
 
+
+# --- Neutered handlers: Ghost no longer writes content ---
+
 @csrf_exempt
 @ghost_webhooks.post("/post/")
-@clear_cache(tag='blog')
 async def webhook_post() -> Response:
-    _check_secret(request)
-
-    data = await request.get_json(force=True, silent=True) or {}
-    ghost_id = _extract_id(data, "post")
-    if not ghost_id:
-        abort(400, "no post id")
-
-    await sync_single_post(g.s, ghost_id)
-
     return Response(status=204)
 
 @csrf_exempt
 @ghost_webhooks.post("/page/")
-@clear_cache(tag='blog')
 async def webhook_page() -> Response:
-    _check_secret(request)
-
-    data = await request.get_json(force=True, silent=True) or {}
-    ghost_id = _extract_id(data, "page")
-    if not ghost_id:
-        abort(400, "no page id")
-
-    await sync_single_page(g.s, ghost_id)
-
     return Response(status=204)
 
 @csrf_exempt
 @ghost_webhooks.post("/author/")
-@clear_cache(tag='blog')
 async def webhook_author() -> Response:
-    _check_secret(request)
-
-    data = await request.get_json(force=True, silent=True) or {}
-    ghost_id = _extract_id(data, "user") or _extract_id(data, "author")
-    if not ghost_id:
-        abort(400, "no author id")
-
-    await sync_single_author(g.s, ghost_id)
-
     return Response(status=204)
 
 @csrf_exempt
 @ghost_webhooks.post("/tag/")
-@clear_cache(tag='blog')
 async def webhook_tag() -> Response:
-    _check_secret(request)
-
-    data = await request.get_json(force=True, silent=True) or {}
-    ghost_id = _extract_id(data, "tag")
-    if not ghost_id:
-        abort(400, "no tag id")
-
-    await sync_single_tag(g.s, ghost_id)
     return Response(status=204)

blog/bp/data/routes.py

@@ -9,7 +9,7 @@ from quart import Blueprint, g, jsonify, request
 
 from shared.infrastructure.data_client import DATA_HEADER
 from shared.contracts.dtos import dto_to_dict
-from shared.services.registry import services
+from services import blog_service
 
 
 def register() -> Blueprint:
@@ -36,7 +36,7 @@ def register() -> Blueprint:
     # --- post-by-slug ---
     async def _post_by_slug():
         slug = request.args.get("slug", "")
-        post = await services.blog.get_post_by_slug(g.s, slug)
+        post = await blog_service.get_post_by_slug(g.s, slug)
         if not post:
             return None
         return dto_to_dict(post)
@@ -46,7 +46,7 @@ def register() -> Blueprint:
     # --- post-by-id ---
     async def _post_by_id():
         post_id = int(request.args.get("id", 0))
-        post = await services.blog.get_post_by_id(g.s, post_id)
+        post = await blog_service.get_post_by_id(g.s, post_id)
         if not post:
             return None
         return dto_to_dict(post)
@@ -59,7 +59,7 @@ def register() -> Blueprint:
         if not ids_raw:
             return []
         ids = [int(x.strip()) for x in ids_raw.split(",") if x.strip()]
-        posts = await services.blog.get_posts_by_ids(g.s, ids)
+        posts = await blog_service.get_posts_by_ids(g.s, ids)
         return [dto_to_dict(p) for p in posts]
 
     _handlers["posts-by-ids"] = _posts_by_ids
@@ -69,7 +69,7 @@ def register() -> Blueprint:
         query = request.args.get("query", "")
         page = int(request.args.get("page", 1))
         per_page = int(request.args.get("per_page", 10))
-        posts, total = await services.blog.search_posts(g.s, query, page, per_page)
+        posts, total = await blog_service.search_posts(g.s, query, page, per_page)
         return {"posts": [dto_to_dict(p) for p in posts], "total": total}
 
     _handlers["search-posts"] = _search_posts

blog/bp/fragments/routes.py

@@ -1,24 +1,23 @@
 """Blog app fragment endpoints.
 
-Exposes HTML fragments at ``/internal/fragments/<type>`` for consumption
+Exposes sx fragments at ``/internal/fragments/<type>`` for consumption
 by other coop apps via the fragment client.
+
+All handlers are defined declaratively in .sx files under
+``blog/sx/handlers/`` and dispatched via the sx handler registry.
 """
 
 from __future__ import annotations
 
-from quart import Blueprint, Response, g, render_template, request
+from quart import Blueprint, Response, request
 
 from shared.infrastructure.fragments import FRAGMENT_HEADER
-from shared.services.navigation import get_navigation_tree
-from shared.sexp.jinja_bridge import sexp
+from shared.sx.handlers import get_handler, execute_handler
 
 
 def register():
     bp = Blueprint("fragments", __name__, url_prefix="/internal/fragments")
 
-    # Registry of fragment handlers: type -> async callable returning HTML str
-    _handlers: dict[str, object] = {}
-
     @bp.before_request
     async def _require_fragment_header():
         if not request.headers.get(FRAGMENT_HEADER):
@@ -26,82 +25,12 @@ def register():
 
     @bp.get("/<fragment_type>")
     async def get_fragment(fragment_type: str):
-        handler = _handlers.get(fragment_type)
-        if handler is None:
-            return Response("", status=200, content_type="text/html")
-        html = await handler()
-        return Response(html, status=200, content_type="text/html")
-
-    # --- nav-tree fragment ---
-    async def _nav_tree_handler():
-        app_name = request.args.get("app_name", "")
-        path = request.args.get("path", "/")
-        first_seg = path.strip("/").split("/")[0]
-        menu_items = list(await get_navigation_tree(g.s))
-
-        # Append Art-DAG as a synthetic nav entry (not a DB MenuNode)
-        class _NavItem:
-            __slots__ = ("slug", "label", "feature_image")
-            def __init__(self, slug, label, feature_image=None):
-                self.slug = slug
-                self.label = label
-                self.feature_image = feature_image
-
-        menu_items.append(_NavItem("artdag", "art-dag"))
-
-        return await render_template(
-            "fragments/nav_tree.html",
-            menu_items=menu_items,
-            frag_app_name=app_name,
-            frag_first_seg=first_seg,
-        )
-
-    _handlers["nav-tree"] = _nav_tree_handler
-
-    # --- link-card fragment (s-expression rendered) ---
-    def _render_blog_link_card(post, link: str) -> str:
-        """Render a blog link-card via the ~link-card s-expression component."""
-        published = post.published_at.strftime("%d %b %Y") if post.published_at else None
-        return sexp(
-            '(~link-card :link link :title title :image image'
-            ' :icon "fas fa-file-alt" :subtitle excerpt'
-            ' :detail published :data-app "blog")',
-            link=link,
-            title=post.title,
-            image=post.feature_image,
-            excerpt=post.custom_excerpt or post.excerpt,
-            published=published,
-        )
-
-    async def _link_card_handler():
-        from shared.services.registry import services
-        from shared.infrastructure.urls import blog_url
-
-        slug = request.args.get("slug", "")
-        keys_raw = request.args.get("keys", "")
-
-        # Batch mode
-        if keys_raw:
-            slugs = [k.strip() for k in keys_raw.split(",") if k.strip()]
-            parts = []
-            for s in slugs:
-                parts.append(f"<!-- fragment:{s} -->")
-                post = await services.blog.get_post_by_slug(g.s, s)
-                if post:
-                    parts.append(_render_blog_link_card(post, blog_url(f"/{post.slug}")))
-            return "\n".join(parts)
-
-        # Single mode
-        if not slug:
-            return ""
-        post = await services.blog.get_post_by_slug(g.s, slug)
-        if not post:
-            return ""
-        return _render_blog_link_card(post, blog_url(f"/{post.slug}"))
-
-    _handlers["link-card"] = _link_card_handler
-
-    # Store handlers dict on blueprint so app code can register handlers
-    bp._fragment_handlers = _handlers
+        handler_def = get_handler("blog", fragment_type)
+        if handler_def is not None:
+            result = await execute_handler(
+                handler_def, "blog", args=dict(request.args),
+            )
+            return Response(result, status=200, content_type="text/sx")
+        return Response("", status=200, content_type="text/sx")
 
     return bp

blog/bp/menu_items/routes.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from quart import Blueprint, render_template, make_response, request, jsonify, g
+from quart import Blueprint, make_response, request, jsonify, g
 
 from shared.browser.app.authz import require_admin
 from .services.menu_items import (
@@ -13,43 +13,36 @@ from .services.menu_items import (
     MenuItemError,
 )
 from shared.browser.app.utils.htmx import is_htmx_request
+from shared.sx.helpers import sx_response
 
 def register():
     bp = Blueprint("menu_items", __name__, url_prefix='/settings/menu_items')
 
     def get_menu_items_nav_oob_sync(menu_items):
         """Helper to generate OOB update for root nav menu items"""
-        from sexp.sexp_components import render_menu_items_nav_oob
+        from sx.sx_components import render_menu_items_nav_oob
         return render_menu_items_nav_oob(menu_items)
 
-    @bp.get("/")
-    @require_admin
-    async def list_menu_items():
-        """List all menu items"""
+    @bp.before_request
+    async def _prepare_page_data():
+        if "defpage_" not in (request.endpoint or ""):
+            return
         menu_items = await get_all_menu_items(g.s)
-
-
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_menu_items_page, render_menu_items_oob
-
+        from shared.sx.page import get_template_context
+        from sx.sx_components import _menu_items_main_panel_sx
         tctx = await get_template_context()
         tctx["menu_items"] = menu_items
-        if not is_htmx_request():
-            html = await render_menu_items_page(tctx)
-        else:
-            html = await render_menu_items_oob(tctx)
+        g.menu_items_content = _menu_items_main_panel_sx(tctx)
 
-        return await make_response(html)
+    from shared.sx.pages import mount_pages
+    mount_pages(bp, "blog", names=["menu-items-page"])
 
     @bp.get("/new/")
     @require_admin
     async def new_menu_item():
         """Show form to create new menu item"""
-        html = await render_template(
-            "_types/menu_items/_form.html",
-            menu_item=None,
-        )
-        return await make_response(html)
+        from sx.sx_components import render_menu_item_form
+        return sx_response(render_menu_item_form())
 
     @bp.post("/")
     @require_admin
@@ -72,10 +65,10 @@ def register():
 
             # Get updated list and nav OOB
             menu_items = await get_all_menu_items(g.s)
-            from sexp.sexp_components import render_menu_items_list
+            from sx.sx_components import render_menu_items_list
             html = render_menu_items_list(menu_items)
             nav_oob = get_menu_items_nav_oob_sync(menu_items)
-            return await make_response(html + nav_oob, 200)
+            return sx_response(html + nav_oob)
 
         except MenuItemError as e:
             return jsonify({"message": str(e), "errors": {}}), 400
@@ -88,11 +81,8 @@ def register():
         if not menu_item:
             return await make_response("Menu item not found", 404)
 
-        html = await render_template(
-            "_types/menu_items/_form.html",
-            menu_item=menu_item,
-        )
-        return await make_response(html)
+        from sx.sx_components import render_menu_item_form
+        return sx_response(render_menu_item_form(menu_item=menu_item))
 
     @bp.put("/<int:item_id>/")
     @require_admin
@@ -115,10 +105,10 @@ def register():
 
             # Get updated list and nav OOB
             menu_items = await get_all_menu_items(g.s)
-            from sexp.sexp_components import render_menu_items_list
+            from sx.sx_components import render_menu_items_list
             html = render_menu_items_list(menu_items)
             nav_oob = get_menu_items_nav_oob_sync(menu_items)
-            return await make_response(html + nav_oob, 200)
+            return sx_response(html + nav_oob)
 
         except MenuItemError as e:
             return jsonify({"message": str(e), "errors": {}}), 400
@@ -136,10 +126,10 @@ def register():
 
         # Get updated list and nav OOB
         menu_items = await get_all_menu_items(g.s)
-        from sexp.sexp_components import render_menu_items_list
+        from sx.sx_components import render_menu_items_list
         html = render_menu_items_list(menu_items)
         nav_oob = get_menu_items_nav_oob_sync(menu_items)
-        return await make_response(html + nav_oob, 200)
+        return sx_response(html + nav_oob)
 
     @bp.get("/pages/search/")
     @require_admin
@@ -152,14 +142,8 @@ def register():
         pages, total = await search_pages(g.s, query, page, per_page)
         has_more = (page * per_page) < total
 
-        html = await render_template(
-            "_types/menu_items/_page_search_results.html",
-            pages=pages,
-            query=query,
-            page=page,
-            has_more=has_more,
-        )
-        return await make_response(html)
+        from sx.sx_components import render_page_search_results
+        return sx_response(render_page_search_results(pages, query, page, has_more))
 
     @bp.post("/reorder/")
     @require_admin
@@ -183,9 +167,9 @@ def register():
 
         # Get updated list and nav OOB
         menu_items = await get_all_menu_items(g.s)
-        from sexp.sexp_components import render_menu_items_list
+        from sx.sx_components import render_menu_items_list
         html = render_menu_items_list(menu_items)
         nav_oob = get_menu_items_nav_oob_sync(menu_items)
-        return await make_response(html + nav_oob, 200)
+        return sx_response(html + nav_oob)
 
     return bp

blog/bp/post/admin/routes.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 
 from quart import (
-    render_template,
     make_response,
     Blueprint,
     g,
@@ -12,56 +11,198 @@ from quart import (
 )
 from shared.browser.app.authz import require_admin, require_post_author
 from shared.browser.app.utils.htmx import is_htmx_request
+from shared.sx.helpers import sx_response
 from shared.utils import host_url
 
+def _post_to_edit_dict(post) -> dict:
+    """Convert an ORM Post to a dict matching the shape templates expect.
+
+    The templates were written for Ghost Admin API responses, so we mimic
+    that structure (dot-access on dicts via Jinja) from ORM columns.
+    """
+    d: dict = {}
+    for col in (
+        "id", "slug", "title", "html", "plaintext", "lexical", "mobiledoc",
+        "sx_content",
+        "feature_image", "feature_image_alt", "feature_image_caption",
+        "excerpt", "custom_excerpt", "visibility", "status", "featured",
+        "is_page", "email_only", "canonical_url",
+        "meta_title", "meta_description",
+        "og_image", "og_title", "og_description",
+        "twitter_image", "twitter_title", "twitter_description",
+        "custom_template", "reading_time", "comment_id",
+    ):
+        d[col] = getattr(post, col, None)
+
+    # Timestamps as ISO strings (templates do [:16] slicing)
+    for ts in ("published_at", "updated_at", "created_at"):
+        val = getattr(post, ts, None)
+        d[ts] = val.isoformat() if val else ""
+
+    # Tags as list of dicts with .name (for Jinja map(attribute='name'))
+    if hasattr(post, "tags") and post.tags:
+        d["tags"] = [{"name": t.name, "slug": t.slug, "id": t.id} for t in post.tags]
+    else:
+        d["tags"] = []
+
+    # email/newsletter — not available without Ghost, set safe defaults
+    d["email"] = None
+    d["newsletter"] = None
+
+    return d
+
+
 def register():
   bp = Blueprint("admin", __name__, url_prefix='/admin')
 
-  
-  @bp.get("/")
-  @require_admin
-  async def admin(slug: str):
-    from shared.browser.app.utils.htmx import is_htmx_request
-    from sqlalchemy import select
-    from shared.models.page_config import PageConfig
+  @bp.before_request
+  async def _prepare_page_data():
+      ep = request.endpoint or ""
+      if "defpage_post_admin" in ep:
+          from sqlalchemy import select
+          from shared.models.page_config import PageConfig
+          post = (g.post_data or {}).get("post", {})
+          features = {}
+          sumup_configured = False
+          sumup_merchant_code = ""
+          sumup_checkout_prefix = ""
+          if post.get("is_page"):
+              pc = (await g.s.execute(
+                  select(PageConfig).where(
+                      PageConfig.container_type == "page",
+                      PageConfig.container_id == post["id"],
+                  )
+              )).scalar_one_or_none()
+              if pc:
+                  features = pc.features or {}
+                  sumup_configured = bool(pc.sumup_api_key)
+                  sumup_merchant_code = pc.sumup_merchant_code or ""
+                  sumup_checkout_prefix = pc.sumup_checkout_prefix or ""
+          from shared.sx.page import get_template_context
+          from sx.sx_components import _post_admin_main_panel_sx
+          tctx = await get_template_context()
+          tctx.update({
+              "features": features,
+              "sumup_configured": sumup_configured,
+              "sumup_merchant_code": sumup_merchant_code,
+              "sumup_checkout_prefix": sumup_checkout_prefix,
+          })
+          g.post_admin_content = _post_admin_main_panel_sx(tctx)
 
-    # Load features for page admin (page_configs now lives in db_blog)
-    post = (g.post_data or {}).get("post", {})
-    features = {}
-    sumup_configured = False
-    sumup_merchant_code = ""
-    sumup_checkout_prefix = ""
-    if post.get("is_page"):
-        pc = (await g.s.execute(
-            select(PageConfig).where(
-                PageConfig.container_type == "page",
-                PageConfig.container_id == post["id"],
-            )
-        )).scalar_one_or_none()
-        if pc:
-            features = pc.features or {}
-            sumup_configured = bool(pc.sumup_api_key)
-            sumup_merchant_code = pc.sumup_merchant_code or ""
-            sumup_checkout_prefix = pc.sumup_checkout_prefix or ""
+      elif "defpage_post_data" in ep:
+          from shared.sx.page import get_template_context
+          from sx.sx_components import _post_data_content_sx
+          tctx = await get_template_context()
+          g.post_data_content = _post_data_content_sx(tctx)
 
-    ctx = {
-        "features": features,
-        "sumup_configured": sumup_configured,
-        "sumup_merchant_code": sumup_merchant_code,
-        "sumup_checkout_prefix": sumup_checkout_prefix,
-    }
+      elif "defpage_post_preview" in ep:
+          from models.ghost_content import Post
+          from sqlalchemy import select as sa_select
+          post_id = g.post_data["post"]["id"]
+          post = (await g.s.execute(
+              sa_select(Post).where(Post.id == post_id)
+          )).scalar_one_or_none()
+          preview_ctx = {}
+          sx_content = getattr(post, "sx_content", None) or ""
+          if sx_content:
+              from shared.sx.prettify import sx_to_pretty_sx
+              preview_ctx["sx_pretty"] = sx_to_pretty_sx(sx_content)
+          lexical_raw = getattr(post, "lexical", None) or ""
+          if lexical_raw:
+              from shared.sx.prettify import json_to_pretty_sx
+              preview_ctx["json_pretty"] = json_to_pretty_sx(lexical_raw)
+          if sx_content:
+              from shared.sx.parser import parse as sx_parse
+              from shared.sx.html import render as sx_html_render
+              from shared.sx.jinja_bridge import _COMPONENT_ENV
+              try:
+                  parsed = sx_parse(sx_content)
+                  preview_ctx["sx_rendered"] = sx_html_render(parsed, dict(_COMPONENT_ENV))
+              except Exception:
+                  preview_ctx["sx_rendered"] = "<em>Error rendering sx</em>"
+          if lexical_raw:
+              from bp.blog.ghost.lexical_renderer import render_lexical
+              try:
+                  preview_ctx["lex_rendered"] = render_lexical(lexical_raw)
+              except Exception:
+                  preview_ctx["lex_rendered"] = "<em>Error rendering lexical</em>"
+          from shared.sx.page import get_template_context
+          from sx.sx_components import _preview_main_panel_sx
+          tctx = await get_template_context()
+          tctx.update(preview_ctx)
+          g.post_preview_content = _preview_main_panel_sx(tctx)
 
-    from shared.sexp.page import get_template_context
-    from sexp.sexp_components import render_post_admin_page, render_post_admin_oob
+      elif "defpage_post_entries" in ep:
+          from sqlalchemy import select
+          from shared.models.calendars import Calendar
+          from ..services.entry_associations import get_post_entry_ids
+          post_id = g.post_data["post"]["id"]
+          associated_entry_ids = await get_post_entry_ids(post_id)
+          result = await g.s.execute(
+              select(Calendar)
+              .where(Calendar.deleted_at.is_(None))
+              .order_by(Calendar.name.asc())
+          )
+          all_calendars = result.scalars().all()
+          for calendar in all_calendars:
+              await g.s.refresh(calendar, ["entries", "post"])
+          from shared.sx.page import get_template_context
+          from sx.sx_components import _post_entries_content_sx
+          tctx = await get_template_context()
+          tctx["all_calendars"] = all_calendars
+          tctx["associated_entry_ids"] = associated_entry_ids
+          g.post_entries_content = _post_entries_content_sx(tctx)
 
-    tctx = await get_template_context()
-    tctx.update(ctx)
-    if not is_htmx_request():
-        html = await render_post_admin_page(tctx)
-    else:
-        html = await render_post_admin_oob(tctx)
+      elif "defpage_post_settings" in ep:
+          from models.ghost_content import Post
+          from sqlalchemy import select as sa_select
+          from sqlalchemy.orm import selectinload
+          post_id = g.post_data["post"]["id"]
+          post = (await g.s.execute(
+              sa_select(Post)
+              .where(Post.id == post_id)
+              .options(selectinload(Post.tags))
+          )).scalar_one_or_none()
+          ghost_post = _post_to_edit_dict(post) if post else {}
+          save_success = request.args.get("saved") == "1"
+          from shared.sx.page import get_template_context
+          from sx.sx_components import _post_settings_content_sx
+          tctx = await get_template_context()
+          tctx["ghost_post"] = ghost_post
+          tctx["save_success"] = save_success
+          g.post_settings_content = _post_settings_content_sx(tctx)
 
-    return await make_response(html)
+      elif "defpage_post_edit" in ep:
+          from models.ghost_content import Post
+          from sqlalchemy import select as sa_select
+          from sqlalchemy.orm import selectinload
+          from shared.infrastructure.data_client import fetch_data
+          post_id = g.post_data["post"]["id"]
+          post = (await g.s.execute(
+              sa_select(Post)
+              .where(Post.id == post_id)
+              .options(selectinload(Post.tags))
+          )).scalar_one_or_none()
+          ghost_post = _post_to_edit_dict(post) if post else {}
+          save_success = request.args.get("saved") == "1"
+          save_error = request.args.get("error", "")
+          raw_newsletters = await fetch_data("account", "newsletters", required=False) or []
+          from types import SimpleNamespace
+          newsletters = [SimpleNamespace(**nl) for nl in raw_newsletters]
+          from shared.sx.page import get_template_context
+          from sx.sx_components import _post_edit_content_sx
+          tctx = await get_template_context()
+          tctx["ghost_post"] = ghost_post
+          tctx["save_success"] = save_success
+          tctx["save_error"] = save_error
+          tctx["newsletters"] = newsletters
+          g.post_edit_content = _post_edit_content_sx(tctx)
+
+  from shared.sx.pages import mount_pages
+  mount_pages(bp, "blog", names=[
+      "post-admin", "post-data", "post-preview",
+      "post-entries", "post-settings", "post-edit",
+  ])
 
   @bp.put("/features/")
   @require_admin
@@ -98,14 +239,14 @@ def register():
 
     features = result.get("features", {})
 
-    from sexp.sexp_components import render_features_panel
+    from sx.sx_components import render_features_panel
     html = render_features_panel(
         features, post,
         sumup_configured=result.get("sumup_configured", False),
         sumup_merchant_code=result.get("sumup_merchant_code") or "",
         sumup_checkout_prefix=result.get("sumup_checkout_prefix") or "",
     )
-    return await make_response(html)
+    return sx_response(html)
 
   @bp.put("/admin/sumup/")
   @require_admin
@@ -137,30 +278,14 @@ def register():
     result = await call_action("blog", "update-page-config", payload=payload)
 
     features = result.get("features", {})
-    from sexp.sexp_components import render_features_panel
+    from sx.sx_components import render_features_panel
     html = render_features_panel(
         features, post,
         sumup_configured=result.get("sumup_configured", False),
         sumup_merchant_code=result.get("sumup_merchant_code") or "",
         sumup_checkout_prefix=result.get("sumup_checkout_prefix") or "",
     )
-    return await make_response(html)
-
-  @bp.get("/data/")
-  @require_admin
-  async def data(slug: str):
-    from shared.sexp.page import get_template_context
-    from sexp.sexp_components import render_post_data_page, render_post_data_oob
-
-    data_html = await render_template("_types/post_data/_main_panel.html")
-    tctx = await get_template_context()
-    tctx["data_html"] = data_html
-    if not is_htmx_request():
-      html = await render_post_data_page(tctx)
-    else:
-      html = await render_post_data_oob(tctx)
-
-    return await make_response(html)
+    return sx_response(html)
 
   @bp.get("/entries/calendar/<int:calendar_id>/")
   @require_admin
@@ -226,64 +351,16 @@ def register():
 
     # Get associated entry IDs for this post
     post_id = g.post_data["post"]["id"]
-    associated_entry_ids = await get_post_entry_ids(g.s, post_id)
+    associated_entry_ids = await get_post_entry_ids(post_id)
 
-    html = await render_template(
-      "_types/post/admin/_calendar_view.html",
-      calendar=calendar_obj,
-      year=year,
-      month=month,
-      month_name=month_name,
-      weekday_names=weekday_names,
-      weeks=weeks,
-      prev_month=prev_month,
-      prev_month_year=prev_month_year,
-      next_month=next_month,
-      next_month_year=next_month_year,
-      prev_year=prev_year,
-      next_year=next_year,
-      month_entries=month_entries,
-      associated_entry_ids=associated_entry_ids,
+    from sx.sx_components import render_calendar_view
+    html = render_calendar_view(
+      calendar_obj, year, month, month_name, weekday_names, weeks,
+      prev_month, prev_month_year, next_month, next_month_year,
+      prev_year, next_year, month_entries, associated_entry_ids,
+      g.post_data["post"]["slug"],
     )
-    return await make_response(html)
-
-  @bp.get("/entries/")
-  @require_admin
-  async def entries(slug: str):
-    from ..services.entry_associations import get_post_entry_ids
-    from shared.models.calendars import Calendar
-    from sqlalchemy import select
-
-    post_id = g.post_data["post"]["id"]
-    associated_entry_ids = await get_post_entry_ids(g.s, post_id)
-
-    # Load ALL calendars (not just this post's calendars)
-    result = await g.s.execute(
-      select(Calendar)
-      .where(Calendar.deleted_at.is_(None))
-      .order_by(Calendar.name.asc())
-    )
-    all_calendars = result.scalars().all()
-
-    # Load entries and post for each calendar
-    for calendar in all_calendars:
-      await g.s.refresh(calendar, ["entries", "post"])
-    from shared.sexp.page import get_template_context
-    from sexp.sexp_components import render_post_entries_page, render_post_entries_oob
-
-    entries_html = await render_template(
-        "_types/post_entries/_main_panel.html",
-        all_calendars=all_calendars,
-        associated_entry_ids=associated_entry_ids,
-    )
-    tctx = await get_template_context()
-    tctx["entries_html"] = entries_html
-    if not is_htmx_request():
-      html = await render_post_entries_page(tctx)
-    else:
-      html = await render_post_entries_oob(tctx)
-
-    return await make_response(html)
+    return sx_response(html)
 
   @bp.post("/entries/<int:entry_id>/toggle/")
   @require_admin
@@ -294,7 +371,7 @@ def register():
     from quart import jsonify
 
     post_id = g.post_data["post"]["id"]
-    is_associated, error = await toggle_entry_association(g.s, post_id, entry_id)
+    is_associated, error = await toggle_entry_association(post_id, entry_id)
 
     if error:
       return jsonify({"message": error, "errors": {}}), 400
@@ -302,7 +379,7 @@ def register():
     await g.s.flush()
 
     # Return updated association status
-    associated_entry_ids = await get_post_entry_ids(g.s, post_id)
+    associated_entry_ids = await get_post_entry_ids(post_id)
 
     # Load ALL calendars
     result = await g.s.execute(
@@ -317,7 +394,7 @@ def register():
       await g.s.refresh(calendar, ["entries", "post"])
 
     # Fetch associated entries for nav display
-    associated_entries = await get_associated_entries(g.s, post_id)
+    associated_entries = await get_associated_entries(post_id)
 
     # Load calendars for this post (for nav display)
     calendars = (
@@ -329,50 +406,21 @@ def register():
     ).scalars().all()
 
     # Return the associated entries admin list + OOB update for nav entries
-    from sexp.sexp_components import render_associated_entries, render_nav_entries_oob
+    from sx.sx_components import render_associated_entries, render_nav_entries_oob
 
     post = g.post_data["post"]
     admin_list = render_associated_entries(all_calendars, associated_entry_ids, post["slug"])
     nav_entries_html = render_nav_entries_oob(associated_entries, calendars, post)
 
-    return await make_response(admin_list + nav_entries_html)
-
-  @bp.get("/settings/")
-  @require_post_author
-  async def settings(slug: str):
-    from ...blog.ghost.ghost_posts import get_post_for_edit
-
-    ghost_id = g.post_data["post"]["ghost_id"]
-    is_page = bool(g.post_data["post"].get("is_page"))
-    ghost_post = await get_post_for_edit(ghost_id, is_page=is_page)
-    save_success = request.args.get("saved") == "1"
-
-    from shared.sexp.page import get_template_context
-    from sexp.sexp_components import render_post_settings_page, render_post_settings_oob
-
-    settings_html = await render_template(
-        "_types/post_settings/_main_panel.html",
-        ghost_post=ghost_post,
-        save_success=save_success,
-    )
-    tctx = await get_template_context()
-    tctx["settings_html"] = settings_html
-    if not is_htmx_request():
-      html = await render_post_settings_page(tctx)
-    else:
-      html = await render_post_settings_oob(tctx)
-
-    return await make_response(html)
+    return sx_response(admin_list + nav_entries_html)
 
   @bp.post("/settings/")
   @require_post_author
   async def settings_save(slug: str):
-    from ...blog.ghost.ghost_posts import update_post_settings
-    from ...blog.ghost.ghost_sync import sync_single_post, sync_single_page
+    from services.post_writer import update_post_settings, OptimisticLockError
     from shared.browser.app.redis_cacher import invalidate_tag_cache
 
-    ghost_id = g.post_data["post"]["ghost_id"]
-    is_page = bool(g.post_data["post"].get("is_page"))
+    post_id = g.post_data["post"]["id"]
     form = await request.form
 
     updated_at = form.get("updated_at", "")
@@ -405,89 +453,48 @@ def register():
     kwargs["featured"] = form.get("featured") == "on"
     kwargs["email_only"] = form.get("email_only") == "on"
 
-    # Tags — comma-separated string → list of {"name": "..."} dicts
+    # Tags — comma-separated string → list of names
     tags_str = form.get("tags", "").strip()
-    if tags_str:
-      kwargs["tags"] = [{"name": t.strip()} for t in tags_str.split(",") if t.strip()]
-    else:
-      kwargs["tags"] = []
+    tag_names = [t.strip() for t in tags_str.split(",") if t.strip()] if tags_str else []
 
-    # Update in Ghost
-    await update_post_settings(
-        ghost_id=ghost_id,
-        updated_at=updated_at,
-        is_page=is_page,
-        **kwargs,
-    )
+    try:
+        post = await update_post_settings(
+            g.s,
+            post_id=post_id,
+            expected_updated_at=updated_at,
+            tag_names=tag_names,
+            **kwargs,
+        )
+    except OptimisticLockError:
+        from urllib.parse import quote
+        return redirect(
+            host_url(url_for("blog.post.admin.defpage_post_settings", slug=slug))
+            + "?error=" + quote("Someone else edited this post. Please reload and try again.")
+        )
 
-    # Sync to local DB
-    if is_page:
-        await sync_single_page(g.s, ghost_id)
-    else:
-        await sync_single_post(g.s, ghost_id)
     await g.s.flush()
 
     # Clear caches
     await invalidate_tag_cache("blog")
     await invalidate_tag_cache("post.post_detail")
 
-    return redirect(host_url(url_for("blog.post.admin.settings", slug=slug)) + "?saved=1")
-
-  @bp.get("/edit/")
-  @require_post_author
-  async def edit(slug: str):
-    from ...blog.ghost.ghost_posts import get_post_for_edit
-    from shared.infrastructure.data_client import fetch_data
-
-    ghost_id = g.post_data["post"]["ghost_id"]
-    is_page = bool(g.post_data["post"].get("is_page"))
-    ghost_post = await get_post_for_edit(ghost_id, is_page=is_page)
-    save_success = request.args.get("saved") == "1"
-    save_error = request.args.get("error", "")
-
-    # Newsletters live in db_account — fetch via HTTP
-    raw_newsletters = await fetch_data("account", "newsletters", required=False) or []
-    # Convert dicts to objects with .name/.ghost_id attributes for template compat
-    from types import SimpleNamespace
-    newsletters = [SimpleNamespace(**nl) for nl in raw_newsletters]
-
-    from shared.sexp.page import get_template_context
-    from sexp.sexp_components import render_post_edit_page, render_post_edit_oob
-
-    edit_html = await render_template(
-        "_types/post_edit/_main_panel.html",
-        ghost_post=ghost_post,
-        save_success=save_success,
-        save_error=save_error,
-        newsletters=newsletters,
-    )
-    tctx = await get_template_context()
-    tctx["edit_html"] = edit_html
-    if not is_htmx_request():
-      html = await render_post_edit_page(tctx)
-    else:
-      html = await render_post_edit_oob(tctx)
-
-    return await make_response(html)
+    # Redirect using the (possibly new) slug
+    return redirect(host_url(url_for("blog.post.admin.defpage_post_settings", slug=post.slug)) + "?saved=1")
 
   @bp.post("/edit/")
   @require_post_author
   async def edit_save(slug: str):
     import json
-    from ...blog.ghost.ghost_posts import update_post
     from ...blog.ghost.lexical_validator import validate_lexical
-    from ...blog.ghost.ghost_sync import sync_single_post, sync_single_page
+    from services.post_writer import update_post as writer_update, OptimisticLockError
     from shared.browser.app.redis_cacher import invalidate_tag_cache
 
-    ghost_id = g.post_data["post"]["ghost_id"]
-    is_page = bool(g.post_data["post"].get("is_page"))
+    post_id = g.post_data["post"]["id"]
     form = await request.form
     title = form.get("title", "").strip()
     lexical_raw = form.get("lexical", "")
     updated_at = form.get("updated_at", "")
     status = form.get("status", "draft")
-    publish_mode = form.get("publish_mode", "web")
-    newsletter_slug = form.get("newsletter_slug", "").strip() or None
     feature_image = form.get("feature_image", "").strip()
     custom_excerpt = form.get("custom_excerpt", "").strip()
     feature_image_caption = form.get("feature_image_caption", "").strip()
@@ -497,82 +504,63 @@ def register():
     try:
       lexical_doc = json.loads(lexical_raw)
     except (json.JSONDecodeError, TypeError):
-      return redirect(host_url(url_for("blog.post.admin.edit", slug=slug)) + "?error=" + quote("Invalid JSON in editor content."))
+      return redirect(host_url(url_for("blog.post.admin.defpage_post_edit", slug=slug)) + "?error=" + quote("Invalid JSON in editor content."))
 
     ok, reason = validate_lexical(lexical_doc)
     if not ok:
-      return redirect(host_url(url_for("blog.post.admin.edit", slug=slug)) + "?error=" + quote(reason))
-
-    # Update in Ghost (content save — no status change yet)
-    ghost_post = await update_post(
-        ghost_id=ghost_id,
-        lexical_json=lexical_raw,
-        title=title or None,
-        updated_at=updated_at,
-        feature_image=feature_image,
-        custom_excerpt=custom_excerpt,
-        feature_image_caption=feature_image_caption,
-        is_page=is_page,
-    )
+      return redirect(host_url(url_for("blog.post.admin.defpage_post_edit", slug=slug)) + "?error=" + quote(reason))
 
     # Publish workflow
     is_admin = bool((g.get("rights") or {}).get("admin"))
     publish_requested_msg = None
 
-    # Guard: if already emailed, force publish_mode to "web" to prevent re-send
-    already_emailed = bool(ghost_post.get("email") and ghost_post["email"].get("status"))
-    if already_emailed and publish_mode in ("email", "both"):
-      publish_mode = "web"
+    # Determine effective status
+    effective_status: str | None = None
+    current_status = g.post_data["post"].get("status", "draft")
 
-    if status == "published" and ghost_post.get("status") != "published" and not is_admin:
-      # Non-admin requesting publish: don't send status to Ghost, set local flag
+    if status == "published" and current_status != "published" and not is_admin:
+      # Non-admin requesting publish: keep as draft, set local flag
       publish_requested_msg = "Publish requested — an admin will review."
-    elif status and status != ghost_post.get("status"):
-      # Status is changing — determine email params based on publish_mode
-      email_kwargs: dict = {}
-      if status == "published" and publish_mode in ("email", "both") and newsletter_slug:
-        email_kwargs["newsletter_slug"] = newsletter_slug
-        email_kwargs["email_segment"] = "all"
-        if publish_mode == "email":
-          email_kwargs["email_only"] = True
+    elif status and status != current_status:
+      effective_status = status
 
-      from ...blog.ghost.ghost_posts import update_post as _up
-      ghost_post = await _up(
-          ghost_id=ghost_id,
+    sx_content_raw = form.get("sx_content", "").strip() or None
+    # Build optional kwargs — only pass sx_content if the form field was present
+    extra_kw: dict = {}
+    if "sx_content" in form:
+      extra_kw["sx_content"] = sx_content_raw
+    try:
+      post = await writer_update(
+          g.s,
+          post_id=post_id,
           lexical_json=lexical_raw,
-          title=None,
-          updated_at=ghost_post["updated_at"],
-          status=status,
-          is_page=is_page,
-          **email_kwargs,
+          title=title or None,
+          expected_updated_at=updated_at,
+          feature_image=feature_image or None,
+          custom_excerpt=custom_excerpt or None,
+          feature_image_caption=feature_image_caption or None,
+          status=effective_status,
+          **extra_kw,
+      )
+    except OptimisticLockError:
+      return redirect(
+          host_url(url_for("blog.post.admin.defpage_post_edit", slug=slug))
+          + "?error=" + quote("Someone else edited this post. Please reload and try again.")
       )
 
-    # Sync to local DB
-    if is_page:
-        await sync_single_page(g.s, ghost_id)
-    else:
-        await sync_single_post(g.s, ghost_id)
+    # Handle publish_requested flag
+    if publish_requested_msg:
+        post.publish_requested = True
+    elif status == "published" and is_admin:
+        post.publish_requested = False
     await g.s.flush()
 
-    # Handle publish_requested flag on the local post
-    from models.ghost_content import Post
-    from sqlalchemy import select as sa_select
-    local_post = (await g.s.execute(
-        sa_select(Post).where(Post.ghost_id == ghost_id)
-    )).scalar_one_or_none()
-    if local_post:
-        if publish_requested_msg:
-            local_post.publish_requested = True
-        elif status == "published" and is_admin:
-            local_post.publish_requested = False
-        await g.s.flush()
-
     # Clear caches
     await invalidate_tag_cache("blog")
     await invalidate_tag_cache("post.post_detail")
 
-    # Redirect to GET to avoid resubmit warning on refresh (PRG pattern)
-    redirect_url = host_url(url_for("blog.post.admin.edit", slug=slug)) + "?saved=1"
+    # Redirect to GET (PRG pattern) — use post.slug in case it changed
+    redirect_url = host_url(url_for("blog.post.admin.defpage_post_edit", slug=post.slug)) + "?saved=1"
     if publish_requested_msg:
         redirect_url += "&publish_requested=1"
     return redirect(redirect_url)
@@ -597,9 +585,8 @@ def register():
 
     page_markets = await _fetch_page_markets(post_id)
 
-    from sexp.sexp_components import render_markets_panel
-    html = render_markets_panel(page_markets, post)
-    return await make_response(html)
+    from sx.sx_components import render_markets_panel
+    return sx_response(render_markets_panel(page_markets, post))
 
   @bp.post("/markets/new/")
   @require_admin
@@ -624,9 +611,8 @@ def register():
     # Return updated markets list
     page_markets = await _fetch_page_markets(post_id)
 
-    from sexp.sexp_components import render_markets_panel
-    html = render_markets_panel(page_markets, post)
-    return await make_response(html)
+    from sx.sx_components import render_markets_panel
+    return sx_response(render_markets_panel(page_markets, post))
 
   @bp.delete("/markets/<market_slug>/")
   @require_admin
@@ -645,8 +631,7 @@ def register():
     # Return updated markets list
     page_markets = await _fetch_page_markets(post_id)
 
-    from sexp.sexp_components import render_markets_panel
-    html = render_markets_panel(page_markets, post)
-    return await make_response(html)
+    from sx.sx_components import render_markets_panel
+    return sx_response(render_markets_panel(page_markets, post))
 
   return bp

blog/bp/post/routes.py

@@ -21,6 +21,7 @@ from shared.browser.app.redis_cacher import cache_page, clear_cache
 from .admin.routes import register as register_admin
 from shared.config import config
 from shared.browser.app.utils.htmx import is_htmx_request
+from shared.sx.helpers import sx_response
 
 def register():
   bp = Blueprint("post", __name__, url_prefix='/<slug>')
@@ -70,7 +71,7 @@ def register():
           post_slug = (g.post_data.get("post") or {}).get("slug", "")
 
           # Fetch container nav from relations service
-          container_nav_html = await fetch_fragment("relations", "container-nav", params={
+          container_nav = await fetch_fragment("relations", "container-nav", params={
               "container_type": "page",
               "container_id": str(db_post_id),
               "post_slug": post_slug,
@@ -79,7 +80,7 @@ def register():
           ctx = {
               **p_data,
               "base_title": config()["title"],
-              "container_nav_html": container_nav_html,
+              "container_nav": container_nav,
           }
 
           # Page cart badge via HTTP
@@ -103,30 +104,28 @@ def register():
   @bp.get("/")
   @cache_page(tag="post.post_detail")
   async def post_detail(slug: str):
-    from shared.sexp.page import get_template_context
-    from sexp.sexp_components import render_post_page, render_post_oob
+    from shared.sx.page import get_template_context
+    from sx.sx_components import render_post_page, render_post_oob
 
     tctx = await get_template_context()
     if not is_htmx_request():
         html = await render_post_page(tctx)
+        return await make_response(html)
     else:
-        html = await render_post_oob(tctx)
-
-    return await make_response(html)
+        sx_src = await render_post_oob(tctx)
+        return sx_response(sx_src)
 
   @bp.post("/like/toggle/")
   @clear_cache(tag="post.post_detail", tag_scope="user")
   async def like_toggle(slug: str):
       from shared.utils import host_url
-      from sexp.sexp_components import render_like_toggle_button
+      from sx.sx_components import render_like_toggle_button
 
       like_url = host_url(url_for('blog.post.like_toggle', slug=slug))
 
       # Get post_id from g.post_data
       if not g.user:
-          html = render_like_toggle_button(slug, False, like_url)
-          resp = make_response(html, 403)
-          return resp
+          return sx_response(render_like_toggle_button(slug, False, like_url), status=403)
 
       post_id = g.post_data["post"]["id"]
       user_id = g.user.id
@@ -136,8 +135,7 @@ def register():
       })
       liked = result["liked"]
 
-      html = render_like_toggle_button(slug, liked, like_url)
-      return html
+      return sx_response(render_like_toggle_button(slug, liked, like_url))
 
   @bp.get("/w/<widget_domain>/")
   async def widget_paginate(slug: str, widget_domain: str):

blog/bp/post/services/markets.py

@@ -7,7 +7,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from shared.contracts.dtos import MarketPlaceDTO
 from shared.infrastructure.actions import call_action, ActionError
-from shared.services.registry import services
+from services import blog_service
 
 
 class MarketError(ValueError):
@@ -33,7 +33,7 @@ async def create_market(sess: AsyncSession, post_id: int, name: str) -> MarketPl
         raise MarketError("Market name must not be empty.")
     slug = slugify(name)
 
-    post = await services.blog.get_post_by_id(sess, post_id)
+    post = await blog_service.get_post_by_id(sess, post_id)
     if not post:
         raise MarketError(f"Post {post_id} does not exist.")
 
@@ -57,7 +57,7 @@ async def create_market(sess: AsyncSession, post_id: int, name: str) -> MarketPl
 
 
 async def soft_delete_market(sess: AsyncSession, post_slug: str, market_slug: str) -> bool:
-    post = await services.blog.get_post_by_slug(sess, post_slug)
+    post = await blog_service.get_post_by_slug(sess, post_slug)
     if not post:
         return False
 

blog/bp/snippets/routes.py

@@ -6,6 +6,7 @@ from sqlalchemy.orm import selectinload
 
 from shared.browser.app.authz import require_login
 from shared.browser.app.utils.htmx import is_htmx_request
+from shared.sx.helpers import sx_response
 from models import Snippet
 
 
@@ -31,25 +32,21 @@ async def _visible_snippets(session):
 def register():
     bp = Blueprint("snippets", __name__, url_prefix="/settings/snippets")
 
-    @bp.get("/")
-    @require_login
-    async def list_snippets():
-        """List snippets visible to the current user."""
+    @bp.before_request
+    async def _prepare_page_data():
+        if "defpage_" not in (request.endpoint or ""):
+            return
         snippets = await _visible_snippets(g.s)
         is_admin = g.rights.get("admin")
-
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_snippets_page, render_snippets_oob
-
+        from shared.sx.page import get_template_context
+        from sx.sx_components import _snippets_main_panel_sx
         tctx = await get_template_context()
         tctx["snippets"] = snippets
         tctx["is_admin"] = is_admin
-        if not is_htmx_request():
-            html = await render_snippets_page(tctx)
-        else:
-            html = await render_snippets_oob(tctx)
+        g.snippets_content = _snippets_main_panel_sx(tctx)
 
-        return await make_response(html)
+    from shared.sx.pages import mount_pages
+    mount_pages(bp, "blog", names=["snippets-page"])
 
     @bp.delete("/<int:snippet_id>/")
     @require_login
@@ -67,9 +64,8 @@ def register():
         await g.s.flush()
 
         snippets = await _visible_snippets(g.s)
-        from sexp.sexp_components import render_snippets_list
-        html = render_snippets_list(snippets, is_admin)
-        return await make_response(html)
+        from sx.sx_components import render_snippets_list
+        return sx_response(render_snippets_list(snippets, is_admin))
 
     @bp.patch("/<int:snippet_id>/visibility/")
     @require_login
@@ -92,8 +88,7 @@ def register():
         await g.s.flush()
 
         snippets = await _visible_snippets(g.s)
-        from sexp.sexp_components import render_snippets_list
-        html = render_snippets_list(snippets, True)
-        return await make_response(html)
+        from sx.sx_components import render_snippets_list
+        return sx_response(render_snippets_list(snippets, True))
 
     return bp

blog/entrypoint.sh

@@ -54,6 +54,7 @@ fi
 RELOAD_FLAG=""
 if [[ "${RELOAD:-}" == "true" ]]; then
   RELOAD_FLAG="--reload"
+  python3 -m shared.dev_watcher &
   echo "Starting Hypercorn (${APP_MODULE:-app:app}) with auto-reload..."
 else
   echo "Starting Hypercorn (${APP_MODULE:-app:app})..."

blog/models/__init__.py

@@ -1,4 +1,4 @@
-from .ghost_content import Post, Author, Tag, PostAuthor, PostTag
+from .content import Post, Author, Tag, PostAuthor, PostTag, PostUser
 from .snippet import Snippet
 from .tag_group import TagGroup, TagGroupTag
 

blog/models/content.py

@@ -19,7 +19,7 @@ class Tag(Base):
     __tablename__ = "tags"
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    ghost_id: Mapped[str] = mapped_column(String(64), index=True, unique=True, nullable=False)
+    ghost_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, unique=True, nullable=True)
 
     slug: Mapped[str] = mapped_column(String(191), index=True, nullable=False)
     name: Mapped[str] = mapped_column(String(255), nullable=False)
@@ -50,8 +50,8 @@ class Post(Base):
     __tablename__ = "posts"
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    ghost_id: Mapped[str] = mapped_column(String(64), index=True, unique=True, nullable=False)
-    uuid: Mapped[str] = mapped_column(String(64), unique=True, nullable=False)
+    ghost_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, unique=True, nullable=True)
+    uuid: Mapped[str] = mapped_column(String(64), unique=True, nullable=False, server_default=func.gen_random_uuid())
     slug: Mapped[str] = mapped_column(String(191), index=True, nullable=False)
 
     title: Mapped[str] = mapped_column(String(500), nullable=False)
@@ -60,6 +60,7 @@ class Post(Base):
     plaintext: Mapped[Optional[str]] = mapped_column(Text())
     mobiledoc: Mapped[Optional[str]] = mapped_column(Text())
     lexical: Mapped[Optional[str]] = mapped_column(Text())
+    sx_content: Mapped[Optional[str]] = mapped_column(Text())
 
     feature_image: Mapped[Optional[str]] = mapped_column(Text())
     feature_image_alt: Mapped[Optional[str]] = mapped_column(Text())
@@ -89,8 +90,8 @@ class Post(Base):
     comment_id: Mapped[Optional[str]] = mapped_column(String(191))
 
     published_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-    updated_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-    created_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+    updated_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), server_default=func.now())
+    created_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), server_default=func.now())
     deleted_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
 
     user_id: Mapped[Optional[int]] = mapped_column(
@@ -136,7 +137,7 @@ class Author(Base):
     __tablename__ = "authors"
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    ghost_id: Mapped[str] = mapped_column(String(64), index=True, unique=True, nullable=False)
+    ghost_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, unique=True, nullable=True)
 
     slug: Mapped[str] = mapped_column(String(191), index=True, nullable=False)
     name: Mapped[str] = mapped_column(String(255), nullable=False)
@@ -192,3 +193,15 @@ class PostTag(Base):
     sort_order: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
 
 
+class PostUser(Base):
+    """Multi-author M2M: links posts to users (cross-DB, no FK on user_id)."""
+    __tablename__ = "post_users"
+
+    post_id: Mapped[int] = mapped_column(
+        ForeignKey("posts.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+    user_id: Mapped[int] = mapped_column(
+        Integer, primary_key=True, index=True,
+    )
+    sort_order: Mapped[int] = mapped_column(Integer, default=0, nullable=False)

blog/models/ghost_content.py

@@ -1,3 +1,3 @@
-from shared.models.ghost_content import (  # noqa: F401
-    Tag, Post, Author, PostAuthor, PostTag,
+from .content import (  # noqa: F401
+    Tag, Post, Author, PostAuthor, PostTag, PostUser,
 )

blog/scripts/backfill_sx_content.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+"""
+Backfill sx_content from lexical JSON for all posts that have lexical but no sx_content.
+
+Usage:
+    python -m blog.scripts.backfill_sx_content [--dry-run]
+"""
+from __future__ import annotations
+
+import argparse
+import asyncio
+import sys
+
+from sqlalchemy import select, and_
+from sqlalchemy.ext.asyncio import AsyncSession
+
+
+async def backfill(dry_run: bool = False) -> int:
+    from shared.db.session import get_session
+    from models.ghost_content import Post
+    from bp.blog.ghost.lexical_to_sx import lexical_to_sx
+
+    converted = 0
+    errors = 0
+
+    async with get_session() as sess:
+        stmt = select(Post).where(
+            and_(
+                Post.lexical.isnot(None),
+                Post.lexical != "",
+                (Post.sx_content.is_(None)) | (Post.sx_content == ""),
+            )
+        )
+        result = await sess.execute(stmt)
+        posts = result.scalars().all()
+
+        print(f"Found {len(posts)} posts to convert")
+
+        for post in posts:
+            try:
+                sx = lexical_to_sx(post.lexical)
+                if dry_run:
+                    print(f"  [DRY RUN] {post.slug}: {len(sx)} chars")
+                else:
+                    post.sx_content = sx
+                    print(f"  Converted: {post.slug} ({len(sx)} chars)")
+                converted += 1
+            except Exception as e:
+                print(f"  ERROR: {post.slug}: {e}", file=sys.stderr)
+                errors += 1
+
+        if not dry_run:
+            await sess.commit()
+
+    print(f"\nDone: {converted} converted, {errors} errors")
+    return converted
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Backfill sx_content from lexical JSON")
+    parser.add_argument("--dry-run", action="store_true", help="Don't write to database")
+    args = parser.parse_args()
+
+    asyncio.run(backfill(dry_run=args.dry_run))
+
+
+if __name__ == "__main__":
+    main()

blog/scripts/final_ghost_sync.py

@@ -0,0 +1,469 @@
+#!/usr/bin/env python3
+"""Final Ghost → db_blog sync with HTML verification + author→user migration.
+
+Run once before cutting over to native writes (Phase 1).
+
+Usage:
+    cd blog && python -m scripts.final_ghost_sync
+
+Requires GHOST_ADMIN_API_URL, GHOST_ADMIN_API_KEY, DATABASE_URL,
+and DATABASE_URL_ACCOUNT env vars.
+"""
+from __future__ import annotations
+
+import asyncio
+import difflib
+import logging
+import os
+import re
+import sys
+
+import httpx
+from sqlalchemy import select, func, delete
+
+# Ensure project root is importable
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "shared"))
+
+from shared.db.base import Base  # noqa: E402
+from shared.db.session import get_session, get_account_session, _engine  # noqa: E402
+from shared.infrastructure.ghost_admin_token import make_ghost_admin_jwt  # noqa: E402
+from blog.models.content import Post, Author, Tag, PostUser, PostAuthor  # noqa: E402
+from shared.models.user import User  # noqa: E402
+
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s [%(levelname)s] %(message)s",
+)
+log = logging.getLogger("final_ghost_sync")
+
+GHOST_ADMIN_API_URL = os.environ["GHOST_ADMIN_API_URL"]
+
+
+def _auth_header() -> dict[str, str]:
+    return {"Authorization": f"Ghost {make_ghost_admin_jwt()}"}
+
+
+def _slugify(name: str) -> str:
+    s = name.strip().lower()
+    s = re.sub(r"[^\w\s-]", "", s)
+    s = re.sub(r"[\s_]+", "-", s)
+    return s.strip("-")
+
+
+# ---------------------------------------------------------------------------
+# Ghost API fetch
+# ---------------------------------------------------------------------------
+
+async def _fetch_all(endpoint: str) -> list[dict]:
+    """Fetch all items from a Ghost Admin API endpoint."""
+    url = (
+        f"{GHOST_ADMIN_API_URL}/{endpoint}/"
+        "?include=authors,tags&limit=all"
+        "&formats=html,plaintext,mobiledoc,lexical"
+    )
+    async with httpx.AsyncClient(timeout=60) as client:
+        resp = await client.get(url, headers=_auth_header())
+        resp.raise_for_status()
+    key = endpoint  # "posts" or "pages"
+    return resp.json().get(key, [])
+
+
+async def fetch_all_ghost_content() -> list[dict]:
+    """Fetch all posts + pages from Ghost."""
+    posts, pages = await asyncio.gather(
+        _fetch_all("posts"),
+        _fetch_all("pages"),
+    )
+    for p in pages:
+        p["page"] = True
+    return posts + pages
+
+
+# ---------------------------------------------------------------------------
+# Author → User migration
+# ---------------------------------------------------------------------------
+
+async def migrate_authors_to_users(author_bucket: dict[str, dict]) -> dict[str, int]:
+    """Ensure every Ghost author has a corresponding User in db_account.
+
+    Returns mapping of ghost_author_id → user_id.
+    """
+    ghost_id_to_user_id: dict[str, int] = {}
+
+    async with get_account_session() as sess:
+        async with sess.begin():
+            for ghost_author_id, ga in author_bucket.items():
+                email = (ga.get("email") or "").strip().lower()
+                if not email:
+                    log.warning(
+                        "Author %s (%s) has no email — skipping user creation",
+                        ghost_author_id, ga.get("name"),
+                    )
+                    continue
+
+                # Find existing user by email
+                user = (await sess.execute(
+                    select(User).where(User.email == email)
+                )).scalar_one_or_none()
+
+                if user is None:
+                    # Auto-create user for this Ghost author
+                    user = User(
+                        email=email,
+                        name=ga.get("name"),
+                        slug=ga.get("slug") or _slugify(ga.get("name") or email.split("@")[0]),
+                        bio=ga.get("bio"),
+                        profile_image=ga.get("profile_image"),
+                        cover_image=ga.get("cover_image"),
+                        website=ga.get("website"),
+                        location=ga.get("location"),
+                        facebook=ga.get("facebook"),
+                        twitter=ga.get("twitter"),
+                        is_admin=True,  # Ghost authors are admins
+                    )
+                    sess.add(user)
+                    await sess.flush()
+                    log.info("Created user %d for author %s (%s)", user.id, ga.get("name"), email)
+                else:
+                    # Update profile fields from Ghost author (fill in blanks)
+                    if not user.slug:
+                        user.slug = ga.get("slug") or _slugify(ga.get("name") or email.split("@")[0])
+                    if not user.name and ga.get("name"):
+                        user.name = ga["name"]
+                    if not user.bio and ga.get("bio"):
+                        user.bio = ga["bio"]
+                    if not user.profile_image and ga.get("profile_image"):
+                        user.profile_image = ga["profile_image"]
+                    if not user.cover_image and ga.get("cover_image"):
+                        user.cover_image = ga["cover_image"]
+                    if not user.website and ga.get("website"):
+                        user.website = ga["website"]
+                    if not user.location and ga.get("location"):
+                        user.location = ga["location"]
+                    if not user.facebook and ga.get("facebook"):
+                        user.facebook = ga["facebook"]
+                    if not user.twitter and ga.get("twitter"):
+                        user.twitter = ga["twitter"]
+                    await sess.flush()
+                    log.info("Updated user %d profile from author %s", user.id, ga.get("name"))
+
+                ghost_id_to_user_id[ghost_author_id] = user.id
+
+    return ghost_id_to_user_id
+
+
+async def populate_post_users(
+    data: list[dict],
+    ghost_author_to_user: dict[str, int],
+) -> int:
+    """Populate post_users M2M and set user_id on all posts from author mapping.
+
+    Returns number of post_users rows created.
+    """
+    rows_created = 0
+
+    async with get_session() as sess:
+        async with sess.begin():
+            for gp in data:
+                ghost_post_id = gp["id"]
+                post = (await sess.execute(
+                    select(Post).where(Post.ghost_id == ghost_post_id)
+                )).scalar_one_or_none()
+                if not post:
+                    continue
+
+                # Set primary user_id from primary author
+                pa = gp.get("primary_author")
+                if pa and pa["id"] in ghost_author_to_user:
+                    post.user_id = ghost_author_to_user[pa["id"]]
+
+                # Build post_users from all authors
+                await sess.execute(
+                    delete(PostUser).where(PostUser.post_id == post.id)
+                )
+                seen_user_ids: set[int] = set()
+                for idx, a in enumerate(gp.get("authors") or []):
+                    uid = ghost_author_to_user.get(a["id"])
+                    if uid and uid not in seen_user_ids:
+                        seen_user_ids.add(uid)
+                        sess.add(PostUser(post_id=post.id, user_id=uid, sort_order=idx))
+                        rows_created += 1
+
+                await sess.flush()
+
+    return rows_created
+
+
+# ---------------------------------------------------------------------------
+# Content sync (reuse ghost_sync upsert logic)
+# ---------------------------------------------------------------------------
+
+async def run_sync() -> dict:
+    """Run full Ghost content sync and author→user migration."""
+    from bp.blog.ghost.ghost_sync import (
+        _upsert_author,
+        _upsert_tag,
+        _upsert_post,
+    )
+
+    log.info("Fetching all content from Ghost...")
+    data = await fetch_all_ghost_content()
+    log.info("Received %d posts/pages from Ghost", len(data))
+
+    # Collect authors and tags
+    author_bucket: dict[str, dict] = {}
+    tag_bucket: dict[str, dict] = {}
+
+    for p in data:
+        for a in p.get("authors") or []:
+            author_bucket[a["id"]] = a
+        if p.get("primary_author"):
+            author_bucket[p["primary_author"]["id"]] = p["primary_author"]
+        for t in p.get("tags") or []:
+            tag_bucket[t["id"]] = t
+        if p.get("primary_tag"):
+            tag_bucket[p["primary_tag"]["id"]] = p["primary_tag"]
+
+    # Step 1: Upsert content into db_blog (existing Ghost sync logic)
+    async with get_session() as sess:
+        async with sess.begin():
+            author_map: dict[str, Author] = {}
+            for ga in author_bucket.values():
+                a = await _upsert_author(sess, ga)
+                author_map[ga["id"]] = a
+            log.info("Upserted %d authors (legacy table)", len(author_map))
+
+            tag_map: dict[str, Tag] = {}
+            for gt in tag_bucket.values():
+                t = await _upsert_tag(sess, gt)
+                tag_map[gt["id"]] = t
+            log.info("Upserted %d tags", len(tag_map))
+
+            for gp in data:
+                await _upsert_post(sess, gp, author_map, tag_map)
+            log.info("Upserted %d posts/pages", len(data))
+
+    # Step 2: Migrate authors → users in db_account
+    log.info("")
+    log.info("--- Migrating Ghost authors → Users ---")
+    ghost_author_to_user = await migrate_authors_to_users(author_bucket)
+    log.info("Mapped %d Ghost authors to User records", len(ghost_author_to_user))
+
+    # Step 3: Populate post_users M2M and set user_id
+    log.info("")
+    log.info("--- Populating post_users M2M ---")
+    pu_rows = await populate_post_users(data, ghost_author_to_user)
+    log.info("Created %d post_users rows", pu_rows)
+
+    n_posts = sum(1 for p in data if not p.get("page"))
+    n_pages = sum(1 for p in data if p.get("page"))
+
+    return {
+        "posts": n_posts,
+        "pages": n_pages,
+        "authors": len(author_bucket),
+        "tags": len(tag_bucket),
+        "users_mapped": len(ghost_author_to_user),
+        "post_users_rows": pu_rows,
+    }
+
+
+# ---------------------------------------------------------------------------
+# HTML rendering verification
+# ---------------------------------------------------------------------------
+
+def _normalize_html(html: str | None) -> str:
+    if not html:
+        return ""
+    return re.sub(r"\s+", " ", html.strip())
+
+
+async def verify_html_rendering() -> dict:
+    """Re-render all posts from lexical and compare with stored HTML."""
+    from bp.blog.ghost.lexical_renderer import render_lexical
+    import json
+
+    diffs_found = 0
+    posts_checked = 0
+    posts_no_lexical = 0
+
+    async with get_session() as sess:
+        result = await sess.execute(
+            select(Post).where(
+                Post.deleted_at.is_(None),
+                Post.status == "published",
+            )
+        )
+        posts = result.scalars().all()
+
+        for post in posts:
+            if not post.lexical:
+                posts_no_lexical += 1
+                continue
+
+            posts_checked += 1
+            try:
+                rendered = render_lexical(json.loads(post.lexical))
+            except Exception as e:
+                log.error(
+                    "Render failed for post %d (%s): %s",
+                    post.id, post.slug, e,
+                )
+                diffs_found += 1
+                continue
+
+            ghost_html = _normalize_html(post.html)
+            our_html = _normalize_html(rendered)
+
+            if ghost_html != our_html:
+                diffs_found += 1
+                diff = difflib.unified_diff(
+                    ghost_html.splitlines(keepends=True),
+                    our_html.splitlines(keepends=True),
+                    fromfile=f"ghost/{post.slug}",
+                    tofile=f"rendered/{post.slug}",
+                    n=2,
+                )
+                diff_text = "".join(diff)
+                if len(diff_text) > 2000:
+                    diff_text = diff_text[:2000] + "\n... (truncated)"
+                log.warning(
+                    "HTML diff for post %d (%s):\n%s",
+                    post.id, post.slug, diff_text,
+                )
+
+    return {
+        "checked": posts_checked,
+        "no_lexical": posts_no_lexical,
+        "diffs": diffs_found,
+    }
+
+
+# ---------------------------------------------------------------------------
+# Verification queries
+# ---------------------------------------------------------------------------
+
+async def run_verification() -> dict:
+    async with get_session() as sess:
+        total_posts = await sess.scalar(
+            select(func.count(Post.id)).where(Post.deleted_at.is_(None))
+        )
+        null_html = await sess.scalar(
+            select(func.count(Post.id)).where(
+                Post.deleted_at.is_(None),
+                Post.status == "published",
+                Post.html.is_(None),
+            )
+        )
+        null_lexical = await sess.scalar(
+            select(func.count(Post.id)).where(
+                Post.deleted_at.is_(None),
+                Post.status == "published",
+                Post.lexical.is_(None),
+            )
+        )
+        # Posts with user_id set
+        has_user = await sess.scalar(
+            select(func.count(Post.id)).where(
+                Post.deleted_at.is_(None),
+                Post.user_id.isnot(None),
+            )
+        )
+        no_user = await sess.scalar(
+            select(func.count(Post.id)).where(
+                Post.deleted_at.is_(None),
+                Post.user_id.is_(None),
+            )
+        )
+
+    return {
+        "total_posts": total_posts,
+        "published_null_html": null_html,
+        "published_null_lexical": null_lexical,
+        "posts_with_user": has_user,
+        "posts_without_user": no_user,
+    }
+
+
+# ---------------------------------------------------------------------------
+# Main
+# ---------------------------------------------------------------------------
+
+async def main():
+    log.info("=" * 60)
+    log.info("Final Ghost Sync — Cutover Preparation")
+    log.info("=" * 60)
+
+    # Step 1: Full sync + author→user migration
+    log.info("")
+    log.info("--- Step 1: Full sync from Ghost + author→user migration ---")
+    stats = await run_sync()
+    log.info(
+        "Sync complete: %d posts, %d pages, %d authors, %d tags, %d users mapped",
+        stats["posts"], stats["pages"], stats["authors"], stats["tags"],
+        stats["users_mapped"],
+    )
+
+    # Step 2: Verification queries
+    log.info("")
+    log.info("--- Step 2: Verification queries ---")
+    vq = await run_verification()
+    log.info("Total non-deleted posts/pages: %d", vq["total_posts"])
+    log.info("Published with NULL html: %d", vq["published_null_html"])
+    log.info("Published with NULL lexical: %d", vq["published_null_lexical"])
+    log.info("Posts with user_id: %d", vq["posts_with_user"])
+    log.info("Posts WITHOUT user_id: %d", vq["posts_without_user"])
+
+    if vq["published_null_html"] > 0:
+        log.warning("WARN: Some published posts have no HTML!")
+    if vq["published_null_lexical"] > 0:
+        log.warning("WARN: Some published posts have no Lexical JSON!")
+    if vq["posts_without_user"] > 0:
+        log.warning("WARN: Some posts have no user_id — authors may lack email!")
+
+    # Step 3: HTML rendering verification
+    log.info("")
+    log.info("--- Step 3: HTML rendering verification ---")
+    html_stats = await verify_html_rendering()
+    log.info(
+        "Checked %d posts, %d with diffs, %d without lexical",
+        html_stats["checked"], html_stats["diffs"], html_stats["no_lexical"],
+    )
+
+    if html_stats["diffs"] > 0:
+        log.warning(
+            "WARN: %d posts have HTML rendering differences — "
+            "review diffs above before cutover",
+            html_stats["diffs"],
+        )
+
+    # Summary
+    log.info("")
+    log.info("=" * 60)
+    log.info("SUMMARY")
+    log.info("  Posts synced:         %d", stats["posts"])
+    log.info("  Pages synced:         %d", stats["pages"])
+    log.info("  Authors synced:       %d", stats["authors"])
+    log.info("  Tags synced:          %d", stats["tags"])
+    log.info("  Users mapped:         %d", stats["users_mapped"])
+    log.info("  post_users rows:      %d", stats["post_users_rows"])
+    log.info("  HTML diffs:           %d", html_stats["diffs"])
+    log.info("  Published null HTML:  %d", vq["published_null_html"])
+    log.info("  Published null lex:   %d", vq["published_null_lexical"])
+    log.info("  Posts without user:   %d", vq["posts_without_user"])
+    log.info("=" * 60)
+
+    if (html_stats["diffs"] == 0
+            and vq["published_null_html"] == 0
+            and vq["posts_without_user"] == 0):
+        log.info("All checks passed — safe to proceed with cutover.")
+    else:
+        log.warning("Review warnings above before proceeding.")
+
+    await _engine.dispose()
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

blog/scripts/migrate_sx_html.py

@@ -0,0 +1,89 @@
+#!/usr/bin/env python3
+"""
+Re-convert sx_content from lexical JSON to eliminate ~kg-html wrappers and
+raw caption strings.
+
+The updated lexical_to_sx converter now produces native sx expressions instead
+of (1) wrapping HTML/markdown cards in (~kg-html :html "...") and (2) storing
+captions as escaped HTML strings.  This script re-runs the conversion on all
+posts that already have sx_content, overwriting the old output.
+
+Usage:
+    cd blog && python3 scripts/migrate_sx_html.py [--dry-run]
+"""
+from __future__ import annotations
+
+import argparse
+import asyncio
+import sys
+
+from sqlalchemy import select, and_
+
+
+async def migrate(dry_run: bool = False) -> int:
+    from shared.db.session import get_session
+    from models.ghost_content import Post
+    from bp.blog.ghost.lexical_to_sx import lexical_to_sx
+
+    converted = 0
+    skipped = 0
+    errors = 0
+
+    async with get_session() as sess:
+        # All posts with lexical content (whether or not sx_content exists)
+        stmt = select(Post).where(
+            and_(
+                Post.lexical.isnot(None),
+                Post.lexical != "",
+            )
+        )
+        result = await sess.execute(stmt)
+        posts = result.scalars().all()
+
+        print(f"Found {len(posts)} posts with lexical content")
+
+        for post in posts:
+            try:
+                new_sx = lexical_to_sx(post.lexical)
+                if post.sx_content == new_sx:
+                    skipped += 1
+                    continue
+
+                if dry_run:
+                    old_has_kg = "~kg-html" in (post.sx_content or "")
+                    old_has_raw = "raw! caption" in (post.sx_content or "")
+                    markers = []
+                    if old_has_kg:
+                        markers.append("~kg-html")
+                    if old_has_raw:
+                        markers.append("raw-caption")
+                    tag = f" [{', '.join(markers)}]" if markers else ""
+                    print(f"  [DRY RUN] {post.slug}: {len(new_sx)} chars{tag}")
+                else:
+                    post.sx_content = new_sx
+                    print(f"  Converted: {post.slug} ({len(new_sx)} chars)")
+                converted += 1
+            except Exception as e:
+                print(f"  ERROR: {post.slug}: {e}", file=sys.stderr)
+                errors += 1
+
+        if not dry_run and converted:
+            await sess.commit()
+
+    print(f"\nDone: {converted} converted, {skipped} unchanged, {errors} errors")
+    return converted
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Re-convert sx_content to eliminate ~kg-html and raw captions"
+    )
+    parser.add_argument("--dry-run", action="store_true",
+                        help="Preview changes without writing to database")
+    args = parser.parse_args()
+
+    asyncio.run(migrate(dry_run=args.dry_run))
+
+
+if __name__ == "__main__":
+    main()

blog/services/__init__.py

@@ -1,6 +1,69 @@
 """Blog app service registration."""
 from __future__ import annotations
 
+from sqlalchemy import select, func
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from shared.contracts.dtos import PostDTO
+
+from models.content import Post
+
+
+def _post_to_dto(post: Post) -> PostDTO:
+    return PostDTO(
+        id=post.id,
+        slug=post.slug,
+        title=post.title,
+        status=post.status,
+        visibility=post.visibility,
+        is_page=post.is_page,
+        feature_image=post.feature_image,
+        html=post.html,
+        sx_content=post.sx_content,
+        excerpt=post.excerpt,
+        custom_excerpt=post.custom_excerpt,
+        published_at=post.published_at,
+    )
+
+
+class SqlBlogService:
+    async def get_post_by_slug(self, session: AsyncSession, slug: str) -> PostDTO | None:
+        post = (
+            await session.execute(select(Post).where(Post.slug == slug))
+        ).scalar_one_or_none()
+        return _post_to_dto(post) if post else None
+
+    async def get_post_by_id(self, session: AsyncSession, id: int) -> PostDTO | None:
+        post = (
+            await session.execute(select(Post).where(Post.id == id))
+        ).scalar_one_or_none()
+        return _post_to_dto(post) if post else None
+
+    async def get_posts_by_ids(self, session: AsyncSession, ids: list[int]) -> list[PostDTO]:
+        if not ids:
+            return []
+        result = await session.execute(select(Post).where(Post.id.in_(ids)))
+        return [_post_to_dto(p) for p in result.scalars().all()]
+
+    async def search_posts(
+        self, session: AsyncSession, query: str, page: int = 1, per_page: int = 10,
+    ) -> tuple[list[PostDTO], int]:
+        if query:
+            count_stmt = select(func.count(Post.id)).where(Post.title.ilike(f"%{query}%"))
+            posts_stmt = select(Post).where(Post.title.ilike(f"%{query}%")).order_by(Post.title)
+        else:
+            count_stmt = select(func.count(Post.id))
+            posts_stmt = select(Post).order_by(Post.published_at.desc().nullslast())
+
+        total = (await session.execute(count_stmt)).scalar() or 0
+        offset = (page - 1) * per_page
+        result = await session.execute(posts_stmt.limit(per_page).offset(offset))
+        return [_post_to_dto(p) for p in result.scalars().all()], total
+
+
+# Module-level singleton — import this in blog code.
+blog_service = SqlBlogService()
+
 
 def register_domain_services() -> None:
     """Register services for the blog app.
@@ -8,12 +71,8 @@ def register_domain_services() -> None:
     Blog owns: Post, Tag, Author, PostAuthor, PostTag.
     Cross-app calls go over HTTP via call_action() / fetch_data().
     """
-    from shared.services.registry import services
-    from shared.services.blog_impl import SqlBlogService
-
-    services.blog = SqlBlogService()
-
     # Federation needed for AP shared infrastructure (activitypub blueprint)
+    from shared.services.registry import services
     if not services.has("federation"):
         from shared.services.federation_impl import SqlFederationService
         services.federation = SqlFederationService()

blog/services/post_writer.py

@@ -0,0 +1,465 @@
+"""Native post/page CRUD — replaces Ghost Admin API writes.
+
+All operations go directly to db_blog. Ghost is never called.
+"""
+from __future__ import annotations
+
+import json
+import logging
+import re
+from datetime import datetime
+from typing import Any, Optional
+
+import nh3
+from sqlalchemy import select, delete, func
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from models.ghost_content import Post, Tag, PostTag, PostUser
+from shared.browser.app.utils import utcnow
+
+log = logging.getLogger(__name__)
+
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+def _slugify(name: str) -> str:
+    s = name.strip().lower()
+    s = re.sub(r"[^\w\s-]", "", s)
+    s = re.sub(r"[\s_]+", "-", s)
+    return s.strip("-")
+
+
+def _reading_time(plaintext: str | None) -> int:
+    """Estimate reading time in minutes (word count / 265, min 1)."""
+    if not plaintext:
+        return 0
+    words = len(plaintext.split())
+    return max(1, round(words / 265))
+
+
+def _extract_plaintext(html: str) -> str:
+    """Strip HTML tags to get plaintext."""
+    text = re.sub(r"<[^>]+>", "", html)
+    text = re.sub(r"\s+", " ", text).strip()
+    return text
+
+
+def _sanitize_html(html: str | None) -> str | None:
+    if not html:
+        return html
+    return nh3.clean(
+        html,
+        tags={
+            "a", "abbr", "acronym", "b", "blockquote", "br", "code",
+            "div", "em", "figcaption", "figure", "h1", "h2", "h3",
+            "h4", "h5", "h6", "hr", "i", "img", "li", "ol", "p",
+            "pre", "span", "strong", "sub", "sup", "table", "tbody",
+            "td", "th", "thead", "tr", "ul", "video", "source",
+            "picture", "iframe", "audio",
+        },
+        attributes={
+            "*": {"class", "id", "style"},
+            "a": {"href", "title", "target"},
+            "img": {"src", "alt", "title", "width", "height", "loading"},
+            "video": {"src", "controls", "width", "height", "poster"},
+            "audio": {"src", "controls"},
+            "source": {"src", "type"},
+            "iframe": {"src", "width", "height", "frameborder", "allowfullscreen"},
+            "td": {"colspan", "rowspan"},
+            "th": {"colspan", "rowspan"},
+        },
+        link_rel="noopener noreferrer",
+        url_schemes={"http", "https", "mailto"},
+    )
+
+
+def _render_and_extract(lexical_json: str) -> tuple[str, str, int]:
+    """Render HTML from Lexical JSON, extract plaintext, compute reading time.
+
+    Returns (html, plaintext, reading_time).
+    """
+    from bp.blog.ghost.lexical_renderer import render_lexical
+
+    doc = json.loads(lexical_json) if isinstance(lexical_json, str) else lexical_json
+    html = render_lexical(doc)
+    html = _sanitize_html(html)
+    plaintext = _extract_plaintext(html or "")
+    rt = _reading_time(plaintext)
+    return html, plaintext, rt
+
+
+async def _ensure_slug_unique(sess: AsyncSession, slug: str, exclude_post_id: int | None = None) -> str:
+    """Append -2, -3, etc. if slug already taken."""
+    base_slug = slug
+    counter = 1
+    while True:
+        q = select(Post.id).where(Post.slug == slug, Post.deleted_at.is_(None))
+        if exclude_post_id:
+            q = q.where(Post.id != exclude_post_id)
+        existing = await sess.scalar(q)
+        if existing is None:
+            return slug
+        counter += 1
+        slug = f"{base_slug}-{counter}"
+
+
+async def _upsert_tags_by_name(sess: AsyncSession, tag_names: list[str]) -> list[Tag]:
+    """Find or create tags by name. Returns Tag objects in order."""
+    tags: list[Tag] = []
+    for name in tag_names:
+        name = name.strip()
+        if not name:
+            continue
+        tag = (await sess.execute(
+            select(Tag).where(Tag.name == name, Tag.deleted_at.is_(None))
+        )).scalar_one_or_none()
+        if tag is None:
+            tag = Tag(
+                name=name,
+                slug=_slugify(name),
+                visibility="public",
+            )
+            sess.add(tag)
+            await sess.flush()
+        tags.append(tag)
+    return tags
+
+
+async def _rebuild_post_tags(sess: AsyncSession, post_id: int, tags: list[Tag]) -> None:
+    """Replace all post_tags for a post."""
+    await sess.execute(delete(PostTag).where(PostTag.post_id == post_id))
+    seen: set[int] = set()
+    for idx, tag in enumerate(tags):
+        if tag.id not in seen:
+            seen.add(tag.id)
+            sess.add(PostTag(post_id=post_id, tag_id=tag.id, sort_order=idx))
+    await sess.flush()
+
+
+async def _rebuild_post_users(sess: AsyncSession, post_id: int, user_ids: list[int]) -> None:
+    """Replace all post_users for a post."""
+    await sess.execute(delete(PostUser).where(PostUser.post_id == post_id))
+    seen: set[int] = set()
+    for idx, uid in enumerate(user_ids):
+        if uid not in seen:
+            seen.add(uid)
+            sess.add(PostUser(post_id=post_id, user_id=uid, sort_order=idx))
+    await sess.flush()
+
+
+async def _fire_ap_publish(
+    sess: AsyncSession,
+    post: Post,
+    old_status: str | None,
+    tag_objs: list[Tag],
+) -> None:
+    """Fire AP federation activity on status transitions."""
+    if post.is_page or not post.user_id:
+        return
+
+    from bp.blog.ghost.ghost_sync import _build_ap_post_data
+    from shared.services.federation_publish import try_publish
+    from shared.infrastructure.urls import app_url
+
+    post_url = app_url("blog", f"/{post.slug}/")
+
+    if post.status == "published":
+        activity_type = "Create" if old_status != "published" else "Update"
+        await try_publish(
+            sess,
+            user_id=post.user_id,
+            activity_type=activity_type,
+            object_type="Note",
+            object_data=_build_ap_post_data(post, post_url, tag_objs),
+            source_type="Post",
+            source_id=post.id,
+        )
+    elif old_status == "published" and post.status != "published":
+        await try_publish(
+            sess,
+            user_id=post.user_id,
+            activity_type="Delete",
+            object_type="Tombstone",
+            object_data={
+                "id": post_url,
+                "formerType": "Note",
+            },
+            source_type="Post",
+            source_id=post.id,
+        )
+
+
+# ---------------------------------------------------------------------------
+# Public API
+# ---------------------------------------------------------------------------
+
+async def create_post(
+    sess: AsyncSession,
+    *,
+    title: str,
+    lexical_json: str,
+    status: str = "draft",
+    user_id: int,
+    feature_image: str | None = None,
+    custom_excerpt: str | None = None,
+    feature_image_caption: str | None = None,
+    tag_names: list[str] | None = None,
+    is_page: bool = False,
+    sx_content: str | None = None,
+) -> Post:
+    """Create a new post or page directly in db_blog."""
+    html, plaintext, reading_time = _render_and_extract(lexical_json)
+    slug = await _ensure_slug_unique(sess, _slugify(title or "untitled"))
+
+    now = utcnow()
+    post = Post(
+        title=title or "Untitled",
+        slug=slug,
+        lexical=lexical_json if isinstance(lexical_json, str) else json.dumps(lexical_json),
+        sx_content=sx_content,
+        html=html,
+        plaintext=plaintext,
+        reading_time=reading_time,
+        status=status,
+        is_page=is_page,
+        feature_image=feature_image,
+        feature_image_caption=_sanitize_html(feature_image_caption),
+        custom_excerpt=custom_excerpt,
+        user_id=user_id,
+        visibility="public",
+        created_at=now,
+        updated_at=now,
+        published_at=now if status == "published" else None,
+    )
+    sess.add(post)
+    await sess.flush()
+
+    # Tags
+    if tag_names:
+        tags = await _upsert_tags_by_name(sess, tag_names)
+        await _rebuild_post_tags(sess, post.id, tags)
+        if tags:
+            post.primary_tag_id = tags[0].id
+
+    # Post users (author)
+    await _rebuild_post_users(sess, post.id, [user_id])
+
+    # PageConfig for pages
+    if is_page:
+        from shared.models.page_config import PageConfig
+        existing = (await sess.execute(
+            select(PageConfig).where(
+                PageConfig.container_type == "page",
+                PageConfig.container_id == post.id,
+            )
+        )).scalar_one_or_none()
+        if existing is None:
+            sess.add(PageConfig(
+                container_type="page",
+                container_id=post.id,
+                features={},
+            ))
+
+    await sess.flush()
+
+    # AP federation
+    if status == "published":
+        tag_objs = (await _upsert_tags_by_name(sess, tag_names)) if tag_names else []
+        await _fire_ap_publish(sess, post, None, tag_objs)
+
+    return post
+
+
+async def create_page(
+    sess: AsyncSession,
+    *,
+    title: str,
+    lexical_json: str,
+    status: str = "draft",
+    user_id: int,
+    feature_image: str | None = None,
+    custom_excerpt: str | None = None,
+    feature_image_caption: str | None = None,
+    tag_names: list[str] | None = None,
+    sx_content: str | None = None,
+) -> Post:
+    """Create a new page. Convenience wrapper around create_post."""
+    return await create_post(
+        sess,
+        title=title,
+        lexical_json=lexical_json,
+        status=status,
+        user_id=user_id,
+        feature_image=feature_image,
+        custom_excerpt=custom_excerpt,
+        feature_image_caption=feature_image_caption,
+        tag_names=tag_names,
+        is_page=True,
+        sx_content=sx_content,
+    )
+
+
+async def update_post(
+    sess: AsyncSession,
+    *,
+    post_id: int,
+    lexical_json: str,
+    title: str | None = None,
+    expected_updated_at: datetime | str,
+    feature_image: str | None = ...,  # type: ignore[assignment]
+    custom_excerpt: str | None = ...,  # type: ignore[assignment]
+    feature_image_caption: str | None = ...,  # type: ignore[assignment]
+    status: str | None = None,
+    sx_content: str | None = ...,  # type: ignore[assignment]
+) -> Post:
+    """Update post content. Optimistic lock via expected_updated_at.
+
+    Fields set to ... (sentinel) are left unchanged. None clears the field.
+    Raises ValueError on optimistic lock conflict (409).
+    """
+    _SENTINEL = ...
+
+    post = await sess.get(Post, post_id)
+    if post is None:
+        raise ValueError(f"Post {post_id} not found")
+
+    # Optimistic lock
+    if isinstance(expected_updated_at, str):
+        expected_updated_at = datetime.fromisoformat(
+            expected_updated_at.replace("Z", "+00:00")
+        )
+    if post.updated_at and abs((post.updated_at - expected_updated_at).total_seconds()) > 1:
+        raise OptimisticLockError(
+            f"Post was modified at {post.updated_at}, expected {expected_updated_at}"
+        )
+
+    old_status = post.status
+
+    # Render content
+    html, plaintext, reading_time = _render_and_extract(lexical_json)
+    post.lexical = lexical_json if isinstance(lexical_json, str) else json.dumps(lexical_json)
+    post.html = html
+    post.plaintext = plaintext
+    post.reading_time = reading_time
+
+    if title is not None:
+        post.title = title
+
+    if sx_content is not _SENTINEL:
+        post.sx_content = sx_content
+
+    if feature_image is not _SENTINEL:
+        post.feature_image = feature_image
+    if custom_excerpt is not _SENTINEL:
+        post.custom_excerpt = custom_excerpt
+    if feature_image_caption is not _SENTINEL:
+        post.feature_image_caption = _sanitize_html(feature_image_caption)
+
+    if status is not None:
+        post.status = status
+        if status == "published" and not post.published_at:
+            post.published_at = utcnow()
+
+    post.updated_at = utcnow()
+    await sess.flush()
+
+    # AP federation on status change
+    tags = list(post.tags) if hasattr(post, "tags") and post.tags else []
+    await _fire_ap_publish(sess, post, old_status, tags)
+
+    return post
+
+
+_SETTINGS_FIELDS = (
+    "slug", "published_at", "featured", "visibility", "email_only",
+    "custom_template", "meta_title", "meta_description", "canonical_url",
+    "og_image", "og_title", "og_description",
+    "twitter_image", "twitter_title", "twitter_description",
+    "feature_image_alt",
+)
+
+
+async def update_post_settings(
+    sess: AsyncSession,
+    *,
+    post_id: int,
+    expected_updated_at: datetime | str,
+    tag_names: list[str] | None = None,
+    **kwargs: Any,
+) -> Post:
+    """Update post settings (slug, tags, SEO, social, etc.).
+
+    Optimistic lock via expected_updated_at.
+    """
+    post = await sess.get(Post, post_id)
+    if post is None:
+        raise ValueError(f"Post {post_id} not found")
+
+    # Optimistic lock
+    if isinstance(expected_updated_at, str):
+        expected_updated_at = datetime.fromisoformat(
+            expected_updated_at.replace("Z", "+00:00")
+        )
+    if post.updated_at and abs((post.updated_at - expected_updated_at).total_seconds()) > 1:
+        raise OptimisticLockError(
+            f"Post was modified at {post.updated_at}, expected {expected_updated_at}"
+        )
+
+    old_status = post.status
+
+    for field in _SETTINGS_FIELDS:
+        val = kwargs.get(field)
+        if val is not None:
+            if field == "slug":
+                val = await _ensure_slug_unique(sess, val, exclude_post_id=post.id)
+            if field == "featured":
+                val = bool(val)
+            if field == "email_only":
+                val = bool(val)
+            if field == "published_at":
+                if isinstance(val, str):
+                    val = datetime.fromisoformat(val.replace("Z", "+00:00"))
+            setattr(post, field, val)
+
+    # Tags
+    if tag_names is not None:
+        tags = await _upsert_tags_by_name(sess, tag_names)
+        await _rebuild_post_tags(sess, post.id, tags)
+        post.primary_tag_id = tags[0].id if tags else None
+
+    post.updated_at = utcnow()
+    await sess.flush()
+
+    # AP federation if visibility/status changed
+    tags_obj = list(post.tags) if hasattr(post, "tags") and post.tags else []
+    await _fire_ap_publish(sess, post, old_status, tags_obj)
+
+    return post
+
+
+async def delete_post(sess: AsyncSession, post_id: int) -> None:
+    """Soft-delete a post via deleted_at."""
+    post = await sess.get(Post, post_id)
+    if post is None:
+        return
+
+    old_status = post.status
+    post.deleted_at = utcnow()
+    post.status = "deleted"
+    await sess.flush()
+
+    # Fire AP Delete if was published
+    if old_status == "published" and post.user_id:
+        tags = list(post.tags) if hasattr(post, "tags") and post.tags else []
+        await _fire_ap_publish(sess, post, old_status, tags)
+
+
+# ---------------------------------------------------------------------------
+# Exceptions
+# ---------------------------------------------------------------------------
+
+class OptimisticLockError(Exception):
+    """Raised when optimistic lock check fails (stale updated_at)."""
+    pass

blog/sexp/cards.sexpr

@@ -1,89 +0,0 @@
-;; Blog card components
-
-(defcomp ~blog-like-button (&key like-url hx-headers heart)
-  (div :class "absolute top-20 right-2 z-10 text-6xl md:text-4xl"
-    (button :hx-post like-url :hx-swap "outerHTML"
-      :hx-headers hx-headers :class "cursor-pointer" heart)))
-
-(defcomp ~blog-draft-status (&key publish-requested timestamp)
-  (<> (div :class "flex justify-center gap-2 mt-1"
-    (span :class "inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-amber-100 text-amber-800" "Draft")
-    (when publish-requested (span :class "inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-blue-100 text-blue-800" "Publish requested")))
-    (when timestamp (p :class "text-sm text-stone-500" (str "Updated: " timestamp)))))
-
-(defcomp ~blog-published-status (&key timestamp)
-  (p :class "text-sm text-stone-500" (str "Published: " timestamp)))
-
-(defcomp ~blog-card (&key like-html href hx-select title status-html feature-image excerpt widget-html at-bar-html)
-  (article :class "border-b pb-6 last:border-b-0 relative"
-    (raw! like-html)
-    (a :href href :hx-get href :hx-target "#main-panel"
-      :hx-select hx-select :hx-swap "outerHTML" :hx-push-url "true"
-      :class "block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden"
-      (header :class "mb-2 text-center"
-        (h2 :class "text-4xl font-bold text-stone-900" title)
-        (raw! status-html))
-      (when feature-image (div :class "mb-4" (img :src feature-image :alt "" :class "rounded-lg w-full object-cover")))
-      (when excerpt (p :class "text-stone-700 text-lg leading-relaxed text-center" excerpt)))
-    (when widget-html (raw! widget-html))
-    (raw! at-bar-html)))
-
-(defcomp ~blog-card-tile (&key href hx-select feature-image title status-html excerpt at-bar-html)
-  (article :class "relative"
-    (a :href href :hx-get href :hx-target "#main-panel"
-      :hx-select hx-select :hx-swap "outerHTML" :hx-push-url "true"
-      :class "block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden"
-      (when feature-image (div (img :src feature-image :alt "" :class "w-full aspect-video object-cover")))
-      (div :class "p-3 text-center"
-        (h2 :class "text-lg font-bold text-stone-900" title)
-        (raw! status-html)
-        (when excerpt (p :class "text-stone-700 text-sm leading-relaxed line-clamp-3 mt-1" excerpt))))
-    (raw! at-bar-html)))
-
-(defcomp ~blog-tag-icon-image (&key src name)
-  (img :src src :alt name :class "h-4 w-4 rounded-full object-cover border border-stone-300 flex-shrink-0"))
-
-(defcomp ~blog-tag-icon-initial (&key initial)
-  (div :class "h-4 w-4 rounded-full text-[8px] font-semibold flex items-center justify-center border border-stone-300 flex-shrink-0 bg-stone-200 text-stone-600" initial))
-
-(defcomp ~blog-tag-li (&key icon-html name)
-  (li (a :class "flex items-center gap-1" (raw! icon-html)
-    (span :class "inline-block rounded-full bg-stone-100 text-stone-600 px-2 py-1 text-sm font-medium border border-stone-200" name))))
-
-(defcomp ~blog-tag-bar (&key items-html)
-  (div :class "mt-4 flex items-center gap-2" (div "in")
-    (ul :class "flex flex-wrap gap-2 text-sm" (raw! items-html))))
-
-(defcomp ~blog-author-with-image (&key image name)
-  (li :class "flex items-center gap-1"
-    (img :src image :alt name :class "h-5 w-5 rounded-full object-cover")
-    (span :class "text-stone-700" name)))
-
-(defcomp ~blog-author-text (&key name)
-  (li :class "text-stone-700" name))
-
-(defcomp ~blog-author-bar (&key items-html)
-  (div :class "mt-4 flex items-center gap-2" (div "by")
-    (ul :class "flex flex-wrap gap-2 text-sm" (raw! items-html))))
-
-(defcomp ~blog-at-bar (&key tag-items-html author-items-html)
-  (div :class "flex flex-row justify-center gap-3"
-    (raw! tag-items-html) (div) (raw! author-items-html)))
-
-(defcomp ~blog-page-badges (&key has-calendar has-market)
-  (div :class "flex justify-center gap-2 mt-2"
-    (when has-calendar (span :class "inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-blue-100 text-blue-800"
-      (i :class "fa fa-calendar mr-1") "Calendar"))
-    (when has-market (span :class "inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-green-100 text-green-800"
-      (i :class "fa fa-shopping-bag mr-1") "Market"))))
-
-(defcomp ~blog-page-card (&key href hx-select title badges-html pub-html feature-image excerpt)
-  (article :class "border-b pb-6 last:border-b-0 relative"
-    (a :href href :hx-get href :hx-target "#main-panel"
-      :hx-select hx-select :hx-swap "outerHTML" :hx-push-url "true"
-      :class "block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden"
-      (header :class "mb-2 text-center"
-        (h2 :class "text-4xl font-bold text-stone-900" title)
-        (raw! badges-html) (raw! pub-html))
-      (when feature-image (div :class "mb-4" (img :src feature-image :alt "" :class "rounded-lg w-full object-cover")))
-      (when excerpt (p :class "text-stone-700 text-lg leading-relaxed text-center" excerpt)))))

blog/sexp/editor.sexpr

@@ -1,54 +0,0 @@
-;; Blog editor components
-
-(defcomp ~blog-editor-error (&key error)
-  (div :class "max-w-[768px] mx-auto mt-[16px] rounded-[8px] border border-red-300 bg-red-50 px-[16px] py-[12px] text-[14px] text-red-700"
-    (strong "Save failed:") " " error))
-
-(defcomp ~blog-editor-form (&key csrf title-placeholder create-label)
-  (form :id "post-new-form" :method "post" :class "max-w-[768px] mx-auto pb-[48px]"
-    (input :type "hidden" :name "csrf_token" :value csrf)
-    (input :type "hidden" :id "lexical-json-input" :name "lexical" :value "")
-    (input :type "hidden" :id "feature-image-input" :name "feature_image" :value "")
-    (input :type "hidden" :id "feature-image-caption-input" :name "feature_image_caption" :value "")
-    (div :id "feature-image-container" :class "relative mt-[16px] mb-[24px] group"
-      (div :id "feature-image-empty"
-        (button :type "button" :id "feature-image-add-btn"
-          :class "text-[14px] text-stone-400 hover:text-stone-600 transition-colors cursor-pointer"
-          "+ Add feature image"))
-      (div :id "feature-image-filled" :class "relative hidden"
-        (img :id "feature-image-preview" :src "" :alt ""
-          :class "w-full max-h-[448px] object-cover rounded-[8px] cursor-pointer")
-        (button :type "button" :id "feature-image-delete-btn"
-          :class "absolute top-[8px] right-[8px] w-[32px] h-[32px] rounded-full bg-black/50 text-white flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity hover:bg-black/70 cursor-pointer text-[14px]"
-          :title "Remove feature image"
-          (i :class "fa-solid fa-trash-can"))
-        (input :type "text" :id "feature-image-caption" :value ""
-          :placeholder "Add a caption..."
-          :class "mt-[8px] w-full text-[14px] text-stone-500 bg-transparent border-none outline-none placeholder:text-stone-300 focus:text-stone-700"))
-      (div :id "feature-image-uploading"
-        :class "hidden flex items-center gap-[8px] mt-[8px] text-[14px] text-stone-400"
-        (i :class "fa-solid fa-spinner fa-spin") " Uploading...")
-      (input :type "file" :id "feature-image-file"
-        :accept "image/jpeg,image/png,image/gif,image/webp,image/svg+xml" :class "hidden"))
-    (input :type "text" :name "title" :value "" :placeholder title-placeholder
-      :class "w-full text-[36px] font-bold bg-transparent border-none outline-none placeholder:text-stone-300 mb-[8px] leading-tight")
-    (textarea :name "custom_excerpt" :rows "1" :placeholder "Add an excerpt..."
-      :class "w-full text-[18px] text-stone-500 bg-transparent border-none outline-none placeholder:text-stone-300 resize-none mb-[24px] leading-relaxed")
-    (div :id "lexical-editor" :class "relative w-full bg-transparent")
-    (div :class "flex items-center gap-[16px] mt-[32px] pt-[16px] border-t border-stone-200"
-      (select :name "status"
-        :class "text-[14px] rounded-[4px] border border-stone-200 px-[8px] py-[6px] bg-white text-stone-600"
-        (option :value "draft" :selected t "Draft")
-        (option :value "published" "Published"))
-      (button :type "submit"
-        :class "px-[20px] py-[6px] bg-stone-700 text-white text-[14px] rounded-[8px] hover:bg-stone-800 transition-colors cursor-pointer" create-label))))
-
-(defcomp ~blog-editor-styles (&key css-href)
-  (<> (link :rel "stylesheet" :href css-href)
-    (style
-      "#lexical-editor { display: flow-root; }"
-      "#lexical-editor [data-kg-card=\"html\"] * { float: none !important; }"
-      "#lexical-editor [data-kg-card=\"html\"] table { width: 100% !important; }")))
-
-(defcomp ~blog-editor-scripts (&key js-src init-js)
-  (<> (script :src js-src) (script (raw! init-js))))

blog/sexp/index.sexpr

@@ -1,72 +0,0 @@
-;; Blog index components
-
-(defcomp ~blog-end-of-results ()
-  (div :class "col-span-full mt-4 text-center text-xs text-stone-400" "End of results"))
-
-(defcomp ~blog-sentinel-mobile (&key id next-url hyperscript)
-  (div :id id :class "block md:hidden h-[60vh] opacity-0 pointer-events-none js-mobile-sentinel"
-    :hx-get next-url :hx-trigger "intersect once delay:250ms, sentinelmobile:retry"
-    :hx-swap "outerHTML" :_ hyperscript
-    :role "status" :aria-live "polite" :aria-hidden "true"
-    (div :class "js-loading hidden flex justify-center py-8"
-      (div :class "animate-spin h-8 w-8 border-4 border-stone-300 border-t-stone-600 rounded-full"))
-    (div :class "js-neterr hidden text-center py-8 text-stone-400"
-      (i :class "fa fa-exclamation-triangle text-2xl")
-      (p :class "mt-2" "Loading failed \u2014 retrying\u2026"))))
-
-(defcomp ~blog-sentinel-desktop (&key id next-url hyperscript)
-  (div :id id :class "hidden md:block h-4 opacity-0 pointer-events-none"
-    :hx-get next-url :hx-trigger "intersect once delay:250ms, sentinel:retry"
-    :hx-swap "outerHTML" :_ hyperscript
-    :role "status" :aria-live "polite" :aria-hidden "true"
-    (div :class "js-loading hidden flex justify-center py-2"
-      (div :class "animate-spin h-6 w-6 border-2 border-stone-300 border-t-stone-600 rounded-full"))
-    (div :class "js-neterr hidden text-center py-2 text-stone-400 text-sm" "Retry\u2026")))
-
-(defcomp ~blog-page-sentinel (&key id next-url)
-  (div :id id :class "h-4 opacity-0 pointer-events-none"
-    :hx-get next-url :hx-trigger "intersect once delay:250ms" :hx-swap "outerHTML"))
-
-(defcomp ~blog-no-pages ()
-  (div :class "col-span-full mt-8 text-center text-stone-500" "No pages found."))
-
-(defcomp ~blog-list-svg ()
-  (svg :xmlns "http://www.w3.org/2000/svg" :class "h-5 w-5" :fill "none" :viewBox "0 0 24 24"
-    :stroke "currentColor" :stroke-width "2"
-    (path :stroke-linecap "round" :stroke-linejoin "round" :d "M4 6h16M4 12h16M4 18h16")))
-
-(defcomp ~blog-tile-svg ()
-  (svg :xmlns "http://www.w3.org/2000/svg" :class "h-5 w-5" :fill "none" :viewBox "0 0 24 24"
-    :stroke "currentColor" :stroke-width "2"
-    (path :stroke-linecap "round" :stroke-linejoin "round"
-      :d "M4 5a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM14 5a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V5zM4 15a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H5a1 1 0 01-1-1v-4zM14 15a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1v-4z")))
-
-(defcomp ~blog-view-toggle (&key list-href tile-href hx-select list-cls tile-cls list-svg-html tile-svg-html)
-  (div :class "hidden md:flex justify-end px-3 pt-3 gap-1"
-    (a :href list-href :hx-get list-href :hx-target "#main-panel" :hx-select hx-select
-      :hx-swap "outerHTML" :hx-push-url "true" :class (str "p-1.5 rounded " list-cls) :title "List view"
-      :_ "on click js localStorage.removeItem('blog_view') end" (raw! list-svg-html))
-    (a :href tile-href :hx-get tile-href :hx-target "#main-panel" :hx-select hx-select
-      :hx-swap "outerHTML" :hx-push-url "true" :class (str "p-1.5 rounded " tile-cls) :title "Tile view"
-      :_ "on click js localStorage.setItem('blog_view','tile') end" (raw! tile-svg-html))))
-
-(defcomp ~blog-content-type-tabs (&key posts-href pages-href hx-select posts-cls pages-cls)
-  (div :class "flex justify-center gap-1 px-3 pt-3"
-    (a :href posts-href :hx-get posts-href :hx-target "#main-panel"
-      :hx-select hx-select :hx-swap "outerHTML" :hx-push-url "true"
-      :class (str "px-4 py-1.5 rounded-t text-sm font-medium transition-colors " posts-cls) "Posts")
-    (a :href pages-href :hx-get pages-href :hx-target "#main-panel"
-      :hx-select hx-select :hx-swap "outerHTML" :hx-push-url "true"
-      :class (str "px-4 py-1.5 rounded-t text-sm font-medium transition-colors " pages-cls) "Pages")))
-
-(defcomp ~blog-main-panel-pages (&key tabs-html cards-html)
-  (<> (raw! tabs-html) (div :class "max-w-full px-3 py-3 space-y-3" (raw! cards-html)) (div :class "pb-8")))
-
-(defcomp ~blog-main-panel-posts (&key tabs-html toggle-html grid-cls cards-html)
-  (<> (raw! tabs-html) (raw! toggle-html) (div :class grid-cls (raw! cards-html)) (div :class "pb-8")))
-
-(defcomp ~blog-aside (&key search-html action-buttons-html tag-groups-filter-html authors-filter-html)
-  (<> (raw! search-html) (raw! action-buttons-html)
-    (div :id "category-summary-desktop" :hxx-swap-oob "outerHTML"
-      (raw! tag-groups-filter-html) (raw! authors-filter-html))
-    (div :id "filter-summary-desktop" :hxx-swap-oob "outerHTML")))

blog/sexp/nav.sexpr

@@ -1,67 +0,0 @@
-;; Blog navigation components
-
-(defcomp ~blog-nav-empty (&key wrapper-id)
-  (div :id wrapper-id :hx-swap-oob "outerHTML"))
-
-(defcomp ~blog-nav-item-image (&key src label)
-  (if src (img :src src :alt label :class "w-8 h-8 rounded-full object-cover flex-shrink-0")
-    (div :class "w-8 h-8 rounded-full bg-stone-200 flex-shrink-0")))
-
-(defcomp ~blog-nav-item-link (&key href hx-get selected nav-cls img-html label)
-  (div (a :href href :hx-get hx-get :hx-target "#main-panel"
-    :hx-swap "outerHTML" :hx-push-url "true"
-    :aria-selected selected :class nav-cls
-    (raw! img-html) (span label))))
-
-(defcomp ~blog-nav-item-plain (&key href selected nav-cls img-html label)
-  (div (a :href href :aria-selected selected :class nav-cls
-    (raw! img-html) (span label))))
-
-(defcomp ~blog-nav-wrapper (&key arrow-cls container-id left-hs scroll-hs right-hs items-html)
-  (div :class "flex flex-col sm:flex-row sm:items-center gap-2 border-r border-stone-200 mr-2 sm:max-w-2xl"
-    :id "menu-items-nav-wrapper" :hx-swap-oob "outerHTML"
-    (button :class (str arrow-cls " hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded")
-      :aria-label "Scroll left"
-      :_ left-hs (i :class "fa fa-chevron-left"))
-    (div :id container-id
-      :class "overflow-y-auto sm:overflow-x-auto sm:overflow-y-visible scrollbar-hide max-h-[50vh] sm:max-h-none"
-      :style "scroll-behavior: smooth;" :_ scroll-hs
-      (div :class "flex flex-col sm:flex-row gap-1" (raw! items-html)))
-    (style ".scrollbar-hide::-webkit-scrollbar { display: none; } .scrollbar-hide { -ms-overflow-style: none; scrollbar-width: none; }")
-    (button :class (str arrow-cls " hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded")
-      :aria-label "Scroll right"
-      :_ right-hs (i :class "fa fa-chevron-right"))))
-
-;; Nav entries
-
-(defcomp ~blog-nav-entries-empty ()
-  (div :id "entries-calendars-nav-wrapper" :hx-swap-oob "true"))
-
-(defcomp ~blog-nav-entry-item (&key href nav-cls name date-str)
-  (a :href href :class nav-cls
-    (div :class "w-8 h-8 rounded bg-stone-200 flex-shrink-0")
-    (div :class "flex-1 min-w-0"
-      (div :class "font-medium truncate" name)
-      (div :class "text-xs text-stone-600 truncate" date-str))))
-
-(defcomp ~blog-nav-calendar-item (&key href nav-cls name)
-  (a :href href :class nav-cls
-    (i :class "fa fa-calendar" :aria-hidden "true")
-    (div name)))
-
-(defcomp ~blog-nav-entries-wrapper (&key scroll-hs items-html)
-  (div :class "flex flex-col sm:flex-row sm:items-center gap-2 border-r border-stone-200 mr-2 sm:max-w-2xl"
-    :id "entries-calendars-nav-wrapper" :hx-swap-oob "true"
-    (button :class "entries-nav-arrow hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded"
-      :aria-label "Scroll left"
-      :_ "on click set #associated-items-container.scrollLeft to #associated-items-container.scrollLeft - 200"
-      (i :class "fa fa-chevron-left"))
-    (div :id "associated-items-container"
-      :class "overflow-y-auto sm:overflow-x-auto sm:overflow-y-visible scrollbar-hide max-h-[50vh] sm:max-h-none"
-      :style "scroll-behavior: smooth;" :_ scroll-hs
-      (div :class "flex flex-col sm:flex-row gap-1" (raw! items-html)))
-    (style ".scrollbar-hide::-webkit-scrollbar { display: none; } .scrollbar-hide { -ms-overflow-style: none; scrollbar-width: none; }")
-    (button :class "entries-nav-arrow hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded"
-      :aria-label "Scroll right"
-      :_ "on click set #associated-items-container.scrollLeft to #associated-items-container.scrollLeft + 200"
-      (i :class "fa fa-chevron-right"))))

blog/sx/admin.sx

@@ -3,94 +3,63 @@
 (defcomp ~blog-cache-panel (&key clear-url csrf)
   (div :class "max-w-2xl mx-auto px-4 py-6 space-y-6"
     (div :class "flex flex-col md:flex-row gap-3 items-start"
-      (form :hx-post clear-url :hx-trigger "submit" :hx-target "#cache-status" :hx-swap "innerHTML"
+      (form :sx-post clear-url :sx-trigger "submit" :sx-target "#cache-status" :sx-swap "innerHTML"
         (input :type "hidden" :name "csrf_token" :value csrf)
         (button :class "border rounded px-4 py-2 bg-stone-800 text-white text-sm" :type "submit" "Clear cache"))
       (div :id "cache-status" :class "py-2"))))
 
-(defcomp ~blog-snippets-panel (&key list-html)
+(defcomp ~blog-snippets-panel (&key list)
   (div :class "max-w-4xl mx-auto p-6"
     (div :class "mb-6 flex justify-between items-center"
       (h1 :class "text-3xl font-bold" "Snippets"))
-    (div :id "snippets-list" (raw! list-html))))
+    (div :id "snippets-list" list)))
 
-(defcomp ~blog-snippets-empty ()
-  (div :class "bg-white rounded-lg shadow"
-    (div :class "p-8 text-center text-stone-400"
-      (i :class "fa fa-puzzle-piece text-4xl mb-2")
-      (p "No snippets yet. Create one from the blog editor."))))
-
-(defcomp ~blog-snippet-visibility-select (&key patch-url hx-headers options-html cls)
-  (select :name "visibility" :hx-patch patch-url :hx-target "#snippets-list" :hx-swap "innerHTML"
-    :hx-headers hx-headers :class "text-sm border border-stone-300 rounded px-2 py-1"
-    (raw! options-html)))
+(defcomp ~blog-snippet-visibility-select (&key patch-url hx-headers options cls)
+  (select :name "visibility" :sx-patch patch-url :sx-target "#snippets-list" :sx-swap "innerHTML"
+    :sx-headers hx-headers :class "text-sm border border-stone-300 rounded px-2 py-1"
+    options))
 
 (defcomp ~blog-snippet-option (&key value selected label)
   (option :value value :selected selected label))
 
-(defcomp ~blog-snippet-delete-button (&key confirm-text delete-url hx-headers)
-  (button :type "button" :data-confirm "" :data-confirm-title "Delete snippet?"
-    :data-confirm-text confirm-text :data-confirm-icon "warning"
-    :data-confirm-confirm-text "Yes, delete" :data-confirm-cancel-text "Cancel"
-    :data-confirm-event "confirmed"
-    :hx-delete delete-url :hx-trigger "confirmed" :hx-target "#snippets-list" :hx-swap "innerHTML"
-    :hx-headers hx-headers
-    :class "px-3 py-1 text-sm bg-red-200 hover:bg-red-300 rounded text-red-800 flex-shrink-0"
-    (i :class "fa fa-trash") " Delete"))
-
-(defcomp ~blog-snippet-row (&key name owner badge-cls visibility extra-html)
+(defcomp ~blog-snippet-row (&key name owner badge-cls visibility extra)
   (div :class "flex items-center gap-4 p-4 hover:bg-stone-50 transition"
     (div :class "flex-1 min-w-0"
       (div :class "font-medium truncate" name)
       (div :class "text-xs text-stone-500" owner))
     (span :class (str "inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium " badge-cls) visibility)
-    (raw! extra-html)))
+    extra))
 
-(defcomp ~blog-snippets-list (&key rows-html)
-  (div :class "bg-white rounded-lg shadow" (div :class "divide-y" (raw! rows-html))))
+(defcomp ~blog-snippets-list (&key rows)
+  (div :class "bg-white rounded-lg shadow" (div :class "divide-y" rows)))
 
-(defcomp ~blog-menu-items-panel (&key new-url list-html)
+(defcomp ~blog-menu-items-panel (&key new-url list)
   (div :class "max-w-4xl mx-auto p-6"
     (div :class "mb-6 flex justify-end items-center"
-      (button :type "button" :hx-get new-url :hx-target "#menu-item-form" :hx-swap "innerHTML"
+      (button :type "button" :sx-get new-url :sx-target "#menu-item-form" :sx-swap "innerHTML"
         :class "px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700"
         (i :class "fa fa-plus") " Add Menu Item"))
     (div :id "menu-item-form" :class "mb-6")
-    (div :id "menu-items-list" (raw! list-html))))
+    (div :id "menu-items-list" list)))
 
-(defcomp ~blog-menu-items-empty ()
-  (div :class "bg-white rounded-lg shadow"
-    (div :class "p-8 text-center text-stone-400"
-      (i :class "fa fa-inbox text-4xl mb-2")
-      (p "No menu items yet. Add one to get started!"))))
-
-(defcomp ~blog-menu-item-image (&key src label)
-  (if src (img :src src :alt label :class "w-12 h-12 rounded-full object-cover flex-shrink-0")
-    (div :class "w-12 h-12 rounded-full bg-stone-200 flex-shrink-0")))
-
-(defcomp ~blog-menu-item-row (&key img-html label slug sort-order edit-url delete-url confirm-text hx-headers)
+(defcomp ~blog-menu-item-row (&key img label slug sort-order edit-url delete-url confirm-text hx-headers)
   (div :class "flex items-center gap-4 p-4 hover:bg-stone-50 transition"
     (div :class "text-stone-400 cursor-move" (i :class "fa fa-grip-vertical"))
-    (raw! img-html)
+    img
     (div :class "flex-1 min-w-0"
       (div :class "font-medium truncate" label)
       (div :class "text-xs text-stone-500 truncate" slug))
     (div :class "text-sm text-stone-500" (str "Order: " sort-order))
     (div :class "flex gap-2 flex-shrink-0"
-      (button :type "button" :hx-get edit-url :hx-target "#menu-item-form" :hx-swap "innerHTML"
+      (button :type "button" :sx-get edit-url :sx-target "#menu-item-form" :sx-swap "innerHTML"
         :class "px-3 py-1 text-sm bg-stone-200 hover:bg-stone-300 rounded"
         (i :class "fa fa-edit") " Edit")
-      (button :type "button" :data-confirm "" :data-confirm-title "Delete menu item?"
-        :data-confirm-text confirm-text :data-confirm-icon "warning"
-        :data-confirm-confirm-text "Yes, delete" :data-confirm-cancel-text "Cancel"
-        :data-confirm-event "confirmed"
-        :hx-delete delete-url :hx-trigger "confirmed" :hx-target "#menu-items-list" :hx-swap "innerHTML"
-        :hx-headers hx-headers
-        :class "px-3 py-1 text-sm bg-red-200 hover:bg-red-300 rounded text-red-800"
-        (i :class "fa fa-trash") " Delete"))))
+      (~delete-btn :url delete-url :trigger-target "#menu-items-list"
+        :title "Delete menu item?" :text confirm-text
+        :sx-headers hx-headers))))
 
-(defcomp ~blog-menu-items-list (&key rows-html)
-  (div :class "bg-white rounded-lg shadow" (div :class "divide-y" (raw! rows-html))))
+(defcomp ~blog-menu-items-list (&key rows)
+  (div :class "bg-white rounded-lg shadow" (div :class "divide-y" rows)))
 
 ;; Tag groups admin
 
@@ -112,43 +81,40 @@
   (div :class "h-8 w-8 rounded-full text-xs font-semibold flex items-center justify-center border border-stone-300 flex-shrink-0"
     :style style initial))
 
-(defcomp ~blog-tag-group-li (&key icon-html edit-href name slug sort-order)
+(defcomp ~blog-tag-group-li (&key icon edit-href name slug sort-order)
   (li :class "border rounded p-3 bg-white flex items-center gap-3"
-    (raw! icon-html)
+    icon
     (div :class "flex-1"
       (a :href edit-href :class "font-medium text-stone-800 hover:underline" name)
       (span :class "text-xs text-stone-500 ml-2" slug))
     (span :class "text-xs text-stone-500" (str "order: " sort-order))))
 
-(defcomp ~blog-tag-groups-list (&key items-html)
-  (ul :class "space-y-2" (raw! items-html)))
-
-(defcomp ~blog-tag-groups-empty ()
-  (p :class "text-stone-500 text-sm" "No tag groups yet."))
+(defcomp ~blog-tag-groups-list (&key items)
+  (ul :class "space-y-2" items))
 
 (defcomp ~blog-unassigned-tag (&key name)
   (span :class "inline-block bg-stone-100 text-stone-600 px-2 py-1 text-xs font-medium border border-stone-200 rounded" name))
 
-(defcomp ~blog-unassigned-tags (&key heading spans-html)
+(defcomp ~blog-unassigned-tags (&key heading spans)
   (div :class "border-t pt-4"
     (h3 :class "text-sm font-semibold text-stone-700 mb-2" heading)
-    (div :class "flex flex-wrap gap-2" (raw! spans-html))))
+    (div :class "flex flex-wrap gap-2" spans)))
 
-(defcomp ~blog-tag-groups-main (&key form-html groups-html unassigned-html)
+(defcomp ~blog-tag-groups-main (&key form groups unassigned)
   (div :class "max-w-2xl mx-auto px-4 py-6 space-y-8"
-    (raw! form-html) (raw! groups-html) (raw! unassigned-html)))
+    form groups unassigned))
 
 ;; Tag group edit
 
-(defcomp ~blog-tag-checkbox (&key tag-id checked img-html name)
+(defcomp ~blog-tag-checkbox (&key tag-id checked img name)
   (label :class "flex items-center gap-2 px-2 py-1 hover:bg-stone-50 rounded text-sm cursor-pointer"
     (input :type "checkbox" :name "tag_ids" :value tag-id :checked checked :class "rounded border-stone-300")
-    (raw! img-html) (span name)))
+    img (span name)))
 
 (defcomp ~blog-tag-checkbox-image (&key src)
   (img :src src :alt "" :class "h-4 w-4 rounded-full object-cover"))
 
-(defcomp ~blog-tag-group-edit-form (&key save-url csrf name colour sort-order feature-image tags-html)
+(defcomp ~blog-tag-group-edit-form (&key save-url csrf name colour sort-order feature-image tags)
   (form :method "post" :action save-url :class "border rounded p-4 bg-white space-y-4"
     (input :type "hidden" :name "csrf_token" :value csrf)
     (div :class "space-y-3"
@@ -163,7 +129,7 @@
         (input :type "text" :name "feature_image" :value feature-image :placeholder "https://..." :class "w-full border rounded px-3 py-2 text-sm")))
     (div (label :class "block text-xs font-medium text-stone-600 mb-2" "Assign Tags")
       (div :class "grid grid-cols-1 sm:grid-cols-2 gap-1 max-h-64 overflow-y-auto border rounded p-2"
-        (raw! tags-html)))
+        tags))
     (div :class "flex gap-3"
       (button :type "submit" :class "border rounded px-4 py-2 bg-stone-800 text-white text-sm" "Save"))))
 
@@ -173,6 +139,33 @@
     (input :type "hidden" :name "csrf_token" :value csrf)
     (button :type "submit" :class "border rounded px-4 py-2 bg-red-600 text-white text-sm" "Delete Group")))
 
-(defcomp ~blog-tag-group-edit-main (&key edit-form-html delete-form-html)
+(defcomp ~blog-tag-group-edit-main (&key edit-form delete-form)
   (div :class "max-w-2xl mx-auto px-4 py-6 space-y-6"
-    (raw! edit-form-html) (raw! delete-form-html)))
+    edit-form delete-form))
+
+;; Preview panel components
+
+(defcomp ~blog-preview-panel (&key sections)
+  (div :class "max-w-4xl mx-auto px-4 py-6 space-y-4"
+    (style "
+      .sx-pretty, .json-pretty { font-family: monospace; font-size: 12px; line-height: 1.6; white-space: pre-wrap; }
+      .sx-list, .json-obj, .json-arr { display: block; }
+      .sx-paren { color: #64748b; }
+      .sx-sym { color: #0369a1; }
+      .sx-kw { color: #7c3aed; }
+      .sx-str { color: #15803d; }
+      .sx-num { color: #c2410c; }
+      .sx-bool { color: #b91c1c; font-weight: 600; }
+      .json-brace, .json-bracket { color: #64748b; }
+      .json-key { color: #7c3aed; }
+      .json-str { color: #15803d; }
+      .json-num { color: #c2410c; }
+      .json-lit { color: #b91c1c; font-weight: 600; }
+      .json-field { display: block; }
+    ")
+    sections))
+
+(defcomp ~blog-preview-section (&key title content)
+  (details :class "border rounded bg-white"
+    (summary :class "cursor-pointer px-4 py-3 font-medium text-sm bg-stone-100 hover:bg-stone-200 select-none" title)
+    (div :class "p-4 overflow-x-auto text-xs" content)))

blog/sx/cards.sx

@@ -0,0 +1,127 @@
+;; Blog card components — pure data, no HTML injection
+
+(defcomp ~blog-like-button (&key like-url hx-headers heart)
+  (div :class "absolute top-20 right-2 z-10 text-6xl md:text-4xl"
+    (button :sx-post like-url :sx-swap "outerHTML"
+      :sx-headers hx-headers :class "cursor-pointer" heart)))
+
+(defcomp ~blog-draft-status (&key publish-requested timestamp)
+  (<> (div :class "flex justify-center gap-2 mt-1"
+    (span :class "inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-amber-100 text-amber-800" "Draft")
+    (when publish-requested (span :class "inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-blue-100 text-blue-800" "Publish requested")))
+    (when timestamp (p :class "text-sm text-stone-500" (str "Updated: " timestamp)))))
+
+(defcomp ~blog-published-status (&key timestamp)
+  (p :class "text-sm text-stone-500" (str "Published: " timestamp)))
+
+;; Tag components — accept data, not HTML
+(defcomp ~blog-tag-icon (&key src name initial)
+  (if src
+    (img :src src :alt name :class "h-4 w-4 rounded-full object-cover border border-stone-300 flex-shrink-0")
+    (div :class "h-4 w-4 rounded-full text-[8px] font-semibold flex items-center justify-center border border-stone-300 flex-shrink-0 bg-stone-200 text-stone-600" initial)))
+
+(defcomp ~blog-tag-item (&key src name initial)
+  (li (a :class "flex items-center gap-1"
+    (~blog-tag-icon :src src :name name :initial initial)
+    (span :class "inline-block rounded-full bg-stone-100 text-stone-600 px-2 py-1 text-sm font-medium border border-stone-200" name))))
+
+;; At-bar — tags + authors row for detail pages
+(defcomp ~blog-at-bar (&key tags authors)
+  (when (or tags authors)
+    (div :class "flex flex-row justify-center gap-3"
+      (when tags
+        (div :class "mt-4 flex items-center gap-2" (div "in")
+          (ul :class "flex flex-wrap gap-2 text-sm"
+            (map (lambda (t) (~blog-tag-item :src (get t "src") :name (get t "name") :initial (get t "initial"))) tags))))
+      (div)
+      (when authors
+        (div :class "mt-4 flex items-center gap-2" (div "by")
+          (ul :class "flex flex-wrap gap-2 text-sm"
+            (map (lambda (a) (~blog-author-item :image (get a "image") :name (get a "name"))) authors)))))))
+
+;; Author components
+(defcomp ~blog-author-item (&key image name)
+  (li :class "flex items-center gap-1"
+    (when image (img :src image :alt name :class "h-5 w-5 rounded-full object-cover"))
+    (span :class "text-stone-700" name)))
+
+;; Card — accepts pure data
+(defcomp ~blog-card (&key slug href hx-select title
+                          feature-image excerpt
+                          status is-draft publish-requested status-timestamp
+                          liked like-url csrf-token
+                          has-like
+                          tags authors widget)
+  (article :class "border-b pb-6 last:border-b-0 relative"
+    (when has-like
+      (~blog-like-button
+        :like-url like-url
+        :sx-headers (str "{\"X-CSRFToken\": \"" csrf-token "\"}")
+        :heart (if liked "❤️" "🤍")))
+    (a :href href :sx-get href :sx-target "#main-panel"
+      :sx-select (or hx-select "#main-panel") :sx-swap "outerHTML" :sx-push-url "true"
+      :class "block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden"
+      (header :class "mb-2 text-center"
+        (h2 :class "text-4xl font-bold text-stone-900" title)
+        (if is-draft
+          (~blog-draft-status :publish-requested publish-requested :timestamp status-timestamp)
+          (when status-timestamp (~blog-published-status :timestamp status-timestamp))))
+      (when feature-image (div :class "mb-4" (img :src feature-image :alt "" :class "rounded-lg w-full object-cover")))
+      (when excerpt (p :class "text-stone-700 text-lg leading-relaxed text-center" excerpt)))
+    widget
+    (when (or tags authors)
+      (div :class "flex flex-row justify-center gap-3"
+        (when tags
+          (div :class "mt-4 flex items-center gap-2" (div "in")
+            (ul :class "flex flex-wrap gap-2 text-sm"
+              (map (lambda (t) (~blog-tag-item :src (get t "src") :name (get t "name") :initial (get t "initial"))) tags))))
+        (div)
+        (when authors
+          (div :class "mt-4 flex items-center gap-2" (div "by")
+            (ul :class "flex flex-wrap gap-2 text-sm"
+              (map (lambda (a) (~blog-author-item :image (get a "image") :name (get a "name"))) authors))))))))
+
+(defcomp ~blog-card-tile (&key href hx-select feature-image title
+                                is-draft publish-requested status-timestamp
+                                excerpt tags authors)
+  (article :class "relative"
+    (a :href href :sx-get href :sx-target "#main-panel"
+      :sx-select (or hx-select "#main-panel") :sx-swap "outerHTML" :sx-push-url "true"
+      :class "block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden"
+      (when feature-image (div (img :src feature-image :alt "" :class "w-full aspect-video object-cover")))
+      (div :class "p-3 text-center"
+        (h2 :class "text-lg font-bold text-stone-900" title)
+        (if is-draft
+          (~blog-draft-status :publish-requested publish-requested :timestamp status-timestamp)
+          (when status-timestamp (~blog-published-status :timestamp status-timestamp)))
+        (when excerpt (p :class "text-stone-700 text-sm leading-relaxed line-clamp-3 mt-1" excerpt))))
+    (when (or tags authors)
+      (div :class "flex flex-row justify-center gap-3"
+        (when tags
+          (div :class "mt-4 flex items-center gap-2" (div "in")
+            (ul :class "flex flex-wrap gap-2 text-sm"
+              (map (lambda (t) (~blog-tag-item :src (get t "src") :name (get t "name") :initial (get t "initial"))) tags))))
+        (div)
+        (when authors
+          (div :class "mt-4 flex items-center gap-2" (div "by")
+            (ul :class "flex flex-wrap gap-2 text-sm"
+              (map (lambda (a) (~blog-author-item :image (get a "image") :name (get a "name"))) authors))))))))
+
+(defcomp ~blog-page-badges (&key has-calendar has-market)
+  (div :class "flex justify-center gap-2 mt-2"
+    (when has-calendar (span :class "inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-blue-100 text-blue-800"
+      (i :class "fa fa-calendar mr-1") "Calendar"))
+    (when has-market (span :class "inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-green-100 text-green-800"
+      (i :class "fa fa-shopping-bag mr-1") "Market"))))
+
+(defcomp ~blog-page-card (&key href hx-select title has-calendar has-market pub-timestamp feature-image excerpt)
+  (article :class "border-b pb-6 last:border-b-0 relative"
+    (a :href href :sx-get href :sx-target "#main-panel"
+      :sx-select (or hx-select "#main-panel") :sx-swap "outerHTML" :sx-push-url "true"
+      :class "block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden"
+      (header :class "mb-2 text-center"
+        (h2 :class "text-4xl font-bold text-stone-900" title)
+        (~blog-page-badges :has-calendar has-calendar :has-market has-market)
+        (when pub-timestamp (~blog-published-status :timestamp pub-timestamp)))
+      (when feature-image (div :class "mb-4" (img :src feature-image :alt "" :class "rounded-lg w-full object-cover")))
+      (when excerpt (p :class "text-stone-700 text-lg leading-relaxed text-center" excerpt)))))

blog/sx/detail.sx

@@ -1,34 +1,39 @@
 ;; Blog post detail components
 
 (defcomp ~blog-detail-edit-link (&key href hx-select)
-  (a :href href :hx-get href :hx-target "#main-panel"
-    :hx-select hx-select :hx-swap "outerHTML" :hx-push-url "true"
+  (a :href href :sx-get href :sx-target "#main-panel"
+    :sx-select hx-select :sx-swap "outerHTML" :sx-push-url "true"
     :class "inline-block px-3 py-1 rounded-full text-sm font-semibold bg-stone-700 text-white hover:bg-stone-800 transition-colors"
     (i :class "fa fa-pencil mr-1") " Edit"))
 
-(defcomp ~blog-detail-draft (&key publish-requested edit-html)
+(defcomp ~blog-detail-draft (&key publish-requested edit)
   (div :class "flex items-center justify-center gap-2 mb-3"
     (span :class "inline-block px-3 py-1 rounded-full text-sm font-semibold bg-amber-100 text-amber-800" "Draft")
     (when publish-requested (span :class "inline-block px-3 py-1 rounded-full text-sm font-semibold bg-blue-100 text-blue-800" "Publish requested"))
-    (raw! edit-html)))
+    edit))
 
 (defcomp ~blog-detail-like (&key like-url hx-headers heart)
   (div :class "absolute top-2 right-2 z-10 text-8xl md:text-6xl"
-    (button :hx-post like-url :hx-swap "outerHTML"
-      :hx-headers hx-headers :class "cursor-pointer" heart)))
+    (button :sx-post like-url :sx-swap "outerHTML"
+      :sx-headers hx-headers :class "cursor-pointer" heart)))
 
 (defcomp ~blog-detail-excerpt (&key excerpt)
   (div :class "w-full text-center italic text-3xl p-2" excerpt))
 
-(defcomp ~blog-detail-chrome (&key like-html excerpt-html at-bar-html)
-  (<> (raw! like-html) (raw! excerpt-html) (div :class "hidden md:block" (raw! at-bar-html))))
+(defcomp ~blog-detail-chrome (&key like excerpt at-bar)
+  (<> like
+      excerpt
+      (div :class "hidden md:block" at-bar)))
 
-(defcomp ~blog-detail-main (&key draft-html chrome-html feature-image html-content)
+(defcomp ~blog-detail-main (&key draft chrome feature-image html-content sx-content)
   (<> (article :class "relative"
-    (raw! draft-html) (raw! chrome-html)
+    draft
+    chrome
     (when feature-image (div :class "mb-3 flex justify-center"
       (img :src feature-image :alt "" :class "rounded-lg w-full md:w-3/4 object-cover")))
-    (when html-content (div :class "blog-content p-2" (raw! html-content))))
+    (if sx-content
+      (div :class "blog-content p-2" sx-content)
+      (when html-content (div :class "blog-content p-2" (~rich-text :html html-content)))))
     (div :class "pb-8")))
 
 (defcomp ~blog-meta (&key robots page-title desc canonical og-type og-title image twitter-card twitter-title)
@@ -47,11 +52,8 @@
     (meta :name "twitter:description" :content desc)
     (when image (meta :name "twitter:image" :content image))))
 
-(defcomp ~blog-home-main (&key html-content)
-  (article :class "relative" (div :class "blog-content p-2" (raw! html-content))))
-
-(defcomp ~blog-admin-empty ()
-  (div :class "pb-8"))
-
-(defcomp ~blog-settings-empty ()
-  (div :class "max-w-2xl mx-auto px-4 py-6"))
+(defcomp ~blog-home-main (&key html-content sx-content)
+  (article :class "relative"
+    (if sx-content
+      (div :class "blog-content p-2" sx-content)
+      (div :class "blog-content p-2" (~rich-text :html html-content)))))

blog/sx/editor.sx

@@ -0,0 +1,207 @@
+;; Blog editor components
+
+(defcomp ~blog-editor-error (&key error)
+  (div :class "max-w-[768px] mx-auto mt-[16px] rounded-[8px] border border-red-300 bg-red-50 px-[16px] py-[12px] text-[14px] text-red-700"
+    (strong "Save failed:") " " error))
+
+(defcomp ~blog-editor-form (&key csrf title-placeholder create-label)
+  (form :id "post-new-form" :method "post" :class "max-w-[768px] mx-auto pb-[48px]"
+    (input :type "hidden" :name "csrf_token" :value csrf)
+    (input :type "hidden" :id "lexical-json-input" :name "lexical" :value "")
+    (input :type "hidden" :id "sx-content-input" :name "sx_content" :value "")
+    (input :type "hidden" :id "feature-image-input" :name "feature_image" :value "")
+    (input :type "hidden" :id "feature-image-caption-input" :name "feature_image_caption" :value "")
+    (div :id "feature-image-container" :class "relative mt-[16px] mb-[24px] group"
+      (div :id "feature-image-empty"
+        (button :type "button" :id "feature-image-add-btn"
+          :class "text-[14px] text-stone-400 hover:text-stone-600 transition-colors cursor-pointer"
+          "+ Add feature image"))
+      (div :id "feature-image-filled" :class "relative hidden"
+        (img :id "feature-image-preview" :src "" :alt ""
+          :class "w-full max-h-[448px] object-cover rounded-[8px] cursor-pointer")
+        (button :type "button" :id "feature-image-delete-btn"
+          :class "absolute top-[8px] right-[8px] w-[32px] h-[32px] rounded-full bg-black/50 text-white flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity hover:bg-black/70 cursor-pointer text-[14px]"
+          :title "Remove feature image"
+          (i :class "fa-solid fa-trash-can"))
+        (input :type "text" :id "feature-image-caption" :value ""
+          :placeholder "Add a caption..."
+          :class "mt-[8px] w-full text-[14px] text-stone-500 bg-transparent border-none outline-none placeholder:text-stone-300 focus:text-stone-700"))
+      (div :id "feature-image-uploading"
+        :class "hidden flex items-center gap-[8px] mt-[8px] text-[14px] text-stone-400"
+        (i :class "fa-solid fa-spinner fa-spin") " Uploading...")
+      (input :type "file" :id "feature-image-file"
+        :accept "image/jpeg,image/png,image/gif,image/webp,image/svg+xml" :class "hidden"))
+    (input :type "text" :name "title" :value "" :placeholder title-placeholder
+      :class "w-full text-[36px] font-bold bg-transparent border-none outline-none placeholder:text-stone-300 mb-[8px] leading-tight")
+    (textarea :name "custom_excerpt" :rows "1" :placeholder "Add an excerpt..."
+      :class "w-full text-[18px] text-stone-500 bg-transparent border-none outline-none placeholder:text-stone-300 resize-none mb-[24px] leading-relaxed")
+    ;; Editor tabs: SX (primary) and Koenig (legacy)
+    (div :class "flex gap-[4px] mb-[8px] border-b border-stone-200"
+      (button :type "button" :id "editor-tab-sx"
+        :class "px-[12px] py-[6px] text-[13px] font-medium text-stone-700 border-b-2 border-stone-700 cursor-pointer bg-transparent"
+        :onclick "document.getElementById('sx-editor').style.display='block';document.getElementById('lexical-editor').style.display='none';this.className='px-[12px] py-[6px] text-[13px] font-medium text-stone-700 border-b-2 border-stone-700 cursor-pointer bg-transparent';document.getElementById('editor-tab-koenig').className='px-[12px] py-[6px] text-[13px] font-medium text-stone-400 border-b-2 border-transparent cursor-pointer bg-transparent hover:text-stone-600'"
+        "SX Editor")
+      (button :type "button" :id "editor-tab-koenig"
+        :class "px-[12px] py-[6px] text-[13px] font-medium text-stone-400 border-b-2 border-transparent cursor-pointer bg-transparent hover:text-stone-600"
+        :onclick "document.getElementById('lexical-editor').style.display='block';document.getElementById('sx-editor').style.display='none';this.className='px-[12px] py-[6px] text-[13px] font-medium text-stone-700 border-b-2 border-stone-700 cursor-pointer bg-transparent';document.getElementById('editor-tab-sx').className='px-[12px] py-[6px] text-[13px] font-medium text-stone-400 border-b-2 border-transparent cursor-pointer bg-transparent hover:text-stone-600'"
+        "Koenig (Legacy)"))
+    (div :id "sx-editor" :class "relative w-full bg-transparent")
+    (div :id "lexical-editor" :class "relative w-full bg-transparent" :style "display:none")
+    (div :class "flex items-center gap-[16px] mt-[32px] pt-[16px] border-t border-stone-200"
+      (select :name "status"
+        :class "text-[14px] rounded-[4px] border border-stone-200 px-[8px] py-[6px] bg-white text-stone-600"
+        (option :value "draft" :selected true "Draft")
+        (option :value "published" "Published"))
+      (button :type "submit"
+        :class "px-[20px] py-[6px] bg-stone-700 text-white text-[14px] rounded-[8px] hover:bg-stone-800 transition-colors cursor-pointer" create-label))))
+
+(defcomp ~blog-editor-styles (&key css-href)
+  (<> (link :rel "stylesheet" :href css-href)
+    (style
+      "#lexical-editor { display: flow-root; }"
+      "#lexical-editor [data-kg-card=\"html\"] * { float: none !important; }"
+      "#lexical-editor [data-kg-card=\"html\"] table { width: 100% !important; }")))
+
+(defcomp ~blog-editor-scripts (&key js-src sx-editor-js-src init-js)
+  (<> (script :src js-src)
+      (when sx-editor-js-src (script :src sx-editor-js-src))
+      (script init-js)))
+
+;; SX editor styles — comprehensive CSS for the Koenig-style block editor
+(defcomp ~sx-editor-styles ()
+  (style
+    ;; Editor container
+    ".sx-editor { position: relative; font-size: 18px; line-height: 1.6; font-family: Georgia, 'Times New Roman', serif; color: #1c1917; }"
+    ".sx-blocks-container { display: flex; flex-direction: column; min-height: 300px; cursor: text; padding-left: 48px; }"
+
+    ;; Block base
+    ".sx-block { position: relative; margin: 1px 0; }"
+    ".sx-block-content { padding: 2px 0; }"
+    ".sx-editable { outline: none; min-height: 1.6em; }"
+    ".sx-editable:empty:before { content: attr(data-placeholder); color: #d6d3d1; pointer-events: none; }"
+
+    ;; Text block styles
+    ".sx-heading { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; font-weight: 700; }"
+    ".sx-block[data-sx-tag='h2'] .sx-heading { font-size: 2em; line-height: 1.25; margin: 0.5em 0 0.25em; }"
+    ".sx-block[data-sx-tag='h3'] .sx-heading { font-size: 1.5em; line-height: 1.3; margin: 0.4em 0 0.2em; }"
+    ".sx-quote { border-left: 3px solid #d6d3d1; padding-left: 16px; font-style: italic; color: #57534e; }"
+
+    ;; HR
+    ".sx-block-hr { padding: 12px 0; }"
+    ".sx-hr { border: none; border-top: 1px solid #e7e5e4; }"
+
+    ;; Code blocks
+    ".sx-block-code { background: #1c1917; border-radius: 6px; padding: 16px; margin: 8px 0; }"
+    ".sx-code-header { margin-bottom: 8px; }"
+    ".sx-code-lang { background: transparent; border: none; color: #a8a29e; font-size: 12px; outline: none; width: 120px; font-family: monospace; }"
+    ".sx-code-textarea { width: 100%; background: transparent; border: none; color: #fafaf9; font-family: 'SF Mono', 'Fira Code', 'Fira Mono', monospace; font-size: 14px; line-height: 1.5; resize: none; outline: none; min-height: 60px; tab-size: 2; }"
+
+    ;; List blocks
+    ".sx-list-content { padding-left: 0; }"
+    ".sx-list-item { padding: 2px 0 2px 24px; position: relative; outline: none; min-height: 1.6em; }"
+    ".sx-list-item:empty:before { content: attr(data-placeholder); color: #d6d3d1; pointer-events: none; }"
+    ".sx-list-item:before { content: '\\2022'; position: absolute; left: 6px; color: #78716c; }"
+    ".sx-block[data-sx-tag='ol'] { counter-reset: sx-list; }"
+    ".sx-block[data-sx-tag='ol'] .sx-list-item { counter-increment: sx-list; }"
+    ".sx-block[data-sx-tag='ol'] .sx-list-item:before { content: counter(sx-list) '.'; font-size: 14px; }"
+
+    ;; Card blocks
+    ".sx-block-card { margin: 12px 0; border-radius: 4px; position: relative; transition: box-shadow 0.15s; }"
+    ".sx-block-card:hover { box-shadow: 0 0 0 1px #d6d3d1; }"
+    ".sx-block-card.sx-card-editing { box-shadow: 0 0 0 2px #3b82f6; }"
+    ".sx-card-preview { cursor: pointer; }"
+    ".sx-card-preview img { max-width: 100%; }"
+    ".sx-card-fallback { padding: 24px; text-align: center; color: #a8a29e; font-style: italic; background: #fafaf9; border-radius: 4px; }"
+    ".sx-card-caption { padding: 8px 0; font-size: 14px; color: #78716c; text-align: center; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }"
+    ".sx-card-caption:empty:before { content: attr(data-placeholder); color: #d6d3d1; }"
+
+    ;; Card toolbar
+    ".sx-card-toolbar { position: absolute; top: -36px; right: 0; z-index: 10; display: none; gap: 4px; }"
+    ".sx-block-card:hover .sx-card-toolbar { display: flex; }"
+    ".sx-card-editing .sx-card-toolbar { display: flex; }"
+    ".sx-card-tool-btn { width: 28px; height: 28px; border-radius: 4px; border: 1px solid #d6d3d1; background: white; color: #78716c; cursor: pointer; display: flex; align-items: center; justify-content: center; font-size: 12px; transition: all 0.1s; }"
+    ".sx-card-tool-btn:hover { background: #fafaf9; color: #dc2626; border-color: #dc2626; }"
+
+    ;; Card edit panel
+    ".sx-card-edit { padding: 16px; background: #fafaf9; border-radius: 4px; }"
+
+    ;; Plus button (Koenig-style floating)
+    ".sx-plus-container { position: absolute; z-index: 40; display: flex; align-items: center; }"
+    ".sx-plus-btn { width: 28px; height: 28px; border-radius: 50%; border: 1px solid #d6d3d1; background: white; color: #a8a29e; cursor: pointer; display: flex; align-items: center; justify-content: center; transition: all 0.15s; padding: 0; }"
+    ".sx-plus-btn:hover { border-color: #1c1917; color: #1c1917; }"
+    ".sx-plus-btn-open { transform: rotate(45deg); border-color: #1c1917; color: #1c1917; }"
+    ".sx-plus-btn svg { width: 14px; height: 14px; }"
+
+    ;; Plus menu
+    ".sx-plus-menu { position: absolute; top: 36px; left: -8px; z-index: 50; background: white; border: 1px solid #e7e5e4; border-radius: 8px; box-shadow: 0 8px 24px rgba(0,0,0,0.12); padding: 8px; width: 320px; max-height: 420px; overflow-y: auto; }"
+    ".sx-plus-menu-section { margin-bottom: 4px; }"
+    ".sx-plus-menu-heading { font-size: 11px; font-weight: 600; text-transform: uppercase; letter-spacing: 0.05em; color: #a8a29e; padding: 6px 8px 2px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }"
+    ".sx-plus-menu-item { display: flex; align-items: center; gap: 10px; width: 100%; padding: 6px 8px; border: none; background: none; cursor: pointer; font-size: 14px; color: #1c1917; border-radius: 4px; text-align: left; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }"
+    ".sx-plus-menu-item:hover { background: #f5f5f4; }"
+    ".sx-plus-menu-icon { width: 24px; text-align: center; font-size: 14px; color: #78716c; flex-shrink: 0; }"
+    ".sx-plus-menu-label { font-weight: 500; white-space: nowrap; }"
+    ".sx-plus-menu-desc { color: #a8a29e; font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }"
+
+    ;; Slash command menu
+    ".sx-slash-menu { position: absolute; z-index: 50; background: white; border: 1px solid #e7e5e4; border-radius: 8px; box-shadow: 0 8px 24px rgba(0,0,0,0.12); padding: 4px; width: 320px; max-height: 300px; overflow-y: auto; }"
+    ".sx-slash-menu-item { display: flex; align-items: center; gap: 10px; width: 100%; padding: 8px 10px; border: none; background: none; cursor: pointer; font-size: 14px; color: #1c1917; border-radius: 4px; text-align: left; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }"
+    ".sx-slash-menu-item:hover { background: #f5f5f4; }"
+    ".sx-slash-menu-icon { width: 24px; text-align: center; font-size: 14px; color: #78716c; flex-shrink: 0; }"
+    ".sx-slash-menu-label { font-weight: 500; white-space: nowrap; }"
+    ".sx-slash-menu-desc { color: #a8a29e; font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }"
+
+    ;; Format toolbar
+    ".sx-format-bar { position: absolute; z-index: 100; display: flex; gap: 1px; background: #1c1917; border-radius: 6px; padding: 2px; box-shadow: 0 4px 12px rgba(0,0,0,0.3); font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }"
+    ".sx-format-btn { border: none; background: none; color: #e7e5e4; cursor: pointer; padding: 6px 10px; border-radius: 4px; font-size: 14px; line-height: 1; }"
+    ".sx-format-btn:hover { background: #44403c; color: white; }"
+    ".sx-fmt-bold { font-weight: 700; }"
+    ".sx-fmt-italic { font-style: italic; }"
+
+    ;; Card edit UI elements
+    ".sx-edit-controls { display: flex; flex-direction: column; gap: 8px; }"
+    ".sx-edit-row { display: flex; align-items: center; gap: 8px; }"
+    ".sx-edit-label { font-size: 12px; font-weight: 600; color: #78716c; min-width: 80px; text-transform: uppercase; letter-spacing: 0.03em; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }"
+    ".sx-edit-input { flex: 1; padding: 6px 10px; border: 1px solid #d6d3d1; border-radius: 4px; font-size: 14px; outline: none; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }"
+    ".sx-edit-input:focus { border-color: #3b82f6; box-shadow: 0 0 0 2px rgba(59,130,246,0.15); }"
+    ".sx-edit-select { padding: 6px 10px; border: 1px solid #d6d3d1; border-radius: 4px; font-size: 14px; outline: none; background: white; }"
+    ".sx-edit-btn { padding: 8px 16px; border: 1px solid #d6d3d1; border-radius: 6px; font-size: 14px; cursor: pointer; background: white; color: #1c1917; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; transition: all 0.1s; }"
+    ".sx-edit-btn:hover { background: #f5f5f4; border-color: #a8a29e; }"
+    ".sx-edit-btn-sm { padding: 4px 12px; font-size: 12px; }"
+    ".sx-edit-info { font-size: 12px; color: #a8a29e; }"
+    ".sx-edit-status { font-size: 13px; color: #78716c; margin-top: 4px; }"
+    ".sx-edit-url-input { font-family: monospace; }"
+    ".sx-edit-url-display { font-size: 12px; color: #78716c; font-family: monospace; margin: 4px 0; word-break: break-all; }"
+    ".sx-edit-checkbox-label { display: flex; align-items: center; gap: 6px; font-size: 14px; color: #44403c; cursor: pointer; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }"
+    ".sx-edit-img-preview { max-width: 100%; max-height: 300px; object-fit: contain; border-radius: 4px; margin-bottom: 12px; }"
+    ".sx-edit-embed-preview { margin-bottom: 8px; }"
+    ".sx-edit-embed-preview iframe { max-width: 100%; }"
+    ".sx-edit-audio-player { width: 100%; margin-bottom: 12px; }"
+    ".sx-edit-video-player { width: 100%; max-height: 300px; margin-bottom: 12px; border-radius: 4px; }"
+    ".sx-edit-html-textarea { width: 100%; min-height: 120px; font-family: 'SF Mono', 'Fira Code', monospace; font-size: 13px; padding: 12px; border: 1px solid #d6d3d1; border-radius: 4px; resize: vertical; outline: none; background: #fafaf9; line-height: 1.5; tab-size: 2; }"
+    ".sx-edit-html-textarea:focus { border-color: #3b82f6; }"
+    ".sx-edit-callout-content { padding: 8px 12px; background: white; border: 1px solid #d6d3d1; border-radius: 4px; min-height: 40px; }"
+    ".sx-edit-toggle-content { padding: 8px 12px; background: white; border: 1px solid #d6d3d1; border-radius: 4px; min-height: 40px; margin-top: 4px; }"
+    ".sx-edit-emoji-input { width: 60px; text-align: center; font-size: 20px; padding: 4px; margin-bottom: 8px; }"
+
+    ;; Color picker
+    ".sx-edit-color-row { display: flex; gap: 6px; margin-bottom: 8px; }"
+    ".sx-edit-color-swatch { width: 28px; height: 28px; border-radius: 50%; border: 2px solid transparent; cursor: pointer; transition: all 0.1s; }"
+    ".sx-edit-color-swatch:hover { transform: scale(1.15); }"
+    ".sx-edit-color-swatch.active { border-color: #3b82f6; box-shadow: 0 0 0 2px rgba(59,130,246,0.3); }"
+
+    ;; Gallery grid
+    ".sx-edit-gallery-grid { display: grid; grid-template-columns: repeat(3, 1fr); gap: 8px; margin-bottom: 12px; }"
+    ".sx-edit-gallery-thumb { position: relative; aspect-ratio: 1; overflow: hidden; border-radius: 4px; }"
+    ".sx-edit-gallery-thumb img { width: 100%; height: 100%; object-fit: cover; }"
+    ".sx-edit-gallery-remove { position: absolute; top: 4px; right: 4px; width: 20px; height: 20px; border-radius: 50%; background: rgba(0,0,0,0.6); color: white; border: none; cursor: pointer; font-size: 14px; line-height: 1; display: flex; align-items: center; justify-content: center; opacity: 0; transition: opacity 0.1s; }"
+    ".sx-edit-gallery-thumb:hover .sx-edit-gallery-remove { opacity: 1; }"
+
+    ;; Upload area
+    ".sx-upload-area { padding: 40px 24px; border: 2px dashed #d6d3d1; border-radius: 8px; text-align: center; cursor: pointer; transition: all 0.15s; }"
+    ".sx-upload-area:hover, .sx-upload-dragover { border-color: #3b82f6; background: rgba(59,130,246,0.03); }"
+    ".sx-upload-icon { font-size: 32px; color: #a8a29e; margin-bottom: 8px; }"
+    ".sx-upload-msg { font-size: 14px; color: #78716c; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }"
+    ".sx-upload-progress { font-size: 13px; color: #3b82f6; margin-top: 8px; }"
+
+    ;; Drag over editor
+    ".sx-drag-over { outline: 2px dashed #3b82f6; outline-offset: -2px; border-radius: 4px; }"))

blog/sx/filters.sx

@@ -1,29 +1,29 @@
 ;; Blog filter components
 
 (defcomp ~blog-action-button (&key href hx-select btn-class title icon-class label)
-  (a :href href :hx-get href :hx-target "#main-panel"
-    :hx-select hx-select :hx-swap "outerHTML" :hx-push-url "true"
+  (a :href href :sx-get href :sx-target "#main-panel"
+    :sx-select hx-select :sx-swap "outerHTML" :sx-push-url "true"
     :class btn-class :title title (i :class icon-class) label))
 
 (defcomp ~blog-drafts-button (&key href hx-select btn-class title label draft-count)
-  (a :href href :hx-get href :hx-target "#main-panel"
-    :hx-select hx-select :hx-swap "outerHTML" :hx-push-url "true"
+  (a :href href :sx-get href :sx-target "#main-panel"
+    :sx-select hx-select :sx-swap "outerHTML" :sx-push-url "true"
     :class btn-class :title title (i :class "fa fa-file-text-o mr-1") " Drafts "
     (span :class "inline-block bg-stone-500 text-white px-1.5 py-0.5 text-xs font-medium rounded ml-1" draft-count)))
 
 (defcomp ~blog-drafts-button-amber (&key href hx-select btn-class title label draft-count)
-  (a :href href :hx-get href :hx-target "#main-panel"
-    :hx-select hx-select :hx-swap "outerHTML" :hx-push-url "true"
+  (a :href href :sx-get href :sx-target "#main-panel"
+    :sx-select hx-select :sx-swap "outerHTML" :sx-push-url "true"
     :class btn-class :title title (i :class "fa fa-file-text-o mr-1") " Drafts "
     (span :class "inline-block bg-amber-500 text-white px-1.5 py-0.5 text-xs font-medium rounded ml-1" draft-count)))
 
-(defcomp ~blog-action-buttons-wrapper (&key inner-html)
-  (div :class "flex flex-wrap gap-2 px-4 py-3" (raw! inner-html)))
+(defcomp ~blog-action-buttons-wrapper (&key inner)
+  (div :class "flex flex-wrap gap-2 px-4 py-3" inner))
 
 (defcomp ~blog-filter-any-topic (&key cls hx-select)
   (li (a :class (str "px-3 py-1 rounded border " cls)
-    :hx-get "?page=1" :hx-target "#main-panel" :hx-select hx-select
-    :hx-swap "outerHTML" :hx-push-url "true" "Any Topic")))
+    :sx-get "?page=1" :sx-target "#main-panel" :sx-select hx-select
+    :sx-swap "outerHTML" :sx-push-url "true" "Any Topic")))
 
 (defcomp ~blog-filter-group-icon-image (&key src name)
   (img :src src :alt name :class "h-6 w-6 rounded-full object-cover border border-stone-300 flex-shrink-0"))
@@ -31,32 +31,32 @@
 (defcomp ~blog-filter-group-icon-color (&key style initial)
   (div :class "h-6 w-6 rounded-full text-[10px] font-semibold flex items-center justify-center border border-stone-300 flex-shrink-0" :style style initial))
 
-(defcomp ~blog-filter-group-li (&key cls hx-get hx-select icon-html name count)
+(defcomp ~blog-filter-group-li (&key cls hx-get hx-select icon name count)
   (li (a :class (str "flex items-center gap-2 px-3 py-1 rounded border " cls)
-    :hx-get hx-get :hx-target "#main-panel" :hx-select hx-select
-    :hx-swap "outerHTML" :hx-push-url "true"
-    (raw! icon-html)
+    :sx-get hx-get :sx-target "#main-panel" :sx-select hx-select
+    :sx-swap "outerHTML" :sx-push-url "true"
+    icon
     (span :class "inline-block rounded-full bg-stone-100 text-stone-600 px-2 py-1 text-sm font-medium border border-stone-200" name)
     (span :class "flex-1")
     (span :class "inline-block bg-stone-100 text-stone-600 px-2 py-1 text-xs font-medium border border-stone-200" count))))
 
-(defcomp ~blog-filter-nav (&key items-html)
+(defcomp ~blog-filter-nav (&key items)
   (nav :class "max-w-3xl mx-auto px-4 pb-4 flex flex-wrap gap-2 text-sm"
-    (ul :class "divide-y flex flex-col gap-3" (raw! items-html))))
+    (ul :class "divide-y flex flex-col gap-3" items)))
 
 (defcomp ~blog-filter-any-author (&key cls hx-select)
   (li (a :class (str "px-3 py-1 rounded " cls)
-    :hx-get "?page=1" :hx-target "#main-panel" :hx-select hx-select
-    :hx-swap "outerHTML" :hx-push-url "true" "Any author")))
+    :sx-get "?page=1" :sx-target "#main-panel" :sx-select hx-select
+    :sx-swap "outerHTML" :sx-push-url "true" "Any author")))
 
 (defcomp ~blog-filter-author-icon (&key src name)
   (img :src src :alt name :class "h-5 w-5 rounded-full object-cover"))
 
-(defcomp ~blog-filter-author-li (&key cls hx-get hx-select icon-html name count)
+(defcomp ~blog-filter-author-li (&key cls hx-get hx-select icon name count)
   (li (a :class (str "flex items-center gap-2 px-3 py-1 rounded " cls)
-    :hx-get hx-get :hx-target "#main-panel" :hx-select hx-select
-    :hx-swap "outerHTML" :hx-push-url "true"
-    (raw! icon-html)
+    :sx-get hx-get :sx-target "#main-panel" :sx-select hx-select
+    :sx-swap "outerHTML" :sx-push-url "true"
+    icon
     (span :class "text-stone-700" name)
     (span :class "flex-1")
     (span :class "inline-block bg-stone-100 text-stone-600 px-2 py-1 text-xs font-medium border border-stone-200" count))))

blog/sx/handlers/link-card.sx

@@ -0,0 +1,31 @@
+;; Blog link-card fragment handler
+;;
+;; Renders link-card(s) for blog posts by slug.
+;; Supports single mode (?slug=x) and batch mode (?keys=x,y,z).
+
+(defhandler link-card (&key slug keys)
+  (if keys
+    (let ((slugs (split keys ",")))
+      (<> (map (fn (s)
+        (let ((post (query "blog" "post-by-slug" :slug (trim s))))
+          (when post
+            (<> (str "<!-- fragment:" (trim s) " -->")
+                (~link-card
+                  :link (app-url "blog" (str "/" (get post "slug") "/"))
+                  :title (get post "title")
+                  :image (get post "feature_image")
+                  :icon "fas fa-file-alt"
+                  :subtitle (or (get post "custom_excerpt") (get post "excerpt"))
+                  :detail (get post "published_at_display")
+                  :data-app "blog"))))) slugs)))
+    (when slug
+      (let ((post (query "blog" "post-by-slug" :slug slug)))
+        (when post
+          (~link-card
+            :link (app-url "blog" (str "/" (get post "slug") "/"))
+            :title (get post "title")
+            :image (get post "feature_image")
+            :icon "fas fa-file-alt"
+            :subtitle (or (get post "custom_excerpt") (get post "excerpt"))
+            :detail (get post "published_at_display")
+            :data-app "blog"))))))

blog/sx/handlers/nav-tree.sx

@@ -0,0 +1,80 @@
+;; Blog nav-tree fragment handler
+;;
+;; Renders the full scrollable navigation menu bar with app icons.
+;; Uses nav-tree I/O primitive to fetch menu nodes from the blog DB.
+
+(defhandler nav-tree (&key app_name path)
+  (let ((app       (or app_name ""))
+        (cur-path  (or path "/"))
+        (first-seg (first (filter (fn (s) (not (empty? s)))
+                            (split (trim cur-path) "/"))))
+        (items     (nav-tree))
+        (nav-cls   "whitespace-nowrap flex items-center gap-2 rounded p-2 text-sm")
+
+        ;; App slug → URL mapping
+        (app-slugs (dict
+          :cart     (app-url "cart" "/")
+          :market   (app-url "market" "/")
+          :events   (app-url "events" "/")
+          :federation (app-url "federation" "/")
+          :account  (app-url "account" "/")
+          :artdag   (app-url "artdag" "/"))))
+
+    (let ((item-sxs
+            (<>
+              ;; Nav items from DB
+              (map (fn (item)
+                (let ((item-slug (or (get item "slug") ""))
+                      (href (or (get app-slugs item-slug)
+                                (app-url "blog" (str "/" item-slug "/"))))
+                      (selected (or (= item-slug (or first-seg ""))
+                                    (= item-slug app))))
+                  (~blog-nav-item-link
+                    :href href
+                    :hx-get href
+                    :selected (if selected "true" "false")
+                    :nav-cls nav-cls
+                    :img (~img-or-placeholder
+                           :src (get item "feature_image")
+                           :alt (or (get item "label") item-slug)
+                           :size-cls "w-8 h-8 rounded-full object-cover flex-shrink-0")
+                    :label (or (get item "label") item-slug)))) items)
+
+              ;; Hardcoded artdag link
+              (~blog-nav-item-link
+                :href (app-url "artdag" "/")
+                :hx-get (app-url "artdag" "/")
+                :selected (if (or (= "artdag" (or first-seg ""))
+                                  (= "artdag" app)) "true" "false")
+                :nav-cls nav-cls
+                :img (~img-or-placeholder
+                       :src nil :alt "art-dag"
+                       :size-cls "w-8 h-8 rounded-full object-cover flex-shrink-0")
+                :label "art-dag")))
+
+          ;; Scroll wrapper IDs + hyperscript
+          (arrow-cls    "scrolling-menu-arrow-menu-items-container")
+          (cid          "menu-items-container")
+          (left-hs      (str "on click set #" cid ".scrollLeft to #" cid ".scrollLeft - 200"))
+          (scroll-hs    (str "on scroll "
+                             "set cls to '" arrow-cls "' "
+                             "set arrows to document.getElementsByClassName(cls) "
+                             "set show to (window.innerWidth >= 640 and "
+                             "my.scrollWidth > my.clientWidth) "
+                             "repeat for arrow in arrows "
+                             "if show remove .hidden from arrow add .flex to arrow "
+                             "else add .hidden to arrow remove .flex from arrow end "
+                             "end"))
+          (right-hs     (str "on click set #" cid ".scrollLeft to #" cid ".scrollLeft + 200")))
+
+      (if (empty? items)
+        (~blog-nav-empty :wrapper-id "menu-items-nav-wrapper")
+        (~scroll-nav-wrapper
+          :wrapper-id "menu-items-nav-wrapper"
+          :container-id cid
+          :arrow-cls arrow-cls
+          :left-hs left-hs
+          :scroll-hs scroll-hs
+          :right-hs right-hs
+          :items item-sxs
+          :oob true)))))

blog/sx/header.sx

@@ -1,11 +1,8 @@
 ;; Blog header components
 
-(defcomp ~blog-header-label ()
-  (div))
-
-(defcomp ~blog-container-nav (&key container-nav-html)
+(defcomp ~blog-container-nav (&key container-nav)
   (div :class "flex flex-col sm:flex-row sm:items-center gap-2 border-r border-stone-200 mr-2 sm:max-w-2xl"
-    :id "entries-calendars-nav-wrapper" (raw! container-nav-html)))
+    :id "entries-calendars-nav-wrapper" container-nav))
 
 (defcomp ~blog-admin-label ()
   (<> (i :class "fa fa-shield-halved" :aria-hidden "true") " admin"))

blog/sx/index.sx

@@ -0,0 +1,32 @@
+;; Blog index components
+
+(defcomp ~blog-no-pages ()
+  (div :class "col-span-full mt-8 text-center text-stone-500" "No pages found."))
+
+(defcomp ~blog-content-type-tabs (&key posts-href pages-href hx-select posts-cls pages-cls)
+  (div :class "flex justify-center gap-1 px-3 pt-3"
+    (a :href posts-href :sx-get posts-href :sx-target "#main-panel"
+      :sx-select hx-select :sx-swap "outerHTML" :sx-push-url "true"
+      :class (str "px-4 py-1.5 rounded-t text-sm font-medium transition-colors " posts-cls) "Posts")
+    (a :href pages-href :sx-get pages-href :sx-target "#main-panel"
+      :sx-select hx-select :sx-swap "outerHTML" :sx-push-url "true"
+      :class (str "px-4 py-1.5 rounded-t text-sm font-medium transition-colors " pages-cls) "Pages")))
+
+(defcomp ~blog-main-panel-pages (&key tabs cards)
+  (<> tabs
+      (div :class "max-w-full px-3 py-3 space-y-3" cards)
+      (div :class "pb-8")))
+
+(defcomp ~blog-main-panel-posts (&key tabs toggle grid-cls cards)
+  (<> tabs
+      toggle
+      (div :class grid-cls cards)
+      (div :class "pb-8")))
+
+(defcomp ~blog-aside (&key search action-buttons tag-groups-filter authors-filter)
+  (<> search
+      action-buttons
+    (div :id "category-summary-desktop" :hxx-swap-oob "outerHTML"
+      tag-groups-filter
+      authors-filter)
+    (div :id "filter-summary-desktop" :hxx-swap-oob "outerHTML")))

blog/sx/kg_cards.sx

@@ -0,0 +1,153 @@
+;; KG card components — Ghost/Koenig-compatible card rendering
+;; Produces same HTML structure as lexical_renderer.py so cards.css works unchanged.
+;; Used by both display pipeline and block editor.
+
+;; @css kg-card kg-image-card kg-width-wide kg-width-full kg-gallery-card kg-gallery-container kg-gallery-row kg-gallery-image kg-embed-card kg-bookmark-card kg-bookmark-container kg-bookmark-content kg-bookmark-title kg-bookmark-description kg-bookmark-metadata kg-bookmark-icon kg-bookmark-author kg-bookmark-publisher kg-bookmark-thumbnail kg-callout-card kg-callout-emoji kg-callout-text kg-button-card kg-btn kg-btn-accent kg-toggle-card kg-toggle-heading kg-toggle-heading-text kg-toggle-card-icon kg-toggle-content kg-audio-card kg-audio-thumbnail kg-audio-player-container kg-audio-title kg-audio-player kg-audio-play-icon kg-audio-current-time kg-audio-time kg-audio-seek-slider kg-audio-playback-rate kg-audio-unmute-icon kg-audio-volume-slider kg-video-card kg-video-container kg-file-card kg-file-card-container kg-file-card-contents kg-file-card-title kg-file-card-filesize kg-file-card-icon kg-file-card-caption kg-align-center kg-align-left kg-callout-card-grey kg-callout-card-white kg-callout-card-blue kg-callout-card-green kg-callout-card-yellow kg-callout-card-red kg-callout-card-pink kg-callout-card-purple kg-callout-card-accent kg-html-card kg-md-card placeholder
+
+;; ---------------------------------------------------------------------------
+;; Image card
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-image (&key src alt caption width href)
+  (figure :class (str "kg-card kg-image-card"
+                   (if (= width "wide") " kg-width-wide"
+                     (if (= width "full") " kg-width-full" "")))
+    (if href
+      (a :href href (img :src src :alt (or alt "") :loading "lazy"))
+      (img :src src :alt (or alt "") :loading "lazy"))
+    (when caption (figcaption caption))))
+
+;; ---------------------------------------------------------------------------
+;; Gallery card
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-gallery (&key images caption)
+  (figure :class "kg-card kg-gallery-card kg-width-wide"
+    (div :class "kg-gallery-container"
+      (map (lambda (row)
+        (div :class "kg-gallery-row"
+          (map (lambda (img-data)
+            (figure :class "kg-gallery-image"
+              (img :src (get img-data "src") :alt (or (get img-data "alt") "") :loading "lazy")
+              (when (get img-data "caption") (figcaption (get img-data "caption")))))
+            row)))
+        images))
+    (when caption (figcaption caption))))
+
+;; ---------------------------------------------------------------------------
+;; HTML card — wraps user-pasted HTML so the editor can identify the block.
+;; Content is native sx children (no longer an opaque HTML string).
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-html (&rest children)
+  (div :class "kg-card kg-html-card" children))
+
+;; ---------------------------------------------------------------------------
+;; Markdown card — rendered markdown content, editor can identify the block.
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-md (&rest children)
+  (div :class "kg-card kg-md-card" children))
+
+;; ---------------------------------------------------------------------------
+;; Embed card
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-embed (&key html caption)
+  (figure :class "kg-card kg-embed-card"
+    (~rich-text :html html)
+    (when caption (figcaption caption))))
+
+;; ---------------------------------------------------------------------------
+;; Bookmark card
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-bookmark (&key url title description icon author publisher thumbnail caption)
+  (figure :class "kg-card kg-bookmark-card"
+    (a :class "kg-bookmark-container" :href url
+      (div :class "kg-bookmark-content"
+        (div :class "kg-bookmark-title" (or title ""))
+        (div :class "kg-bookmark-description" (or description ""))
+        (when (or icon author publisher)
+          (span :class "kg-bookmark-metadata"
+            (when icon (img :class "kg-bookmark-icon" :src icon :alt ""))
+            (when author (span :class "kg-bookmark-author" author))
+            (when publisher (span :class "kg-bookmark-publisher" publisher)))))
+      (when thumbnail
+        (div :class "kg-bookmark-thumbnail"
+          (img :src thumbnail :alt ""))))
+    (when caption (figcaption caption))))
+
+;; ---------------------------------------------------------------------------
+;; Callout card
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-callout (&key color emoji content)
+  (div :class (str "kg-card kg-callout-card kg-callout-card-" (or color "grey"))
+    (when emoji (div :class "kg-callout-emoji" emoji))
+    (div :class "kg-callout-text" (or content ""))))
+
+;; ---------------------------------------------------------------------------
+;; Button card
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-button (&key url text alignment)
+  (div :class (str "kg-card kg-button-card kg-align-" (or alignment "center"))
+    (a :href url :class "kg-btn kg-btn-accent" (or text ""))))
+
+;; ---------------------------------------------------------------------------
+;; Toggle card (accordion)
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-toggle (&key heading content)
+  (div :class "kg-card kg-toggle-card" :data-kg-toggle-state "close"
+    (div :class "kg-toggle-heading"
+      (h4 :class "kg-toggle-heading-text" (or heading ""))
+      (button :class "kg-toggle-card-icon"
+        (~rich-text :html "<svg viewBox=\"0 0 14 14\"><path d=\"M7 0a.5.5 0 0 1 .5.5v6h6a.5.5 0 1 1 0 1h-6v6a.5.5 0 1 1-1 0v-6h-6a.5.5 0 0 1 0-1h6v-6A.5.5 0 0 1 7 0Z\" fill=\"currentColor\"/></svg>")))
+    (div :class "kg-toggle-content" (or content ""))))
+
+;; ---------------------------------------------------------------------------
+;; Audio card
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-audio (&key src title duration thumbnail)
+  (div :class "kg-card kg-audio-card"
+    (if thumbnail
+      (img :src thumbnail :alt "audio-thumbnail" :class "kg-audio-thumbnail")
+      (div :class "kg-audio-thumbnail placeholder"
+        (~rich-text :html "<svg viewBox=\"0 0 24 24\"><path d=\"M2 12C2 6.48 6.48 2 12 2s10 4.48 10 10-4.48 10-10 10S2 17.52 2 12zm7.5 5.25L16 12 9.5 6.75v10.5z\" fill=\"currentColor\"/></svg>")))
+    (div :class "kg-audio-player-container"
+      (div :class "kg-audio-title" (or title ""))
+      (div :class "kg-audio-player"
+        (button :class "kg-audio-play-icon"
+          (~rich-text :html "<svg viewBox=\"0 0 24 24\"><path d=\"M8 5v14l11-7z\" fill=\"currentColor\"/></svg>"))
+        (div :class "kg-audio-current-time" "0:00")
+        (div :class "kg-audio-time" (str "/ " (or duration "0:00")))
+        (input :type "range" :class "kg-audio-seek-slider" :max "100" :value "0")
+        (button :class "kg-audio-playback-rate" "1×")
+        (button :class "kg-audio-unmute-icon"
+          (~rich-text :html "<svg viewBox=\"0 0 24 24\"><path d=\"M3 9v6h4l5 5V4L7 9H3zm13.5 3c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 2.5-4.02zM14 3.23v2.06c2.89.86 5 3.54 5 6.71s-2.11 5.85-5 6.71v2.06c4.01-.91 7-4.49 7-8.77s-2.99-7.86-7-8.77z\" fill=\"currentColor\"/></svg>"))
+        (input :type "range" :class "kg-audio-volume-slider" :max "100" :value "100")))
+    (audio :src src :preload "metadata")))
+
+;; ---------------------------------------------------------------------------
+;; Video card
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-video (&key src caption width thumbnail loop)
+  (figure :class (str "kg-card kg-video-card"
+                   (if (= width "wide") " kg-width-wide"
+                     (if (= width "full") " kg-width-full" "")))
+    (div :class "kg-video-container"
+      (video :src src :controls true :preload "metadata"
+        :poster (or thumbnail nil) :loop (or loop nil)))
+    (when caption (figcaption caption))))
+
+;; ---------------------------------------------------------------------------
+;; File card
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-file (&key src filename title filesize caption)
+  (div :class "kg-card kg-file-card"
+    (a :class "kg-file-card-container" :href src :download (or filename "")
+      (div :class "kg-file-card-contents"
+        (div :class "kg-file-card-title" (or title filename ""))
+        (when filesize (div :class "kg-file-card-filesize" filesize)))
+      (div :class "kg-file-card-icon"
+        (~rich-text :html "<svg viewBox=\"0 0 24 24\"><path d=\"M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z\" fill=\"currentColor\"/></svg>")))
+    (when caption (div :class "kg-file-card-caption" caption))))
+
+;; ---------------------------------------------------------------------------
+;; Paywall marker
+;; ---------------------------------------------------------------------------
+(defcomp ~kg-paywall ()
+  (~rich-text :html "<!--members-only-->"))

blog/sx/menu_items.sx

@@ -0,0 +1,26 @@
+;; Menu item form and page search components
+
+(defcomp ~page-search-item (&key id title slug feature-image)
+  (div :class "flex items-center gap-3 p-3 hover:bg-stone-50 cursor-pointer border-b last:border-b-0"
+    :data-page-id id :data-page-title title :data-page-slug slug
+    :data-page-image (or feature-image "")
+    (if feature-image
+      (img :src feature-image :alt title :class "w-10 h-10 rounded-full object-cover flex-shrink-0")
+      (div :class "w-10 h-10 rounded-full bg-stone-200 flex-shrink-0"))
+    (div :class "flex-1 min-w-0"
+      (div :class "font-medium truncate" title)
+      (div :class "text-xs text-stone-500 truncate" slug))))
+
+(defcomp ~page-search-results (&key items sentinel)
+  (div :class "border border-stone-200 rounded-md max-h-64 overflow-y-auto"
+    items sentinel))
+
+(defcomp ~page-search-sentinel (&key url query next-page)
+  (div :sx-get url :sx-trigger "intersect once" :sx-swap "outerHTML"
+    :sx-vals (str "{\"q\": \"" query "\", \"page\": " next-page "}")
+    :class "p-3 text-center text-sm text-stone-400"
+    (i :class "fa fa-spinner fa-spin") " Loading more..."))
+
+(defcomp ~page-search-empty (&key query)
+  (div :class "p-3 text-center text-stone-400 border border-stone-200 rounded-md"
+    (str "No pages found matching \"" query "\"")))

blog/sx/settings.sx

@@ -1,8 +1,8 @@
 ;; Blog settings panel components (features, markets, associated entries)
 
 (defcomp ~blog-features-form (&key features-url calendar-checked market-checked hs-trigger)
-  (form :hx-put features-url :hx-target "#features-panel" :hx-swap "outerHTML"
-    :hx-headers "{\"Content-Type\": \"application/json\"}" :hx-ext "json-enc" :class "space-y-3"
+  (form :sx-put features-url :sx-target "#features-panel" :sx-swap "outerHTML"
+    :sx-headers "{\"Content-Type\": \"application/json\"}" :sx-encoding "json" :class "space-y-3"
     (label :class "flex items-center gap-3 cursor-pointer"
       (input :type "checkbox" :name "calendar" :value "true" :checked calendar-checked
         :class "h-5 w-5 rounded border-stone-300 text-blue-600 focus:ring-blue-500"
@@ -18,38 +18,16 @@
         (i :class "fa fa-shopping-bag text-green-600 mr-1")
         " Market \u2014 enable product catalog on this page"))))
 
-(defcomp ~blog-sumup-connected ()
-  (span :class "ml-2 text-xs text-green-600" (i :class "fa fa-check-circle") " Connected"))
-
-(defcomp ~blog-sumup-key-hint ()
-  (p :class "text-xs text-stone-400 mt-0.5" "Key is set. Leave blank to keep current key."))
-
-(defcomp ~blog-sumup-form (&key sumup-url merchant-code placeholder key-hint-html checkout-prefix connected-html)
+(defcomp ~blog-sumup-form (&key sumup-url merchant-code placeholder sumup-configured checkout-prefix)
   (div :class "mt-4 pt-4 border-t border-stone-100"
-    (h4 :class "text-sm font-medium text-stone-700"
-      (i :class "fa fa-credit-card text-purple-600 mr-1") " SumUp Payment")
-    (p :class "text-xs text-stone-400 mt-1 mb-3"
-      "Configure per-page SumUp credentials. Leave blank to use the global merchant account.")
-    (form :hx-put sumup-url :hx-target "#features-panel" :hx-swap "outerHTML" :class "space-y-3"
-      (div (label :class "block text-xs font-medium text-stone-600 mb-1" "Merchant Code")
-        (input :type "text" :name "merchant_code" :value merchant-code :placeholder "e.g. ME4J6100"
-          :class "w-full px-3 py-1.5 text-sm border border-stone-300 rounded focus:ring-purple-500 focus:border-purple-500"))
-      (div (label :class "block text-xs font-medium text-stone-600 mb-1" "API Key")
-        (input :type "password" :name "api_key" :value "" :placeholder placeholder
-          :class "w-full px-3 py-1.5 text-sm border border-stone-300 rounded focus:ring-purple-500 focus:border-purple-500")
-        (raw! key-hint-html))
-      (div (label :class "block text-xs font-medium text-stone-600 mb-1" "Checkout Reference Prefix")
-        (input :type "text" :name "checkout_prefix" :value checkout-prefix :placeholder "e.g. ROSE-"
-          :class "w-full px-3 py-1.5 text-sm border border-stone-300 rounded focus:ring-purple-500 focus:border-purple-500"))
-      (button :type "submit"
-        :class "px-4 py-1.5 text-sm font-medium text-white bg-purple-600 rounded hover:bg-purple-700 focus:ring-2 focus:ring-purple-500"
-        "Save SumUp Settings")
-      (raw! connected-html))))
+    (~sumup-settings-form :update-url sumup-url :merchant-code merchant-code
+      :placeholder placeholder :sumup-configured sumup-configured
+      :checkout-prefix checkout-prefix :panel-id "features-panel")))
 
-(defcomp ~blog-features-panel (&key form-html sumup-html)
+(defcomp ~blog-features-panel (&key form sumup)
   (div :id "features-panel" :class "space-y-4 p-4 bg-white rounded-lg border border-stone-200"
     (h3 :class "text-lg font-semibold text-stone-800" "Page Features")
-    (raw! form-html) (raw! sumup-html)))
+    form sumup))
 
 ;; Markets panel
 
@@ -57,20 +35,20 @@
   (li :class "flex items-center justify-between p-3 bg-stone-50 rounded"
     (div (span :class "font-medium" name)
       (span :class "text-stone-400 text-sm ml-2" (str "/" slug "/")))
-    (button :hx-delete delete-url :hx-target "#markets-panel" :hx-swap "outerHTML"
-      :hx-confirm confirm-text :class "text-red-600 hover:text-red-800 text-sm" "Delete")))
+    (button :sx-delete delete-url :sx-target "#markets-panel" :sx-swap "outerHTML"
+      :sx-confirm confirm-text :class "text-red-600 hover:text-red-800 text-sm" "Delete")))
 
-(defcomp ~blog-markets-list (&key items-html)
-  (ul :class "space-y-2 mb-4" (raw! items-html)))
+(defcomp ~blog-markets-list (&key items)
+  (ul :class "space-y-2 mb-4" items))
 
 (defcomp ~blog-markets-empty ()
   (p :class "text-stone-500 mb-4 text-sm" "No markets yet."))
 
-(defcomp ~blog-markets-panel (&key list-html create-url)
+(defcomp ~blog-markets-panel (&key list create-url)
   (div :id "markets-panel"
     (h3 :class "text-lg font-semibold mb-3" "Markets")
-    (raw! list-html)
-    (form :hx-post create-url :hx-target "#markets-panel" :hx-swap "outerHTML" :class "flex gap-2"
+    list
+    (form :sx-post create-url :sx-target "#markets-panel" :sx-swap "outerHTML" :class "flex gap-2"
       (input :type "text" :name "name" :placeholder "Market name" :required ""
         :class "flex-1 border border-stone-300 rounded px-3 py-1.5 text-sm")
       (button :type "submit"
@@ -82,32 +60,32 @@
   (if src (img :src src :alt title :class "w-8 h-8 rounded-full object-cover flex-shrink-0")
     (div :class "w-8 h-8 rounded-full bg-stone-200 flex-shrink-0")))
 
-(defcomp ~blog-associated-entry (&key confirm-text toggle-url hx-headers img-html name date-str)
+(defcomp ~blog-associated-entry (&key confirm-text toggle-url hx-headers img name date-str)
   (button :type "button"
     :class "w-full text-left p-3 rounded border bg-green-50 border-green-300 transition hover:bg-green-100"
     :data-confirm "" :data-confirm-title "Remove entry?"
     :data-confirm-text confirm-text :data-confirm-icon "warning"
     :data-confirm-confirm-text "Yes, remove it"
     :data-confirm-cancel-text "Cancel" :data-confirm-event "confirmed"
-    :hx-post toggle-url :hx-trigger "confirmed"
-    :hx-target "#associated-entries-list" :hx-swap "outerHTML"
-    :hx-headers hx-headers
+    :sx-post toggle-url :sx-trigger "confirmed"
+    :sx-target "#associated-entries-list" :sx-swap "outerHTML"
+    :sx-headers hx-headers
     :_ "on htmx:afterRequest trigger entryToggled on body"
     (div :class "flex items-center justify-between gap-3"
-      (raw! img-html)
+      img
       (div :class "flex-1"
         (div :class "font-medium text-sm" name)
         (div :class "text-xs text-stone-600 mt-1" date-str))
       (i :class "fa fa-times-circle text-green-600 text-lg flex-shrink-0"))))
 
-(defcomp ~blog-associated-entries-content (&key items-html)
-  (div :class "space-y-1" (raw! items-html)))
+(defcomp ~blog-associated-entries-content (&key items)
+  (div :class "space-y-1" items))
 
 (defcomp ~blog-associated-entries-empty ()
   (div :class "text-sm text-stone-400"
     "No entries associated yet. Browse calendars below to add entries."))
 
-(defcomp ~blog-associated-entries-panel (&key content-html)
+(defcomp ~blog-associated-entries-panel (&key content)
   (div :id "associated-entries-list" :class "border rounded-lg p-4 bg-white"
     (h3 :class "text-lg font-semibold mb-4" "Associated Entries")
-    (raw! content-html)))
+    content))

blog/sxc/pages/__init__.py

@@ -0,0 +1,278 @@
+"""Blog defpage setup — registers layouts, page helpers, and loads .sx pages."""
+from __future__ import annotations
+
+from typing import Any
+
+
+def setup_blog_pages() -> None:
+    """Register blog-specific layouts, page helpers, and load page definitions."""
+    _register_blog_layouts()
+    _register_blog_helpers()
+    _load_blog_page_files()
+
+
+def _load_blog_page_files() -> None:
+    import os
+    from shared.sx.pages import load_page_dir
+    load_page_dir(os.path.dirname(__file__), "blog")
+
+
+# ---------------------------------------------------------------------------
+# Layouts
+# ---------------------------------------------------------------------------
+
+def _register_blog_layouts() -> None:
+    from shared.sx.layouts import register_custom_layout
+    # :blog — root + blog header (for new-post, new-page)
+    register_custom_layout("blog", _blog_full, _blog_oob)
+    # :blog-settings — root + settings header (with settings nav menu)
+    register_custom_layout("blog-settings", _settings_full, _settings_oob,
+                           mobile_fn=_settings_mobile)
+    # Sub-settings layouts (root + settings + sub header)
+    register_custom_layout("blog-cache", _cache_full, _cache_oob)
+    register_custom_layout("blog-snippets", _snippets_full, _snippets_oob)
+    register_custom_layout("blog-menu-items", _menu_items_full, _menu_items_oob)
+    register_custom_layout("blog-tag-groups", _tag_groups_full, _tag_groups_oob)
+    register_custom_layout("blog-tag-group-edit",
+                           _tag_group_edit_full, _tag_group_edit_oob)
+
+
+# --- Blog layout (root + blog header) ---
+
+def _blog_full(ctx: dict, **kw: Any) -> str:
+    from shared.sx.helpers import root_header_sx
+    from sx.sx_components import _blog_header_sx
+    root_hdr = root_header_sx(ctx)
+    blog_hdr = _blog_header_sx(ctx)
+    return "(<> " + root_hdr + " " + blog_hdr + ")"
+
+
+def _blog_oob(ctx: dict, **kw: Any) -> str:
+    from shared.sx.helpers import root_header_sx, oob_header_sx
+    from sx.sx_components import _blog_header_sx
+    root_hdr = root_header_sx(ctx)
+    blog_hdr = _blog_header_sx(ctx)
+    rows = "(<> " + root_hdr + " " + blog_hdr + ")"
+    return oob_header_sx("root-header-child", "blog-header-child", rows)
+
+
+# --- Settings layout (root + settings header) ---
+
+def _settings_full(ctx: dict, **kw: Any) -> str:
+    from shared.sx.helpers import root_header_sx
+    from sx.sx_components import _settings_header_sx
+    root_hdr = root_header_sx(ctx)
+    settings_hdr = _settings_header_sx(ctx)
+    return "(<> " + root_hdr + " " + settings_hdr + ")"
+
+
+def _settings_oob(ctx: dict, **kw: Any) -> str:
+    from shared.sx.helpers import root_header_sx, oob_header_sx
+    from sx.sx_components import _settings_header_sx
+    root_hdr = root_header_sx(ctx)
+    settings_hdr = _settings_header_sx(ctx)
+    rows = "(<> " + root_hdr + " " + settings_hdr + ")"
+    return oob_header_sx("root-header-child", "root-settings-header-child", rows)
+
+
+def _settings_mobile(ctx: dict, **kw: Any) -> str:
+    from sx.sx_components import _settings_nav_sx
+    return _settings_nav_sx(ctx)
+
+
+# --- Sub-settings helpers ---
+
+def _sub_settings_full(ctx: dict, row_id: str, child_id: str,
+                       endpoint: str, icon: str, label: str) -> str:
+    from shared.sx.helpers import root_header_sx
+    from sx.sx_components import _settings_header_sx, _sub_settings_header_sx
+    from quart import url_for as qurl
+    root_hdr = root_header_sx(ctx)
+    settings_hdr = _settings_header_sx(ctx)
+    sub_hdr = _sub_settings_header_sx(row_id, child_id,
+                                       qurl(endpoint), icon, label, ctx)
+    return "(<> " + root_hdr + " " + settings_hdr + " " + sub_hdr + ")"
+
+
+def _sub_settings_oob(ctx: dict, row_id: str, child_id: str,
+                      endpoint: str, icon: str, label: str) -> str:
+    from shared.sx.helpers import oob_header_sx
+    from sx.sx_components import _settings_header_sx, _sub_settings_header_sx
+    from quart import url_for as qurl
+    settings_hdr_oob = _settings_header_sx(ctx, oob=True)
+    sub_hdr = _sub_settings_header_sx(row_id, child_id,
+                                       qurl(endpoint), icon, label, ctx)
+    sub_oob = oob_header_sx("root-settings-header-child", child_id, sub_hdr)
+    return "(<> " + settings_hdr_oob + " " + sub_oob + ")"
+
+
+# --- Cache ---
+
+def _cache_full(ctx: dict, **kw: Any) -> str:
+    return _sub_settings_full(ctx, "cache-row", "cache-header-child",
+                              "settings.defpage_cache_page", "refresh", "Cache")
+
+
+def _cache_oob(ctx: dict, **kw: Any) -> str:
+    return _sub_settings_oob(ctx, "cache-row", "cache-header-child",
+                             "settings.defpage_cache_page", "refresh", "Cache")
+
+
+# --- Snippets ---
+
+def _snippets_full(ctx: dict, **kw: Any) -> str:
+    return _sub_settings_full(ctx, "snippets-row", "snippets-header-child",
+                              "snippets.defpage_snippets_page", "puzzle-piece", "Snippets")
+
+
+def _snippets_oob(ctx: dict, **kw: Any) -> str:
+    return _sub_settings_oob(ctx, "snippets-row", "snippets-header-child",
+                             "snippets.defpage_snippets_page", "puzzle-piece", "Snippets")
+
+
+# --- Menu Items ---
+
+def _menu_items_full(ctx: dict, **kw: Any) -> str:
+    return _sub_settings_full(ctx, "menu_items-row", "menu_items-header-child",
+                              "menu_items.defpage_menu_items_page", "bars", "Menu Items")
+
+
+def _menu_items_oob(ctx: dict, **kw: Any) -> str:
+    return _sub_settings_oob(ctx, "menu_items-row", "menu_items-header-child",
+                             "menu_items.defpage_menu_items_page", "bars", "Menu Items")
+
+
+# --- Tag Groups ---
+
+def _tag_groups_full(ctx: dict, **kw: Any) -> str:
+    return _sub_settings_full(ctx, "tag-groups-row", "tag-groups-header-child",
+                              "blog.tag_groups_admin.defpage_tag_groups_page", "tags", "Tag Groups")
+
+
+def _tag_groups_oob(ctx: dict, **kw: Any) -> str:
+    return _sub_settings_oob(ctx, "tag-groups-row", "tag-groups-header-child",
+                             "blog.tag_groups_admin.defpage_tag_groups_page", "tags", "Tag Groups")
+
+
+# --- Tag Group Edit ---
+
+def _tag_group_edit_full(ctx: dict, **kw: Any) -> str:
+    from quart import request
+    g_id = (request.view_args or {}).get("id")
+    from quart import url_for as qurl
+    from shared.sx.helpers import root_header_sx
+    from sx.sx_components import _settings_header_sx, _sub_settings_header_sx
+    root_hdr = root_header_sx(ctx)
+    settings_hdr = _settings_header_sx(ctx)
+    sub_hdr = _sub_settings_header_sx("tag-groups-row", "tag-groups-header-child",
+                                       qurl("blog.tag_groups_admin.defpage_tag_group_edit", id=g_id),
+                                       "tags", "Tag Groups", ctx)
+    return "(<> " + root_hdr + " " + settings_hdr + " " + sub_hdr + ")"
+
+
+def _tag_group_edit_oob(ctx: dict, **kw: Any) -> str:
+    from quart import request
+    g_id = (request.view_args or {}).get("id")
+    from quart import url_for as qurl
+    from shared.sx.helpers import oob_header_sx
+    from sx.sx_components import _settings_header_sx, _sub_settings_header_sx
+    settings_hdr_oob = _settings_header_sx(ctx, oob=True)
+    sub_hdr = _sub_settings_header_sx("tag-groups-row", "tag-groups-header-child",
+                                       qurl("blog.tag_groups_admin.defpage_tag_group_edit", id=g_id),
+                                       "tags", "Tag Groups", ctx)
+    sub_oob = oob_header_sx("root-settings-header-child", "tag-groups-header-child", sub_hdr)
+    return "(<> " + settings_hdr_oob + " " + sub_oob + ")"
+
+
+# ---------------------------------------------------------------------------
+# Page helpers (sync functions available in .sx defpage expressions)
+# ---------------------------------------------------------------------------
+
+def _register_blog_helpers() -> None:
+    from shared.sx.pages import register_page_helpers
+    register_page_helpers("blog", {
+        "editor-content": _h_editor_content,
+        "editor-page-content": _h_editor_page_content,
+        "post-admin-content": _h_post_admin_content,
+        "post-data-content": _h_post_data_content,
+        "post-preview-content": _h_post_preview_content,
+        "post-entries-content": _h_post_entries_content,
+        "post-settings-content": _h_post_settings_content,
+        "post-edit-content": _h_post_edit_content,
+        "settings-content": _h_settings_content,
+        "cache-content": _h_cache_content,
+        "snippets-content": _h_snippets_content,
+        "menu-items-content": _h_menu_items_content,
+        "tag-groups-content": _h_tag_groups_content,
+        "tag-group-edit-content": _h_tag_group_edit_content,
+    })
+
+
+def _h_editor_content():
+    from quart import g
+    return getattr(g, "editor_content", "")
+
+
+def _h_editor_page_content():
+    from quart import g
+    return getattr(g, "editor_page_content", "")
+
+
+def _h_post_admin_content():
+    from quart import g
+    return getattr(g, "post_admin_content", "")
+
+
+def _h_post_data_content():
+    from quart import g
+    return getattr(g, "post_data_content", "")
+
+
+def _h_post_preview_content():
+    from quart import g
+    return getattr(g, "post_preview_content", "")
+
+
+def _h_post_entries_content():
+    from quart import g
+    return getattr(g, "post_entries_content", "")
+
+
+def _h_post_settings_content():
+    from quart import g
+    return getattr(g, "post_settings_content", "")
+
+
+def _h_post_edit_content():
+    from quart import g
+    return getattr(g, "post_edit_content", "")
+
+
+def _h_settings_content():
+    from quart import g
+    return getattr(g, "settings_content", "")
+
+
+def _h_cache_content():
+    from quart import g
+    return getattr(g, "cache_content", "")
+
+
+def _h_snippets_content():
+    from quart import g
+    return getattr(g, "snippets_content", "")
+
+
+def _h_menu_items_content():
+    from quart import g
+    return getattr(g, "menu_items_content", "")
+
+
+def _h_tag_groups_content():
+    from quart import g
+    return getattr(g, "tag_groups_content", "")
+
+
+def _h_tag_group_edit_content():
+    from quart import g
+    return getattr(g, "tag_group_edit_content", "")

blog/sxc/pages/blog.sx

@@ -0,0 +1,98 @@
+; Blog app defpage declarations
+; Pages kept as Python: home, index, post-detail (cache_page / complex branching)
+
+; --- New post/page editors ---
+
+(defpage new-post
+  :path "/new/"
+  :auth :admin
+  :layout :blog
+  :content (editor-content))
+
+(defpage new-page
+  :path "/new-page/"
+  :auth :admin
+  :layout :blog
+  :content (editor-page-content))
+
+; --- Post admin pages (nested under /<slug>/admin/) ---
+
+(defpage post-admin
+  :path "/"
+  :auth :admin
+  :layout (:post-admin :selected "admin")
+  :content (post-admin-content))
+
+(defpage post-data
+  :path "/data/"
+  :auth :admin
+  :layout (:post-admin :selected "data")
+  :content (post-data-content))
+
+(defpage post-preview
+  :path "/preview/"
+  :auth :admin
+  :layout (:post-admin :selected "preview")
+  :content (post-preview-content))
+
+(defpage post-entries
+  :path "/entries/"
+  :auth :admin
+  :layout (:post-admin :selected "entries")
+  :content (post-entries-content))
+
+(defpage post-settings
+  :path "/settings/"
+  :auth :post_author
+  :layout (:post-admin :selected "settings")
+  :content (post-settings-content))
+
+(defpage post-edit
+  :path "/edit/"
+  :auth :post_author
+  :layout (:post-admin :selected "edit")
+  :content (post-edit-content))
+
+; --- Settings pages ---
+
+(defpage settings-home
+  :path "/"
+  :auth :admin
+  :layout :blog-settings
+  :content (settings-content))
+
+(defpage cache-page
+  :path "/cache/"
+  :auth :admin
+  :layout :blog-cache
+  :content (cache-content))
+
+; --- Snippets ---
+
+(defpage snippets-page
+  :path "/"
+  :auth :login
+  :layout :blog-snippets
+  :content (snippets-content))
+
+; --- Menu Items ---
+
+(defpage menu-items-page
+  :path "/"
+  :auth :admin
+  :layout :blog-menu-items
+  :content (menu-items-content))
+
+; --- Tag Groups ---
+
+(defpage tag-groups-page
+  :path "/"
+  :auth :admin
+  :layout :blog-tag-groups
+  :content (tag-groups-content))
+
+(defpage tag-group-edit
+  :path "/<int:id>/"
+  :auth :admin
+  :layout :blog-tag-group-edit
+  :content (tag-group-edit-content))

blog/templates/_email/magic_link.html

@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head><meta charset="utf-8"></head>
-<body style="margin:0;padding:0;background:#f5f5f4;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;">
-  <table width="100%" cellpadding="0" cellspacing="0" style="background:#f5f5f4;padding:40px 0;">
-    <tr><td align="center">
-      <table width="480" cellpadding="0" cellspacing="0" style="background:#ffffff;border-radius:12px;border:1px solid #e7e5e4;padding:40px;">
-        <tr><td>
-          <h1 style="margin:0 0 8px;font-size:20px;font-weight:600;color:#1c1917;">{{ site_name }}</h1>
-          <p style="margin:0 0 24px;font-size:15px;color:#57534e;">Sign in to your account</p>
-          <p style="margin:0 0 24px;font-size:15px;line-height:1.5;color:#44403c;">
-            Click the button below to sign in. This link will expire in 15&nbsp;minutes.
-          </p>
-          <table cellpadding="0" cellspacing="0" style="margin:0 0 24px;"><tr><td style="border-radius:8px;background:#1c1917;">
-            <a href="{{ link_url }}" target="_blank"
-               style="display:inline-block;padding:12px 32px;font-size:15px;font-weight:500;color:#ffffff;text-decoration:none;border-radius:8px;">
-              Sign in
-            </a>
-          </td></tr></table>
-          <p style="margin:0 0 8px;font-size:13px;color:#78716c;">Or copy and paste this link into your browser:</p>
-          <p style="margin:0 0 24px;font-size:13px;word-break:break-all;">
-            <a href="{{ link_url }}" style="color:#1c1917;">{{ link_url }}</a>
-          </p>
-          <hr style="border:none;border-top:1px solid #e7e5e4;margin:24px 0;">
-          <p style="margin:0;font-size:12px;color:#a8a29e;">
-            If you did not request this email, you can safely ignore it.
-          </p>
-        </td></tr>
-      </table>
-    </td></tr>
-  </table>
-</body>
-</html>

blog/templates/_email/magic_link.txt

@@ -1,8 +0,0 @@
-Hello,
-
-Click this link to sign in:
-{{ link_url }}
-
-This link will expire in 15 minutes.
-
-If you did not request this, you can ignore this email.

blog/templates/_types/blog/_action_buttons.html

@@ -1,64 +0,0 @@
-{# New Post/Page + Drafts toggle — shown in aside (desktop + mobile) #}
-<div class="flex flex-wrap gap-2 px-4 py-3">
-  {% if has_access('blog.new_post') %}
-    {% set new_href = url_for('blog.new_post')|host %}
-    <a
-      href="{{ new_href }}"
-      hx-get="{{ new_href }}"
-      hx-target="#main-panel"
-      hx-select="{{hx_select_search}}"
-      hx-swap="outerHTML"
-      hx-push-url="true"
-      class="px-3 py-1 rounded bg-stone-700 text-white text-sm hover:bg-stone-800 transition-colors"
-      title="New Post"
-    >
-      <i class="fa fa-plus mr-1"></i> New Post
-    </a>
-    {% set new_page_href = url_for('blog.new_page')|host %}
-    <a
-      href="{{ new_page_href }}"
-      hx-get="{{ new_page_href }}"
-      hx-target="#main-panel"
-      hx-select="{{hx_select_search}}"
-      hx-swap="outerHTML"
-      hx-push-url="true"
-      class="px-3 py-1 rounded bg-blue-600 text-white text-sm hover:bg-blue-700 transition-colors"
-      title="New Page"
-    >
-      <i class="fa fa-plus mr-1"></i> New Page
-    </a>
-  {% endif %}
-  {% if g.user and (draft_count or drafts) %}
-    {% if drafts %}
-      {% set drafts_off_href = (current_local_href ~ {'drafts': None}|qs)|host %}
-      <a
-        href="{{ drafts_off_href }}"
-        hx-get="{{ drafts_off_href }}"
-        hx-target="#main-panel"
-        hx-select="{{hx_select_search}}"
-        hx-swap="outerHTML"
-        hx-push-url="true"
-        class="px-3 py-1 rounded bg-stone-700 text-white text-sm hover:bg-stone-800 transition-colors"
-        title="Hide Drafts"
-      >
-        <i class="fa fa-file-text-o mr-1"></i> Drafts
-        <span class="inline-block bg-stone-500 text-white px-1.5 py-0.5 text-xs font-medium rounded ml-1">{{ draft_count }}</span>
-      </a>
-    {% else %}
-      {% set drafts_on_href = (current_local_href ~ {'drafts': '1'}|qs)|host %}
-      <a
-        href="{{ drafts_on_href }}"
-        hx-get="{{ drafts_on_href }}"
-        hx-target="#main-panel"
-        hx-select="{{hx_select_search}}"
-        hx-swap="outerHTML"
-        hx-push-url="true"
-        class="px-3 py-1 rounded bg-amber-600 text-white text-sm hover:bg-amber-700 transition-colors"
-        title="Show Drafts"
-      >
-        <i class="fa fa-file-text-o mr-1"></i> Drafts
-        <span class="inline-block bg-amber-500 text-white px-1.5 py-0.5 text-xs font-medium rounded ml-1">{{ draft_count }}</span>
-      </a>
-    {% endif %}
-  {% endif %}
-</div>

blog/templates/_types/blog/_card.html

@@ -1,80 +0,0 @@
-{% import 'macros/stickers.html' as stick %}
-  <article class="border-b pb-6 last:border-b-0 relative">
-    {# ❤️ like button - OUTSIDE the link, aligned with image top #}
-    {% if g.user %}
-    <div class="absolute top-20 right-2 z-10 text-6xl md:text-4xl">
-      {% set slug = post.slug %}
-      {% set liked = post.is_liked or False %}
-      {% set like_url = url_for('blog.post.like_toggle', slug=slug)|host %}
-      {% set item_type = 'post' %}
-      {% include "_types/browse/like/button.html" %}
-    </div>
-    {% endif %}
-
-    {% set _href=url_for('blog.post.post_detail', slug=post.slug)|host %}
-    <a
-      href="{{ _href }}"
-      hx-get="{{ _href }}"
-      hx-target="#main-panel"
-      hx-select ="{{hx_select_search}}"
-      hx-swap="outerHTML"
-      hx-push-url="true"
-      aria-selected="{{ 'true' if _active else 'false' }}"
-      class="block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden"
-    >
-      <header class="mb-2 text-center">
-        <h2 class="text-4xl font-bold text-stone-900">
-          {{ post.title }}
-        </h2>
-
-        {% if post.status == "draft" %}
-          <div class="flex justify-center gap-2 mt-1">
-            <span class="inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-amber-100 text-amber-800">Draft</span>
-            {% if post.publish_requested %}
-              <span class="inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-blue-100 text-blue-800">Publish requested</span>
-            {% endif %}
-          </div>
-          {% if post.updated_at %}
-            <p class="text-sm text-stone-500">
-              Updated: {{ post.updated_at.strftime("%-d %b %Y at %H:%M") }}
-            </p>
-          {% endif %}
-        {% elif post.published_at %}
-          <p class="text-sm text-stone-500">
-            Published: {{ post.published_at.strftime("%-d %b %Y at %H:%M") }}
-          </p>
-        {% endif %}
-
-      </header>
-
-      {% if post.feature_image %}
-        <div class="mb-4">
-          <img
-            src="{{ post.feature_image }}"
-            alt=""
-            class="rounded-lg w-full object-cover"
-          >
-        </div>
-      {% endif %}
-      {% if post.custom_excerpt %}
-        <p class="text-stone-700 text-lg leading-relaxed text-center">
-            {{ post.custom_excerpt }}
-          </p>
-      {% else %}
-        {% if post.excerpt %}
-          <p class="text-stone-700 text-lg leading-relaxed text-center">
-            {{ post.excerpt }}
-          </p>
-        {% endif %}
-      {% endif %}
-      </a>
-
-      {# Card decorations — via fragments #}
-      {% if card_widgets_html %}
-        {% set _card_html = card_widgets_html.get(post.id|string, "") %}
-        {% if _card_html %}{{ _card_html | safe }}{% endif %}
-      {% endif %}
-
-      {% include '_types/blog/_card/at_bar.html' %}
-
-  </article>

blog/templates/_types/blog/_card/at_bar.html

@@ -1,19 +0,0 @@
-<div class="flex flex-row justify-center gap-3">
-  {% if post.tags %}
-    <div class="mt-4 flex items-center gap-2">
-      <div>in</div>
-      <ul class="flex flex-wrap gap-2 text-sm">
-        {% include '_types/blog/_card/tags.html' %}
-      </ul>
-    </div>
-  {% endif %}
-  <div></div>
-  {% if post.authors %}
-    <div class="mt-4 flex items-center gap-2">
-      <div>by</div>
-      <ul class="flex flex-wrap gap-2 text-sm">
-        {% include '_types/blog/_card/authors.html' %}
-      </ul>
-    </div>
-  {% endif %}
-</div>

blog/templates/_types/blog/_card/author.html

@@ -1,21 +0,0 @@
-{% macro author(author) %}
-  {% if author %}
-    {% if author.profile_image %}
-      <img
-        src="{{ author.profile_image }}"
-        alt="{{ author.name }}"
-        class="h-6 w-6 rounded-full object-cover border border-stone-300 flex-shrink-0"
-      >
-    {% else %}
-      <div class="h-6 w-6"></div>
-      {# optional fallback circle with first letter
-      <div class="h-6 w-6 rounded-full bg-stone-200 text-stone-600 text-[10px] font-semibold flex items-center justify-center border border-stone-300 flex-shrink-0">
-        {{ author.name[:1] }}
-      </div> #}
-    {% endif %}
-
-    <span class="inline-block rounded-full bg-stone-100 text-stone-600 px-2 py-1 text-sm font-medium border border-stone-200">
-      {{ author.name }}
-    </span>
-  {% endif %}
-{% endmacro %}

blog/templates/_types/blog/_card/authors.html

@@ -1,32 +0,0 @@
-{# --- AUTHORS LIST STARTS HERE --- #}
-          {% if post.authors and post.authors|length %}
-            {% for a in post.authors %}
-              {% for author in authors if author.slug==a.slug %}
-                <li>
-                  <a
-                    class="flex items-center gap-1"
-                    href="{{ { 'clear_filters': True, 'add_author': author.slug }|qs|host}}"
-                  >
-                    {% if author.profile_image %}
-                      <img
-                        src="{{ author.profile_image }}"
-                        alt="{{ author.name }}"
-                        class="h-6 w-6 rounded-full object-cover border border-stone-300 flex-shrink-0"
-                      >
-                    {% else %}
-                      {# optional fallback circle with first letter #}
-                      <div class="h-6 w-6 rounded-full bg-stone-200 text-stone-600 text-[10px] font-semibold flex items-center justify-center border border-stone-300 flex-shrink-0">
-                        {{ author.name[:1] }}
-                      </div>
-                    {% endif %}
-
-                    <span class="inline-block rounded-full bg-stone-100 text-stone-600 px-2 py-1 text-xs font-medium border border-stone-200">
-                      {{ author.name }}
-                    </span>
-                  </a>
-                </li>
-              {% endfor %}
-            {% endfor %}
-          {% endif %}
-      
-      {# --- AUTHOR LIST ENDS HERE --- #}

blog/templates/_types/blog/_card/tag.html

@@ -1,19 +0,0 @@
-{% macro tag(tag) %}
-  {% if tag %}
-    {% if tag.feature_image %}
-      <img
-        src="{{ tag.feature_image }}"
-        alt="{{ tag.name }}"
-        class="h-6 w-6 rounded-full object-cover border border-stone-300 flex-shrink-0"
-      >
-    {% else %}
-      <div class="h-6 w-6 rounded-full bg-stone-200 text-stone-600 text-[10px] font-semibold flex items-center justify-center border border-stone-300 flex-shrink-0">
-        {{ tag.name[:1] }}
-      </div>
-    {% endif %}
-
-    <span class="inline-block rounded-full bg-stone-100 text-stone-600 px-2 py-1 text-sm font-medium border border-stone-200">
-      {{ tag.name }}
-    </span>
-  {% endif %}
-{% endmacro %}

blog/templates/_types/blog/_card/tag_group.html

@@ -1,22 +0,0 @@
-{% macro tag_group(group) %}
-  {% if group %}
-    {% if group.feature_image %}
-      <img
-        src="{{ group.feature_image }}"
-        alt="{{ group.name }}"
-        class="h-6 w-6 rounded-full object-cover border border-stone-300 flex-shrink-0"
-      >
-    {% else %}
-      <div
-        class="h-6 w-6 rounded-full text-[10px] font-semibold flex items-center justify-center border border-stone-300 flex-shrink-0"
-        style="{% if group.colour %}background-color: {{ group.colour }}; color: white;{% else %}background-color: #e7e5e4; color: #57534e;{% endif %}"
-      >
-        {{ group.name[:1] }}
-      </div>
-    {% endif %}
-
-    <span class="inline-block rounded-full bg-stone-100 text-stone-600 px-2 py-1 text-sm font-medium border border-stone-200">
-      {{ group.name }}
-    </span>
-  {% endif %}
-{% endmacro %}

blog/templates/_types/blog/_card/tags.html

@@ -1,17 +0,0 @@
-{% import '_types/blog/_card/tag.html' as dotag %}
-{# --- TAG LIST STARTS HERE --- #}
-      {% if post.tags and post.tags|length %}
-          {% for t in post.tags %}
-            {% for tag in tags if tag.slug==t.slug %}
-              <li>
-                <a
-                  class="flex items-center gap-1"
-                  href="{{ { 'clear_filters': True, 'add_tag': tag.slug }|qs|host}}"
-                >
-                  {{dotag.tag(tag)}}
-                </a>
-              </li>
-            {% endfor %}
-          {% endfor %}
-      {% endif %}
-    {# --- TAG LIST ENDS HERE --- #}

blog/templates/_types/blog/_card_tile.html

@@ -1,59 +0,0 @@
-  <article class="relative">
-    {% set _href=url_for('blog.post.post_detail', slug=post.slug)|host %}
-    <a
-      href="{{ _href }}"
-      hx-get="{{ _href }}"
-      hx-target="#main-panel"
-      hx-select ="{{hx_select_search}}"
-      hx-swap="outerHTML"
-      hx-push-url="true"
-      aria-selected="{{ 'true' if _active else 'false' }}"
-      class="block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden"
-    >
-      {% if post.feature_image %}
-        <div>
-          <img
-            src="{{ post.feature_image }}"
-            alt=""
-            class="w-full aspect-video object-cover"
-          >
-        </div>
-      {% endif %}
-
-      <div class="p-3 text-center">
-        <h2 class="text-lg font-bold text-stone-900">
-          {{ post.title }}
-        </h2>
-
-        {% if post.status == "draft" %}
-          <div class="flex justify-center gap-1 mt-1">
-            <span class="inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-amber-100 text-amber-800">Draft</span>
-            {% if post.publish_requested %}
-              <span class="inline-block px-2 py-0.5 rounded-full text-xs font-semibold bg-blue-100 text-blue-800">Publish requested</span>
-            {% endif %}
-          </div>
-          {% if post.updated_at %}
-            <p class="text-sm text-stone-500">
-              Updated: {{ post.updated_at.strftime("%-d %b %Y at %H:%M") }}
-            </p>
-          {% endif %}
-        {% elif post.published_at %}
-          <p class="text-sm text-stone-500">
-            Published: {{ post.published_at.strftime("%-d %b %Y at %H:%M") }}
-          </p>
-        {% endif %}
-
-        {% if post.custom_excerpt %}
-          <p class="text-stone-700 text-sm leading-relaxed line-clamp-3 mt-1">
-            {{ post.custom_excerpt }}
-          </p>
-        {% elif post.excerpt %}
-          <p class="text-stone-700 text-sm leading-relaxed line-clamp-3 mt-1">
-            {{ post.excerpt }}
-          </p>
-        {% endif %}
-      </div>
-    </a>
-
-    {% include '_types/blog/_card/at_bar.html' %}
-  </article>

blog/templates/_types/blog/_cards.html

@@ -1,111 +0,0 @@
-{% for post in posts %}
-  {% if view == 'tile' %}
-    {% include "_types/blog/_card_tile.html" %}
-  {% else %}
-    {% include "_types/blog/_card.html" %}
-  {% endif %}
-{% endfor %}
-{% if page < total_pages|int %}
-
-  
-  <div
-    id="sentinel-{{ page }}-m"
-    class="block md:hidden h-[60vh] opacity-0 pointer-events-none js-mobile-sentinel"
-    hx-get="{{ (current_local_href ~ {'page': page + 1}|qs)|host }}"
-    hx-trigger="intersect once delay:250ms, sentinelmobile:retry"
-    hx-swap="outerHTML"
-    _="
-      init
-        if not me.dataset.retryMs then set me.dataset.retryMs to 1000 end
-        if window.matchMedia('(min-width: 768px)').matches then set @hx-disabled to '' end
-
-      on resize from window
-        if window.matchMedia('(min-width: 768px)').matches then set @hx-disabled to '' else remove @hx-disabled end
-
-      on htmx:beforeRequest
-        if window.matchMedia('(min-width: 768px)').matches then halt end
-        add .hidden to .js-neterr in me
-        remove .hidden from .js-loading in me
-        remove .opacity-100 from me
-        add .opacity-0 to me
-
-      def backoff()
-        set ms to me.dataset.retryMs
-        if ms > 30000 then set ms to 30000 end
-        -- show big SVG panel & make sentinel visible
-        add .hidden to .js-loading in me
-        remove .hidden from .js-neterr in me
-        remove .opacity-0 from me
-        add .opacity-100 to me
-        wait ms ms
-        trigger sentinelmobile:retry
-        set ms to ms * 2
-        if ms > 30000 then set ms to 30000 end
-        set me.dataset.retryMs to ms
-      end
-
-      on htmx:sendError     call backoff()
-      on htmx:responseError call backoff()
-      on htmx:timeout       call backoff()
-    "
-    role="status"
-    aria-live="polite"
-    aria-hidden="true"
-  >
-    {% include "sentinel/mobile_content.html" %}
-  </div>
-  <!-- DESKTOP sentinel (custom scroll container) -->
-  <div
-    id="sentinel-{{ page }}-d"
-    class="hidden md:block h-4 opacity-0 pointer-events-none"
-    hx-get="{{ (current_local_href ~ {'page': page + 1}|qs)|host}}"
-    hx-trigger="intersect once delay:250ms, sentinel:retry"
-    hx-swap="outerHTML"
-     _="
-      init
-        if not me.dataset.retryMs then set me.dataset.retryMs to 1000 end
-
-      on htmx:beforeRequest(event)
-        add .hidden to .js-neterr in me
-        remove .hidden from .js-loading in me
-        remove .opacity-100 from me
-        add .opacity-0 to me
-
-        set trig to null
-        if event.detail and event.detail.triggeringEvent then
-          set trig to event.detail.triggeringEvent
-        end
-        if trig and trig.type is 'intersect'
-          set scroller to the closest .js-grid-viewport
-          if scroller is null then halt end
-          if scroller.scrollTop < 20 then halt end
-        end
-
-      def backoff()
-        set ms to me.dataset.retryMs
-        if ms > 30000 then set ms to 30000 end
-        add .hidden to .js-loading in me
-        remove .hidden from .js-neterr in me
-        remove .opacity-0 from me
-        add .opacity-100 to me
-        wait ms ms
-        trigger sentinel:retry
-        set ms to ms * 2
-        if ms > 30000 then set ms to 30000 end
-        set me.dataset.retryMs to ms
-      end
-
-      on htmx:sendError     call backoff()
-      on htmx:responseError call backoff()
-      on htmx:timeout       call backoff()
-    "
-    role="status"
-    aria-live="polite"
-    aria-hidden="true"
-  >
-    {% include "sentinel/desktop_content.html" %}
-  </div>
-{% else %}
-  <div class="col-span-full mt-4 text-center text-xs text-stone-400">End of results</div>
-{% endif %}
-

blog/templates/_types/blog/_main_panel.html

@@ -1,84 +0,0 @@
-
-  {# Content type tabs: Posts | Pages #}
-  <div class="flex justify-center gap-1 px-3 pt-3">
-    {% set posts_href = (url_for('blog.index'))|host %}
-    {% set pages_href = (url_for('blog.index') ~ '?type=pages')|host %}
-    <a
-      href="{{ posts_href }}"
-      hx-get="{{ posts_href }}"
-      hx-target="#main-panel"
-      hx-select="{{ hx_select_search }}"
-      hx-swap="outerHTML"
-      hx-push-url="true"
-      class="px-4 py-1.5 rounded-t text-sm font-medium transition-colors
-        {{ 'bg-stone-700 text-white' if content_type != 'pages' else 'bg-stone-100 text-stone-600 hover:bg-stone-200' }}"
-    >Posts</a>
-    <a
-      href="{{ pages_href }}"
-      hx-get="{{ pages_href }}"
-      hx-target="#main-panel"
-      hx-select="{{ hx_select_search }}"
-      hx-swap="outerHTML"
-      hx-push-url="true"
-      class="px-4 py-1.5 rounded-t text-sm font-medium transition-colors
-        {{ 'bg-stone-700 text-white' if content_type == 'pages' else 'bg-stone-100 text-stone-600 hover:bg-stone-200' }}"
-    >Pages</a>
-  </div>
-
-  {% if content_type == 'pages' %}
-    {# Pages listing #}
-    <div class="max-w-full px-3 py-3 space-y-3">
-      {% set page_num = page %}
-      {% include "_types/blog/_page_cards.html" %}
-    </div>
-    <div class="pb-8"></div>
-  {% else %}
-
-  {# View toggle bar - desktop only #}
-  <div class="hidden md:flex justify-end px-3 pt-3 gap-1">
-    {% set list_href = (current_local_href ~ {'view': None}|qs)|host %}
-    {% set tile_href = (current_local_href ~ {'view': 'tile'}|qs)|host %}
-    <a
-      href="{{ list_href }}"
-      hx-get="{{ list_href }}"
-      hx-target="#main-panel"
-      hx-select="{{hx_select_search}}"
-      hx-swap="outerHTML"
-      hx-push-url="true"
-      class="p-1.5 rounded {{ 'bg-stone-200 text-stone-800' if view != 'tile' else 'text-stone-400 hover:text-stone-600' }}"
-      title="List view"
-      _="on click js localStorage.removeItem('blog_view') end"
-    >
-      <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-        <path stroke-linecap="round" stroke-linejoin="round" d="M4 6h16M4 12h16M4 18h16" />
-      </svg>
-    </a>
-    <a
-      href="{{ tile_href }}"
-      hx-get="{{ tile_href }}"
-      hx-target="#main-panel"
-      hx-select="{{hx_select_search}}"
-      hx-swap="outerHTML"
-      hx-push-url="true"
-      class="p-1.5 rounded {{ 'bg-stone-200 text-stone-800' if view == 'tile' else 'text-stone-400 hover:text-stone-600' }}"
-      title="Tile view"
-      _="on click js localStorage.setItem('blog_view','tile') end"
-    >
-      <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-        <path stroke-linecap="round" stroke-linejoin="round" d="M4 5a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM14 5a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V5zM4 15a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H5a1 1 0 01-1-1v-4zM14 15a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1v-4z" />
-      </svg>
-    </a>
-  </div>
-
-  {# Cards container - list or grid based on view #}
-  {% if view == 'tile' %}
-    <div class="max-w-full px-3 py-3 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">
-      {% include "_types/blog/_cards.html" %}
-    </div>
-  {% else %}
-    <div class="max-w-full px-3 py-3 space-y-3">
-      {% include "_types/blog/_cards.html" %}
-    </div>
-  {% endif %}
-  <div class="pb-8"></div>
-  {% endif %}{# end content_type check #}

blog/templates/_types/blog/_oob_elements.html

@@ -1,40 +0,0 @@
-{% extends 'oob_elements.html' %}
-
-{# OOB elements for HTMX navigation - all elements that need updating #}
-
-{# Import shared OOB macros #}
-{% from '_types/root/header/_oob_.html' import root_header with context %}
-{% from '_types/root/_oob_menu.html' import mobile_menu with context %}
-
-
-{% block oobs %}
-
-  {% from '_types/root/_n/macros.html' import oob_header with context %}
-  {{oob_header('root-header-child', 'blog-header-child', '_types/blog/header/_header.html')}}
-
-  {% from '_types/root/header/_header.html' import header_row with context %}
-  {{ header_row(oob=True) }}
-{% endblock %}
-              
-
-
-{# Filter container - blog doesn't have child_summary but still needs this element #}
-{% block filter %}
-  {% include "_types/blog/mobile/_filter/summary.html" %}
-{% endblock %}
-
-{# Aside with filters #}
-{% block aside %}
-  {% include "_types/blog/desktop/menu.html" %}
-{% endblock %}
-
-
-{% block mobile_menu %}
-  {% include '_types/root/_nav.html' %}
-  {% include '_types/root/_nav_panel.html' %}
-{% endblock %}
-
-
-{% block content %}
-  {% include '_types/blog/_main_panel.html' %}
-{% endblock %}