Refactor SX templates: shared components, Python migration, cleanup

- Extract shared components (empty-state, delete-btn, sentinel, crud-*,
  view-toggle, img-or-placeholder, avatar, sumup-settings-form, auth
  forms, order tables/detail/checkout)
- Migrate all Python sx_call() callers to use shared components directly
- Remove 55+ thin wrapper defcomps from domain .sx files
- Remove trivial passthrough wrappers (blog-header-label, market-card-text, etc)
- Unify duplicate auth flows (account + federation) into shared/sx/templates/auth.sx
- Unify duplicate order views (cart + orders) into shared/sx/templates/orders.sx
- Disable static file caching in dev (SEND_FILE_MAX_AGE_DEFAULT=0)
- Add SX response validation and debug headers

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,7 +58,7 @@ jobs:
               fi
             fi
 
-            for app in blog market cart events federation account relations likes orders; do
+            for app in blog market cart events federation account relations likes orders test; do
               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
                 echo \"Building \$app...\"

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
 

account/bp/account/routes.py

@@ -18,6 +18,7 @@ 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
+from shared.sx.helpers import sx_response
 
 oob = {
     "oob_extends": "oob_elements.html",
@@ -41,13 +42,13 @@ def register(url_prefix="/"):
             ("cart", "account-nav-item", {}),
             ("artdag", "nav-item", {}),
         ], required=False)
-        return {"oob": oob, "account_nav_html": events_nav + cart_nav + artdag_nav}
+        return {"oob": oob, "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
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_account_page, render_account_oob
 
         if not g.get("user"):
             return redirect(login_url("/"))
@@ -55,10 +56,10 @@ def register(url_prefix="/"):
         ctx = await get_template_context()
         if not is_htmx_request():
             html = await render_account_page(ctx)
+            return await make_response(html)
         else:
-            html = await render_account_oob(ctx)
-
-        return await make_response(html)
+            sx_src = await render_account_oob(ctx)
+            return sx_response(sx_src)
 
     @account_bp.get("/newsletters/")
     async def newsletters():
@@ -88,16 +89,16 @@ def register(url_prefix="/"):
                 "subscribed": un.subscribed if un else False,
             })
 
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_newsletters_page, render_newsletters_oob
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_newsletters_page, render_newsletters_oob
 
         ctx = await get_template_context()
         if not is_htmx_request():
             html = await render_newsletters_page(ctx, newsletter_list)
+            return await make_response(html)
         else:
-            html = await render_newsletters_oob(ctx, newsletter_list)
-
-        return await make_response(html)
+            sx_src = await render_newsletters_oob(ctx, newsletter_list)
+            return sx_response(sx_src)
 
     @account_bp.post("/newsletter/<int:newsletter_id>/toggle/")
     async def toggle_newsletter(newsletter_id: int):
@@ -124,8 +125,8 @@ def register(url_prefix="/"):
 
         await g.s.flush()
 
-        from sexp.sexp_components import render_newsletter_toggle
-        return render_newsletter_toggle(un)
+        from sx.sx_components import render_newsletter_toggle
+        return sx_response(render_newsletter_toggle(un))
 
     # Catch-all for fragment-provided pages — must be last
     @account_bp.get("/<slug>/")
@@ -143,15 +144,15 @@ def register(url_prefix="/"):
         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
+        from shared.sx.page import get_template_context
+        from sx.sx_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)
+            return await make_response(html)
         else:
-            html = await render_fragment_oob(ctx, fragment_html)
-
-        return await make_response(html)
+            sx_src = await render_fragment_oob(ctx, fragment_html)
+            return sx_response(sx_src)
 
     return account_bp

account/bp/auth/routes.py

@@ -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,6 +1,6 @@
 """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:
@@ -18,18 +18,17 @@ def register():
     bp = Blueprint("fragments", __name__, url_prefix="/internal/fragments")
 
     # ---------------------------------------------------------------
-    # Fragment handlers
+    # Fragment handlers — return sx source text
     # ---------------------------------------------------------------
 
     async def _auth_menu():
         from shared.infrastructure.urls import account_url
-        from shared.sexp.jinja_bridge import sexp as render_sexp
+        from shared.sx.helpers import sx_call
 
         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("")},
-        )
+        return sx_call("auth-menu",
+                         user_email=user_email or None,
+                         account_url=account_url(""))
 
     _handlers = {
         "auth-menu": _auth_menu,
@@ -48,8 +47,8 @@ def register():
     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")
+            return Response("", status=200, content_type="text/sx")
+        src = await handler()
+        return Response(src, 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/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/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

@@ -9,13 +9,13 @@ 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,
+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, header_child_sx, oob_page_sx,
 )
 
-# Load account-specific .sexpr components at import time
+# Load account-specific .sx components at import time
 load_service_components(os.path.dirname(os.path.dirname(__file__)))
 
 
@@ -23,51 +23,53 @@ load_service_components(os.path.dirname(os.path.dirname(__file__)))
 # Header helpers
 # ---------------------------------------------------------------------------
 
-def _auth_nav_html(ctx: dict) -> str:
+def _auth_nav_sx(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
+    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_html(ctx: dict, *, oob: bool = False) -> str:
+def _auth_header_sx(ctx: dict, *, oob: bool = False) -> str:
     """Build the account section header row."""
-    return render(
-        "menu-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_html=_auth_nav_html(ctx),
+        nav=SxExpr(_auth_nav_sx(ctx)),
         child_id="auth-header-child", oob=oob,
     )
 
 
-def _auth_nav_mobile_html(ctx: dict) -> str:
+def _auth_nav_mobile_sx(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
+    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_html(ctx: dict) -> str:
+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
@@ -75,30 +77,33 @@ def _account_main_panel_html(ctx: dict) -> str:
     user = getattr(g, "user", None)
     error = ctx.get("error", "")
 
-    error_html = render("account-error-banner", error=error) if error else ""
+    error_sx = sx_call("account-error-banner", error=error) if error else ""
 
-    user_email_html = ""
-    user_name_html = ""
+    user_email_sx = ""
+    user_name_sx = ""
     if user:
-        user_email_html = render("account-user-email", email=user.email)
+        user_email_sx = sx_call("account-user-email", email=user.email)
         if user.name:
-            user_name_html = render("account-user-name", name=user.name)
+            user_name_sx = sx_call("account-user-name", name=user.name)
 
-    logout_html = render("account-logout-form", csrf_token=generate_csrf_token())
+    logout_sx = sx_call("account-logout-form", csrf_token=generate_csrf_token())
 
-    labels_html = ""
+    labels_sx = ""
     if user and hasattr(user, "labels") and user.labels:
-        label_items = "".join(
-            render("account-label-item", name=label.name)
+        label_items = " ".join(
+            sx_call("account-label-item", name=label.name)
             for label in user.labels
         )
-        labels_html = render("account-labels-section", items_html=label_items)
+        labels_sx = sx_call("account-labels-section",
+                                items=SxExpr("(<> " + label_items + ")"))
 
-    return render(
+    return sx_call(
         "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,
+        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,
     )
 
 
@@ -106,7 +111,7 @@ def _account_main_panel_html(ctx: dict) -> str:
 # Newsletters (GET /newsletters/)
 # ---------------------------------------------------------------------------
 
-def _newsletter_toggle_html(un: Any, account_url_fn: Any, csrf_token: str) -> str:
+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/")
@@ -118,7 +123,7 @@ def _newsletter_toggle_html(un: Any, account_url_fn: Any, csrf_token: str) -> st
         bg = "bg-stone-300"
         translate = "translate-x-1"
         checked = "false"
-    return render(
+    return sx_call(
         "account-newsletter-toggle",
         id=f"nl-{nid}", url=toggle_url,
         hdrs=f'{{"X-CSRFToken": "{csrf_token}"}}',
@@ -129,17 +134,20 @@ def _newsletter_toggle_html(un: Any, account_url_fn: Any, csrf_token: str) -> st
     )
 
 
-def _newsletter_toggle_off_html(nid: int, toggle_url: str, csrf_token: str) -> str:
+def _newsletter_toggle_off_sx(nid: int, toggle_url: str, csrf_token: str) -> str:
     """Render an unsubscribed newsletter toggle (no subscription record yet)."""
-    return render(
-        "account-newsletter-toggle-off",
+    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_html(ctx: dict, newsletter_list: list) -> str:
+def _newsletters_panel_sx(ctx: dict, newsletter_list: list) -> str:
     """Newsletters management panel."""
     from shared.browser.app.csrf import generate_csrf_token
 
@@ -152,28 +160,30 @@ def _newsletters_panel_html(ctx: dict, newsletter_list: list) -> str:
             nl = item["newsletter"]
             un = item.get("un")
 
-            desc_html = render(
+            desc_sx = sx_call(
                 "account-newsletter-desc", description=nl.description
             ) if nl.description else ""
 
             if un:
-                toggle = _newsletter_toggle_html(un, account_url_fn, csrf)
+                toggle = _newsletter_toggle_sx(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)
+                toggle = _newsletter_toggle_off_sx(nl.id, toggle_url, csrf)
 
-            items.append(render(
+            items.append(sx_call(
                 "account-newsletter-item",
-                name=nl.name, desc_html=desc_html, toggle_html=toggle,
+                name=nl.name,
+                desc=SxExpr(desc_sx) if desc_sx else None,
+                toggle=SxExpr(toggle),
             ))
-        list_html = render(
+        list_sx = sx_call(
             "account-newsletter-list",
-            items_html="".join(items),
+            items=SxExpr("(<> " + " ".join(items) + ")"),
         )
     else:
-        list_html = render("account-newsletter-empty")
+        list_sx = sx_call("account-newsletter-empty")
 
-    return render("account-newsletters-panel", list_html=list_html)
+    return sx_call("account-newsletters-panel", list=SxExpr(list_sx))
 
 
 # ---------------------------------------------------------------------------
@@ -189,11 +199,12 @@ def _login_page_content(ctx: dict) -> str:
     email = ctx.get("email", "")
     action = url_for("auth.start_login")
 
-    error_html = render("account-login-error", error=error) if error else ""
+    error_sx = sx_call("auth-error-banner", error=error) if error else ""
 
-    return render(
-        "account-login-form",
-        error_html=error_html, action=action,
+    return sx_call(
+        "auth-login-form",
+        error=SxExpr(error_sx) if error_sx else None,
+        action=action,
         csrf_token=generate_csrf_token(), email=email,
     )
 
@@ -207,18 +218,19 @@ def _device_page_content(ctx: dict) -> str:
     code = ctx.get("code", "")
     action = url_for("auth.device_submit")
 
-    error_html = render("account-device-error", error=error) if error else ""
+    error_sx = sx_call("account-device-error", error=error) if error else ""
 
-    return render(
+    return sx_call(
         "account-device-form",
-        error_html=error_html, action=action,
+        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 render("account-device-approved")
+    return sx_call("account-device-approved")
 
 
 # ---------------------------------------------------------------------------
@@ -227,28 +239,26 @@ def _device_approved_content() -> str:
 
 async def render_account_page(ctx: dict) -> str:
     """Full page: account dashboard."""
-    main = _account_main_panel_html(ctx)
+    main = _account_main_panel_sx(ctx)
 
-    hdr = root_header_html(ctx)
-    hdr += render("account-header-child", inner_html=_auth_header_html(ctx))
+    hdr = root_header_sx(ctx)
+    hdr_child = header_child_sx(_auth_header_sx(ctx))
+    header_rows = "(<> " + hdr + " " + hdr_child + ")"
 
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=main,
-                     menu_html=_auth_nav_mobile_html(ctx))
+    return full_page_sx(ctx, header_rows=header_rows,
+                          content=main,
+                          menu=_auth_nav_mobile_sx(ctx))
 
 
 async def render_account_oob(ctx: dict) -> str:
     """OOB response for account dashboard."""
-    main = _account_main_panel_html(ctx)
+    main = _account_main_panel_sx(ctx)
 
-    oobs = (
-        _auth_header_html(ctx, oob=True)
-        + root_header_html(ctx, oob=True)
-    )
+    oobs = "(<> " + _auth_header_sx(ctx, oob=True) + " " + root_header_sx(ctx, oob=True) + ")"
 
-    return oob_page(ctx, oobs_html=oobs,
-                    content_html=main,
-                    menu_html=_auth_nav_mobile_html(ctx))
+    return oob_page_sx(oobs=oobs,
+                         content=main,
+                         menu=_auth_nav_mobile_sx(ctx))
 
 
 # ---------------------------------------------------------------------------
@@ -257,28 +267,26 @@ async def render_account_oob(ctx: dict) -> str:
 
 async def render_newsletters_page(ctx: dict, newsletter_list: list) -> str:
     """Full page: newsletters."""
-    main = _newsletters_panel_html(ctx, newsletter_list)
+    main = _newsletters_panel_sx(ctx, newsletter_list)
 
-    hdr = root_header_html(ctx)
-    hdr += render("account-header-child", inner_html=_auth_header_html(ctx))
+    hdr = root_header_sx(ctx)
+    hdr_child = header_child_sx(_auth_header_sx(ctx))
+    header_rows = "(<> " + hdr + " " + hdr_child + ")"
 
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=main,
-                     menu_html=_auth_nav_mobile_html(ctx))
+    return full_page_sx(ctx, header_rows=header_rows,
+                          content=main,
+                          menu=_auth_nav_mobile_sx(ctx))
 
 
 async def render_newsletters_oob(ctx: dict, newsletter_list: list) -> str:
     """OOB response for newsletters."""
-    main = _newsletters_panel_html(ctx, newsletter_list)
+    main = _newsletters_panel_sx(ctx, newsletter_list)
 
-    oobs = (
-        _auth_header_html(ctx, oob=True)
-        + root_header_html(ctx, oob=True)
-    )
+    oobs = "(<> " + _auth_header_sx(ctx, oob=True) + " " + root_header_sx(ctx, oob=True) + ")"
 
-    return oob_page(ctx, oobs_html=oobs,
-                    content_html=main,
-                    menu_html=_auth_nav_mobile_html(ctx))
+    return oob_page_sx(oobs=oobs,
+                         content=main,
+                         menu=_auth_nav_mobile_sx(ctx))
 
 
 # ---------------------------------------------------------------------------
@@ -287,24 +295,22 @@ async def render_newsletters_oob(ctx: dict, newsletter_list: list) -> str:
 
 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))
+    hdr = root_header_sx(ctx)
+    hdr_child = header_child_sx(_auth_header_sx(ctx))
+    header_rows = "(<> " + hdr + " " + hdr_child + ")"
 
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=page_fragment_html,
-                     menu_html=_auth_nav_mobile_html(ctx))
+    return full_page_sx(ctx, header_rows=header_rows,
+                          content=f'(~rich-text :html "{_sx_escape(page_fragment_html)}")',
+                          menu=_auth_nav_mobile_sx(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)
-    )
+    oobs = "(<> " + _auth_header_sx(ctx, oob=True) + " " + root_header_sx(ctx, oob=True) + ")"
 
-    return oob_page(ctx, oobs_html=oobs,
-                    content_html=page_fragment_html,
-                    menu_html=_auth_nav_mobile_html(ctx))
+    return oob_page_sx(oobs=oobs,
+                         content=f'(~rich-text :html "{_sx_escape(page_fragment_html)}")',
+                         menu=_auth_nav_mobile_sx(ctx))
 
 
 # ---------------------------------------------------------------------------
@@ -313,26 +319,26 @@ async def render_fragment_oob(ctx: dict, page_fragment_html: str) -> str:
 
 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>')
+    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_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>')
+    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_html(ctx)
-    return full_page(ctx, header_rows_html=hdr,
-                     content_html=_device_approved_content(),
-                     meta_html='<title>Device Authorized \u2014 Rose Ash</title>')
+    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>')
 
 
 # ---------------------------------------------------------------------------
@@ -343,13 +349,14 @@ 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))
+    error_sx = sx_call(
+        "auth-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,
+    return sx_call(
+        "auth-check-email",
+        email=str(escape(email)),
+        error=SxExpr(error_sx) if error_sx else None,
     )
 
 
@@ -357,22 +364,16 @@ 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>')
+    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_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)."""
@@ -382,4 +383,13 @@ def render_newsletter_toggle(un) -> str:
     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())
+    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/templates/_types/auth/_newsletter_toggle.html

@@ -1,9 +1,9 @@
 <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"
+    sx-post="{{ account_url('/newsletter/' ~ un.newsletter_id ~ '/toggle/') }}"
+    sx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
+    sx-target="#nl-{{ un.newsletter_id }}"
+    sx-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"

account/templates/_types/auth/_newsletters_panel.html

@@ -22,10 +22,10 @@
                 {# 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"
+                    sx-post="{{ account_url('/newsletter/' ~ item.newsletter.id ~ '/toggle/') }}"
+                    sx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
+                    sx-target="#nl-{{ item.newsletter.id }}"
+                    sx-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"

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/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
@@ -27,7 +27,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 +65,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
 
@@ -134,7 +134,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 +147,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
 
@@ -29,29 +30,30 @@ def register(url_prefix):
     @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
+      from shared.sx.page import get_template_context
+      from sx.sx_components import render_settings_page, render_settings_oob
 
       tctx = await get_template_context()
       if not is_htmx_request():
           html = await render_settings_page(tctx)
+          return await make_response(html)
       else:
-          html = await render_settings_oob(tctx)
-
-      return await make_response(html)
+          sx_src = await render_settings_oob(tctx)
+          return sx_response(sx_src)
 
     @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
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_cache_page, render_cache_oob
 
         tctx = await get_template_context()
         if not is_htmx_request():
             html = await render_cache_page(tctx)
+            return await make_response(html)
         else:
-            html = await render_cache_oob(tctx)
-        return await make_response(html)
+            sx_src = await render_cache_oob(tctx)
+            return sx_response(sx_src)
 
     @bp.post("/cache_clear/")
     @require_admin
@@ -59,9 +61,9 @@ 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 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
@@ -57,15 +58,15 @@ def register():
 
         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
+        from shared.sx.page import get_template_context
+        from sx.sx_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))
+            return sx_response(await render_tag_groups_oob(tctx))
 
     @bp.post("/")
     @require_admin
@@ -122,15 +123,15 @@ def register():
             "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
+        from shared.sx.page import get_template_context
+        from sx.sx_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 sx_response(await render_tag_group_edit_oob(tctx))
 
     @bp.post("/<int:id>/")
     @require_admin

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,33 +46,9 @@ 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():
@@ -117,7 +93,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 +102,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 +118,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 +156,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 +199,42 @@ 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)
+          sx_src = await render_blog_oob(tctx)
+          return sx_response(sx_src)
 
     @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
+      from shared.sx.page import get_template_context
+      from sx.sx_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)
+        return await make_response(html)
       else:
-        html = await render_new_post_oob(tctx)
-      return await make_response(html)
+        sx_src = await render_new_post_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 +248,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 +257,54 @@ 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
+      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,
       )
-
-      # 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.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
+      from shared.sx.page import get_template_context
+      from sx.sx_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)
+        return await make_response(html)
       else:
-        html = await render_new_post_oob(tctx)
-      return await make_response(html)
+        sx_src = await render_new_post_oob(tctx)
+        return sx_response(sx_src)
 
     @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 +318,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 +328,32 @@ 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
+      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,
       )
-
-      # 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.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,6 +1,6 @@
 """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.
 """
 
@@ -10,13 +10,11 @@ from quart import Blueprint, Response, g, render_template, request
 
 from shared.infrastructure.fragments import FRAGMENT_HEADER
 from shared.services.navigation import get_navigation_tree
-from shared.sexp.jinja_bridge import sexp
 
 
 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
@@ -28,53 +26,110 @@ def register():
     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")
+            return Response("", status=200, content_type="text/sx")
+        result = await handler()
+        return Response(result, status=200, content_type="text/sx")
 
-    # --- nav-tree fragment ---
+    # --- nav-tree fragment — returns sx source ---
     async def _nav_tree_handler():
+        from shared.sx.helpers import sx_call, SxExpr
+        from shared.infrastructure.urls import (
+            blog_url, cart_url, market_url, events_url,
+            federation_url, account_url, artdag_url,
+        )
+
         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
+        app_slugs = {
+            "cart": cart_url("/"),
+            "market": market_url("/"),
+            "events": events_url("/"),
+            "federation": federation_url("/"),
+            "account": account_url("/"),
+            "artdag": artdag_url("/"),
+        }
 
-        menu_items.append(_NavItem("artdag", "art-dag"))
+        nav_cls = "whitespace-nowrap flex items-center gap-2 rounded p-2 text-sm"
 
-        return await render_template(
-            "fragments/nav_tree.html",
-            menu_items=menu_items,
-            frag_app_name=app_name,
-            frag_first_seg=first_seg,
-        )
+        item_sxs = []
+        for item in menu_items:
+            href = app_slugs.get(item.slug, blog_url(f"/{item.slug}/"))
+            selected = "true" if (item.slug == first_seg
+                                  or item.slug == app_name) else "false"
+            img = sx_call("img-or-placeholder",
+                            src=getattr(item, "feature_image", None),
+                            alt=getattr(item, "label", item.slug),
+                            size_cls="w-8 h-8 rounded-full object-cover flex-shrink-0")
+            item_sxs.append(sx_call(
+                "blog-nav-item-link",
+                href=href, hx_get=href, selected=selected, nav_cls=nav_cls,
+                img=SxExpr(img), label=getattr(item, "label", item.slug),
+            ))
+
+        # artdag link
+        href = artdag_url("/")
+        selected = "true" if ("artdag" == first_seg
+                              or "artdag" == app_name) else "false"
+        img = sx_call("img-or-placeholder", src=None, alt="art-dag",
+                          size_cls="w-8 h-8 rounded-full object-cover flex-shrink-0")
+        item_sxs.append(sx_call(
+            "blog-nav-item-link",
+            href=href, hx_get=href, selected=selected, nav_cls=nav_cls,
+            img=SxExpr(img), label="art-dag",
+        ))
+
+        if not item_sxs:
+            return sx_call("blog-nav-empty",
+                             wrapper_id="menu-items-nav-wrapper")
+
+        items_frag = "(<> " + " ".join(item_sxs) + ")"
+
+        arrow_cls = "scrolling-menu-arrow-menu-items-container"
+        container_id = "menu-items-container"
+        left_hs = ("on click set #" + container_id
+                    + ".scrollLeft to #" + container_id + ".scrollLeft - 200")
+        scroll_hs = ("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 = ("on click set #" + container_id
+                     + ".scrollLeft to #" + container_id + ".scrollLeft + 200")
+
+        return sx_call("scroll-nav-wrapper",
+                         wrapper_id="menu-items-nav-wrapper",
+                         container_id=container_id,
+                         arrow_cls=arrow_cls,
+                         left_hs=left_hs,
+                         scroll_hs=scroll_hs,
+                         right_hs=right_hs,
+                         items=SxExpr(items_frag),
+                         oob=True)
 
     _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."""
+    # --- link-card fragment — returns sx source ---
+    def _blog_link_card_sx(post, link: str) -> str:
+        from shared.sx.helpers import sx_call
         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,
-        )
+        return sx_call("link-card",
+                         link=link,
+                         title=post.title,
+                         image=post.feature_image,
+                         icon="fas fa-file-alt",
+                         subtitle=post.custom_excerpt or post.excerpt,
+                         detail=published,
+                         data_app="blog")
 
     async def _link_card_handler():
-        from shared.services.registry import services
+        from services import blog_service
         from shared.infrastructure.urls import blog_url
 
         slug = request.args.get("slug", "")
@@ -86,22 +141,21 @@ def register():
             parts = []
             for s in slugs:
                 parts.append(f"<!-- fragment:{s} -->")
-                post = await services.blog.get_post_by_slug(g.s, s)
+                post = await blog_service.get_post_by_slug(g.s, s)
                 if post:
-                    parts.append(_render_blog_link_card(post, blog_url(f"/{post.slug}")))
+                    parts.append(_blog_link_card_sx(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)
+        post = await blog_service.get_post_by_slug(g.s, slug)
         if not post:
             return ""
-        return _render_blog_link_card(post, blog_url(f"/{post.slug}"))
+        return _blog_link_card_sx(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
 
     return bp

blog/bp/menu_items/routes.py

@@ -13,13 +13,14 @@ 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("/")
@@ -29,17 +30,17 @@ def register():
         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 render_menu_items_page, render_menu_items_oob
 
         tctx = await get_template_context()
         tctx["menu_items"] = menu_items
         if not is_htmx_request():
             html = await render_menu_items_page(tctx)
+            return await make_response(html)
         else:
-            html = await render_menu_items_oob(tctx)
-
-        return await make_response(html)
+            sx_src = await render_menu_items_oob(tctx)
+            return sx_response(sx_src)
 
     @bp.get("/new/")
     @require_admin
@@ -72,10 +73,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
@@ -115,10 +116,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 +137,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
@@ -183,9 +184,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

@@ -12,8 +12,46 @@ 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",
+        "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')
 
@@ -51,17 +89,17 @@ def register():
         "sumup_checkout_prefix": sumup_checkout_prefix,
     }
 
-    from shared.sexp.page import get_template_context
-    from sexp.sexp_components import render_post_admin_page, render_post_admin_oob
+    from shared.sx.page import get_template_context
+    from sx.sx_components import render_post_admin_page, render_post_admin_oob
 
     tctx = await get_template_context()
     tctx.update(ctx)
     if not is_htmx_request():
         html = await render_post_admin_page(tctx)
+        return await make_response(html)
     else:
-        html = await render_post_admin_oob(tctx)
-
-    return await make_response(html)
+        sx_src = await render_post_admin_oob(tctx)
+        return sx_response(sx_src)
 
   @bp.put("/features/")
   @require_admin
@@ -98,14 +136,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 +175,30 @@ 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)
+    return sx_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
+    from shared.sx.page import get_template_context
+    from sx.sx_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)
+      return await make_response(html)
     else:
-      html = await render_post_data_oob(tctx)
-
-    return await make_response(html)
+      sx_src = await render_post_data_oob(tctx)
+      return sx_response(sx_src)
 
   @bp.get("/entries/calendar/<int:calendar_id>/")
   @require_admin
@@ -226,7 +264,7 @@ 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",
@@ -255,7 +293,7 @@ def register():
     from sqlalchemy import select
 
     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)
 
     # Load ALL calendars (not just this post's calendars)
     result = await g.s.execute(
@@ -268,8 +306,8 @@ def register():
     # 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
+    from shared.sx.page import get_template_context
+    from sx.sx_components import render_post_entries_page, render_post_entries_oob
 
     entries_html = await render_template(
         "_types/post_entries/_main_panel.html",
@@ -280,10 +318,10 @@ def register():
     tctx["entries_html"] = entries_html
     if not is_htmx_request():
       html = await render_post_entries_page(tctx)
+      return await make_response(html)
     else:
-      html = await render_post_entries_oob(tctx)
-
-    return await make_response(html)
+      sx_src = await render_post_entries_oob(tctx)
+      return sx_response(sx_src)
 
   @bp.post("/entries/<int:entry_id>/toggle/")
   @require_admin
@@ -294,7 +332,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 +340,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 +355,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,26 +367,33 @@ 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)
+    return sx_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
+    from models.ghost_content import Post
+    from sqlalchemy import select as sa_select
+    from sqlalchemy.orm import selectinload
 
-    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)
+    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.sexp.page import get_template_context
-    from sexp.sexp_components import render_post_settings_page, render_post_settings_oob
+    from shared.sx.page import get_template_context
+    from sx.sx_components import render_post_settings_page, render_post_settings_oob
 
     settings_html = await render_template(
         "_types/post_settings/_main_panel.html",
@@ -359,20 +404,18 @@ def register():
     tctx["settings_html"] = settings_html
     if not is_htmx_request():
       html = await render_post_settings_page(tctx)
+      return await make_response(html)
     else:
-      html = await render_post_settings_oob(tctx)
-
-    return await make_response(html)
+      sx_src = await render_post_settings_oob(tctx)
+      return sx_response(sx_src)
 
   @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,54 +448,60 @@ 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.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")
+    # Redirect using the (possibly new) slug
+    return redirect(host_url(url_for("blog.post.admin.settings", slug=post.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 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
 
-    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)
+    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", "")
 
     # 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
+    from shared.sx.page import get_template_context
+    from sx.sx_components import render_post_edit_page, render_post_edit_oob
 
     edit_html = await render_template(
         "_types/post_edit/_main_panel.html",
@@ -465,29 +514,25 @@ def register():
     tctx["edit_html"] = edit_html
     if not is_htmx_request():
       html = await render_post_edit_page(tctx)
+      return await make_response(html)
     else:
-      html = await render_post_edit_oob(tctx)
-
-    return await make_response(html)
+      sx_src = await render_post_edit_oob(tctx)
+      return sx_response(sx_src)
 
   @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()
@@ -503,76 +548,51 @@ def register():
     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,
-    )
-
     # 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,
+    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,
+      )
+    except OptimisticLockError:
+      return redirect(
+          host_url(url_for("blog.post.admin.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.edit", slug=post.slug)) + "?saved=1"
     if publish_requested_msg:
         redirect_url += "&publish_requested=1"
     return redirect(redirect_url)
@@ -597,9 +617,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 +643,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 +663,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
 
 
@@ -38,18 +39,18 @@ def register():
         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 render_snippets_page, render_snippets_oob
 
         tctx = await get_template_context()
         tctx["snippets"] = snippets
         tctx["is_admin"] = is_admin
         if not is_htmx_request():
             html = await render_snippets_page(tctx)
+            return await make_response(html)
         else:
-            html = await render_snippets_oob(tctx)
-
-        return await make_response(html)
+            sx_src = await render_snippets_oob(tctx)
+            return sx_response(sx_src)
 
     @bp.delete("/<int:snippet_id>/")
     @require_login
@@ -67,9 +68,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 +92,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)
@@ -89,8 +89,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 +136,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 +192,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/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/services/__init__.py

@@ -1,6 +1,68 @@
 """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,
+        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 +70,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,457 @@
+"""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,
+) -> 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),
+        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,
+) -> 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,
+    )
+
+
+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,
+) -> 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 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/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,6 @@
     (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))

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,37 @@
 ;; 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)
   (<> (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))))
+    (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)
@@ -48,10 +51,4 @@
     (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"))
+  (article :class "relative" (div :class "blog-content p-2" (~rich-text :html html-content))))

blog/sx/editor.sx

@@ -38,7 +38,7 @@
     (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 "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))))
@@ -51,4 +51,4 @@
       "#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))))
+  (<> (script :src js-src) (script init-js)))

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/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/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/templates/_types/blog/_action_buttons.html

@@ -4,11 +4,11 @@
     {% 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"
+      sx-get="{{ new_href }}"
+      sx-target="#main-panel"
+      sx-select="{{hx_select_search}}"
+      sx-swap="outerHTML"
+      sx-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"
     >
@@ -17,11 +17,11 @@
     {% 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"
+      sx-get="{{ new_page_href }}"
+      sx-target="#main-panel"
+      sx-select="{{hx_select_search}}"
+      sx-swap="outerHTML"
+      sx-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"
     >
@@ -33,11 +33,11 @@
       {% 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"
+        sx-get="{{ drafts_off_href }}"
+        sx-target="#main-panel"
+        sx-select="{{hx_select_search}}"
+        sx-swap="outerHTML"
+        sx-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"
       >
@@ -48,11 +48,11 @@
       {% 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"
+        sx-get="{{ drafts_on_href }}"
+        sx-target="#main-panel"
+        sx-select="{{hx_select_search}}"
+        sx-swap="outerHTML"
+        sx-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"
       >

blog/templates/_types/blog/_card.html

@@ -14,11 +14,11 @@
     {% 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"
+      sx-get="{{ _href }}"
+      sx-target="#main-panel"
+      sx-select ="{{hx_select_search}}"
+      sx-swap="outerHTML"
+      sx-push-url="true"
       aria-selected="{{ 'true' if _active else 'false' }}"
       class="block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden"
     >

blog/templates/_types/blog/_card_tile.html

@@ -2,11 +2,11 @@
     {% 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"
+      sx-get="{{ _href }}"
+      sx-target="#main-panel"
+      sx-select ="{{hx_select_search}}"
+      sx-swap="outerHTML"
+      sx-push-url="true"
       aria-selected="{{ 'true' if _active else 'false' }}"
       class="block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden"
     >

blog/templates/_types/blog/_cards.html

@@ -11,43 +11,11 @@
   <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()
-    "
+    sx-get="{{ (current_local_href ~ {'page': page + 1}|qs)|host }}"
+    sx-trigger="intersect once delay:250ms, sentinelmobile:retry"
+    sx-swap="outerHTML"
+    sx-media="(max-width: 767px)"
+    sx-retry="exponential:1000:30000"
     role="status"
     aria-live="polite"
     aria-hidden="true"
@@ -58,47 +26,10 @@
   <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()
-    "
+    sx-get="{{ (current_local_href ~ {'page': page + 1}|qs)|host}}"
+    sx-trigger="intersect once delay:250ms, sentinel:retry"
+    sx-swap="outerHTML"
+    sx-retry="exponential:1000:30000"
     role="status"
     aria-live="polite"
     aria-hidden="true"

blog/templates/_types/blog/_main_panel.html

@@ -5,21 +5,21 @@
     {% 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"
+      sx-get="{{ posts_href }}"
+      sx-target="#main-panel"
+      sx-select="{{ hx_select_search }}"
+      sx-swap="outerHTML"
+      sx-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"
+      sx-get="{{ pages_href }}"
+      sx-target="#main-panel"
+      sx-select="{{ hx_select_search }}"
+      sx-swap="outerHTML"
+      sx-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>
@@ -40,14 +40,14 @@
     {% 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"
+      sx-get="{{ list_href }}"
+      sx-target="#main-panel"
+      sx-select="{{hx_select_search}}"
+      sx-swap="outerHTML"
+      sx-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"
+      onclick="localStorage.removeItem('blog_view')"
     >
       <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" />
@@ -55,14 +55,14 @@
     </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"
+      sx-get="{{ tile_href }}"
+      sx-target="#main-panel"
+      sx-select="{{hx_select_search}}"
+      sx-swap="outerHTML"
+      sx-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"
+      onclick="localStorage.setItem('blog_view','tile')"
     >
       <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" />

blog/templates/_types/blog/_page_card.html

@@ -3,11 +3,11 @@
   {% set _href = url_for('blog.post.post_detail', slug=page.slug)|host %}
   <a
     href="{{ _href }}"
-    hx-get="{{ _href }}"
-    hx-target="#main-panel"
-    hx-select="{{ hx_select_search }}"
-    hx-swap="outerHTML"
-    hx-push-url="true"
+    sx-get="{{ _href }}"
+    sx-target="#main-panel"
+    sx-select="{{ hx_select_search }}"
+    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">

blog/templates/_types/blog/_page_cards.html

@@ -6,9 +6,9 @@
   <div
     id="sentinel-{{ page_num }}-d"
     class="h-4 opacity-0 pointer-events-none"
-    hx-get="{{ (current_local_href ~ {'page': page_num + 1}|qs)|host }}"
-    hx-trigger="intersect once delay:250ms"
-    hx-swap="outerHTML"
+    sx-get="{{ (current_local_href ~ {'page': page_num + 1}|qs)|host }}"
+    sx-trigger="intersect once delay:250ms"
+    sx-swap="outerHTML"
   ></div>
 {% else %}
   {% if pages %}

blog/templates/_types/blog/desktop/menu/authors.html

@@ -13,11 +13,11 @@
           <a
             class="px-3 py-1 rounded {% if is_on %}bg-stone-900 text-white border-stone-900{% else %}bg-white text-stone-600 border-stone-300 hover:bg-stone-50{% endif %}"
             href="{{ href }}"
-            hx-get="{{ href }}"
-            hx-target="#main-panel"
-            hx-select="{{hx_select_search}}"
-            hx-swap="outerHTML"
-            hx-push-url="true"
+            sx-get="{{ href }}"
+            sx-target="#main-panel"
+            sx-select="{{hx_select_search}}"
+            sx-swap="outerHTML"
+            sx-push-url="true"
           >
             Any author
           </a>
@@ -32,11 +32,11 @@
             <a
               class="flex items-center gap-2 px-3 py-1 rounded {% if is_on %}bg-stone-900 text-white border-stone-900{% else %}bg-white text-stone-600 border-stone-300 hover:bg-stone-50{% endif %}"
               href="{{ href }}"
-              hx-get="{{ href }}"
-              hx-target="#main-panel"
-              hx-select="{{hx_select_search}}"
-              hx-swap="outerHTML"
-              hx-push-url="true"
+              sx-get="{{ href }}"
+              sx-target="#main-panel"
+              sx-select="{{hx_select_search}}"
+              sx-swap="outerHTML"
+              sx-push-url="true"
             >
 
               {{doauthor.author(author)}}

blog/templates/_types/blog/desktop/menu/tag_groups.html

@@ -11,11 +11,11 @@
           <a
             class="px-3 py-1 rounded border {% if is_on %}bg-stone-900 text-white border-stone-900{% else %}bg-white text-stone-600 border-stone-300 hover:bg-stone-50{% endif %}"
             href="{{ href }}"
-            hx-get="{{ href }}"
-            hx-target="#main-panel"
-            hx-select="{{hx_select_search}}"
-            hx-swap="outerHTML"
-            hx-push-url="true"
+            sx-get="{{ href }}"
+            sx-target="#main-panel"
+            sx-select="{{hx_select_search}}"
+            sx-swap="outerHTML"
+            sx-push-url="true"
           >
             Any Topic
           </a>
@@ -31,11 +31,11 @@
             <a
               class="flex items-center gap-2 px-3 py-1 rounded border {% if is_on %}bg-stone-900 text-white border-stone-900{% else %}bg-white text-stone-600 border-stone-300 hover:bg-stone-50{% endif %}"
               href="{{ href }}"
-              hx-get="{{ href }}"
-              hx-target="#main-panel"
-              hx-select="{{hx_select_search}}"
-              hx-swap="outerHTML"
-              hx-push-url="true"
+              sx-get="{{ href }}"
+              sx-target="#main-panel"
+              sx-select="{{hx_select_search}}"
+              sx-swap="outerHTML"
+              sx-push-url="true"
             >
 
               {% if group.feature_image %}

blog/templates/_types/blog/desktop/menu/tags.html

@@ -12,11 +12,11 @@
           <a
             class="px-3 py-1 rounded border {% if is_on %}bg-stone-900 text-white border-stone-900{% else %}bg-white text-stone-600 border-stone-300 hover:bg-stone-50{% endif %}"
             href="{{ href }}"
-            hx-get="{{ href }}"
-            hx-target="#main-panel"
-            hx-select="{{hx_select_search}}"
-            hx-swap="outerHTML"
-            hx-push-url="true"
+            sx-get="{{ href }}"
+            sx-target="#main-panel"
+            sx-select="{{hx_select_search}}"
+            sx-swap="outerHTML"
+            sx-push-url="true"
           >
             Any Tag
           </a>
@@ -31,11 +31,11 @@
             <a
               class="flex items-center gap-2 px-3 py-1 rounded border {% if is_on %}bg-stone-900 text-white border-stone-900{% else %}bg-white text-stone-600 border-stone-300 hover:bg-stone-50{% endif %}"
               href="{{ href }}"
-              hx-get="{{ href }}"
-              hx-target="#main-panel"
-              hx-select="{{hx_select_search}}"
-              hx-swap="outerHTML"
-              hx-push-url="true"
+              sx-get="{{ href }}"
+              sx-target="#main-panel"
+              sx-select="{{hx_select_search}}"
+              sx-swap="outerHTML"
+              sx-push-url="true"
             >
 
               {{dotag.tag(tag)}}

blog/templates/_types/blog/not_found.html

@@ -9,11 +9,11 @@
   </p>
   <a 
     href="{{ url_for('blog.index')|host }}"
-    hx-get="{{ url_for('blog.index')|host }}"
-    hx-target="#main-panel"
-    hx-select="{{ hx_select }}"
-    hx-swap="outerHTML"
-    hx-push-url="true"
+    sx-get="{{ url_for('blog.index')|host }}"
+    sx-target="#main-panel"
+    sx-select="{{ hx_select }}"
+    sx-swap="outerHTML"
+    sx-push-url="true"
     class="px-4 py-2 bg-stone-800 text-white rounded hover:bg-stone-700 transition-colors"
   >
     ← Back to Blog

blog/templates/_types/blog_drafts/_main_panel.html

@@ -5,11 +5,11 @@
     {% 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"
+      sx-get="{{ new_href }}"
+      sx-target="#main-panel"
+      sx-select="{{ hx_select_search }}"
+      sx-swap="outerHTML"
+      sx-push-url="true"
       class="px-3 py-1 rounded bg-stone-700 text-white text-sm hover:bg-stone-800 transition-colors"
     >
       <i class="fa fa-plus mr-1"></i> New Post
@@ -22,7 +22,7 @@
         {% set edit_href = url_for('blog.post.admin.edit', slug=draft.slug)|host %}
         <a
           href="{{ edit_href }}"
-          hx-boost="false"
+          sx-disable
           class="block rounded-xl bg-white shadow hover:shadow-md transition overflow-hidden p-4"
         >
           <div class="flex items-start justify-between gap-3">

blog/templates/_types/menu_items/_form.html

@@ -38,14 +38,14 @@
   {# Form for submission #}
   <form
     {% if menu_item %}
-      hx-put="{{ url_for('menu_items.update_menu_item_route', item_id=menu_item.id) }}"
+      sx-put="{{ url_for('menu_items.update_menu_item_route', item_id=menu_item.id) }}"
     {% else %}
-      hx-post="{{ url_for('menu_items.create_menu_item_route') }}"
+      sx-post="{{ url_for('menu_items.create_menu_item_route') }}"
     {% endif %}
-    hx-target="#menu-items-list"
-    hx-swap="innerHTML"
-    hx-include="#selected-post-id"
-    hx-on::after-request="if(event.detail.successful) { document.getElementById('menu-item-form').innerHTML = '' }"
+    sx-target="#menu-items-list"
+    sx-swap="innerHTML"
+    sx-include="#selected-post-id"
+    sx-on:afterRequest="if(event.detail.successful) { document.getElementById('menu-item-form').innerHTML = '' }"
     class="space-y-4">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     {# Form actions #}
@@ -74,10 +74,10 @@
     <input
       type="text"
       placeholder="Search for a page... (or leave blank for all)"
-      hx-get="{{ url_for('menu_items.search_pages_route') }}"
-      hx-trigger="keyup changed delay:300ms, focus once"
-      hx-target="#page-search-results"
-      hx-swap="innerHTML"
+      sx-get="{{ url_for('menu_items.search_pages_route') }}"
+      sx-trigger="keyup changed delay:300ms, focus once"
+      sx-target="#page-search-results"
+      sx-swap="innerHTML"
       name="q"
       id="page-search-input"
       class="w-full px-3 py-2 border border-stone-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500" />

blog/templates/_types/menu_items/_list.html

@@ -32,9 +32,9 @@
           <div class="flex gap-2 flex-shrink-0">
             <button
               type="button"
-              hx-get="{{ url_for('menu_items.edit_menu_item', item_id=item.id) }}"
-              hx-target="#menu-item-form"
-              hx-swap="innerHTML"
+              sx-get="{{ url_for('menu_items.edit_menu_item', item_id=item.id) }}"
+              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"></i> Edit
             </button>
@@ -47,11 +47,11 @@
               data-confirm-confirm-text="Yes, delete"
               data-confirm-cancel-text="Cancel"
               data-confirm-event="confirmed"
-              hx-delete="{{ url_for('menu_items.delete_menu_item_route', item_id=item.id) }}"
-              hx-trigger="confirmed"
-              hx-target="#menu-items-list"
-              hx-swap="innerHTML"
-              hx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
+              sx-delete="{{ url_for('menu_items.delete_menu_item_route', item_id=item.id) }}"
+              sx-trigger="confirmed"
+              sx-target="#menu-items-list"
+              sx-swap="innerHTML"
+              sx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
               class="px-3 py-1 text-sm bg-red-200 hover:bg-red-300 rounded text-red-800">
               <i class="fa fa-trash"></i> Delete
             </button>

blog/templates/_types/menu_items/_main_panel.html

@@ -2,9 +2,9 @@
   <div class="mb-6 flex justify-end items-center">
     <button
       type="button"
-      hx-get="{{ url_for('menu_items.new_menu_item') }}"
-      hx-target="#menu-item-form"
-      hx-swap="innerHTML"
+      sx-get="{{ url_for('menu_items.new_menu_item') }}"
+      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"></i> Add Menu Item
     </button>

blog/templates/_types/menu_items/_nav_oob.html

@@ -2,18 +2,18 @@
 {% set _first_seg = request.path.strip('/').split('/')[0] %}
 <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">
+     sx-swap-oob="outerHTML">
   {% from 'macros/scrolling_menu.html' import scrolling_menu with context %}
   {% call(item) scrolling_menu('menu-items-container', menu_items) %}
     {% set _href = _app_slugs.get(item.slug, blog_url('/' + item.slug + '/')) %}
     <a
       href="{{ _href }}"
       {% if item.slug not in _app_slugs %}
-        hx-get="/{{ item.slug }}/"
-        hx-target="#main-panel"
-        hx-select="{{ hx_select_search }}"
-        hx-swap="outerHTML"
-        hx-push-url="true"
+        sx-get="/{{ item.slug }}/"
+        sx-target="#main-panel"
+        sx-select="{{ hx_select_search }}"
+        sx-swap="outerHTML"
+        sx-push-url="true"
       {% endif %}
       aria-selected="{{ 'true' if (item.slug == _first_seg or item.slug == app_name) else 'false' }}"
       class="{{styles.nav_button}}"

blog/templates/_types/menu_items/_page_search_results.html

@@ -28,10 +28,10 @@
     {# Infinite scroll sentinel #}
     {% if has_more %}
       <div
-        hx-get="{{ url_for('menu_items.search_pages_route') }}"
-        hx-trigger="intersect once"
-        hx-swap="outerHTML"
-        hx-vals='{"q": "{{ query }}", "page": {{ page + 1 }}}'
+        sx-get="{{ url_for('menu_items.search_pages_route') }}"
+        sx-trigger="intersect once"
+        sx-swap="outerHTML"
+        sx-vals='{"q": "{{ query }}", "page": {{ page + 1 }}}'
         class="p-3 text-center text-sm text-stone-400">
         <i class="fa fa-spinner fa-spin"></i> Loading more...
       </div>

blog/templates/_types/post/_entry_container.html

@@ -1,13 +1,7 @@
 <div id="associated-entries-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;"
-     _="on load or scroll
-        -- Show arrows if content overflows (desktop only)
-        if window.innerWidth >= 640 and my.scrollWidth > my.clientWidth
-          remove .hidden from .entries-nav-arrow
-        else
-          add .hidden to .entries-nav-arrow
-        end">
+     data-scroll-arrows="entries-nav-arrow">
   <div class="flex flex-col sm:flex-row gap-1">
     {% include '_types/post/_entry_items.html' with context %}
   </div>

blog/templates/_types/post/_entry_items.html

@@ -29,10 +29,10 @@
 {# Load more entries one at a time until container is full #}
 {% if has_more_entries %}
   <div id="entries-load-sentinel-{{ current_page }}"
-       hx-get="{{ url_for('blog.post.get_entries', slug=post.slug, page=current_page + 1) }}"
-       hx-trigger="intersect once"
-       hx-swap="beforebegin"
-       _="on htmx:afterRequest trigger scroll on #associated-entries-container"
+       sx-get="{{ url_for('blog.post.get_entries', slug=post.slug, page=current_page + 1) }}"
+       sx-trigger="intersect once"
+       sx-swap="beforebegin"
+       sx-on:afterSwap="document.querySelector('#associated-entries-container').dispatchEvent(new Event('scroll'))"
        class="flex-shrink-0 w-1">
   </div>
 {% endif %}

blog/templates/_types/post/_main_panel.html

@@ -12,11 +12,11 @@
           {% set edit_href = url_for('blog.post.admin.edit', slug=post.slug)|host %}
           <a
             href="{{ edit_href }}"
-            hx-get="{{ edit_href }}"
-            hx-target="#main-panel"
-            hx-select="{{hx_select_search}}"
-            hx-swap="outerHTML"
-            hx-push-url="true"
+            sx-get="{{ edit_href }}"
+            sx-target="#main-panel"
+            sx-select="{{hx_select_search}}"
+            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"></i> Edit

blog/templates/_types/post/admin/_associated_entries.html

@@ -15,12 +15,12 @@
               data-confirm-confirm-text="Yes, remove it"
               data-confirm-cancel-text="Cancel"
               data-confirm-event="confirmed"
-              hx-post="{{ url_for('blog.post.admin.toggle_entry', slug=post.slug, entry_id=entry.id) }}"
-              hx-trigger="confirmed"
-              hx-target="#associated-entries-list"
-              hx-swap="outerHTML"
-              hx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
-              _="on htmx:afterRequest trigger entryToggled on body"
+              sx-post="{{ url_for('blog.post.admin.toggle_entry', slug=post.slug, entry_id=entry.id) }}"
+              sx-trigger="confirmed"
+              sx-target="#associated-entries-list"
+              sx-swap="outerHTML"
+              sx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
+              sx-on:afterSwap="document.body.dispatchEvent(new CustomEvent('entryToggled'))"
             >
               <div class="flex items-center justify-between gap-3">
                 {% if calendar.post.feature_image %}

blog/templates/_types/post/admin/_calendar_view.html

@@ -1,15 +1,15 @@
 <div id="calendar-view-{{ calendar.id }}"
-     hx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id, year=year, month=month) }}"
-     hx-trigger="entryToggled from:body"
-     hx-swap="outerHTML">
+     sx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id, year=year, month=month) }}"
+     sx-trigger="entryToggled from:body"
+     sx-swap="outerHTML">
   {# Month/year navigation #}
   <header class="flex items-center justify-center mb-4">
     <nav class="flex items-center gap-2 text-xl">
-      <a class="px-2 py-1 hover:bg-stone-100 rounded" href="?calendar_id={{ calendar.id }}&year={{ prev_year }}&month={{ month }}" hx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id, year=prev_year, month=month) }}" hx-target="#calendar-view-{{ calendar.id }}" hx-swap="outerHTML">&laquo;</a>
-      <a class="px-2 py-1 hover:bg-stone-100 rounded" href="?calendar_id={{ calendar.id }}&year={{ prev_month_year }}&month={{ prev_month }}" hx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id, year=prev_month_year, month=prev_month) }}" hx-target="#calendar-view-{{ calendar.id }}" hx-swap="outerHTML">&lsaquo;</a>
+      <a class="px-2 py-1 hover:bg-stone-100 rounded" href="?calendar_id={{ calendar.id }}&year={{ prev_year }}&month={{ month }}" sx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id, year=prev_year, month=month) }}" sx-target="#calendar-view-{{ calendar.id }}" sx-swap="outerHTML">&laquo;</a>
+      <a class="px-2 py-1 hover:bg-stone-100 rounded" href="?calendar_id={{ calendar.id }}&year={{ prev_month_year }}&month={{ prev_month }}" sx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id, year=prev_month_year, month=prev_month) }}" sx-target="#calendar-view-{{ calendar.id }}" sx-swap="outerHTML">&lsaquo;</a>
       <div class="px-3 font-medium">{{ month_name }} {{ year }}</div>
-      <a class="px-2 py-1 hover:bg-stone-100 rounded" href="?calendar_id={{ calendar.id }}&year={{ next_month_year }}&month={{ next_month }}" hx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id, year=next_month_year, month=next_month) }}" hx-target="#calendar-view-{{ calendar.id }}" hx-swap="outerHTML">&rsaquo;</a>
-      <a class="px-2 py-1 hover:bg-stone-100 rounded" href="?calendar_id={{ calendar.id }}&year={{ next_year }}&month={{ month }}" hx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id, year=next_year, month=month) }}" hx-target="#calendar-view-{{ calendar.id }}" hx-swap="outerHTML">&raquo;</a>
+      <a class="px-2 py-1 hover:bg-stone-100 rounded" href="?calendar_id={{ calendar.id }}&year={{ next_month_year }}&month={{ next_month }}" sx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id, year=next_month_year, month=next_month) }}" sx-target="#calendar-view-{{ calendar.id }}" sx-swap="outerHTML">&rsaquo;</a>
+      <a class="px-2 py-1 hover:bg-stone-100 rounded" href="?calendar_id={{ calendar.id }}&year={{ next_year }}&month={{ month }}" sx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id, year=next_year, month=month) }}" sx-target="#calendar-view-{{ calendar.id }}" sx-swap="outerHTML">&raquo;</a>
     </nav>
   </header>
 
@@ -45,12 +45,12 @@
                         data-confirm-confirm-text="Yes, remove it"
                         data-confirm-cancel-text="Cancel"
                         data-confirm-event="confirmed"
-                        hx-post="{{ url_for('blog.post.admin.toggle_entry', slug=post.slug, entry_id=e.id) }}"
-                        hx-trigger="confirmed"
-                        hx-target="#associated-entries-list"
-                        hx-swap="outerHTML"
-                        hx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
-                        _="on htmx:afterRequest trigger entryToggled on body"
+                        sx-post="{{ url_for('blog.post.admin.toggle_entry', slug=post.slug, entry_id=e.id) }}"
+                        sx-trigger="confirmed"
+                        sx-target="#associated-entries-list"
+                        sx-swap="outerHTML"
+                        sx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
+                        sx-on:afterSwap="document.body.dispatchEvent(new CustomEvent('entryToggled'))"
                       >
                         <i class="fa fa-times"></i>
                       </button>
@@ -67,12 +67,12 @@
                       data-confirm-confirm-text="Yes, add it"
                       data-confirm-cancel-text="Cancel"
                       data-confirm-event="confirmed"
-                      hx-post="{{ url_for('blog.post.admin.toggle_entry', slug=post.slug, entry_id=e.id) }}"
-                      hx-trigger="confirmed"
-                      hx-target="#associated-entries-list"
-                      hx-swap="outerHTML"
-                      hx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
-                      _="on htmx:afterRequest trigger entryToggled on body"
+                      sx-post="{{ url_for('blog.post.admin.toggle_entry', slug=post.slug, entry_id=e.id) }}"
+                      sx-trigger="confirmed"
+                      sx-target="#associated-entries-list"
+                      sx-swap="outerHTML"
+                      sx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
+                      sx-on:afterSwap="document.body.dispatchEvent(new CustomEvent('entryToggled'))"
                     >
                       <span class="truncate block">{{ e.name }}</span>
                     </button>

blog/templates/_types/post/admin/_features_panel.html

@@ -3,11 +3,11 @@
   <h3 class="text-lg font-semibold text-stone-800">Page Features</h3>
 
   <form
-    hx-put="{{ url_for('blog.post.admin.update_features', slug=post.slug)|host }}"
-    hx-target="#features-panel"
-    hx-swap="outerHTML"
-    hx-headers='{"Content-Type": "application/json"}'
-    hx-ext="json-enc"
+    sx-put="{{ url_for('blog.post.admin.update_features', slug=post.slug)|host }}"
+    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">
@@ -17,7 +17,7 @@
         value="true"
         {{ 'checked' if features.get('calendar') }}
         class="h-5 w-5 rounded border-stone-300 text-blue-600 focus:ring-blue-500"
-        _="on change trigger submit on closest <form/>"
+        onchange="this.closest('form').requestSubmit()"
       >
       <span class="text-sm text-stone-700">
         <i class="fa fa-calendar text-blue-600 mr-1"></i>
@@ -32,7 +32,7 @@
         value="true"
         {{ 'checked' if features.get('market') }}
         class="h-5 w-5 rounded border-stone-300 text-green-600 focus:ring-green-500"
-        _="on change trigger submit on closest <form/>"
+        onchange="this.closest('form').requestSubmit()"
       >
       <span class="text-sm text-stone-700">
         <i class="fa fa-shopping-bag text-green-600 mr-1"></i>
@@ -53,9 +53,9 @@
     </p>
 
     <form
-      hx-put="{{ url_for('blog.post.admin.update_sumup', slug=post.slug)|host }}"
-      hx-target="#features-panel"
-      hx-swap="outerHTML"
+      sx-put="{{ url_for('blog.post.admin.update_sumup', slug=post.slug)|host }}"
+      sx-target="#features-panel"
+      sx-swap="outerHTML"
       class="space-y-3"
     >
       <div>

blog/templates/_types/post/admin/_markets_panel.html

@@ -10,10 +10,10 @@
         <span class="text-stone-400 text-sm ml-2">/{{ m.slug }}/</span>
       </div>
       <button
-        hx-delete="{{ url_for('blog.post.admin.delete_market', slug=post.slug, market_slug=m.slug) }}"
-        hx-target="#markets-panel"
-        hx-swap="outerHTML"
-        hx-confirm="Delete market '{{ m.name }}'?"
+        sx-delete="{{ url_for('blog.post.admin.delete_market', slug=post.slug, market_slug=m.slug) }}"
+        sx-target="#markets-panel"
+        sx-swap="outerHTML"
+        sx-confirm="Delete market '{{ m.name }}'?"
         class="text-red-600 hover:text-red-800 text-sm"
       >Delete</button>
     </li>
@@ -24,9 +24,9 @@
   {% endif %}
 
   <form
-    hx-post="{{ url_for('blog.post.admin.create_market', slug=post.slug) }}"
-    hx-target="#markets-panel"
-    hx-swap="outerHTML"
+    sx-post="{{ url_for('blog.post.admin.create_market', slug=post.slug) }}"
+    sx-target="#markets-panel"
+    sx-swap="outerHTML"
     class="flex gap-2"
   >
     <input

blog/templates/_types/post/admin/_nav_entries.html

@@ -3,8 +3,7 @@
     <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">
+      onclick="document.getElementById('associated-items-container').scrollLeft -= 200">
       <i class="fa fa-chevron-left"></i>
     </button>
 
@@ -12,15 +11,8 @@
     <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;"
-         _="on load or scroll
-            -- Show arrows if content overflows (desktop only)
-            if window.innerWidth >= 640 and my.scrollWidth > my.clientWidth
-              remove .hidden from .entries-nav-arrow
-              add .flex to .entries-nav-arrow
-            else
-              add .hidden to .entries-nav-arrow
-              remove .flex from .entries-nav-arrow
-            end">
+         data-scroll-arrows="entries-nav-arrow"
+         onscroll="(function(el){var arrows=document.getElementsByClassName('entries-nav-arrow');var show=window.innerWidth>=640&&el.scrollWidth>el.clientWidth;for(var i=0;i<arrows.length;i++){if(show){arrows[i].classList.remove('hidden');arrows[i].classList.add('flex')}else{arrows[i].classList.add('hidden');arrows[i].classList.remove('flex')}}})(this)">
       <div class="flex flex-col sm:flex-row gap-1">
         {% for wdata in container_nav_widgets %}
           {% with ctx=wdata.ctx %}
@@ -44,7 +36,6 @@
     <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">
+      onclick="document.getElementById('associated-items-container').scrollLeft += 200">
       <i class="fa fa-chevron-right"></i>
     </button>

blog/templates/_types/post_entries/_main_panel.html

@@ -8,14 +8,7 @@
     <h3 class="text-lg font-semibold">Browse Calendars</h3>
     {% for calendar in all_calendars %}
       <details class="border rounded-lg bg-white"
-               _="on toggle
-                  if my.open
-                    for other in <details[open]/>
-                      if other is not me
-                        set other.open to false
-                      end
-                    end
-                  end">
+               data-toggle-group="calendar-browser">
         <summary class="p-4 cursor-pointer hover:bg-stone-50 flex items-center gap-3">
           {% if calendar.post.feature_image %}
             <img src="{{ calendar.post.feature_image }}"
@@ -35,9 +28,9 @@
           </div>
         </summary>
         <div class="p-4 border-t"
-             hx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id) }}"
-             hx-trigger="intersect once"
-             hx-swap="innerHTML">
+             sx-get="{{ url_for('blog.post.admin.calendar_view', slug=post.slug, calendar_id=calendar.id) }}"
+             sx-trigger="intersect once"
+             sx-swap="innerHTML">
           <div class="text-sm text-stone-400">Loading calendar...</div>
         </div>
       </details>

blog/templates/_types/root/settings/cache/_main_panel.html

@@ -1,10 +1,10 @@
   <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="{{ url_for('settings.cache_clear') }}"
-        hx-trigger="submit"
-        hx-target="#cache-status"
-        hx-swap="innerHTML"
+        sx-post="{{ url_for('settings.cache_clear') }}"
+        sx-trigger="submit"
+        sx-target="#cache-status"
+        sx-swap="innerHTML"
       >
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
         <button class="border rounded px-4 py-2 bg-stone-800 text-white text-sm" type="submit">Clear cache</button>

blog/templates/_types/snippets/_list.html

@@ -29,10 +29,10 @@
           {% if is_admin %}
             <select
               name="visibility"
-              hx-patch="{{ url_for('snippets.patch_visibility', snippet_id=s.id) }}"
-              hx-target="#snippets-list"
-              hx-swap="innerHTML"
-              hx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
+              sx-patch="{{ url_for('snippets.patch_visibility', snippet_id=s.id) }}"
+              sx-target="#snippets-list"
+              sx-swap="innerHTML"
+              sx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
               class="text-sm border border-stone-300 rounded px-2 py-1"
             >
               {% for v in ['private', 'shared', 'admin'] %}
@@ -52,11 +52,11 @@
               data-confirm-confirm-text="Yes, delete"
               data-confirm-cancel-text="Cancel"
               data-confirm-event="confirmed"
-              hx-delete="{{ url_for('snippets.delete_snippet', snippet_id=s.id) }}"
-              hx-trigger="confirmed"
-              hx-target="#snippets-list"
-              hx-swap="innerHTML"
-              hx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
+              sx-delete="{{ url_for('snippets.delete_snippet', snippet_id=s.id) }}"
+              sx-trigger="confirmed"
+              sx-target="#snippets-list"
+              sx-swap="innerHTML"
+              sx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
               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"></i> Delete
             </button>

blog/templates/macros/scrolling_menu.html

@@ -19,8 +19,7 @@
     <button
       class="scrolling-menu-arrow-{{ container_id }} hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded"
       aria-label="Scroll left"
-      _="on click
-         set #{{ container_id }}.scrollLeft to #{{ container_id }}.scrollLeft - 200">
+      onclick="document.getElementById('{{ container_id }}').scrollLeft -= 200">
       <i class="fa fa-chevron-left"></i>
     </button>
 
@@ -28,15 +27,8 @@
     <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 {{ container_class }}"
          style="scroll-behavior: smooth;"
-         _="on load or scroll
-            -- Show arrows if content overflows (desktop only)
-            if window.innerWidth >= 640 and my.scrollWidth > my.clientWidth
-              remove .hidden from .scrolling-menu-arrow-{{ container_id }}
-              add .flex to .scrolling-menu-arrow-{{ container_id }}
-            else
-              add .hidden to .scrolling-menu-arrow-{{ container_id }}
-              remove .flex from .scrolling-menu-arrow-{{ container_id }}
-            end">
+         data-scroll-arrows="scrolling-menu-arrow-{{ container_id }}"
+         onscroll="(function(el){var cls='scrolling-menu-arrow-{{ container_id }}';var arrows=document.getElementsByClassName(cls);var show=window.innerWidth>=640&&el.scrollWidth>el.clientWidth;for(var i=0;i<arrows.length;i++){if(show){arrows[i].classList.remove('hidden');arrows[i].classList.add('flex')}else{arrows[i].classList.add('hidden');arrows[i].classList.remove('flex')}}})(this)">
       <div class="flex flex-col sm:flex-row gap-1 {{ wrapper_class }}">
         {% for item in items %}
           <div class="{{ item_class }}">
@@ -60,8 +52,7 @@
     <button
       class="scrolling-menu-arrow-{{ container_id }} hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded"
       aria-label="Scroll right"
-      _="on click
-         set #{{ container_id }}.scrollLeft to #{{ container_id }}.scrollLeft + 200">
+      onclick="document.getElementById('{{ container_id }}').scrollLeft += 200">
       <i class="fa fa-chevron-right"></i>
     </button>
   {% endif %}

build-tw.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Build Tailwind CSS from source templates.
+# Requires: tailwindcss CLI standalone binary on PATH.
+#   curl -sL https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 \
+#     -o /usr/local/bin/tailwindcss && chmod +x /usr/local/bin/tailwindcss
+set -euo pipefail
+cd "$(dirname "$0")"
+tailwindcss -i shared/static/styles/tailwind.css -o shared/static/styles/tw.css --minify
+echo "Built shared/static/styles/tw.css ($(wc -c < shared/static/styles/tw.css) bytes)"

cart/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 decimal import Decimal
 from pathlib import Path
@@ -50,7 +50,7 @@ async def cart_context() -> dict:
     - cart / calendar_cart_entries / total / calendar_total: direct DB
       (cart app owns this data)
     - cart_count: derived from cart + calendar entries (for _mini.html)
-    - nav_tree_html: fetched from blog as fragment
+    - nav_tree: fetched from blog as fragment
 
     When g.page_post exists, cart and calendar_cart_entries are page-scoped.
     Global cart_count / cart_total stay global for cart-mini.
@@ -73,14 +73,14 @@ async def cart_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": "cart", "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
 
     # Cart app owns cart data — use g.cart from _load_cart
     all_cart = getattr(g, "cart", None) or []

cart/bp/cart/global_routes.py

@@ -54,7 +54,7 @@ def register(url_prefix: str) -> Blueprint:
         if not cart_item:
             return await make_response("Product not found", 404)
 
-        if request.headers.get("HX-Request") == "true":
+        if request.headers.get("SX-Request") == "true" or request.headers.get("HX-Request") == "true":
             # Redirect to overview for HTMX
             return redirect(url_for("cart_overview.overview"))
 
@@ -150,8 +150,8 @@ def register(url_prefix: str) -> Blueprint:
         try:
             page_config = await resolve_page_config(g.s, cart, calendar_entries, tickets)
         except ValueError as e:
-            from shared.sexp.page import get_template_context
-            from sexp.sexp_components import render_checkout_error_page
+            from shared.sx.page import get_template_context
+            from sx.sx_components import render_checkout_error_page
             tctx = await get_template_context()
             html = await render_checkout_error_page(tctx, error=str(e))
             return await make_response(html, 400)
@@ -207,8 +207,8 @@ def register(url_prefix: str) -> Blueprint:
         hosted_url = result.get("sumup_hosted_url")
 
         if not hosted_url:
-            from shared.sexp.page import get_template_context
-            from sexp.sexp_components import render_checkout_error_page
+            from shared.sx.page import get_template_context
+            from sx.sx_components import render_checkout_error_page
             tctx = await get_template_context()
             html = await render_checkout_error_page(tctx, error="No hosted checkout URL returned from SumUp.")
             return await make_response(html, 500)

cart/bp/cart/overview_routes.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from quart import Blueprint, render_template, make_response
 
 from shared.browser.app.utils.htmx import is_htmx_request
+from shared.sx.helpers import sx_response
 from .services import get_cart_grouped_by_page
 
 
@@ -14,16 +15,17 @@ def register(url_prefix: str) -> Blueprint:
     @bp.get("/")
     async def overview():
         from quart import g
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_overview_page, render_overview_oob
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_overview_page, render_overview_oob
 
         page_groups = await get_cart_grouped_by_page(g.s)
         ctx = await get_template_context()
 
         if not is_htmx_request():
             html = await render_overview_page(ctx, page_groups)
+            return await make_response(html)
         else:
-            html = await render_overview_oob(ctx, page_groups)
-        return await make_response(html)
+            sx_src = await render_overview_oob(ctx, page_groups)
+            return sx_response(sx_src)
 
     return bp

cart/bp/cart/page_routes.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from quart import Blueprint, g, redirect, make_response, url_for
 
 from shared.browser.app.utils.htmx import is_htmx_request
+from shared.sx.helpers import sx_response
 from shared.infrastructure.actions import call_action
 from .services import (
     total,
@@ -40,8 +41,8 @@ def register(url_prefix: str) -> Blueprint:
             ticket_total=ticket_total,
         )
 
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_page_cart_page, render_page_cart_oob
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_page_cart_page, render_page_cart_oob
 
         ctx = await get_template_context()
         if not is_htmx_request():
@@ -49,12 +50,13 @@ def register(url_prefix: str) -> Blueprint:
                 ctx, post, cart, cal_entries, page_tickets,
                 ticket_groups, total, calendar_total, ticket_total,
             )
+            return await make_response(html)
         else:
-            html = await render_page_cart_oob(
+            sx_src = await render_page_cart_oob(
                 ctx, post, cart, cal_entries, page_tickets,
                 ticket_groups, total, calendar_total, ticket_total,
             )
-        return await make_response(html)
+            return sx_response(sx_src)
 
     @bp.post("/checkout/")
     async def page_checkout():
@@ -109,8 +111,8 @@ def register(url_prefix: str) -> Blueprint:
         hosted_url = result.get("sumup_hosted_url")
 
         if not hosted_url:
-            from shared.sexp.page import get_template_context
-            from sexp.sexp_components import render_checkout_error_page
+            from shared.sx.page import get_template_context
+            from sx.sx_components import render_checkout_error_page
             tctx = await get_template_context()
             html = await render_checkout_error_page(tctx, error="No hosted checkout URL returned from SumUp.")
             return await make_response(html, 500)

cart/bp/fragments/routes.py

@@ -1,6 +1,6 @@
 """Cart 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:
@@ -19,13 +19,13 @@ def register():
     bp = Blueprint("fragments", __name__, url_prefix="/internal/fragments")
 
     # ---------------------------------------------------------------
-    # Fragment handlers
+    # Fragment handlers — return sx source text
     # ---------------------------------------------------------------
 
     async def _cart_mini():
         from shared.services.registry import services
         from shared.infrastructure.urls import blog_url, cart_url
-        from shared.sexp.jinja_bridge import sexp as render_sexp
+        from shared.sx.helpers import sx_call
 
         user_id = request.args.get("user_id", type=int)
         session_id = request.args.get("session_id")
@@ -35,19 +35,19 @@ def register():
         )
         count = summary.count + summary.calendar_count + summary.ticket_count
         oob = request.args.get("oob", "")
-        return render_sexp(
-            '(~cart-mini :cart-count cart-count :blog-url blog-url :cart-url cart-url :oob oob)',
-            **{"cart-count": count, "blog-url": blog_url(""), "cart-url": cart_url(""), "oob": oob or None},
-        )
+        return sx_call("cart-mini",
+                         cart_count=count,
+                         blog_url=blog_url(""),
+                         cart_url=cart_url(""),
+                         oob=oob or None)
 
     async def _account_nav_item():
         from shared.infrastructure.urls import cart_url
-        from shared.sexp.jinja_bridge import sexp as render_sexp
+        from shared.sx.helpers import sx_call
 
-        return render_sexp(
-            '(~account-nav-item :href href :label "orders")',
-            href=cart_url("/orders/"),
-        )
+        return sx_call("account-nav-item",
+                         href=cart_url("/orders/"),
+                         label="orders")
 
     _handlers = {
         "cart-mini": _cart_mini,
@@ -67,8 +67,8 @@ def register():
     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")
+            return Response("", status=200, content_type="text/sx")
+        src = await handler()
+        return Response(src, status=200, content_type="text/sx")
 
     return bp

cart/bp/order/routes.py

@@ -13,6 +13,7 @@ from shared.infrastructure.http_utils import vary as _vary, current_url_without_
 from shared.infrastructure.cart_identity import current_cart_identity
 from bp.cart.services import check_sumup_status
 from shared.browser.app.utils.htmx import is_htmx_request
+from shared.sx.helpers import sx_response
 
 from .filters.qs import makeqs_factory, decode
 
@@ -55,18 +56,18 @@ def register() -> Blueprint:
         order = result.scalar_one_or_none()
         if not order:
             return await make_response("Order not found", 404)
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_order_page, render_order_oob
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_order_page, render_order_oob
 
         ctx = await get_template_context()
         calendar_entries = ctx.get("calendar_entries")
 
         if not is_htmx_request():
             html = await render_order_page(ctx, order, calendar_entries, url_for)
+            return await make_response(html)
         else:
-            html = await render_order_oob(ctx, order, calendar_entries, url_for)
-
-        return await make_response(html)
+            sx_src = await render_order_oob(ctx, order, calendar_entries, url_for)
+            return sx_response(sx_src)
 
     @bp.get("/pay/")
     async def order_pay(order_id: int):
@@ -120,8 +121,8 @@ def register() -> Blueprint:
         await g.s.flush()
 
         if not hosted_url:
-            from shared.sexp.page import get_template_context
-            from sexp.sexp_components import render_checkout_error_page
+            from shared.sx.page import get_template_context
+            from sx.sx_components import render_checkout_error_page
             tctx = await get_template_context()
             html = await render_checkout_error_page(tctx, error="No hosted checkout URL returned from SumUp when trying to reopen payment.", order=order)
             return await make_response(html, 500)

cart/bp/orders/routes.py

@@ -13,6 +13,7 @@ from shared.infrastructure.http_utils import vary as _vary, current_url_without_
 from shared.infrastructure.cart_identity import current_cart_identity
 from bp.cart.services import check_sumup_status
 from shared.browser.app.utils.htmx import is_htmx_request
+from shared.sx.helpers import sx_response
 from bp import register_order
 
 from .filters.qs import makeqs_factory, decode
@@ -136,8 +137,8 @@ def register(url_prefix: str) -> Blueprint:
         result = await g.s.execute(stmt)
         orders = result.scalars().all()
 
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import (
+        from shared.sx.page import get_template_context
+        from sx.sx_components import (
             render_orders_page,
             render_orders_rows,
             render_orders_oob,
@@ -151,17 +152,18 @@ def register(url_prefix: str) -> Blueprint:
                 ctx, orders, page, total_pages, search, total_count,
                 url_for, qs_fn,
             )
+            resp = await make_response(html)
         elif page > 1:
-            html = await render_orders_rows(
+            sx_src = await render_orders_rows(
                 ctx, orders, page, total_pages, url_for, qs_fn,
             )
+            resp = sx_response(sx_src)
         else:
-            html = await render_orders_oob(
+            sx_src = await render_orders_oob(
                 ctx, orders, page, total_pages, search, total_count,
                 url_for, qs_fn,
             )
-
-        resp = await make_response(html)
+            resp = sx_response(sx_src)
         resp.headers["Hx-Push-Url"] = _current_url_without_page()
         return _vary(resp)
 

cart/bp/page_admin/routes.py

@@ -8,6 +8,7 @@ from shared.infrastructure.actions import call_action
 from shared.infrastructure.data_client import fetch_data
 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
 
 
 def register():
@@ -16,30 +17,32 @@ def register():
     @bp.get("/")
     @require_admin
     async def admin(**kwargs):
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_cart_admin_page, render_cart_admin_oob
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_cart_admin_page, render_cart_admin_oob
 
         ctx = await get_template_context()
         page_post = getattr(g, "page_post", None)
         if not is_htmx_request():
             html = await render_cart_admin_page(ctx, page_post)
+            return await make_response(html)
         else:
-            html = await render_cart_admin_oob(ctx, page_post)
-        return await make_response(html)
+            sx_src = await render_cart_admin_oob(ctx, page_post)
+            return sx_response(sx_src)
 
     @bp.get("/payments/")
     @require_admin
     async def payments(**kwargs):
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_cart_payments_page, render_cart_payments_oob
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_cart_payments_page, render_cart_payments_oob
 
         ctx = await get_template_context()
         page_post = getattr(g, "page_post", None)
         if not is_htmx_request():
             html = await render_cart_payments_page(ctx, page_post)
+            return await make_response(html)
         else:
-            html = await render_cart_payments_oob(ctx, page_post)
-        return await make_response(html)
+            sx_src = await render_cart_payments_oob(ctx, page_post)
+            return sx_response(sx_src)
 
     @bp.put("/payments/")
     @require_admin
@@ -74,10 +77,10 @@ def register():
         )
         g.page_config = SimpleNamespace(**raw_pc) if raw_pc else None
 
-        from shared.sexp.page import get_template_context
-        from sexp.sexp_components import render_cart_payments_panel
+        from shared.sx.page import get_template_context
+        from sx.sx_components import render_cart_payments_panel
         ctx = await get_template_context()
         html = render_cart_payments_panel(ctx)
-        return await make_response(html)
+        return sx_response(html)
 
     return bp

cart/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})..."

cart/sexp/checkout.sexpr

@@ -1,20 +0,0 @@
-;; Cart checkout error components
-
-(defcomp ~cart-checkout-error-filter ()
-  (header :class "mb-6 sm:mb-8"
-    (h1 :class "text-xl sm:text-2xl md:text-3xl font-semibold tracking-tight" "Checkout error")
-    (p :class "text-xs sm:text-sm text-stone-600"
-      "We tried to start your payment with SumUp but hit a problem.")))
-
-(defcomp ~cart-checkout-error-order-id (&key order-id)
-  (p :class "text-xs text-rose-800/80"
-    "Order ID: " (span :class "font-mono" (raw! order-id))))
-
-(defcomp ~cart-checkout-error-content (&key error-msg order-html back-url)
-  (div :class "max-w-full px-3 py-3 space-y-4"
-    (div :class "rounded-2xl border border-rose-200 bg-rose-50/80 p-4 sm:p-6 text-sm text-rose-900 space-y-2"
-      (p :class "font-medium" "Something went wrong.")
-      (p (raw! error-msg))
-      (raw! order-html))
-    (div (a :href back-url :class "inline-flex items-center px-3 py-2 text-xs sm:text-sm rounded-full border border-stone-300 bg-white hover:bg-stone-50 transition"
-      (i :class "fa fa-shopping-cart mr-2" :aria-hidden "true") "Back to cart"))))

cart/sexp/header.sexpr

@@ -1,44 +0,0 @@
-;; Cart header components
-
-(defcomp ~cart-page-label-img (&key src)
-  (img :src src :class "h-8 w-8 rounded-full object-cover border border-stone-300 flex-shrink-0"))
-
-(defcomp ~cart-all-carts-link (&key href)
-  (a :href href :class "inline-flex items-center gap-1.5 px-3 py-1.5 text-sm rounded-full border border-stone-300 bg-white hover:bg-stone-50 transition"
-    (i :class "fa fa-arrow-left text-xs" :aria-hidden "true") "All carts"))
-
-(defcomp ~cart-header-child (&key inner-html)
-  (div :id "root-header-child" :class "flex flex-col w-full items-center"
-    (raw! inner-html)))
-
-(defcomp ~cart-header-child-nested (&key outer-html inner-html)
-  (div :id "root-header-child" :class "flex flex-col w-full items-center"
-    (raw! outer-html)
-    (div :id "cart-header-child" :class "flex flex-col w-full items-center"
-      (raw! inner-html))))
-
-(defcomp ~cart-header-child-oob (&key inner-html)
-  (div :id "cart-header-child" :hx-swap-oob "outerHTML" :class "flex flex-col w-full items-center"
-    (raw! inner-html)))
-
-(defcomp ~cart-auth-header-child (&key auth-html orders-html)
-  (div :id "root-header-child" :class "flex flex-col w-full items-center"
-    (raw! auth-html)
-    (div :id "auth-header-child" :class "flex flex-col w-full items-center"
-      (raw! orders-html))))
-
-(defcomp ~cart-auth-header-child-oob (&key inner-html)
-  (div :id "auth-header-child" :hx-swap-oob "outerHTML" :class "flex flex-col w-full items-center"
-    (raw! inner-html)))
-
-(defcomp ~cart-order-header-child (&key auth-html orders-html order-html)
-  (div :id "root-header-child" :class "flex flex-col w-full items-center"
-    (raw! auth-html)
-    (div :id "auth-header-child" :class "flex flex-col w-full items-center"
-      (raw! orders-html)
-      (div :id "orders-header-child" :class "flex flex-col w-full items-center"
-        (raw! order-html)))))
-
-(defcomp ~cart-orders-header-child-oob (&key inner-html)
-  (div :id "orders-header-child" :hx-swap-oob "outerHTML" :class "flex flex-col w-full items-center"
-    (raw! inner-html)))

cart/sexp/order_detail.sexpr

@@ -1,53 +0,0 @@
-;; Cart single order detail components
-
-(defcomp ~cart-order-item-img (&key src alt)
-  (img :src src :alt alt :class "w-full h-full object-contain object-center" :loading "lazy" :decoding "async"))
-
-(defcomp ~cart-order-item-no-img ()
-  (div :class "w-full h-full flex items-center justify-center text-[9px] text-stone-400" "No image"))
-
-(defcomp ~cart-order-item (&key prod-url img-html title product-id qty price)
-  (li (a :class "w-full py-2 flex gap-3" :href prod-url
-    (div :class "w-12 h-12 sm:w-14 sm:h-14 rounded-md bg-stone-100 flex-shrink-0 overflow-hidden" (raw! img-html))
-    (div :class "flex-1 flex justify-between gap-3"
-      (div (p :class "font-medium" (raw! title))
-        (p :class "text-[11px] text-stone-500" (raw! product-id)))
-      (div :class "text-right whitespace-nowrap"
-        (p (raw! qty)) (p (raw! price)))))))
-
-(defcomp ~cart-order-items-panel (&key items-html)
-  (div :class "rounded-2xl border border-stone-200 bg-white/80 p-4 sm:p-6"
-    (h2 :class "text-sm sm:text-base font-semibold mb-3" "Items")
-    (ul :class "divide-y divide-stone-100 text-xs sm:text-sm" (raw! items-html))))
-
-(defcomp ~cart-order-cal-entry (&key name pill status date-str cost)
-  (li :class "px-4 py-3 flex items-start justify-between text-sm"
-    (div (div :class "font-medium flex items-center gap-2"
-      (raw! name) (span :class pill (raw! status)))
-      (div :class "text-xs text-stone-500" (raw! date-str)))
-    (div :class "ml-4 font-medium" (raw! cost))))
-
-(defcomp ~cart-order-cal-section (&key items-html)
-  (section :class "mt-6 space-y-3"
-    (h2 :class "text-base sm:text-lg font-semibold" "Calendar bookings in this order")
-    (ul :class "divide-y divide-stone-200 rounded-2xl border border-stone-200 bg-white/80" (raw! items-html))))
-
-(defcomp ~cart-order-main (&key summary-html items-html cal-html)
-  (div :class "max-w-full px-3 py-3 space-y-4" (raw! summary-html) (raw! items-html) (raw! cal-html)))
-
-(defcomp ~cart-order-pay-btn (&key url)
-  (a :href url :class "inline-flex items-center px-3 py-2 text-xs sm:text-sm rounded-full border border-emerald-600 bg-emerald-600 text-white hover:bg-emerald-700 transition"
-    (i :class "fa fa-credit-card mr-2" :aria-hidden "true") "Open payment page"))
-
-(defcomp ~cart-order-filter (&key info list-url recheck-url csrf pay-html)
-  (header :class "mb-6 sm:mb-8 flex flex-col sm:flex-row sm:items-center justify-between gap-3 sm:gap-4"
-    (div :class "space-y-1"
-      (p :class "text-xs sm:text-sm text-stone-600" (raw! info)))
-    (div :class "flex w-full sm:w-auto justify-start sm:justify-end gap-2"
-      (a :href list-url :class "inline-flex items-center px-3 py-2 text-xs sm:text-sm rounded-full border border-stone-300 bg-white hover:bg-stone-50 transition"
-        (i :class "fa-solid fa-list mr-2" :aria-hidden "true") "All orders")
-      (form :method "post" :action recheck-url :class "inline"
-        (input :type "hidden" :name "csrf_token" :value csrf)
-        (button :type "submit" :class "inline-flex items-center px-3 py-2 text-xs sm:text-sm rounded-full border border-stone-300 bg-white hover:bg-stone-50 transition"
-          (i :class "fa-solid fa-rotate mr-2" :aria-hidden "true") "Re-check status"))
-      (raw! pay-html))))

cart/sexp/orders.sexpr

@@ -1,51 +0,0 @@
-;; Cart orders list components
-
-(defcomp ~cart-order-row-desktop (&key order-id created desc total pill status detail-url)
-  (tr :class "hidden sm:table-row border-t border-stone-100 hover:bg-stone-50/60"
-    (td :class "px-3 py-2 align-top" (span :class "font-mono text-[11px] sm:text-xs" (raw! order-id)))
-    (td :class "px-3 py-2 align-top text-stone-700 text-xs sm:text-sm" (raw! created))
-    (td :class "px-3 py-2 align-top text-stone-700 text-xs sm:text-sm" (raw! desc))
-    (td :class "px-3 py-2 align-top text-stone-700 text-xs sm:text-sm" (raw! total))
-    (td :class "px-3 py-2 align-top" (span :class pill (raw! status)))
-    (td :class "px-3 py-0.5 align-top text-right"
-      (a :href detail-url :class "inline-flex items-center px-3 py-1.5 text-xs sm:text-sm rounded-full border border-stone-300 bg-white hover:bg-stone-50 transition" "View"))))
-
-(defcomp ~cart-order-row-mobile (&key order-id pill status created total detail-url)
-  (tr :class "sm:hidden border-t border-stone-100"
-    (td :colspan "5" :class "px-3 py-3"
-      (div :class "flex flex-col gap-2 text-xs"
-        (div :class "flex items-center justify-between gap-2"
-          (span :class "font-mono text-[11px] text-stone-700" (raw! order-id))
-          (span :class pill (raw! status)))
-        (div :class "text-[11px] text-stone-500 break-words" (raw! created))
-        (div :class "flex items-center justify-between gap-2"
-          (div :class "font-medium text-stone-800" (raw! total))
-          (a :href detail-url :class "inline-flex items-center px-2 py-1 text-[11px] rounded-full border border-stone-300 bg-white hover:bg-stone-50 transition shrink-0" "View"))))))
-
-(defcomp ~cart-orders-end ()
-  (tr (td :colspan "5" :class "px-3 py-4 text-center text-xs text-stone-400" "End of results")))
-
-(defcomp ~cart-orders-empty ()
-  (div :class "max-w-full px-3 py-3 space-y-3"
-    (div :class "rounded-2xl border border-dashed border-stone-300 bg-white/80 p-4 sm:p-6 text-sm text-stone-700"
-      "No orders yet.")))
-
-(defcomp ~cart-orders-table (&key rows-html)
-  (div :class "max-w-full px-3 py-3 space-y-3"
-    (div :class "overflow-x-auto rounded-2xl border border-stone-200 bg-white/80"
-      (table :class "min-w-full text-xs sm:text-sm"
-        (thead :class "bg-stone-50 border-b border-stone-200 text-stone-600"
-          (tr
-            (th :class "px-3 py-2 text-left font-medium" "Order")
-            (th :class "px-3 py-2 text-left font-medium" "Created")
-            (th :class "px-3 py-2 text-left font-medium" "Description")
-            (th :class "px-3 py-2 text-left font-medium" "Total")
-            (th :class "px-3 py-2 text-left font-medium" "Status")
-            (th :class "px-3 py-2 text-left font-medium")))
-        (tbody (raw! rows-html))))))
-
-(defcomp ~cart-orders-filter (&key search-mobile-html)
-  (header :class "mb-6 sm:mb-8 flex flex-col sm:flex-row sm:items-center justify-between gap-3 sm:gap-4"
-    (div :class "space-y-1"
-      (p :class "text-xs sm:text-sm text-stone-600" "Recent orders placed via the checkout."))
-    (div :class "md:hidden" (raw! search-mobile-html))))

cart/sexp/overview.sexpr

@@ -1,52 +0,0 @@
-;; Cart overview components
-
-(defcomp ~cart-badge (&key icon text)
-  (span :class "inline-flex items-center gap-1 px-2 py-0.5 rounded-full bg-stone-100"
-    (i :class icon :aria-hidden "true") (raw! text)))
-
-(defcomp ~cart-badges-wrap (&key badges-html)
-  (div :class "mt-1 flex flex-wrap gap-2 text-xs text-stone-600"
-    (raw! badges-html)))
-
-(defcomp ~cart-group-card-img (&key src alt)
-  (img :src src :alt alt :class "h-16 w-16 rounded-xl object-cover border border-stone-200 flex-shrink-0"))
-
-(defcomp ~cart-group-card-placeholder ()
-  (div :class "h-16 w-16 rounded-xl bg-stone-100 flex items-center justify-center flex-shrink-0"
-    (i :class "fa fa-store text-stone-400 text-xl" :aria-hidden "true")))
-
-(defcomp ~cart-mp-subtitle (&key title)
-  (p :class "text-xs text-stone-500 truncate" (raw! title)))
-
-(defcomp ~cart-group-card (&key href img-html display-title subtitle-html badges-html total)
-  (a :href href :class "block rounded-2xl border border-stone-200 bg-white shadow-sm hover:shadow-md hover:border-stone-300 transition p-4 sm:p-5"
-    (div :class "flex items-start gap-4"
-      (raw! img-html)
-      (div :class "flex-1 min-w-0"
-        (h3 :class "text-base sm:text-lg font-semibold text-stone-900 truncate" (raw! display-title))
-        (raw! subtitle-html) (raw! badges-html))
-      (div :class "text-right flex-shrink-0"
-        (div :class "text-lg font-bold text-stone-900" (raw! total))
-        (div :class "mt-1 text-xs text-emerald-700 font-medium" "View cart \u2192")))))
-
-(defcomp ~cart-orphan-card (&key badges-html total)
-  (div :class "rounded-2xl border border-dashed border-amber-300 bg-amber-50/60 p-4 sm:p-5"
-    (div :class "flex items-start gap-4"
-      (div :class "h-16 w-16 rounded-xl bg-amber-100 flex items-center justify-center flex-shrink-0"
-        (i :class "fa fa-shopping-cart text-amber-500 text-xl" :aria-hidden "true"))
-      (div :class "flex-1 min-w-0"
-        (h3 :class "text-base sm:text-lg font-semibold text-stone-900" "Other items")
-        (raw! badges-html))
-      (div :class "text-right flex-shrink-0"
-        (div :class "text-lg font-bold text-stone-900" (raw! total))))))
-
-(defcomp ~cart-empty ()
-  (div :class "max-w-full px-3 py-3 space-y-3"
-    (div :class "rounded-2xl border border-dashed border-stone-300 bg-white/80 p-6 sm:p-8 text-center"
-      (div :class "inline-flex h-10 w-10 sm:h-12 sm:w-12 items-center justify-center rounded-full bg-stone-100 mb-3"
-        (i :class "fa fa-shopping-cart text-stone-500 text-sm sm:text-base" :aria-hidden "true"))
-      (p :class "text-base sm:text-lg font-medium text-stone-800" "Your cart is empty"))))
-
-(defcomp ~cart-overview-panel (&key cards-html)
-  (div :class "max-w-full px-3 py-3 space-y-3"
-    (div :class "space-y-4" (raw! cards-html))))

cart/sexp/payments.sexpr

@@ -1,21 +0,0 @@
-;; Cart payments components
-
-(defcomp ~cart-payments-panel (&key update-url csrf merchant-code placeholder input-cls sumup-configured checkout-prefix)
-  (section :class "p-4 max-w-lg mx-auto"
-    (div :id "payments-panel" :class "space-y-4 p-4 bg-white rounded-lg border border-stone-200"
-      (h3 :class "text-lg font-semibold text-stone-800"
-        (i :class "fa fa-credit-card text-purple-600 mr-1") " SumUp Payment")
-      (p :class "text-xs text-stone-400" "Configure per-page SumUp credentials. Leave blank to use the global merchant account.")
-      (form :hx-put update-url :hx-target "#payments-panel" :hx-swap "outerHTML" :hx-select "#payments-panel" :class "space-y-3"
-        (input :type "hidden" :name "csrf_token" :value csrf)
-        (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 input-cls))
-        (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 input-cls)
-          (when sumup-configured (p :class "text-xs text-stone-400 mt-0.5" "Key is set. Leave blank to keep current key.")))
-        (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 input-cls))
-        (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")
-        (when sumup-configured (span :class "ml-2 text-xs text-green-600"
-          (i :class "fa fa-check-circle") " Connected"))))))

cart/sx/calendar.sx

@@ -2,11 +2,11 @@
 
 (defcomp ~cart-cal-entry (&key name date-str cost)
   (li :class "flex items-start justify-between text-sm"
-    (div (div :class "font-medium" (raw! name))
-      (div :class "text-xs text-stone-500" (raw! date-str)))
-    (div :class "ml-4 font-medium" (raw! cost))))
+    (div (div :class "font-medium" name)
+      (div :class "text-xs text-stone-500" date-str))
+    (div :class "ml-4 font-medium" cost)))
 
-(defcomp ~cart-cal-section (&key items-html)
+(defcomp ~cart-cal-section (&key items)
   (div :class "mt-6 border-t border-stone-200 pt-4"
     (h2 :class "text-base font-semibold mb-2" "Calendar bookings")
-    (ul :class "space-y-2" (raw! items-html))))
+    (ul :class "space-y-2" items)))

cart/sx/header.sx

@@ -0,0 +1,10 @@
+;; Cart header components
+
+(defcomp ~cart-page-label-img (&key src)
+  (img :src src :class "h-8 w-8 rounded-full object-cover border border-stone-300 flex-shrink-0"))
+
+(defcomp ~cart-all-carts-link (&key href)
+  (a :href href :class "inline-flex items-center gap-1.5 px-3 py-1.5 text-sm rounded-full border border-stone-300 bg-white hover:bg-stone-50 transition"
+    (i :class "fa fa-arrow-left text-xs" :aria-hidden "true") "All carts"))
+
+