merge: frame resize handle (bottom-right corner)

Mirrors picasso's device-resize pattern. 10x10 handle at frame's
bottom-right; pointerdown→drag→PATCH width+height on release. Min
200x150. Doesn't interfere with frame-body drag or label-as-grip
selection.

.dockerignore

@@ -15,7 +15,7 @@ data
 
 # Build artefacts
 bin
-mcables
+/cablegui
 
 # Editor cruft
 .vscode

.gitignore

@@ -8,7 +8,7 @@ data/*.db-shm
 
 # Build artefacts
 bin/
-mcables
+/cablegui
 
 # Editor
 .vscode/

CLAUDE.md

@@ -1,11 +1,11 @@
-# mCables — Project Instructions
+# CableGUI — Project Instructions
 
 ## Project Overview
 
 Cable-management **framework + solver** for m's setup. m declares his
 **devices** and the **connection requirements** between them ("NAS must
-connect to Switch via RJ45"). mCables runs a solver that emits the cable
-plan + bundle recommendations. mCables is a **schematic**, not a
+connect to Switch via RJ45"). CableGUI runs a solver that emits the cable
+plan + bundle recommendations. CableGUI is a **schematic**, not a
 physical-routing tool — cables are straight lines between endpoints; the
 "maximum bundling" objective is satisfied by the endpoint-pair rule
 (when two or more cables share the same A↔B endpoint pair, group them
@@ -13,16 +13,17 @@ into one bundle). The visual editor is still there for tweaking the
 plan, but the solver is the headline.
 
 Each cable-managed environment (LOFT, OFFICE, …) is a separate
-**mCables project**, and each project is backed by exactly one Excalidraw
+**CableGUI project**, and each project is backed by exactly one Excalidraw
 drawing. The framework provides a visual web interface backed by a Go
 HTTP API and SQLite, plus an export pipeline that writes `.excalidraw`
 files via mExDraw.
 
-**Memory group_id:** `mcables`
+**Memory group_id:** `mcables` (kept historical — all prior memories live
+under this id; renaming would orphan them)
 
 **No CLI.** Frontend-first — every interaction is through the visual
 interface. The backend serves the UI and the API; there is no
-`mcables` shell binary intended for humans.
+`cablegui` shell binary intended for humans.
 
 ## Goal
 
@@ -53,7 +54,7 @@ interface. The backend serves the UI and the API; there is no
 
 | Layer | Tech | Notes |
 |---|---|---|
-| DB | SQLite | `./data/mcables.db` (project-local, gitignored). Driver: `modernc.org/sqlite` (cgo-free). |
+| DB | SQLite | `./data/cablegui.db` (project-local, gitignored). Driver: `modernc.org/sqlite` (cgo-free). |
 | Backend | Go | `net/http` HTTP API + static frontend via `embed.FS`. Standard library + minimal deps. Single binary. |
 | Frontend | Vanilla JS modules + SVG, no build step | TypeScript types via JSDoc, optional `tsc --noEmit` in CI. Preact-via-CDN-ESM is the documented fallback if vanilla state gets painful — no build step either way. |
 | Diagram I/O | mExDraw HTTP API | `PUT https://mxdrw.msbls.de/api/drawings/<name>.excalidraw` with `Authorization: Bearer $MEXDRAW_TOKEN`. (The `mcp__mexdraw__*` MCP tools are not currently configured for this project — workers use the raw HTTP API.) |
@@ -112,14 +113,14 @@ interface. The backend serves the UI and the API; there is no
 
 ## Deployment — mDock, raw docker (NOT Dokploy)
 
-mCables runs on **mDock** (`192.168.178.131` on the LAN, Tailscale `mdock`)
+CableGUI runs on **mDock** (`192.168.178.131` on the LAN, Tailscale `mdock`)
 as a **plain docker-compose service**. Dokploy is for public mlake/mRiver
 stuff; mDock uses raw `docker compose` per the conventions of the existing
 mDock services (mgreen, mgeo, msports-garmin, paperless, …).
 
-- Repo layout on mDock: `/home/m/stacks/mcables/` with `docker-compose.yml`,
-  `data/` bind-mount, secrets in `/home/m/secrets/mcables/.env`.
-- Image: `mgit.msbls.de/m/mcables:latest` (built and pushed by a Gitea
+- Repo layout on mDock: `/home/m/stacks/cablegui/` with `docker-compose.yml`,
+  `data/` bind-mount, secrets in `/home/m/secrets/cablegui/.env`.
+- Image: `mgit.msbls.de/m/cablegui:latest` (built and pushed by a Gitea
   Actions workflow on push to `main`, runs on the self-hosted runner on
   mDock with label `self-hosted:host`).
 - Port mapping: `7777:7777`, exposed on the LAN — no reverse proxy.
@@ -127,12 +128,12 @@ mDock services (mgreen, mgeo, msports-garmin, paperless, …).
 - LAN URL: `http://mdock:7777`.
 - No auth — LAN-trusted.
 
-Local dev (no Docker): `go run ./cmd/mcables` against `./data/mcables.db`.
+Local dev (no Docker): `go run ./cmd/cablegui` against `./data/cablegui.db`.
 
 ## Seed drawing — visual grammar reference, **not** a runtime importer
 
 `mxdrw.msbls.de/draw/Cable-Management.excalidraw` is **reference material
-only**. mCables does **not** auto-ingest it. m will rebuild LOFT and OFFICE
+only**. CableGUI does **not** auto-ingest it. m will rebuild LOFT and OFFICE
 from scratch inside the tool — the seed exists so the **exporter** mimics
 its visual grammar:
 
@@ -163,13 +164,13 @@ Legend colours (global, seeded once by migration 001):
 
 ## Out of scope (v0)
 
-- Multi-user. mCables is m-only.
+- Multi-user. CableGUI is m-only.
 - Auth / sharing — LAN-trusted on mDock.
 - Mobile / responsive — desktop browser only.
 - Cable inventory beyond visual structure (no length, no purchase history,
   no SKU). Strictly visual structure for v0.
 - Import from `.excalidraw` at runtime. If a one-shot migration is ever
-  needed, a separate `mcables-migrate` CLI tool is the right shape, not a
+  needed, a separate `cablegui-migrate` CLI tool is the right shape, not a
   hot API endpoint.
 
 ## Worker Preferences

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.7
 #
-# mCables — single-stage build → distroless runtime image.
+# CableGUI — single-stage build → distroless runtime image.
 # go.mod requires go 1.25; modernc.org/sqlite is pure Go so CGO_ENABLED=0
 # and a distroless/static runtime is all we need.
 
@@ -17,20 +17,20 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build \
         -trimpath \
         -ldflags="-s -w" \
-        -o /out/mcables \
-        ./cmd/mcables
+        -o /out/cablegui \
+        ./cmd/cablegui
 
 FROM gcr.io/distroless/static-debian12:nonroot
 WORKDIR /app
-COPY --from=build /out/mcables /app/mcables
+COPY --from=build /out/cablegui /app/cablegui
 
-ENV MCABLES_ADDR=0.0.0.0:7777 \
-    MCABLES_DB=/app/data/mcables.db
+ENV CABLEGUI_ADDR=0.0.0.0:7777 \
+    CABLEGUI_DB=/app/data/cablegui.db
 
 EXPOSE 7777
 # Run as UID:GID 1000:1000 to match m on mDock — the bind-mounted
-# /home/m/stacks/mcables/data is owned by m:m, so the container can write
+# /home/m/stacks/cablegui/data is owned by m:m, so the container can write
 # to it without chowning the host dir. distroless/static-debian12 accepts
 # arbitrary numeric UIDs; the Go binary doesn't need a /etc/passwd entry.
 USER 1000:1000
-ENTRYPOINT ["/app/mcables"]
+ENTRYPOINT ["/app/cablegui"]

Makefile

@@ -1,14 +1,14 @@
 .PHONY: build run test typecheck fmt clean
 
-BIN := bin/mcables
+BIN := bin/cablegui
 PKG := ./...
 
 build:
 	@mkdir -p bin
-	go build -trimpath -ldflags="-s -w" -o $(BIN) ./cmd/mcables
+	go build -trimpath -ldflags="-s -w" -o $(BIN) ./cmd/cablegui
 
 run:
-	go run ./cmd/mcables
+	go run ./cmd/cablegui
 
 test:
 	go test -race $(PKG)

README.md

@@ -1,9 +1,9 @@
-# mCables
+# CableGUI
 
 Cable-management **framework** for m's setup — visual web editor backed by
 a single Go binary + SQLite, generating Excalidraw drawings via mExDraw.
 
-Each cable-managed environment (LOFT, OFFICE, …) is a separate mCables
+Each cable-managed environment (LOFT, OFFICE, …) is a separate CableGUI
 *project*; each project is backed by exactly one `.excalidraw` drawing on
 mxdrw.msbls.de.
 
@@ -23,7 +23,7 @@ end-to-end; the SVG canvas is intentionally empty until slice 2.
 ## Run it
 
 ```sh
-go run ./cmd/mcables
+go run ./cmd/cablegui
 # open http://localhost:7777
 ```
 
@@ -31,18 +31,18 @@ Or built:
 
 ```sh
 make build
-./bin/mcables
+./bin/cablegui
 ```
 
 The binary serves the frontend from an embedded `web/static/` and the
-JSON API under `/api/`. SQLite lives at `./data/mcables.db` by default.
+JSON API under `/api/`. SQLite lives at `./data/cablegui.db` by default.
 
 ### Environment
 
 | Var | Default | Notes |
 |---|---|---|
-| `MCABLES_ADDR` | `0.0.0.0:7777` | Listen address. |
-| `MCABLES_DB` | `./data/mcables.db` | SQLite path. Parent dir is created on boot. |
+| `CABLEGUI_ADDR` | `0.0.0.0:7777` | Listen address. |
+| `CABLEGUI_DB` | `./data/cablegui.db` | SQLite path. Parent dir is created on boot. |
 | `MEXDRAW_BASE_URL` | `https://mxdrw.msbls.de` | Base URL for mExDraw export. |
 | `MEXDRAW_USER` | (unset) | Username for the mxdrw HTTP Basic Auth on export. Required. |
 | `MEXDRAW_PASS` | (unset) | Password for the mxdrw HTTP Basic Auth on export. Required. |
@@ -78,37 +78,35 @@ DELETE /api/cable-types/:id               ← 409 in_use if any cable references
 
 ## Deploy to mDock
 
-mCables runs on **mDock** at `http://mdock:7777` as a docker-compose
-service under `/home/m/stacks/mcables/`. Pattern matches the other
+CableGUI runs on **mDock** at `http://mdock:7777` as a docker-compose
+service under `/home/m/stacks/cablegui/`. Pattern matches the other
 mDock services (mgreen-journal, mgeo, msports-garmin, …) — no Dokploy,
 no reverse proxy, LAN-trusted.
 
-### Manual deploy (first roll)
+### Manual deploy
 
-1. **Build + push the image** (from any host with docker; today the
-   image lives in mAi's Gitea namespace because mAi doesn't have write
-   access to `m/`):
+1. **Build + push the image** (image now lives under `m/` in Gitea):
 
    ```sh
-   docker build -t mgit.msbls.de/mai/mcables:latest .
-   awk '/machine mgit.msbls.de/{getline; getline; print $2}' ~/.netrc-mai \
-     | docker login mgit.msbls.de -u mAi --password-stdin
-   docker push mgit.msbls.de/mai/mcables:latest
+   docker build -t mgit.msbls.de/m/cablegui:latest .
+   awk '/machine mgit.msbls.de/{getline; getline; print $2}' ~/.netrc \
+     | docker login mgit.msbls.de -u m --password-stdin
+   docker push mgit.msbls.de/m/cablegui:latest
    ```
 
 2. **Prepare directories on mDock** (one-time):
 
    ```sh
-   ssh mdock 'mkdir -p /home/m/stacks/mcables/data /home/m/secrets/mcables \
-              && touch /home/m/secrets/mcables/.env \
-              && chmod 0600 /home/m/secrets/mcables/.env'
-   scp docker-compose.yml mdock:/home/m/stacks/mcables/docker-compose.yml
+   ssh mdock 'mkdir -p /home/m/stacks/cablegui/data /home/m/secrets/cablegui \
+              && touch /home/m/secrets/cablegui/.env \
+              && chmod 0600 /home/m/secrets/cablegui/.env'
+   scp docker-compose.yml mdock:/home/m/stacks/cablegui/docker-compose.yml
    ```
 
 3. **Pull + start**:
 
    ```sh
-   ssh mdock 'cd /home/m/stacks/mcables && docker compose pull && docker compose up -d'
+   ssh mdock 'cd /home/m/stacks/cablegui && docker compose pull && docker compose up -d'
    ```
 
 4. **Verify** from any LAN host:
@@ -119,11 +117,11 @@ no reverse proxy, LAN-trusted.
    ```
 
 To **update** to a new build: rebuild + push the image, then
-`ssh mdock 'cd /home/m/stacks/mcables && docker compose pull && docker compose up -d'`.
+`ssh mdock 'cd /home/m/stacks/cablegui && docker compose pull && docker compose up -d'`.
 
 ### Persistence
 
-SQLite lives at `/home/m/stacks/mcables/data/mcables.db` on the host
+SQLite lives at `/home/m/stacks/cablegui/data/cablegui.db` on the host
 (bind-mounted into the container at `/app/data`). Container runs as
 UID 1000:1000 to align with `m:m` ownership on mDock — DB files end
 up owned by `m`, the host user.

cmd/cablegui/main.go

@@ -0,0 +1,64 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"log"
+	"net/http"
+	"os"
+	"os/signal"
+	"path/filepath"
+	"syscall"
+	"time"
+
+	"mgit.msbls.de/m/cablegui/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/server"
+	"mgit.msbls.de/m/cablegui/web"
+)
+
+func main() {
+	addr := envOr("CABLEGUI_ADDR", "0.0.0.0:7777")
+	dbPath := envOr("CABLEGUI_DB", "./data/cablegui.db")
+
+	if err := os.MkdirAll(filepath.Dir(dbPath), 0o755); err != nil {
+		log.Fatalf("mkdir data dir: %v", err)
+	}
+
+	store, err := db.Open(dbPath)
+	if err != nil {
+		log.Fatalf("open db: %v", err)
+	}
+	defer store.Close()
+
+	if err := db.Migrate(store.DB()); err != nil {
+		log.Fatalf("migrate: %v", err)
+	}
+
+	srv := &http.Server{
+		Addr:              addr,
+		Handler:           server.New(store, web.Static()),
+		ReadHeaderTimeout: 5 * time.Second,
+	}
+
+	go func() {
+		log.Printf("cablegui listening on %s (db=%s)", addr, dbPath)
+		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
+			log.Fatalf("listen: %v", err)
+		}
+	}()
+
+	stop := make(chan os.Signal, 1)
+	signal.Notify(stop, os.Interrupt, syscall.SIGTERM)
+	<-stop
+	log.Printf("shutting down")
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	_ = srv.Shutdown(ctx)
+}
+
+func envOr(key, fallback string) string {
+	if v := os.Getenv(key); v != "" {
+		return v
+	}
+	return fallback
+}

docker-compose.yml

@@ -1,20 +1,20 @@
-# mCables — production compose for mDock.
-# Lives at /home/m/stacks/mcables/docker-compose.yml on mDock.
+# CableGUI — production compose for mDock.
+# Lives at /home/m/stacks/cablegui/docker-compose.yml on mDock.
 # Matches the existing mDock service patterns (mgreen, mgeo, …).
 
 services:
-  mcables:
-    image: mgit.msbls.de/m/mcables:latest
-    container_name: mcables
+  cablegui:
+    image: mgit.msbls.de/m/cablegui:latest
+    container_name: cablegui
     restart: unless-stopped
     ports:
       - "7777:7777"
     environment:
       - TZ=Europe/Berlin
-      - MCABLES_ADDR=0.0.0.0:7777
-      - MCABLES_DB=/app/data/mcables.db
+      - CABLEGUI_ADDR=0.0.0.0:7777
+      - CABLEGUI_DB=/app/data/cablegui.db
     env_file:
       # MEXDRAW_USER + MEXDRAW_PASS for the mxdrw HTTP Basic Auth on export.
-      - /home/m/secrets/mcables/.env
+      - /home/m/secrets/cablegui/.env
     volumes:
-      - /home/m/stacks/mcables/data:/app/data
+      - /home/m/stacks/cablegui/data:/app/data

docs/design.md

@@ -1,4 +1,4 @@
-# mCables — Design v4.1
+# CableGUI — Design v4.1
 
 Cable-management **framework + solver** for m's setup. Inventor shift 1
 design, revised through v2 (rescope to multi-project framework), v3
@@ -6,7 +6,7 @@ design, revised through v2 (rescope to multi-project framework), v3
 **v4.1 — six locked answers from m's v4 review**.
 
 > **What changed in v4.1** (tight pass on v4)
-> 1. **mCables is a schematic, not a physical-routing tool.** Cables are
+> 1. **CableGUI is a schematic, not a physical-routing tool.** Cables are
 >    straight lines between endpoints; the solver and the renderer do not
 >    care about paths, trunks, frame edges, or cable-tray polylines.
 >    "Maximum bundling" reduces to the v3 rule: **≥2 cables between the
@@ -33,13 +33,13 @@ design, revised through v2 (rescope to multi-project framework), v3
 
 Sources: the live `Cable-Management.excalidraw` on mxdrw.msbls.de (used as
 the *visual-grammar reference*, not a bootstrap import target),
-`mai-memory` (`mcables`, `m`), and the live mDock services for deploy
+`mai-memory` (`cablegui`, `m`), and the live mDock services for deploy
 conventions (§10). v4 driven by m's product-vision clarification:
 
 > "we provide a cable manager — I say what devices we have, the app tells
 > me how to bundle cables and how the most efficient connection looks like"
 
-mCables shifts from a manual draw-and-click editor to a **solver** that
+CableGUI shifts from a manual draw-and-click editor to a **solver** that
 takes a list of devices + the connections m needs and emits the cable
 plan + bundle recommendations. The manual editor stays (it's the only way
 to inspect + tweak the plan) but is no longer the primary surface.
@@ -60,7 +60,7 @@ to inspect + tweak the plan) but is no longer the primary surface.
 >   without applying; default applies.
 > - **Solver objective: maximum bundling** (§5b.1). Schematic only: when
 >   two or more cables share the same endpoint pair, group them into one
->   bundle. No path or trunk geometry — mCables is a wiring schematic,
+>   bundle. No path or trunk geometry — CableGUI is a wiring schematic,
 >   not a routing tool. v4.1 strips all path/trunk language from the v4
 >   draft.
 > - **UI: device-type dropdown** on device-create, **Connection
@@ -72,7 +72,7 @@ to inspect + tweak the plan) but is no longer the primary surface.
 >   bundle-rendering polish.
 >
 > **What carried over from v3 (unchanged in v4)**
-> - mCables is a framework: top-level `projects`, each backed by one
+> - CableGUI is a framework: top-level `projects`, each backed by one
 >   `.excalidraw` drawing. `UNIQUE(projects.name)`.
 > - `cable_types` is global. Migration 001 seeds Power/USB/HDMI/DP/RJ45.
 > - `devices` UNIQUE(project_id, name); `frame_id` nullable; FrameRef
@@ -81,8 +81,8 @@ to inspect + tweak the plan) but is no longer the primary surface.
 > - `projects.drawing_name` auto-defaults to `<name>.excalidraw`.
 > - `DELETE /api/projects/:pid?confirm=<name>` guardrail.
 > - No cable inventory metadata; visual + connectivity structure only.
-> - DB at `./data/mcables.db` (gitignored). Bind `0.0.0.0:7777` LAN, no auth.
-> - Deploy on mDock under `/home/m/stacks/mcables/`, raw docker-compose.
+> - DB at `./data/cablegui.db` (gitignored). Bind `0.0.0.0:7777` LAN, no auth.
+> - Deploy on mDock under `/home/m/stacks/cablegui/`, raw docker-compose.
 >
 > **What's superseded in v4**
 > - The "manual draw-a-cable port-to-port" flow from v3 §7 is *kept* as a
@@ -97,7 +97,7 @@ to inspect + tweak the plan) but is no longer the primary surface.
 
 `Cable-Management.excalidraw` on mxdrw.msbls.de is **not** ingested at
 runtime. It is the visual-grammar reference we lock the export onto so that
-when m rebuilds LOFT and OFFICE inside mCables, the exported `.excalidraw`
+when m rebuilds LOFT and OFFICE inside CableGUI, the exported `.excalidraw`
 looks like the seed.
 
 Concrete numbers from the live file (180 elements):
@@ -128,7 +128,7 @@ Three observations about the seed's visual grammar — these constrain the
 1. **Ports sit on a device edge as small ellipses (~12×9)**, coloured by
    cable type. They are not children of the device in the Excalidraw sense
    (no `containerId`/`boundElements` link) — purely positional. When we
-   export from mCables we mimic that: port ellipse at `(device.x +
+   export from CableGUI we mimic that: port ellipse at `(device.x +
    port.x_offset, device.y + port.y_offset)`, stroke colour = type colour.
 2. **Cable arrows bind to elements**. In the seed: 44 endpoints to ellipses
    (ports), 12 to whole rectangles (device-level, no specific port), 3 to
@@ -161,7 +161,7 @@ painful: switch to Preact-via-CDN-ESM (still no build step). Not v0.
 
 ## 2. SQLite schema
 
-`./data/mcables.db` (project-local, gitignored). WAL mode, FKs on.
+`./data/cablegui.db` (project-local, gitignored). WAL mode, FKs on.
 Driver: **`modernc.org/sqlite`** (cgo-free — clean cross-compile, simple
 Dockerfile).
 
@@ -453,18 +453,26 @@ Office setup template:
 | fritz | network | Power × 1; RJ45 × 4 |
 | ChromeCast | display | Power × 1; HDMI × 1 |
 | SteamLink | compute | Power × 1; HDMI × 1; USB × 2 |
-| IOx-3 | hub | Power × 1; (3× port slots — concrete cable type per slot is set at instantiation; defaults to USB × 3 for v0) |
-| IOx-6 | hub | Power × 1; USB × 6 |
-| IOx-8 | hub | Power × 1; USB × 8 |
+| IOx-3 | hub | Power In × 1 (top/back); Power Out × 3 (bottom/front) |
+| IOx-6 | hub | Power In × 1 (top/back); Power Out × 6 (bottom/front) |
+| IOx-8 | hub | Power In × 1 (top/back); Power Out × 8 (bottom/front) |
 | **Screen** | display | Power × 1; HDMI × 1 |
 | **Keyboard** | accessory | USB × 1 |
 | **Mouse** | accessory | USB × 1 |
+| **Multi-plug 3** | hub | Power In × 1 (top/back); Power Out × 3 (bottom/front) |
+| **Multi-plug 4** | hub | Power In × 1 (top/back); Power Out × 4 (bottom/front) |
+| **Multi-plug 5** | hub | Power In × 1 (top/back); Power Out × 5 (bottom/front) |
+| **Multi-plug 6** | hub | Power In × 1 (top/back); Power Out × 6 (bottom/front) |
+| **Wifi-plug** | accessory | Power In × 1 (top/back); Power Out × 1 (bottom/front) — pass-through outlet |
 
-"Hub" devices like IOx-* have ambiguous port profiles (the seed drawing
-shows them in red because most carry Power, but they also hub USB). v0
-seeds them as USB hubs; m overrides per-instance. The catalog is editable
-in the UI (slice 4.5 — "Manage device types") so m can refine the IOx-3
-profile once and not re-override every instance.
+v5 (migration 005) added the Multi-plug 3–6 strips and the Wifi-plug
+pass-through outlet. v6 (migration 006) re-shaped the IOx-* and
+Multi-plug-* profiles to the "1 in on top / N out on bottom" layout —
+the IOx-* devices are physical power strips, not USB hubs (m's
+hardware), and the Multi-plug-* outputs are now visually distinct from
+the input. Convention: `top = back`, `bottom = front`. Existing device
+instances keep their already-seeded ports per §2.3 — to pick up the
+new layout, delete + re-create the instance.
 
 m can also add **project-custom types** at any time (UI: "+ New device
 type" inside the device-create modal) with `project_id = current`.
@@ -601,8 +609,8 @@ cascade does **not** touch `cable_types` (no FK to projects).
 
 ## 3. Go HTTP API
 
-Single binary `cmd/mcables`, `net/http`, no router framework. Listens on
-`0.0.0.0:7777` by default (overridable via `MCABLES_ADDR`). Static frontend
+Single binary `cmd/cablegui`, `net/http`, no router framework. Listens on
+`0.0.0.0:7777` by default (overridable via `CABLEGUI_ADDR`). Static frontend
 from `embed.FS` at `/`, JSON API under `/api/`.
 
 ```
@@ -772,7 +780,7 @@ generated scene JSON.
 
 ## 4. Export — DB → Excalidraw (visual-grammar conformance)
 
-mCables generates a `.excalidraw` scene from a project's rows. The seed
+CableGUI generates a `.excalidraw` scene from a project's rows. The seed
 drawing's grammar is the contract.
 
 ### 4.1 Element mapping
@@ -790,7 +798,7 @@ drawing's grammar is the contract.
 
 ### 4.2 Element IDs are stable across exports
 
-Every mCables row carries `excalidraw_id` (TEXT, generated on first export
+Every CableGUI row carries `excalidraw_id` (TEXT, generated on first export
 via `crypto/rand` → 21-char Excalidraw-style ID). On re-export the same row
 reuses the same ID. This means:
 
@@ -858,7 +866,7 @@ left strictly alone — the solver only adds and removes its own.
 
 ### 5b.1 Objective: maximum bundling — schematic only
 
-mCables is a **schematic**, not a physical-routing tool. Cables are
+CableGUI is a **schematic**, not a physical-routing tool. Cables are
 straight lines between endpoints; the solver has no model of walls,
 floors, cable trays, or path geometry. "Maximum bundling" therefore
 reduces to a single rule on the schematic:
@@ -980,7 +988,7 @@ triggers a debounced re-solve) is parked at slice 9+ as an opt-in.
 
 ```
                 ┌─────────────────────┐
-                │ mCables DB (truth)  │
+                │ CableGUI DB (truth)  │
                 └──────────┬──────────┘
                            │
               export       ▼
@@ -990,11 +998,11 @@ triggers a debounced re-solve) is parked at slice 9+ as an opt-in.
                        └────────────────────────┘
 ```
 
-- mCables UI → DB: synchronous (every drag/add/remove persists immediately).
+- CableGUI UI → DB: synchronous (every drag/add/remove persists immediately).
 - DB → Excalidraw: **manual** button "Export to Excalidraw" in the header,
   per project. Calls `POST /api/projects/:pid/sync/export`.
 - Excalidraw → DB: **not implemented** in v0. Anything m draws in
-  Excalidraw stays in Excalidraw until he redraws it in mCables.
+  Excalidraw stays in Excalidraw until he redraws it in CableGUI.
 
 This keeps the v0 scope tight: no conflict resolution, no element-diff
 import, no auto-debounce. mExDraw keeps its own version history (git
@@ -1004,7 +1012,7 @@ When mxdrw is unreachable: the export button shows a tooltip and disables;
 the editor keeps working against the local DB.
 
 Post-MVP, import returns as a one-shot migration tool (separate
-`mcables-migrate` CLI tool, not part of the running server) for seeding
+`cablegui-migrate` CLI tool, not part of the running server) for seeding
 new projects from existing `.excalidraw` files.
 
 ---
@@ -1015,7 +1023,7 @@ The editor lives at `/`. Layout:
 
 ```
 ┌────────────────────────────────────────────────────────────────────┐
-│ mCables   [LOFT ▾ projects-picker]            [Export] [+ Project] │  ← header
+│ CableGUI   [LOFT ▾ projects-picker]            [Export] [+ Project] │  ← header
 ├────────┬───────────────────────────────────────────────────────────┤
 │        │                                                           │
 │ Legend │                                                           │
@@ -1246,7 +1254,7 @@ Slices 9+ (not promised for the first coder shift):
 - Cable inventory metadata (length/SKU) if m later wants it.
 - Dark mode.
 
-Out of scope, period (would change mCables's mental model): path
+Out of scope, period (would change CableGUI's mental model): path
 routing, cable-tray polylines, frame-edge corridors, wall-axis bundling,
 3D, anything that treats a cable as more than a labelled endpoint pair.
 
@@ -1256,7 +1264,7 @@ routing, cable-tray polylines, frame-edge corridors, wall-axis bundling,
 
 The six v4 questions are now answered. Locked answers:
 
-1. **Where do paths come from?** → **Nowhere — mCables is a schematic.**
+1. **Where do paths come from?** → **Nowhere — CableGUI is a schematic.**
    Cables are straight lines between endpoints. The solver does not
    route, the renderer does not route, and "maximum bundling" reduces to
    the endpoint-pair rule (§5b.1). Anything resembling a path, trunk,
@@ -1299,25 +1307,25 @@ before writing this:
 - Host port mappings: deliberately collision-free across the host. Existing
   high ports in use include 3300 (mgreen), 3077 (paperless-ai), 7878
   (radarr), 8082 (mgeo-tileserver), 8989 (sonarr), 9696 (prowlarr).
-  **Port 7777 is free** — taking it for mCables.
+  **Port 7777 is free** — taking it for CableGUI.
 - Bind-mount volumes: `/home/m/<project>-data:/app/data` is the canonical
   pattern (mgreen). For project-local data we put `data/` *next to* the
   compose file so a `git pull && docker compose up -d` is the whole deploy:
-  `/home/m/stacks/mcables/data:/app/data`.
+  `/home/m/stacks/cablegui/data:/app/data`.
 - Secrets via `env_file: /home/m/secrets/<project>/.env` (msports-garmin
-  pattern). mCables only needs `MEXDRAW_TOKEN` for export.
+  pattern). CableGUI only needs `MEXDRAW_TOKEN` for export.
 - No reverse proxy on mDock. Services expose ports directly on the LAN
   (mDock = `192.168.178.131` / Tailscale `mdock`). Public exposure goes via
-  mlake/Dokploy + Caddy when needed — out of scope for mCables (LAN-only).
+  mlake/Dokploy + Caddy when needed — out of scope for CableGUI (LAN-only).
 - Auto-deploy via the Gitea Actions self-hosted runner already installed
   on mDock (`/home/m/act-runner/`, label `self-hosted:host`). Push to
   `main` → workflow on mDock → `docker compose up --build -d`.
 
-### Repo layout for mCables
+### Repo layout for CableGUI
 
 ```
-mCables/
-├── cmd/mcables/main.go        # Go binary
+CableGUI/
+├── cmd/cablegui/main.go        # Go binary
 ├── internal/
 │   ├── db/                    # migrations + store
 │   ├── importer/              # post-MVP only (not in MVP)
@@ -1328,7 +1336,7 @@ mCables/
 │   ├── main.js                # ES module entry
 │   ├── style.css
 │   └── lib/...                # SVG helpers, store, components
-├── data/                      # mCables runtime DB lives here (gitignored)
+├── data/                      # CableGUI runtime DB lives here (gitignored)
 │   └── .gitkeep
 ├── docs/design.md             # this file
 ├── Dockerfile
@@ -1353,37 +1361,37 @@ COPY go.mod go.sum ./
 RUN go mod download
 COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags="-s -w" \
-        -o /out/mcables ./cmd/mcables
+        -o /out/cablegui ./cmd/cablegui
 
 FROM gcr.io/distroless/static-debian12:nonroot
 WORKDIR /app
-COPY --from=build /out/mcables /app/mcables
-ENV MCABLES_ADDR=0.0.0.0:7777
-ENV MCABLES_DB=/app/data/mcables.db
+COPY --from=build /out/cablegui /app/cablegui
+ENV CABLEGUI_ADDR=0.0.0.0:7777
+ENV CABLEGUI_DB=/app/data/cablegui.db
 USER nonroot:nonroot
 EXPOSE 7777
-ENTRYPOINT ["/app/mcables"]
+ENTRYPOINT ["/app/cablegui"]
 ```
 
-### docker-compose.yml (on mDock at `/home/m/stacks/mcables/`)
+### docker-compose.yml (on mDock at `/home/m/stacks/cablegui/`)
 
 ```yaml
 services:
-  mcables:
-    image: mgit.msbls.de/m/mcables:latest
-    container_name: mcables
+  cablegui:
+    image: mgit.msbls.de/m/cablegui:latest
+    container_name: cablegui
     restart: unless-stopped
     ports:
       - "7777:7777"
     environment:
       - TZ=Europe/Berlin
-      - MCABLES_ADDR=0.0.0.0:7777
-      - MCABLES_DB=/app/data/mcables.db
+      - CABLEGUI_ADDR=0.0.0.0:7777
+      - CABLEGUI_DB=/app/data/cablegui.db
       - MEXDRAW_BASE_URL=https://mxdrw.msbls.de
     env_file:
-      - /home/m/secrets/mcables/.env       # contains MEXDRAW_TOKEN
+      - /home/m/secrets/cablegui/.env       # contains MEXDRAW_TOKEN
     volumes:
-      - /home/m/stacks/mcables/data:/app/data
+      - /home/m/stacks/cablegui/data:/app/data
 ```
 
 LAN URL: `http://mdock:7777` (or `http://192.168.178.131:7777`).
@@ -1404,15 +1412,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Build image
-        run: docker build -t mgit.msbls.de/m/mcables:latest .
+        run: docker build -t mgit.msbls.de/m/cablegui:latest .
       - name: Push image
         run: |
           echo "${{ secrets.GITEA_TOKEN }}" | \
             docker login mgit.msbls.de -u mAi --password-stdin
-          docker push mgit.msbls.de/m/mcables:latest
+          docker push mgit.msbls.de/m/cablegui:latest
       - name: Up
         run: |
-          cd /home/m/stacks/mcables
+          cd /home/m/stacks/cablegui
           docker compose pull
           docker compose up -d
 ```
@@ -1420,7 +1428,7 @@ jobs:
 ### Local-development run (no Docker)
 
 ```
-make run          # go run ./cmd/mcables → :7777 against ./data/mcables.db
+make run          # go run ./cmd/cablegui → :7777 against ./data/cablegui.db
 make typecheck    # tsc --noEmit on web/
 make test         # go test ./...
 ```
@@ -1430,4 +1438,228 @@ gitignored.
 
 ---
 
-DESIGN v4.1 READY FOR REVIEW
+## 11. v5 — Cable routing via clamps
+
+m's bundling primitive: a **clamp** is a physical anchor on the canvas
+(think cable tie / clip). A cable routes from its `from` endpoint,
+through zero or more clamps **in order**, to its `to` endpoint. Two
+cables that share an ordered pair of consecutive clamps are visibly
+bundled along that segment — no detection pass, no inference: the
+overlap *is* the bundle.
+
+This replaces the abandoned waypoints + segment-detection approach.
+v0's straight-line schematic stays as the empty-clamps case
+(`cable_clamps` is empty for a fresh solver-emitted cable).
+
+### 11.1 Schema (migration 007)
+
+```sql
+CREATE TABLE clamps (
+    id              INTEGER PRIMARY KEY,
+    project_id      INTEGER NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+    x               REAL NOT NULL,
+    y               REAL NOT NULL,
+    label           TEXT NOT NULL DEFAULT '',
+    frame_id        INTEGER REFERENCES frames(id) ON DELETE SET NULL,
+    excalidraw_id   TEXT,
+    created_at      TEXT NOT NULL DEFAULT (datetime('now')),
+    updated_at      TEXT NOT NULL DEFAULT (datetime('now')),
+    UNIQUE (project_id, excalidraw_id)
+);
+CREATE INDEX clamps_project_idx ON clamps(project_id);
+
+CREATE TABLE cable_clamps (
+    cable_id        INTEGER NOT NULL REFERENCES cables(id) ON DELETE CASCADE,
+    clamp_id        INTEGER NOT NULL REFERENCES clamps(id) ON DELETE CASCADE,
+    ord             INTEGER NOT NULL,    -- 1..N along from→to
+    PRIMARY KEY (cable_id, ord),
+    UNIQUE (cable_id, clamp_id)          -- a cable can't visit the same clamp twice
+);
+CREATE INDEX cable_clamps_clamp_idx ON cable_clamps(clamp_id);
+```
+
+`frame_id` on clamps mirrors devices + IO markers — m can put a clamp
+inside a frame and the frame-drag carries it.
+
+`UNIQUE (cable_id, clamp_id)` blocks loops. `ord` is a small int, 1-based;
+nothing requires it to be contiguous (m can renumber 1, 2, 3 → 1, 3, 5
+during edits and the renderer is fine with that), but the UI keeps them
+contiguous on every mutation for sanity.
+
+### 11.2 Cable rendering model
+
+Each cable resolves to a polyline `[from-anchor, clamp₁, clamp₂, …, clampₙ, to-anchor]`
+where:
+- `from-anchor` / `to-anchor` come from the existing `anchorForEndpoint`
+  resolver (port / device / IO).
+- clamp anchors are `(clamp.x, clamp.y)` directly — clamps don't have a
+  width/height to centre.
+
+For N=0 clamps the result is the v0 straight line. For N≥1 we render
+a `<polyline>` instead of a `<line>`.
+
+The endpoint-replug handles from §10 (cable-replug) stay on the **first
+and last** vertices. Mid-polyline vertices get their own clamp-handle —
+small grab points only on the selected cable, which behave like
+clamp-detach when dragged onto empty canvas (drop a clamp off the
+cable's path).
+
+### 11.3 Bundle visualisation — derived from shared segments
+
+A **segment** is a directed pair `(A, B)` where A and B are consecutive
+nodes of a cable's polyline. Two cables share a segment when their
+polyline contains the same A→B (or B→A — segment matching is
+undirected).
+
+For each segment, compute `cables[]` — the cables that traverse it.
+If `len(cables) ≥ 2`, render the segment as a single thick line on top
+of the individual ones:
+
+- **Width**: `2 + N` px (N = cable count). Caps at ~12 px.
+- **Colour**: a striped pattern, one stripe per distinct cable type in
+  the bundle, ordered by cable_type.id. SVG `<linearGradient>` with
+  hard stops produces the stripe band cheaply; render it on a sibling
+  `<polyline>` over the individual lines.
+- **Tooltip**: `<title>` child listing the cables ("Power · USB · HDMI").
+
+At a clamp where ≥ 2 cables meet, the clamp icon (10×10 rounded square)
+shows a small count badge (`×N`) when N > 1. At fan-out points
+(endpoint with no clamp before it on the polyline) the individual
+coloured lines re-emerge, so m sees which port each strand goes to.
+
+Shared-segment computation is O(C·N̄) where C = #cables and N̄ = average
+polyline length. For a v0-sized project (≤ ~30 cables, ≤ ~5 clamps per
+cable) this is trivial. We rebuild the segment map on every renderCanvas
+— no caching layer.
+
+### 11.4 UI gestures
+
+**+ Clamp tool (`C` shortcut, also a sidebar button):**
+- Click empty canvas → place a clamp at the cursor (POST `/clamps`).
+  Standalone clamp — not on any cable yet.
+- Click a cable line → insert this clamp into that cable. The new clamp
+  sits at the click position (snapped to the nearest point on the
+  cable's polyline) and its `ord` is computed so it falls between the
+  two existing vertices it lies between.
+
+**Drag a cable's mid-segment:**
+- Pointerdown on a cable line (not on an endpoint handle) and drag.
+  Live preview shows a bend at the cursor. Pointerup:
+  - If the cursor is within snap-radius (~16 px) of an existing clamp:
+    insert that clamp into the cable's polyline at the right `ord`.
+  - Otherwise: create a fresh clamp at the release point and insert it.
+
+**Clamp inspector** (selecting a clamp on the canvas):
+- Position (x, y editable + label)
+- "Cables through this clamp": list with each cable's two endpoints,
+  click → select that cable
+- "Remove from this cable" (per row) → DELETE the matching cable_clamps
+  row; cable's polyline collapses around the gap.
+- "Delete clamp" → cascade-removes from every cable_clamps row.
+
+**Right-click on a clamp icon ON a cable** → "Remove from this cable"
+inline.
+
+**Frame drag** carries clamps the same way it carries devices + IO
+markers (clamp.frame_id mirrors the existing pattern, drag handler
+already iterates frame-contained items).
+
+### 11.5 Relationship to the existing `bundles` table
+
+**Recommendation: keep `bundles` and `bundle_cables`, repurpose them.**
+
+- Implicit/auto bundles → derived live from shared clamp segments. No
+  DB rows. The §5 `GET /bundles/suggestions` endpoint stays useful as a
+  "you might want to route these through the same clamps" hint.
+- Explicit named bundles → still in the `bundles` table. m names a
+  group ("desk → wall trunk"), the UI offers "route all members through
+  these clamps" as a one-click action. Useful for the case where m
+  wants a stable label on a logical bundle that isn't yet routed.
+
+Migration 007 leaves `bundles` + `bundle_cables` untouched. A v6 cleanup
+can drop them if m decides the explicit-named path isn't worth keeping.
+
+### 11.6 Solver coupling
+
+The v0 solver still emits **straight cables** — no clamp rows. m
+hand-routes after Solve. The solver's preview-diff is unaffected
+(solver compares endpoint pairs; clamp routing is independent of the
+endpoint identity).
+
+Future v5.1: solver-suggested clamps based on shared paths between
+endpoint pairs. Out of scope here.
+
+### 11.7 Export to mxdrw
+
+Clamps map to small diamond elements (separate from IO markers — IO
+diamonds are red wall-outlets; clamps are grey routing points).
+`excalidraw_id` is stable across re-exports per the existing pattern.
+
+Cable arrows become Excalidraw `arrow` elements with mid-points (the
+clamp positions) when N≥1 — Excalidraw supports multi-vertex arrows
+via the `points` array. Each `startBinding` / `endBinding` resolves to
+the from/to anchor's excalidraw_id; mid-vertices are unbound.
+
+Bundle visualisation (thick striped lines on shared segments) is **not
+exported** in v0 — Excalidraw doesn't natively support gradient strokes,
+and the mxdrw round-trip would lose them. We export each cable as its
+own polyline; bundling is a viewer-only concept.
+
+### 11.8 API additions
+
+```
+POST   /api/projects/:pid/clamps                   { x, y, label?, frame_id? } → Clamp
+PATCH  /api/projects/:pid/clamps/:id               { x?, y?, label?, frame_id? } → Clamp
+DELETE /api/projects/:pid/clamps/:id
+
+POST   /api/projects/:pid/cables/:cid/clamps       { clamp_id, ord? } → CableClamp
+DELETE /api/projects/:pid/cables/:cid/clamps/:cmid
+
+# Convenience: re-order clamps on a cable in one call
+PUT    /api/projects/:pid/cables/:cid/clamps       { clamp_ids: [int, int, …] }
+```
+
+Snapshot endpoint grows two arrays:
+- `clamps: []Clamp`
+- `cable_clamps: []{ cable_id, clamp_id, ord }`
+
+### 11.9 Open questions for m
+
+1. **Clamp icon shape.** Diamond (overlaps visually with IO markers
+   when zoomed out), small filled circle (overlaps with port circles),
+   or rounded square `▢` 10×10? Recommend rounded square — distinct from
+   everything else on the canvas today.
+2. **Snap radius when inserting onto a cable.** ~16 px world-units feels
+   right at 1× zoom. Should it scale with zoom (visual constant) or stay
+   world-constant (gesture stays the same regardless of zoom)? Recommend
+   visual constant — divide by current zoom.
+3. **Clamp deletion when shared.** If a clamp is used by 4 cables and m
+   clicks "Delete clamp", do we (a) refuse with a "still in use" prompt,
+   (b) cascade-remove from all 4 cables, or (c) cascade silently? Current
+   draft says cascade silently. Worth a confirmation?
+4. **Bundle stripe order.** Cable-type id is stable but arbitrary; visual
+   order on a thick line affects readability. Order by stripe-count
+   (Power first if 3 Power + 1 USB), or by cable-type-id (deterministic
+   but unrelated to importance)? Recommend by-count, ties broken by id.
+5. **Solver respect for existing routing.** When m re-runs Solve after
+   hand-routing, should the solver preserve existing clamp routing on
+   user-owned (`auto=0`) cables? Auto cables are wiped + rebuilt, so
+   their clamps disappear with them — that's expected. But manual cables
+   with clamps should clearly keep them. Confirm.
+
+### 11.10 Slice plan (post-design)
+
+1. Schema migration + tx-aware store helpers (Create/Update/DeleteClamp,
+   AttachClampToCable, DetachClampFromCable, ReorderClamps).
+2. HTTP endpoints + snapshot extension.
+3. Frontend: clamp render + + Clamp tool + canvas placement (no
+   cable attach yet).
+4. Cable polyline render via clamps, mid-segment drag-to-clamp,
+   clamp inspector.
+5. Shared-segment bundle visualisation (gradient stripe + count badge).
+6. Export pipeline extension — mxdrw arrows with mid-points + clamp
+   diamonds. Bundle viz stays viewer-only.
+
+---
+
+DESIGN v5 READY FOR REVIEW

go.mod

@@ -1,4 +1,4 @@
-module mgit.msbls.de/m/mcables
+module mgit.msbls.de/m/cablegui
 
 go 1.25.5
 

internal/db/clamps.go

@@ -0,0 +1,351 @@
+package db
+
+import (
+	"database/sql"
+	"errors"
+	"fmt"
+	"strings"
+)
+
+// ClampCreate is the create-shape for a new clamp.
+type ClampCreate struct {
+	X       float64
+	Y       float64
+	Label   string
+	FrameID *int64
+}
+
+// ClampUpdate is the partial-update shape.
+type ClampUpdate struct {
+	X       *float64
+	Y       *float64
+	Label   *string
+	// FrameID tri-state: nil = leave alone; non-nil pointer to nil ptr
+	// would be ambiguous, so we use FrameRef like devices.
+	FrameID FrameRef
+}
+
+// CreateClamp inserts a new clamp inside a project.
+func (s *Store) CreateClamp(projectID int64, c ClampCreate) (*Clamp, error) {
+	if _, err := s.GetProject(projectID); err != nil {
+		return nil, err
+	}
+	if c.FrameID != nil {
+		if _, err := s.GetFrame(projectID, *c.FrameID); err != nil {
+			return nil, fmt.Errorf("%w: frame_id: %v", ErrInvalidInput, err)
+		}
+	}
+	res, err := s.db.Exec(
+		`INSERT INTO clamps (project_id, x, y, label, frame_id)
+		 VALUES (?, ?, ?, ?, ?)`,
+		projectID, c.X, c.Y, strings.TrimSpace(c.Label), nullableInt64(c.FrameID),
+	)
+	if err != nil {
+		return nil, mapWriteErr(err)
+	}
+	id, _ := res.LastInsertId()
+	return s.GetClamp(projectID, id)
+}
+
+// GetClamp returns a single clamp scoped to the project.
+func (s *Store) GetClamp(projectID, id int64) (*Clamp, error) {
+	var c Clamp
+	var frame sql.NullInt64
+	var ex sql.NullString
+	err := s.db.QueryRow(
+		`SELECT id, project_id, x, y, label, frame_id, excalidraw_id, created_at, updated_at
+		 FROM clamps WHERE id = ? AND project_id = ?`, id, projectID,
+	).Scan(&c.ID, &c.ProjectID, &c.X, &c.Y, &c.Label, &frame, &ex, &c.CreatedAt, &c.UpdatedAt)
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, ErrNotFound
+	}
+	if err != nil {
+		return nil, err
+	}
+	if frame.Valid {
+		v := frame.Int64
+		c.FrameID = &v
+	}
+	if ex.Valid {
+		c.ExcalidrawID = &ex.String
+	}
+	return &c, nil
+}
+
+// ListClamps returns every clamp in a project, ordered by id.
+func (s *Store) ListClamps(projectID int64) ([]Clamp, error) {
+	rows, err := s.db.Query(
+		`SELECT id, project_id, x, y, label, frame_id, excalidraw_id, created_at, updated_at
+		 FROM clamps WHERE project_id = ? ORDER BY id`, projectID,
+	)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	out := []Clamp{}
+	for rows.Next() {
+		var c Clamp
+		var frame sql.NullInt64
+		var ex sql.NullString
+		if err := rows.Scan(&c.ID, &c.ProjectID, &c.X, &c.Y, &c.Label, &frame, &ex, &c.CreatedAt, &c.UpdatedAt); err != nil {
+			return nil, err
+		}
+		if frame.Valid {
+			v := frame.Int64
+			c.FrameID = &v
+		}
+		if ex.Valid {
+			c.ExcalidrawID = &ex.String
+		}
+		out = append(out, c)
+	}
+	return out, rows.Err()
+}
+
+// UpdateClamp applies a partial update.
+func (s *Store) UpdateClamp(projectID, id int64, u ClampUpdate) (*Clamp, error) {
+	cur, err := s.GetClamp(projectID, id)
+	if err != nil {
+		return nil, err
+	}
+	if u.X != nil {
+		cur.X = *u.X
+	}
+	if u.Y != nil {
+		cur.Y = *u.Y
+	}
+	if u.Label != nil {
+		cur.Label = strings.TrimSpace(*u.Label)
+	}
+	if u.FrameID.Set {
+		if u.FrameID.ID == nil {
+			cur.FrameID = nil
+		} else {
+			if _, err := s.GetFrame(projectID, *u.FrameID.ID); err != nil {
+				return nil, fmt.Errorf("%w: frame_id: %v", ErrInvalidInput, err)
+			}
+			id := *u.FrameID.ID
+			cur.FrameID = &id
+		}
+	}
+	if _, err := s.db.Exec(
+		`UPDATE clamps SET x = ?, y = ?, label = ?, frame_id = ?, updated_at = datetime('now')
+		 WHERE id = ? AND project_id = ?`,
+		cur.X, cur.Y, cur.Label, nullableInt64(cur.FrameID), id, projectID,
+	); err != nil {
+		return nil, mapWriteErr(err)
+	}
+	return s.GetClamp(projectID, id)
+}
+
+// DeleteClamp removes a clamp. cable_clamps rows cascade.
+func (s *Store) DeleteClamp(projectID, id int64) error {
+	res, err := s.db.Exec(`DELETE FROM clamps WHERE id = ? AND project_id = ?`, id, projectID)
+	if err != nil {
+		return mapWriteErr(err)
+	}
+	n, _ := res.RowsAffected()
+	if n == 0 {
+		return ErrNotFound
+	}
+	return nil
+}
+
+// ListCableClamps returns every (cable_id, clamp_id, ord) row in a
+// project, joined through cables to scope by project_id.
+func (s *Store) ListCableClamps(projectID int64) ([]CableClamp, error) {
+	rows, err := s.db.Query(
+		`SELECT cc.cable_id, cc.clamp_id, cc.ord
+		 FROM cable_clamps cc
+		 JOIN cables c ON c.id = cc.cable_id
+		 WHERE c.project_id = ?
+		 ORDER BY cc.cable_id, cc.ord`, projectID,
+	)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	out := []CableClamp{}
+	for rows.Next() {
+		var cc CableClamp
+		if err := rows.Scan(&cc.CableID, &cc.ClampID, &cc.Ord); err != nil {
+			return nil, err
+		}
+		out = append(out, cc)
+	}
+	return out, rows.Err()
+}
+
+// ListClampsForCable returns the clamps on a cable in ord sequence.
+func (s *Store) ListClampsForCable(projectID, cableID int64) ([]CableClamp, error) {
+	if _, err := s.GetCable(projectID, cableID); err != nil {
+		return nil, err
+	}
+	rows, err := s.db.Query(
+		`SELECT cable_id, clamp_id, ord
+		 FROM cable_clamps WHERE cable_id = ? ORDER BY ord`, cableID,
+	)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	out := []CableClamp{}
+	for rows.Next() {
+		var cc CableClamp
+		if err := rows.Scan(&cc.CableID, &cc.ClampID, &cc.Ord); err != nil {
+			return nil, err
+		}
+		out = append(out, cc)
+	}
+	return out, rows.Err()
+}
+
+// AttachClampToCable inserts a (cable, clamp) row. If `ord` is 0, the
+// clamp is appended at the end. Otherwise existing rows at or after
+// `ord` shift up by 1 to make room.
+func (s *Store) AttachClampToCable(projectID, cableID, clampID int64, ord int) (*CableClamp, error) {
+	if _, err := s.GetCable(projectID, cableID); err != nil {
+		return nil, err
+	}
+	if _, err := s.GetClamp(projectID, clampID); err != nil {
+		return nil, fmt.Errorf("%w: clamp not found", ErrInvalidInput)
+	}
+	tx, err := s.db.Begin()
+	if err != nil {
+		return nil, err
+	}
+	defer tx.Rollback()
+	// Refuse loops — UNIQUE (cable_id, clamp_id) enforces this, but a
+	// pre-check gives a clearer error.
+	var exists int
+	if err := tx.QueryRow(
+		`SELECT COUNT(*) FROM cable_clamps WHERE cable_id = ? AND clamp_id = ?`,
+		cableID, clampID,
+	).Scan(&exists); err != nil {
+		return nil, err
+	}
+	if exists > 0 {
+		return nil, fmt.Errorf("%w: clamp %d already on cable %d", ErrConflict, clampID, cableID)
+	}
+	var maxOrd sql.NullInt64
+	if err := tx.QueryRow(
+		`SELECT MAX(ord) FROM cable_clamps WHERE cable_id = ?`, cableID,
+	).Scan(&maxOrd); err != nil {
+		return nil, err
+	}
+	current := 0
+	if maxOrd.Valid {
+		current = int(maxOrd.Int64)
+	}
+	if ord <= 0 || ord > current+1 {
+		ord = current + 1
+	} else if ord <= current {
+		// Shift existing rows at ord..current up by 1 to free the slot.
+		// SQLite UPDATE doesn't support ORDER BY (no UPDATE-with-temp
+		// trick available), so a single `ord = ord + 1` would collide
+		// with the UNIQUE (cable_id, ord) constraint during the bulk
+		// update. Two-pass avoids the conflict: bump to a high offset
+		// first, then settle back to ord+1.
+		if _, err := tx.Exec(
+			`UPDATE cable_clamps SET ord = ord + 10000
+			 WHERE cable_id = ? AND ord >= ?`, cableID, ord,
+		); err != nil {
+			return nil, mapWriteErr(err)
+		}
+		if _, err := tx.Exec(
+			`UPDATE cable_clamps SET ord = ord - 10000 + 1
+			 WHERE cable_id = ? AND ord >= ?`, cableID, 10000+ord,
+		); err != nil {
+			return nil, mapWriteErr(err)
+		}
+	}
+	if _, err := tx.Exec(
+		`INSERT INTO cable_clamps (cable_id, clamp_id, ord) VALUES (?, ?, ?)`,
+		cableID, clampID, ord,
+	); err != nil {
+		return nil, mapWriteErr(err)
+	}
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+	return &CableClamp{CableID: cableID, ClampID: clampID, Ord: ord}, nil
+}
+
+// DetachClampFromCable removes a clamp from a cable's polyline. The
+// trailing rows close up to keep `ord` contiguous.
+func (s *Store) DetachClampFromCable(projectID, cableID, clampID int64) error {
+	if _, err := s.GetCable(projectID, cableID); err != nil {
+		return err
+	}
+	tx, err := s.db.Begin()
+	if err != nil {
+		return err
+	}
+	defer tx.Rollback()
+	var removed sql.NullInt64
+	if err := tx.QueryRow(
+		`SELECT ord FROM cable_clamps WHERE cable_id = ? AND clamp_id = ?`,
+		cableID, clampID,
+	).Scan(&removed); err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return ErrNotFound
+		}
+		return err
+	}
+	if _, err := tx.Exec(
+		`DELETE FROM cable_clamps WHERE cable_id = ? AND clamp_id = ?`,
+		cableID, clampID,
+	); err != nil {
+		return mapWriteErr(err)
+	}
+	// Close the gap: anyone with ord > removed slides down by 1.
+	if _, err := tx.Exec(
+		`UPDATE cable_clamps SET ord = ord - 1
+		 WHERE cable_id = ? AND ord > ?`, cableID, removed.Int64,
+	); err != nil {
+		return mapWriteErr(err)
+	}
+	return tx.Commit()
+}
+
+// ReorderCableClamps replaces the whole clamp sequence on a cable with
+// the given clamp IDs, in order. Every member of clampIDs must already
+// be a valid clamp in the same project; duplicates → ErrConflict.
+func (s *Store) ReorderCableClamps(projectID, cableID int64, clampIDs []int64) ([]CableClamp, error) {
+	if _, err := s.GetCable(projectID, cableID); err != nil {
+		return nil, err
+	}
+	seen := map[int64]bool{}
+	for _, cid := range clampIDs {
+		if seen[cid] {
+			return nil, fmt.Errorf("%w: duplicate clamp %d", ErrConflict, cid)
+		}
+		seen[cid] = true
+		if _, err := s.GetClamp(projectID, cid); err != nil {
+			return nil, fmt.Errorf("%w: clamp %d not in project", ErrInvalidInput, cid)
+		}
+	}
+	tx, err := s.db.Begin()
+	if err != nil {
+		return nil, err
+	}
+	defer tx.Rollback()
+	if _, err := tx.Exec(`DELETE FROM cable_clamps WHERE cable_id = ?`, cableID); err != nil {
+		return nil, mapWriteErr(err)
+	}
+	out := make([]CableClamp, 0, len(clampIDs))
+	for i, cid := range clampIDs {
+		ord := i + 1
+		if _, err := tx.Exec(
+			`INSERT INTO cable_clamps (cable_id, clamp_id, ord) VALUES (?, ?, ?)`,
+			cableID, cid, ord,
+		); err != nil {
+			return nil, mapWriteErr(err)
+		}
+		out = append(out, CableClamp{CableID: cableID, ClampID: cid, Ord: ord})
+	}
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+	return out, nil
+}

internal/db/clamps_test.go

@@ -0,0 +1,188 @@
+package db
+
+import (
+	"errors"
+	"testing"
+)
+
+func TestCreateClamp_Basic(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	c, err := s.CreateClamp(p.ID, ClampCreate{X: 100, Y: 200, Label: "trunk-1"})
+	if err != nil {
+		t.Fatalf("create: %v", err)
+	}
+	if c.X != 100 || c.Y != 200 || c.Label != "trunk-1" {
+		t.Errorf("bad shape: %+v", c)
+	}
+	if c.ProjectID != p.ID {
+		t.Errorf("project_id mismatch: got %d, want %d", c.ProjectID, p.ID)
+	}
+}
+
+func TestUpdateClamp_PositionAndLabel(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	c, _ := s.CreateClamp(p.ID, ClampCreate{X: 0, Y: 0})
+	nx, ny := 50.0, 75.0
+	lbl := "renamed"
+	upd, err := s.UpdateClamp(p.ID, c.ID, ClampUpdate{X: &nx, Y: &ny, Label: &lbl})
+	if err != nil {
+		t.Fatalf("update: %v", err)
+	}
+	if upd.X != 50 || upd.Y != 75 || upd.Label != "renamed" {
+		t.Errorf("update didn't take: %+v", upd)
+	}
+}
+
+func TestDeleteClamp_CascadesToCableClamps(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	pcT := builtInTypeID(t, s, "PC")
+	a, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "A", TypeID: &pcT, X: 0, Y: 0, Width: 100, Height: 35})
+	b, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "B", TypeID: &pcT, X: 200, Y: 0, Width: 100, Height: 35})
+	cab, _ := s.CreateCable(p.ID, CableCreate{TypeID: 1,
+		From: CableEndpoint{DeviceID: &a.ID}, To: CableEndpoint{DeviceID: &b.ID}})
+	cl, _ := s.CreateClamp(p.ID, ClampCreate{X: 100, Y: 50})
+	if _, err := s.AttachClampToCable(p.ID, cab.ID, cl.ID, 0); err != nil {
+		t.Fatalf("attach: %v", err)
+	}
+	if err := s.DeleteClamp(p.ID, cl.ID); err != nil {
+		t.Fatalf("delete: %v", err)
+	}
+	rows, _ := s.ListClampsForCable(p.ID, cab.ID)
+	if len(rows) != 0 {
+		t.Errorf("cable_clamps not cleared: %+v", rows)
+	}
+}
+
+func TestAttachClampToCable_AppendsAndOrders(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	pcT := builtInTypeID(t, s, "PC")
+	a, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "A", TypeID: &pcT, X: 0, Y: 0, Width: 100, Height: 35})
+	b, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "B", TypeID: &pcT, X: 200, Y: 0, Width: 100, Height: 35})
+	cab, _ := s.CreateCable(p.ID, CableCreate{TypeID: 1,
+		From: CableEndpoint{DeviceID: &a.ID}, To: CableEndpoint{DeviceID: &b.ID}})
+	c1, _ := s.CreateClamp(p.ID, ClampCreate{X: 50, Y: 0})
+	c2, _ := s.CreateClamp(p.ID, ClampCreate{X: 100, Y: 0})
+	c3, _ := s.CreateClamp(p.ID, ClampCreate{X: 150, Y: 0})
+	cc1, _ := s.AttachClampToCable(p.ID, cab.ID, c1.ID, 0)
+	cc2, _ := s.AttachClampToCable(p.ID, cab.ID, c2.ID, 0)
+	cc3, _ := s.AttachClampToCable(p.ID, cab.ID, c3.ID, 0)
+	if cc1.Ord != 1 || cc2.Ord != 2 || cc3.Ord != 3 {
+		t.Errorf("ord sequence wrong: %d, %d, %d", cc1.Ord, cc2.Ord, cc3.Ord)
+	}
+}
+
+func TestAttachClampToCable_InsertShiftsExisting(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	pcT := builtInTypeID(t, s, "PC")
+	a, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "A", TypeID: &pcT, X: 0, Y: 0, Width: 100, Height: 35})
+	b, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "B", TypeID: &pcT, X: 200, Y: 0, Width: 100, Height: 35})
+	cab, _ := s.CreateCable(p.ID, CableCreate{TypeID: 1,
+		From: CableEndpoint{DeviceID: &a.ID}, To: CableEndpoint{DeviceID: &b.ID}})
+	c1, _ := s.CreateClamp(p.ID, ClampCreate{X: 50, Y: 0})
+	c2, _ := s.CreateClamp(p.ID, ClampCreate{X: 100, Y: 0})
+	c3, _ := s.CreateClamp(p.ID, ClampCreate{X: 150, Y: 0})
+	_, _ = s.AttachClampToCable(p.ID, cab.ID, c1.ID, 0) // ord=1
+	_, _ = s.AttachClampToCable(p.ID, cab.ID, c2.ID, 0) // ord=2
+	// Insert c3 between c1 and c2 → c3 gets ord=2, old c2 bumps to 3.
+	if _, err := s.AttachClampToCable(p.ID, cab.ID, c3.ID, 2); err != nil {
+		t.Fatalf("attach mid: %v", err)
+	}
+	got, _ := s.ListClampsForCable(p.ID, cab.ID)
+	if len(got) != 3 {
+		t.Fatalf("len = %d, want 3: %+v", len(got), got)
+	}
+	want := []struct{ id int64; ord int }{
+		{c1.ID, 1}, {c3.ID, 2}, {c2.ID, 3},
+	}
+	for i, w := range want {
+		if got[i].ClampID != w.id || got[i].Ord != w.ord {
+			t.Errorf("[%d] got %+v, want clamp=%d ord=%d", i, got[i], w.id, w.ord)
+		}
+	}
+}
+
+func TestAttachClampToCable_DuplicateRejected(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	pcT := builtInTypeID(t, s, "PC")
+	a, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "A", TypeID: &pcT, X: 0, Y: 0, Width: 100, Height: 35})
+	b, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "B", TypeID: &pcT, X: 200, Y: 0, Width: 100, Height: 35})
+	cab, _ := s.CreateCable(p.ID, CableCreate{TypeID: 1,
+		From: CableEndpoint{DeviceID: &a.ID}, To: CableEndpoint{DeviceID: &b.ID}})
+	c1, _ := s.CreateClamp(p.ID, ClampCreate{X: 50, Y: 0})
+	_, _ = s.AttachClampToCable(p.ID, cab.ID, c1.ID, 0)
+	if _, err := s.AttachClampToCable(p.ID, cab.ID, c1.ID, 0); !errors.Is(err, ErrConflict) {
+		t.Errorf("duplicate err = %v, want ErrConflict", err)
+	}
+}
+
+func TestDetachClampFromCable_ClosesGap(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	pcT := builtInTypeID(t, s, "PC")
+	a, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "A", TypeID: &pcT, X: 0, Y: 0, Width: 100, Height: 35})
+	b, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "B", TypeID: &pcT, X: 200, Y: 0, Width: 100, Height: 35})
+	cab, _ := s.CreateCable(p.ID, CableCreate{TypeID: 1,
+		From: CableEndpoint{DeviceID: &a.ID}, To: CableEndpoint{DeviceID: &b.ID}})
+	c1, _ := s.CreateClamp(p.ID, ClampCreate{X: 50, Y: 0})
+	c2, _ := s.CreateClamp(p.ID, ClampCreate{X: 100, Y: 0})
+	c3, _ := s.CreateClamp(p.ID, ClampCreate{X: 150, Y: 0})
+	_, _ = s.AttachClampToCable(p.ID, cab.ID, c1.ID, 0)
+	_, _ = s.AttachClampToCable(p.ID, cab.ID, c2.ID, 0)
+	_, _ = s.AttachClampToCable(p.ID, cab.ID, c3.ID, 0)
+	if err := s.DetachClampFromCable(p.ID, cab.ID, c2.ID); err != nil {
+		t.Fatalf("detach: %v", err)
+	}
+	got, _ := s.ListClampsForCable(p.ID, cab.ID)
+	if len(got) != 2 {
+		t.Fatalf("len = %d, want 2", len(got))
+	}
+	if got[0].ClampID != c1.ID || got[0].Ord != 1 {
+		t.Errorf("[0] = %+v", got[0])
+	}
+	if got[1].ClampID != c3.ID || got[1].Ord != 2 {
+		t.Errorf("[1] = %+v", got[1])
+	}
+}
+
+func TestReorderCableClamps_FullReplace(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	pcT := builtInTypeID(t, s, "PC")
+	a, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "A", TypeID: &pcT, X: 0, Y: 0, Width: 100, Height: 35})
+	b, _ := s.CreateDevice(p.ID, DeviceCreate{Name: "B", TypeID: &pcT, X: 200, Y: 0, Width: 100, Height: 35})
+	cab, _ := s.CreateCable(p.ID, CableCreate{TypeID: 1,
+		From: CableEndpoint{DeviceID: &a.ID}, To: CableEndpoint{DeviceID: &b.ID}})
+	c1, _ := s.CreateClamp(p.ID, ClampCreate{X: 50, Y: 0})
+	c2, _ := s.CreateClamp(p.ID, ClampCreate{X: 100, Y: 0})
+	c3, _ := s.CreateClamp(p.ID, ClampCreate{X: 150, Y: 0})
+	if _, err := s.ReorderCableClamps(p.ID, cab.ID, []int64{c3.ID, c1.ID, c2.ID}); err != nil {
+		t.Fatalf("reorder: %v", err)
+	}
+	got, _ := s.ListClampsForCable(p.ID, cab.ID)
+	if len(got) != 3 {
+		t.Fatalf("len = %d, want 3", len(got))
+	}
+	if got[0].ClampID != c3.ID || got[1].ClampID != c1.ID || got[2].ClampID != c2.ID {
+		t.Errorf("order wrong: %+v", got)
+	}
+}
+
+func TestSnapshot_IncludesClamps(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	_, _ = s.CreateClamp(p.ID, ClampCreate{X: 10, Y: 20})
+	_, _ = s.CreateClamp(p.ID, ClampCreate{X: 30, Y: 40})
+	snap, err := s.Snapshot(p.ID)
+	if err != nil {
+		t.Fatalf("snapshot: %v", err)
+	}
+	if len(snap.Clamps) != 2 {
+		t.Errorf("clamps in snapshot = %d, want 2", len(snap.Clamps))
+	}
+}

internal/db/db.go

@@ -1,4 +1,4 @@
-// Package db owns SQLite access for mCables: migrations runner + the
+// Package db owns SQLite access for CableGUI: migrations runner + the
 // query layer (store.go). The Store wraps a *sql.DB with helpers; tests
 // and the HTTP layer take a *Store, never a raw *sql.DB.
 package db

internal/db/device_types_test.go

@@ -55,17 +55,17 @@ func TestSeed_PortProfiles(t *testing.T) {
 		"fritz":      {5},  // Power 1 + RJ45 4
 		"ChromeCast": {2},  // Power 1 + HDMI 1
 		"SteamLink":  {4},  // Power 1 + HDMI 1 + USB 2
-		"IOx-3":      {4},  // Power 1 + USB 3
-		"IOx-6":      {7},  // Power 1 + USB 6
-		"IOx-8":      {9},  // Power 1 + USB 8
+		"IOx-3":        {4}, // Power In 1 + Power Out 3 (after v6)
+		"IOx-6":        {7}, // Power In 1 + Power Out 6 (after v6)
+		"IOx-8":        {9}, // Power In 1 + Power Out 8 (after v6)
 		"Screen":       {2}, // Power 1 + HDMI 1
 		"Keyboard":     {1}, // USB 1
 		"Mouse":        {1}, // USB 1
-		"Multi-plug 3": {4}, // Power 4
-		"Multi-plug 4": {5}, // Power 5
-		"Multi-plug 5": {6}, // Power 6
-		"Multi-plug 6": {7}, // Power 7
-		"Wifi-plug":    {2}, // Power 2
+		"Multi-plug 3": {4}, // Power In 1 + Power Out 3 (after v6)
+		"Multi-plug 4": {5}, // Power In 1 + Power Out 4 (after v6)
+		"Multi-plug 5": {6}, // Power In 1 + Power Out 5 (after v6)
+		"Multi-plug 6": {7}, // Power In 1 + Power Out 6 (after v6)
+		"Wifi-plug":    {2}, // Power In 1 + Power Out 1 (after v6)
 	}
 	for name, want := range cases {
 		dt, ok := byName[name]
@@ -83,10 +83,16 @@ func TestSeed_PortProfiles(t *testing.T) {
 	}
 }
 
-// TestSeed_PowerCatalog locks down migration 005: the 5 power-distribution
-// device types are present with the expected kind/icon/port profile, and
-// the total built-in count rose from 16 to 21.
-func TestSeed_PowerCatalog(t *testing.T) {
+// TestSeed_PowerHubs locks down the post-migration-006 port profile for
+// every power-distribution device type: IOx-3/6/8, Multi-plug 3/4/5/6,
+// and Wifi-plug. Each carries exactly two profile rows — a single
+// "Power In" port on the top (back) edge and N "Power Out" ports on the
+// bottom (front) edge, where N is the device-specific output count.
+//
+// This test covers the v5 catalog identity (kind, icon, built-in) for
+// the 5 power-distribution types and the v6 port-profile fix for all
+// 8 hubs in one table.
+func TestSeed_PowerHubs(t *testing.T) {
 	s := newTestStore(t)
 	all, err := s.ListBuiltInDeviceTypes()
 	if err != nil {
@@ -100,16 +106,23 @@ func TestSeed_PowerCatalog(t *testing.T) {
 		byName[d.Name] = d
 	}
 	cases := []struct {
-		name      string
-		kind      string
-		icon      string
-		powerPort int // count on the single Power port row
+		name string
+		// kind/icon are only set for the 5 v5-power types; empty means
+		// "don't check" (the IOx-* keep their v4-seeded kind=hub icon=nil).
+		kind     string
+		icon     string
+		outCount int // N — number of "Power Out" outlets on the bottom edge
 	}{
-		{"Multi-plug 3", "hub", "🔌", 4},
-		{"Multi-plug 4", "hub", "🔌", 5},
-		{"Multi-plug 5", "hub", "🔌", 6},
-		{"Multi-plug 6", "hub", "🔌", 7},
-		{"Wifi-plug", "accessory", "📶", 2},
+		// v5 catalog (kind+icon checked)
+		{name: "Multi-plug 3", kind: "hub", icon: "🔌", outCount: 3},
+		{name: "Multi-plug 4", kind: "hub", icon: "🔌", outCount: 4},
+		{name: "Multi-plug 5", kind: "hub", icon: "🔌", outCount: 5},
+		{name: "Multi-plug 6", kind: "hub", icon: "🔌", outCount: 6},
+		{name: "Wifi-plug", kind: "accessory", icon: "📶", outCount: 1},
+		// v4 hubs re-shaped by v6 (kind/icon left blank → not checked)
+		{name: "IOx-3", outCount: 3},
+		{name: "IOx-6", outCount: 6},
+		{name: "IOx-8", outCount: 8},
 	}
 	for _, c := range cases {
 		dt, ok := byName[c.name]
@@ -123,19 +136,23 @@ func TestSeed_PowerCatalog(t *testing.T) {
 		if dt.ProjectID != nil {
 			t.Errorf("%s: project_id should be nil", c.name)
 		}
-		if dt.Kind != c.kind {
+		if c.kind != "" && dt.Kind != c.kind {
 			t.Errorf("%s: kind = %q, want %q", c.name, dt.Kind, c.kind)
 		}
-		if dt.Icon == nil || *dt.Icon != c.icon {
+		if c.icon != "" && (dt.Icon == nil || *dt.Icon != c.icon) {
 			t.Errorf("%s: icon = %v, want %q", c.name, dt.Icon, c.icon)
 		}
-		if len(dt.Ports) != 1 {
-			t.Errorf("%s: expected 1 port-profile row, got %d", c.name, len(dt.Ports))
+		if len(dt.Ports) != 2 {
+			t.Errorf("%s: expected 2 port-profile rows, got %d", c.name, len(dt.Ports))
 			continue
 		}
-		p := dt.Ports[0]
-		if p.CableTypeID != 1 || p.Count != c.powerPort || p.Edge != "bottom" || p.LabelPrefix != "Power" {
-			t.Errorf("%s: port profile mismatch: %+v", c.name, p)
+		in := dt.Ports[0]
+		out := dt.Ports[1]
+		if in.CableTypeID != 1 || in.Count != 1 || in.Edge != "top" || in.LabelPrefix != "Power In" {
+			t.Errorf("%s: Power In row mismatch: %+v", c.name, in)
+		}
+		if out.CableTypeID != 1 || out.Count != c.outCount || out.Edge != "bottom" || out.LabelPrefix != "Power Out" {
+			t.Errorf("%s: Power Out row mismatch: %+v (want count=%d)", c.name, out, c.outCount)
 		}
 	}
 }

internal/db/excalidraw_ids.go

@@ -12,7 +12,7 @@ import (
 // Caller passes one map per kind; keys are the in-project row ids,
 // values are the 21-char Excalidraw element ids the exporter minted.
 func (s *Store) PersistExcalidrawIDs(projectID int64,
-	frames, devices, ports, ios, cables map[int64]string,
+	frames, devices, ports, ios, cables, clamps map[int64]string,
 ) error {
 	tx, err := s.db.Begin()
 	if err != nil {
@@ -35,6 +35,9 @@ func (s *Store) PersistExcalidrawIDs(projectID int64,
 	if err := updateExIDs(tx, "cables", projectID, cables); err != nil {
 		return err
 	}
+	if err := updateExIDs(tx, "clamps", projectID, clamps); err != nil {
+		return err
+	}
 	return tx.Commit()
 }
 

internal/db/migrations/001_init.sql

@@ -1,4 +1,4 @@
--- mCables v3 initial schema. See docs/design.md §2.
+-- CableGUI v3 initial schema. See docs/design.md §2.
 
 -- A project IS a drawing. LOFT and OFFICE are separate projects.
 -- One project ↔ one .excalidraw file in mExDraw.

internal/db/migrations/002_device_catalog.sql

@@ -1,4 +1,4 @@
--- mCables v4 device-type catalog. See docs/design.md §2.1 + §2.2.
+-- CableGUI v4 device-type catalog. See docs/design.md §2.1 + §2.2.
 
 -- v4 — device-type catalog. Built-in types live globally (project_id NULL).
 -- Per-project custom types use project_id = X.

internal/db/migrations/003_connection_requirements.sql

@@ -1,4 +1,4 @@
--- mCables v4.1 connection requirements + solver-owned cable flag.
+-- CableGUI v4.1 connection requirements + solver-owned cable flag.
 -- See docs/design.md §2.1 + §2 connection_requirements + §5b.3.
 
 -- The solver's input: "device A must connect to device B via cable type T".

internal/db/migrations/004_setup_templates.sql

@@ -1,4 +1,4 @@
--- mCables v4.1 setup templates. See docs/design.md §2.4.
+-- CableGUI v4.1 setup templates. See docs/design.md §2.4.
 --
 -- A template is a named recipe of (device_types + requirements) that
 -- bootstraps a project from blank to solver-ready in one apply call.

internal/db/migrations/005_catalog_power.sql

@@ -1,4 +1,4 @@
--- mCables v5 — catalog: power-distribution devices.
+-- CableGUI v5 — catalog: power-distribution devices.
 -- Adds 5 built-in device_types (project_id NULL, built_in=1).
 --
 -- Multi-plug N exposes Power × (N+1) ports — one input + N outputs. The

internal/db/migrations/006_fix_power_hubs.sql

@@ -0,0 +1,87 @@
+-- CableGUI v6 — fix IOx-* and Multi-plug-* + Wifi-plug port profiles.
+--
+-- v4 seeded the IOx-3 / IOx-6 / IOx-8 as USB hubs (Power × 1 + USB × N),
+-- but m's physical IOx-* devices are power strips (1 power input on
+-- the back, N power outputs on the front). v5's Multi-plug 3/4/5/6
+-- profiles also lumped every Power port on the bottom edge without
+-- distinguishing the input from the outputs.
+--
+-- This migration replaces the port profile for the 8 power-distribution
+-- types with the canonical "1 in (top/back) + N out (bottom/front)"
+-- layout. Convention: top=back, bottom=front.
+--
+-- N for each type:
+--   IOx-3 / Multi-plug 3 → 3 outputs
+--   IOx-6                 → 6 outputs
+--   IOx-8                 → 8 outputs
+--   Multi-plug 4          → 4 outputs
+--   Multi-plug 5          → 5 outputs
+--   Multi-plug 6          → 6 outputs
+--   Wifi-plug             → 1 output (it's a pass-through outlet)
+--
+-- Existing devices m may have created with the old profile keep their
+-- already-seeded ports — per design §2.3, ports are instance-owned. To
+-- get the new layout on an existing instance, delete it and re-create.
+--
+-- cable_types id 1 = Power (seeded in 001).
+
+-- 1) Drop the existing port-profile rows for each affected type.
+DELETE FROM device_type_ports
+ WHERE device_type_id IN (
+     SELECT id FROM device_types
+      WHERE project_id IS NULL
+        AND name IN (
+            'IOx-3', 'IOx-6', 'IOx-8',
+            'Multi-plug 3', 'Multi-plug 4', 'Multi-plug 5', 'Multi-plug 6',
+            'Wifi-plug'
+        )
+ );
+
+-- 2) Insert the canonical (1 in on top, N out on bottom) profile.
+-- IOx-3 — 1 in + 3 out
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power In',  1, 'top',    0 FROM device_types WHERE name='IOx-3' AND project_id IS NULL;
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power Out', 3, 'bottom', 1 FROM device_types WHERE name='IOx-3' AND project_id IS NULL;
+
+-- IOx-6 — 1 in + 6 out
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power In',  1, 'top',    0 FROM device_types WHERE name='IOx-6' AND project_id IS NULL;
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power Out', 6, 'bottom', 1 FROM device_types WHERE name='IOx-6' AND project_id IS NULL;
+
+-- IOx-8 — 1 in + 8 out
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power In',  1, 'top',    0 FROM device_types WHERE name='IOx-8' AND project_id IS NULL;
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power Out', 8, 'bottom', 1 FROM device_types WHERE name='IOx-8' AND project_id IS NULL;
+
+-- Multi-plug 3 — 1 in + 3 out
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power In',  1, 'top',    0 FROM device_types WHERE name='Multi-plug 3' AND project_id IS NULL;
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power Out', 3, 'bottom', 1 FROM device_types WHERE name='Multi-plug 3' AND project_id IS NULL;
+
+-- Multi-plug 4 — 1 in + 4 out
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power In',  1, 'top',    0 FROM device_types WHERE name='Multi-plug 4' AND project_id IS NULL;
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power Out', 4, 'bottom', 1 FROM device_types WHERE name='Multi-plug 4' AND project_id IS NULL;
+
+-- Multi-plug 5 — 1 in + 5 out
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power In',  1, 'top',    0 FROM device_types WHERE name='Multi-plug 5' AND project_id IS NULL;
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power Out', 5, 'bottom', 1 FROM device_types WHERE name='Multi-plug 5' AND project_id IS NULL;
+
+-- Multi-plug 6 — 1 in + 6 out
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power In',  1, 'top',    0 FROM device_types WHERE name='Multi-plug 6' AND project_id IS NULL;
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power Out', 6, 'bottom', 1 FROM device_types WHERE name='Multi-plug 6' AND project_id IS NULL;
+
+-- Wifi-plug — 1 in + 1 out (pass-through outlet)
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power In',  1, 'top',    0 FROM device_types WHERE name='Wifi-plug' AND project_id IS NULL;
+INSERT INTO device_type_ports (device_type_id, cable_type_id, label_prefix, count, edge, sort_order)
+    SELECT id, 1, 'Power Out', 1, 'bottom', 1 FROM device_types WHERE name='Wifi-plug' AND project_id IS NULL;

internal/db/migrations/007_clamps.sql

@@ -0,0 +1,31 @@
+-- CableGUI v5 — cable routing via clamps. See docs/design.md §11.
+--
+-- A clamp is a physical anchor placed on the canvas. A cable's polyline
+-- runs from its `from` endpoint → its clamps in `ord` sequence → its
+-- `to` endpoint. Cables that share an ordered pair of consecutive
+-- clamps are visibly bundled along that segment (computed live by the
+-- frontend; no detection pass).
+
+CREATE TABLE clamps (
+    id              INTEGER PRIMARY KEY,
+    project_id      INTEGER NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+    x               REAL NOT NULL,
+    y               REAL NOT NULL,
+    label           TEXT NOT NULL DEFAULT '',
+    frame_id        INTEGER REFERENCES frames(id) ON DELETE SET NULL,
+    excalidraw_id   TEXT,
+    created_at      TEXT NOT NULL DEFAULT (datetime('now')),
+    updated_at      TEXT NOT NULL DEFAULT (datetime('now')),
+    UNIQUE (project_id, excalidraw_id)
+);
+CREATE INDEX clamps_project_idx ON clamps(project_id);
+CREATE INDEX clamps_frame_idx   ON clamps(frame_id);
+
+CREATE TABLE cable_clamps (
+    cable_id        INTEGER NOT NULL REFERENCES cables(id) ON DELETE CASCADE,
+    clamp_id        INTEGER NOT NULL REFERENCES clamps(id) ON DELETE CASCADE,
+    ord             INTEGER NOT NULL,            -- 1-based along from→to
+    PRIMARY KEY (cable_id, ord),
+    UNIQUE (cable_id, clamp_id)
+);
+CREATE INDEX cable_clamps_clamp_idx ON cable_clamps(clamp_id);

internal/db/models.go

@@ -191,10 +191,11 @@ type UnsatisfiedReq struct {
 
 // ApplyTemplateResult is the response from POST /apply-template.
 type ApplyTemplateResult struct {
-	DevicesAdded         []Device                `json:"devices_added"`
-	RequirementsAdded    []ConnectionRequirement `json:"requirements_added"`
-	SkippedDevices       []SkippedTemplateDevice `json:"skipped_devices"`
-	RequirementsSkipped  []SkippedTemplateReq    `json:"requirements_skipped"`
+	FramesAdded         []Frame                 `json:"frames_added"`
+	DevicesAdded        []Device                `json:"devices_added"`
+	RequirementsAdded   []ConnectionRequirement `json:"requirements_added"`
+	SkippedDevices      []SkippedTemplateDevice `json:"skipped_devices"`
+	RequirementsSkipped []SkippedTemplateReq    `json:"requirements_skipped"`
 }
 
 type SkippedTemplateDevice struct {
@@ -219,4 +220,29 @@ type Snapshot struct {
 	Bundles                []Bundle                `json:"bundles"`
 	CableTypes             []CableType             `json:"cable_types"`
 	ConnectionRequirements []ConnectionRequirement `json:"connection_requirements"`
+	Clamps                 []Clamp                 `json:"clamps"`
+	CableClamps            []CableClamp            `json:"cable_clamps"`
+}
+
+// Clamp is a routing anchor on the canvas. Cables route through clamps
+// in `ord` sequence (see cable_clamps), giving m a physical handle on
+// where bundles converge.
+type Clamp struct {
+	ID           int64   `json:"id"`
+	ProjectID    int64   `json:"project_id"`
+	X            float64 `json:"x"`
+	Y            float64 `json:"y"`
+	Label        string  `json:"label"`
+	FrameID      *int64  `json:"frame_id"`
+	ExcalidrawID *string `json:"excalidraw_id,omitempty"`
+	CreatedAt    string  `json:"created_at"`
+	UpdatedAt    string  `json:"updated_at"`
+}
+
+// CableClamp is one (cable, clamp, ord) row. Ord is 1-based along the
+// cable's from→to direction.
+type CableClamp struct {
+	CableID int64 `json:"cable_id"`
+	ClampID int64 `json:"clamp_id"`
+	Ord     int   `json:"ord"`
 }

internal/db/setup_templates.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"math"
 	"strings"
 )
 
@@ -161,6 +162,7 @@ func (s *Store) ApplyTemplate(projectID, templateID int64, opts ApplyTemplateOpt
 	}
 
 	out := &ApplyTemplateResult{
+		FramesAdded:         []Frame{},
 		DevicesAdded:        []Device{},
 		RequirementsAdded:   []ConnectionRequirement{},
 		SkippedDevices:      []SkippedTemplateDevice{},
@@ -171,8 +173,8 @@ func (s *Store) ApplyTemplate(projectID, templateID int64, opts ApplyTemplateOpt
 		opts.OriginX, opts.OriginY = 200, 200
 	}
 
-	// Pull existing device names in the project so we can pre-check
-	// collisions without aborting the whole transaction.
+	// Pull existing device + frame names in the project so we can
+	// pre-check collisions without aborting the whole transaction.
 	existing, err := s.ListDevices(projectID, nil)
 	if err != nil {
 		return nil, err
@@ -181,6 +183,14 @@ func (s *Store) ApplyTemplate(projectID, templateID int64, opts ApplyTemplateOpt
 	for _, d := range existing {
 		nameTaken[d.Name] = true
 	}
+	existingFrames, err := s.ListFrames(projectID)
+	if err != nil {
+		return nil, err
+	}
+	frameNameTaken := map[string]bool{}
+	for _, f := range existingFrames {
+		frameNameTaken[f.Name] = true
+	}
 
 	tx, err := s.db.Begin()
 	if err != nil {
@@ -188,6 +198,37 @@ func (s *Store) ApplyTemplate(projectID, templateID int64, opts ApplyTemplateOpt
 	}
 	defer tx.Rollback()
 
+	// Plan a uniform grid for the template's devices inside a new frame
+	// named after the template. The grid drives both frame size and
+	// per-device (x, y). Devices that get skipped (name collision /
+	// SkipDevices) leave their grid cell empty.
+	const (
+		devW, devH = 100.0, 35.0
+		gapX, gapY = 30.0, 50.0
+		padX, padY = 32.0, 48.0 // padY larger so the frame title clears row 1
+	)
+	n := len(tmpl.Devices)
+	cols := 1
+	if n > 0 {
+		cols = min(int(math.Ceil(math.Sqrt(float64(n)))), 4)
+	}
+	rows := 1
+	if n > 0 {
+		rows = (n + cols - 1) / cols
+	}
+	frameW := padX*2 + float64(cols)*devW + float64(cols-1)*gapX
+	frameH := padY + padX + float64(rows)*devH + float64(rows-1)*gapY
+	frameName := pickFrameName(tmpl.Name, frameNameTaken)
+
+	frame, err := createFrameTx(tx, projectID, FrameCreate{
+		Name: frameName, X: opts.OriginX, Y: opts.OriginY,
+		Width: frameW, Height: frameH,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("seed frame %q: %w", frameName, err)
+	}
+	out.FramesAdded = append(out.FramesAdded, *frame)
+
 	// Map: template_device_id → newly-created device_id (or 0 if skipped).
 	tmplToDevice := map[int64]int64{}
 
@@ -215,17 +256,22 @@ func (s *Store) ApplyTemplate(projectID, templateID int64, opts ApplyTemplateOpt
 			tmplToDevice[td.ID] = 0
 			continue
 		}
-		// Lay out devices in a horizontal row near the origin, 150 px apart.
-		x := opts.OriginX + float64(i)*150
-		y := opts.OriginY
-		// Use createDeviceTx so the port-seeding share the same transaction.
+		// Grid cell (col, row) within the frame. Cell anchor is the
+		// top-left of the device rect; offsets are added to the frame's
+		// own (x, y) so the device sits inside the frame.
+		col := i % cols
+		row := i / cols
+		x := frame.X + padX + float64(col)*(devW+gapX)
+		y := frame.Y + padY + float64(row)*(devH+gapY)
+		// Use createDeviceTx so port-seeding shares the same transaction.
 		d, err := s.createDeviceTx(tx, projectID, DeviceCreate{
 			Name:    name,
 			TypeID:  &td.DeviceTypeID,
+			FrameID: &frame.ID,
 			X:       x,
 			Y:       y,
-			Width:   100,
-			Height:  35,
+			Width:   devW,
+			Height:  devH,
 		})
 		if err != nil {
 			return nil, fmt.Errorf("seed %s: %w", name, err)
@@ -294,6 +340,58 @@ func (s *Store) ApplyTemplate(projectID, templateID int64, opts ApplyTemplateOpt
 	return out, nil
 }
 
+// pickFrameName returns a frame name that doesn't collide with anything
+// in `taken`. Tries the template name first, then "<name> 2", "<name> 3",
+// and so on.
+func pickFrameName(base string, taken map[string]bool) string {
+	if !taken[base] {
+		return base
+	}
+	for i := 2; ; i++ {
+		candidate := fmt.Sprintf("%s %d", base, i)
+		if !taken[candidate] {
+			return candidate
+		}
+	}
+}
+
+// createFrameTx inserts a frame inside the caller's transaction. Mirrors
+// the validation in CreateFrame (name + positive size) but avoids the
+// s.db.Exec call so ApplyTemplate can keep everything on the same
+// connection under MaxOpenConns(1).
+func createFrameTx(tx *sql.Tx, projectID int64, f FrameCreate) (*Frame, error) {
+	name := strings.TrimSpace(f.Name)
+	if name == "" {
+		return nil, fmt.Errorf("%w: name is required", ErrInvalidInput)
+	}
+	if f.Width <= 0 || f.Height <= 0 {
+		return nil, fmt.Errorf("%w: width and height must be positive", ErrInvalidInput)
+	}
+	res, err := tx.Exec(
+		`INSERT INTO frames (project_id, name, x, y, width, height)
+		 VALUES (?, ?, ?, ?, ?, ?)`,
+		projectID, name, f.X, f.Y, f.Width, f.Height,
+	)
+	if err != nil {
+		return nil, mapWriteErr(err)
+	}
+	id, _ := res.LastInsertId()
+	var out Frame
+	var ex sql.NullString
+	err = tx.QueryRow(
+		`SELECT id, project_id, name, x, y, width, height, excalidraw_id, created_at, updated_at
+		 FROM frames WHERE id = ? AND project_id = ?`, id, projectID,
+	).Scan(&out.ID, &out.ProjectID, &out.Name, &out.X, &out.Y, &out.Width, &out.Height,
+		&ex, &out.CreatedAt, &out.UpdatedAt)
+	if err != nil {
+		return nil, err
+	}
+	if ex.Valid {
+		out.ExcalidrawID = &ex.String
+	}
+	return &out, nil
+}
+
 // createDeviceTx is a tx-aware variant of CreateDevice used by
 // ApplyTemplate so seeding the template's devices + their ports stays
 // inside one atomic apply.

internal/db/solver_test.go

@@ -234,6 +234,76 @@ func TestApplyTemplate_HomeOffice_ThenSolve(t *testing.T) {
 	}
 }
 
+func TestApplyTemplate_CreatesFrameAndPlacesDevicesInside(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	tmpls, _ := s.ListSetupTemplates()
+	var lr SetupTemplate
+	for _, tm := range tmpls {
+		if tm.Name == "Living Room" {
+			lr = tm
+			break
+		}
+	}
+	res, err := s.ApplyTemplate(p.ID, lr.ID, ApplyTemplateOptions{})
+	if err != nil {
+		t.Fatalf("apply: %v", err)
+	}
+	if len(res.FramesAdded) != 1 {
+		t.Fatalf("frames added = %d, want 1", len(res.FramesAdded))
+	}
+	frame := res.FramesAdded[0]
+	if frame.Name != "Living Room" {
+		t.Errorf("frame name = %q, want %q", frame.Name, "Living Room")
+	}
+	for _, d := range res.DevicesAdded {
+		if d.FrameID == nil || *d.FrameID != frame.ID {
+			t.Errorf("device %q: frame_id = %v, want %d", d.Name, d.FrameID, frame.ID)
+		}
+		// Device top-left should be inside the frame rect.
+		if d.X < frame.X || d.X+d.Width > frame.X+frame.Width {
+			t.Errorf("device %q: x=%v width=%v outside frame [%v..%v]", d.Name, d.X, d.Width, frame.X, frame.X+frame.Width)
+		}
+		if d.Y < frame.Y || d.Y+d.Height > frame.Y+frame.Height {
+			t.Errorf("device %q: y=%v height=%v outside frame [%v..%v]", d.Name, d.Y, d.Height, frame.Y, frame.Y+frame.Height)
+		}
+	}
+	// No two devices share the same (X, Y) — the grid layout spreads them out.
+	seen := map[[2]float64]string{}
+	for _, d := range res.DevicesAdded {
+		key := [2]float64{d.X, d.Y}
+		if prev, ok := seen[key]; ok {
+			t.Errorf("devices %q and %q share grid cell (%v, %v)", prev, d.Name, d.X, d.Y)
+		}
+		seen[key] = d.Name
+	}
+}
+
+func TestApplyTemplate_FrameNameSuffixOnCollision(t *testing.T) {
+	s := newTestStore(t)
+	p, _ := s.CreateProject("LOFT", "", "")
+	// Pre-create a frame called "Living Room" so the template's frame name collides.
+	_, _ = s.CreateFrame(p.ID, FrameCreate{Name: "Living Room", X: 0, Y: 0, Width: 100, Height: 100})
+	tmpls, _ := s.ListSetupTemplates()
+	var lr SetupTemplate
+	for _, tm := range tmpls {
+		if tm.Name == "Living Room" {
+			lr = tm
+			break
+		}
+	}
+	res, err := s.ApplyTemplate(p.ID, lr.ID, ApplyTemplateOptions{})
+	if err != nil {
+		t.Fatalf("apply: %v", err)
+	}
+	if len(res.FramesAdded) != 1 {
+		t.Fatalf("frames added = %d, want 1", len(res.FramesAdded))
+	}
+	if res.FramesAdded[0].Name != "Living Room 2" {
+		t.Errorf("frame name = %q, want %q (suffixed)", res.FramesAdded[0].Name, "Living Room 2")
+	}
+}
+
 func TestApplyTemplate_NameCollisionSkipped(t *testing.T) {
 	s := newTestStore(t)
 	p, _ := s.CreateProject("LOFT", "", "")

internal/db/store.go

@@ -187,6 +187,14 @@ func (s *Store) Snapshot(id int64) (*Snapshot, error) {
 	if err != nil {
 		return nil, err
 	}
+	clamps, err := s.ListClamps(id)
+	if err != nil {
+		return nil, err
+	}
+	cableClamps, err := s.ListCableClamps(id)
+	if err != nil {
+		return nil, err
+	}
 	return &Snapshot{
 		Project:                *p,
 		Frames:                 frames,
@@ -197,6 +205,8 @@ func (s *Store) Snapshot(id int64) (*Snapshot, error) {
 		Bundles:                bundles,
 		CableTypes:             types,
 		ConnectionRequirements: reqs,
+		Clamps:                 clamps,
+		CableClamps:            cableClamps,
 	}, nil
 }
 

internal/exporter/exporter.go

@@ -11,8 +11,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/big"
+	"sort"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
 // Scene is the top-level Excalidraw file format. Keys mirror what the
@@ -114,6 +115,7 @@ type IDAssignment struct {
 	Ports     map[int64]string `json:"ports"`
 	IOMarkers map[int64]string `json:"io_markers"`
 	Cables    map[int64]string `json:"cables"`
+	Clamps    map[int64]string `json:"clamps"`
 }
 
 // BuildScene transforms a project snapshot into an Excalidraw Scene +
@@ -132,6 +134,7 @@ func BuildScene(snap *db.Snapshot, nowMilli int64, genID func() string) (*Scene,
 		Ports:     map[int64]string{},
 		IOMarkers: map[int64]string{},
 		Cables:    map[int64]string{},
+		Clamps:    map[int64]string{},
 	}
 	// idFor: reuse the existing excalidraw_id if present, else mint one.
 	idFor := func(existing *string) string {
@@ -381,6 +384,58 @@ func BuildScene(snap *db.Snapshot, nowMilli int64, genID func() string) (*Scene,
 		})
 	}
 
+	// Clamps — small grey rounded squares (v5 §11.7). Distinct from the
+	// red IO marker diamonds so m can tell routing anchors from wall
+	// outlets at a glance.
+	const clampSize = 12.0
+	for _, cl := range snap.Clamps {
+		elID := idFor(cl.ExcalidrawID)
+		a.Clamps[cl.ID] = elID
+		var frameRef *string
+		if cl.FrameID != nil {
+			if v, ok := frameElID[*cl.FrameID]; ok {
+				frameRef = &v
+			}
+		}
+		els = append(els, Element{
+			ID:              elID,
+			Type:            "rectangle",
+			X:               cl.X - clampSize/2,
+			Y:               cl.Y - clampSize/2,
+			Width:           clampSize,
+			Height:          clampSize,
+			StrokeColor:     "#555555",
+			BackgroundColor: "#888888",
+			FillStyle:       "solid",
+			StrokeWidth:     1,
+			StrokeStyle:     "solid",
+			Roughness:       0,
+			Opacity:         100,
+			GroupIDs:        []string{},
+			FrameID:         frameRef,
+			Roundness:       &Roundness{Type: 3},
+			Seed:            randInt(),
+			Version:         1,
+			VersionNonce:    randInt(),
+			Updated:         nowMilli,
+		})
+	}
+
+	// Pre-group cable_clamps by cable for the arrow mid-points pass.
+	clampsByCable := map[int64][]db.CableClamp{}
+	for _, cc := range snap.CableClamps {
+		clampsByCable[cc.CableID] = append(clampsByCable[cc.CableID], cc)
+	}
+	for _, arr := range clampsByCable {
+		// Already sorted by ListCableClamps (ORDER BY cable_id, ord),
+		// but defend against unsorted inputs.
+		sort.Slice(arr, func(i, j int) bool { return arr[i].Ord < arr[j].Ord })
+	}
+	clampPos := map[int64][2]float64{}
+	for _, cl := range snap.Clamps {
+		clampPos[cl.ID] = [2]float64{cl.X, cl.Y}
+	}
+
 	// Cables — arrows with startBinding/endBinding to the port / device /
 	// IO marker excalidraw_ids. Endpoint anchors (the visible "from" /
 	// "to" points) come from the same anchor logic the canvas uses.
@@ -403,6 +458,18 @@ func BuildScene(snap *db.Snapshot, nowMilli int64, genID func() string) (*Scene,
 		}
 		startArr := ""
 		endArr := "arrow"
+		// Excalidraw arrow `points` is relative to (X, Y). We anchor at
+		// the from-point, so vertex 0 is always (0, 0). Mid-vertices
+		// (clamps) and the final to-vertex are offsets from there.
+		pts := [][2]float64{{0, 0}}
+		for _, cc := range clampsByCable[c.ID] {
+			pos, ok := clampPos[cc.ClampID]
+			if !ok {
+				continue
+			}
+			pts = append(pts, [2]float64{pos[0] - fromAnchor[0], pos[1] - fromAnchor[1]})
+		}
+		pts = append(pts, [2]float64{toAnchor[0] - fromAnchor[0], toAnchor[1] - fromAnchor[1]})
 		els = append(els, Element{
 			ID:              elID,
 			Type:            "arrow",
@@ -422,7 +489,7 @@ func BuildScene(snap *db.Snapshot, nowMilli int64, genID func() string) (*Scene,
 			Version:         1,
 			VersionNonce:    randInt(),
 			Updated:         nowMilli,
-			Points:          [][2]float64{{0, 0}, {toAnchor[0] - fromAnchor[0], toAnchor[1] - fromAnchor[1]}},
+			Points:          pts,
 			StartArrowhead:  &startArr,
 			EndArrowhead:    &endArr,
 			StartBinding:    bindingPtr(fromRef),
@@ -470,7 +537,7 @@ func BuildScene(snap *db.Snapshot, nowMilli int64, genID func() string) (*Scene,
 	scene := &Scene{
 		Type:     "excalidraw",
 		Version:  2,
-		Source:   "mcables",
+		Source:   "cablegui",
 		Elements: els,
 		AppState: AppState{
 			GridSize:       nil,

internal/exporter/exporter_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
 // deterministic id generator for tests
@@ -137,6 +137,66 @@ func TestBuildScene_BundlesIgnored(t *testing.T) {
 	}
 }
 
+func TestBuildScene_ClampsRenderAsRectangles(t *testing.T) {
+	snap := sampleSnapshot()
+	snap.Clamps = []db.Clamp{
+		{ID: 1, ProjectID: 1, X: 500, Y: 300},
+		{ID: 2, ProjectID: 1, X: 550, Y: 320},
+	}
+	scene, ids := BuildScene(snap, 1700000000000, newSeq())
+	if len(ids.Clamps) != 2 {
+		t.Errorf("clamp ids = %d, want 2", len(ids.Clamps))
+	}
+	clampElIDs := map[string]bool{}
+	for _, id := range ids.Clamps {
+		clampElIDs[id] = true
+	}
+	got := 0
+	for _, e := range scene.Elements {
+		if clampElIDs[e.ID] && e.Type == "rectangle" {
+			got++
+		}
+	}
+	if got != 2 {
+		t.Errorf("clamp rectangle elements = %d, want 2", got)
+	}
+}
+
+func TestBuildScene_ArrowPointsIncludeClamps(t *testing.T) {
+	snap := sampleSnapshot()
+	snap.Clamps = []db.Clamp{
+		{ID: 10, ProjectID: 1, X: 350, Y: 250},
+	}
+	snap.CableClamps = []db.CableClamp{
+		{CableID: 1000, ClampID: 10, Ord: 1},
+	}
+	scene, _ := BuildScene(snap, 1700000000000, newSeq())
+	var arrow *Element
+	for i := range scene.Elements {
+		if scene.Elements[i].Type == "arrow" {
+			arrow = &scene.Elements[i]
+			break
+		}
+	}
+	if arrow == nil {
+		t.Fatal("no arrow in scene")
+	}
+	if len(arrow.Points) != 3 {
+		t.Errorf("arrow points = %d, want 3 (from + clamp + to): %+v", len(arrow.Points), arrow.Points)
+	}
+	// First point is always (0, 0) by convention; middle point should
+	// equal the clamp's position relative to the arrow's anchor.
+	if arrow.Points[0][0] != 0 || arrow.Points[0][1] != 0 {
+		t.Errorf("first point = %v, want [0,0]", arrow.Points[0])
+	}
+	// Middle vertex = clamp.x - fromAnchor.x, clamp.y - fromAnchor.y.
+	// fromAnchor for port 100 = (200 + 50, 200 + 35) = (250, 235).
+	wantX, wantY := 350.0-250.0, 250.0-235.0
+	if arrow.Points[1][0] != wantX || arrow.Points[1][1] != wantY {
+		t.Errorf("mid point = %v, want [%v, %v]", arrow.Points[1], wantX, wantY)
+	}
+}
+
 func TestMarshalScene_IsJSON(t *testing.T) {
 	snap := sampleSnapshot()
 	scene, _ := BuildScene(snap, 1700000000000, newSeq())

internal/server/cables.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
 type cableEndpointBody struct {

internal/server/clamps.go

@@ -0,0 +1,195 @@
+package server
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+
+	"mgit.msbls.de/m/cablegui/internal/db"
+)
+
+type clampCreate struct {
+	X       float64         `json:"x"`
+	Y       float64         `json:"y"`
+	Label   string          `json:"label,omitempty"`
+	FrameID json.RawMessage `json:"frame_id,omitempty"`
+}
+
+type clampPatch struct {
+	X       *float64        `json:"x,omitempty"`
+	Y       *float64        `json:"y,omitempty"`
+	Label   *string         `json:"label,omitempty"`
+	FrameID json.RawMessage `json:"frame_id,omitempty"`
+}
+
+type cableClampAttach struct {
+	ClampID int64 `json:"clamp_id"`
+	Ord     int   `json:"ord,omitempty"`
+}
+
+type cableClampReorder struct {
+	ClampIDs []int64 `json:"clamp_ids"`
+}
+
+func (h *handlers) listClamps(w http.ResponseWriter, r *http.Request) {
+	pid, ok := parseInt64Path(r, "pid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "pid must be a positive integer")
+		return
+	}
+	cs, err := h.store.ListClamps(pid)
+	if err != nil {
+		writeError(w, err, nil)
+		return
+	}
+	writeJSON(w, http.StatusOK, cs)
+}
+
+func (h *handlers) createClamp(w http.ResponseWriter, r *http.Request) {
+	pid, ok := parseInt64Path(r, "pid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "pid must be a positive integer")
+		return
+	}
+	var body clampCreate
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, errors.Join(db.ErrInvalidInput, err), nil)
+		return
+	}
+	ref, err := parseFrameRef(body.FrameID)
+	if err != nil {
+		writeError(w, errors.Join(db.ErrInvalidInput, err), nil)
+		return
+	}
+	c, err := h.store.CreateClamp(pid, db.ClampCreate{
+		X: body.X, Y: body.Y, Label: body.Label, FrameID: ref.ID,
+	})
+	if err != nil {
+		writeError(w, err, nil)
+		return
+	}
+	writeJSON(w, http.StatusCreated, c)
+}
+
+func (h *handlers) patchClamp(w http.ResponseWriter, r *http.Request) {
+	pid, ok := parseInt64Path(r, "pid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "pid must be a positive integer")
+		return
+	}
+	id, ok := parseInt64Path(r, "id")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "id must be a positive integer")
+		return
+	}
+	var body clampPatch
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, errors.Join(db.ErrInvalidInput, err), nil)
+		return
+	}
+	ref, err := parseFrameRef(body.FrameID)
+	if err != nil {
+		writeError(w, errors.Join(db.ErrInvalidInput, err), nil)
+		return
+	}
+	c, err := h.store.UpdateClamp(pid, id, db.ClampUpdate{
+		X: body.X, Y: body.Y, Label: body.Label, FrameID: ref,
+	})
+	if err != nil {
+		writeError(w, err, nil)
+		return
+	}
+	writeJSON(w, http.StatusOK, c)
+}
+
+func (h *handlers) deleteClamp(w http.ResponseWriter, r *http.Request) {
+	pid, ok := parseInt64Path(r, "pid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "pid must be a positive integer")
+		return
+	}
+	id, ok := parseInt64Path(r, "id")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "id must be a positive integer")
+		return
+	}
+	if err := h.store.DeleteClamp(pid, id); err != nil {
+		writeError(w, err, nil)
+		return
+	}
+	w.WriteHeader(http.StatusNoContent)
+}
+
+// POST /api/projects/:pid/cables/:cid/clamps — attach a clamp to a cable.
+func (h *handlers) attachClampToCable(w http.ResponseWriter, r *http.Request) {
+	pid, ok := parseInt64Path(r, "pid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "pid must be a positive integer")
+		return
+	}
+	cid, ok := parseInt64Path(r, "cid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "cid must be a positive integer")
+		return
+	}
+	var body cableClampAttach
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, errors.Join(db.ErrInvalidInput, err), nil)
+		return
+	}
+	cc, err := h.store.AttachClampToCable(pid, cid, body.ClampID, body.Ord)
+	if err != nil {
+		writeError(w, err, nil)
+		return
+	}
+	writeJSON(w, http.StatusCreated, cc)
+}
+
+// DELETE /api/projects/:pid/cables/:cid/clamps/:cmid — detach a clamp.
+func (h *handlers) detachClampFromCable(w http.ResponseWriter, r *http.Request) {
+	pid, ok := parseInt64Path(r, "pid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "pid must be a positive integer")
+		return
+	}
+	cid, ok := parseInt64Path(r, "cid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "cid must be a positive integer")
+		return
+	}
+	cmid, ok := parseInt64Path(r, "cmid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "cmid must be a positive integer")
+		return
+	}
+	if err := h.store.DetachClampFromCable(pid, cid, cmid); err != nil {
+		writeError(w, err, nil)
+		return
+	}
+	w.WriteHeader(http.StatusNoContent)
+}
+
+// PUT /api/projects/:pid/cables/:cid/clamps — replace clamp sequence.
+func (h *handlers) reorderCableClamps(w http.ResponseWriter, r *http.Request) {
+	pid, ok := parseInt64Path(r, "pid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "pid must be a positive integer")
+		return
+	}
+	cid, ok := parseInt64Path(r, "cid")
+	if !ok {
+		writeError(w, db.ErrInvalidInput, "cid must be a positive integer")
+		return
+	}
+	var body cableClampReorder
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, errors.Join(db.ErrInvalidInput, err), nil)
+		return
+	}
+	out, err := h.store.ReorderCableClamps(pid, cid, body.ClampIDs)
+	if err != nil {
+		writeError(w, err, nil)
+		return
+	}
+	writeJSON(w, http.StatusOK, out)
+}

internal/server/connection_requirements.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
 type connReqCreate struct {

internal/server/device_types.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
 type deviceTypePortBody struct {

internal/server/export.go

@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"mgit.msbls.de/m/mcables/internal/db"
-	"mgit.msbls.de/m/mcables/internal/exporter"
+	"mgit.msbls.de/m/cablegui/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/exporter"
 )
 
 // syncExport runs the project's snapshot through the exporter, persists
@@ -34,7 +34,7 @@ func (h *handlers) syncExport(w http.ResponseWriter, r *http.Request) {
 	if user == "" || pass == "" {
 		writeJSON(w, http.StatusBadRequest, errorBody{
 			Error:   "MEXDRAW_USER / MEXDRAW_PASS not set",
-			Details: "Add MEXDRAW_USER and MEXDRAW_PASS to /home/m/secrets/mcables/.env on mDock and restart the container — mxdrw expects HTTP Basic Auth",
+			Details: "Add MEXDRAW_USER and MEXDRAW_PASS to /home/m/secrets/cablegui/.env on mDock and restart the container — mxdrw expects HTTP Basic Auth",
 		})
 		return
 	}
@@ -51,7 +51,7 @@ func (h *handlers) syncExport(w http.ResponseWriter, r *http.Request) {
 	// Persist the freshly-assigned ids so the next export reuses them.
 	// We pass in the full maps; PersistExcalidrawIDs is idempotent (it
 	// only updates rows whose excalidraw_id is still NULL).
-	if err := h.store.PersistExcalidrawIDs(pid, ids.Frames, ids.Devices, ids.Ports, ids.IOMarkers, ids.Cables); err != nil {
+	if err := h.store.PersistExcalidrawIDs(pid, ids.Frames, ids.Devices, ids.Ports, ids.IOMarkers, ids.Cables, ids.Clamps); err != nil {
 		writeError(w, fmt.Errorf("persist excalidraw_ids: %w", err), nil)
 		return
 	}

internal/server/frames_devices.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
 // ---------------------------------------------------------------- frames

internal/server/handlers.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
 type handlers struct {

internal/server/io_markers.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
 type ioMarkerCreate struct {

internal/server/ports.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
 type portCreate struct {

internal/server/server.go

@@ -7,10 +7,10 @@ import (
 	"io/fs"
 	"net/http"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
-// New returns an http.Handler serving the mCables API at /api/ and the
+// New returns an http.Handler serving the CableGUI API at /api/ and the
 // embedded frontend at /. The frontend FS should be rooted such that
 // "index.html" is at its root.
 func New(store *db.Store, frontend fs.FS) http.Handler {
@@ -93,6 +93,15 @@ func New(store *db.Store, frontend fs.FS) http.Handler {
 	// Slice 8 — export to mxdrw.msbls.de
 	mux.HandleFunc("POST /api/projects/{pid}/sync/export", h.syncExport)
 
+	// v5 — clamps + cable routing.
+	mux.HandleFunc("GET /api/projects/{pid}/clamps", h.listClamps)
+	mux.HandleFunc("POST /api/projects/{pid}/clamps", h.createClamp)
+	mux.HandleFunc("PATCH /api/projects/{pid}/clamps/{id}", h.patchClamp)
+	mux.HandleFunc("DELETE /api/projects/{pid}/clamps/{id}", h.deleteClamp)
+	mux.HandleFunc("POST /api/projects/{pid}/cables/{cid}/clamps", h.attachClampToCable)
+	mux.HandleFunc("PUT /api/projects/{pid}/cables/{cid}/clamps", h.reorderCableClamps)
+	mux.HandleFunc("DELETE /api/projects/{pid}/cables/{cid}/clamps/{cmid}", h.detachClampFromCable)
+
 	// Frontend (embedded). Serve "/" → index.html via http.FileServerFS.
 	// Wrap in noCache so the browser revalidates with the ETag/Last-Modified
 	// the file server already emits — without this, browsers cache aggressively

internal/server/solver.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http"
 
-	"mgit.msbls.de/m/mcables/internal/db"
+	"mgit.msbls.de/m/cablegui/internal/db"
 )
 
 func (h *handlers) solve(w http.ResponseWriter, r *http.Request) {

web/static/index.html

@@ -3,12 +3,12 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>mCables</title>
+  <title>CableGUI</title>
   <link rel="stylesheet" href="/style.css" />
 </head>
 <body>
   <header class="topbar">
-    <span class="brand">mCables</span>
+    <span class="brand">CableGUI</span>
     <div class="project-picker">
       <label for="project-select" class="sr-only">Project</label>
       <select id="project-select" aria-label="Active project">
@@ -23,6 +23,11 @@
     <button type="button" id="btn-apply-template" class="btn">Apply template…</button>
     <button type="button" id="btn-solve" class="btn btn-primary">Solve</button>
     <button type="button" id="btn-export" class="btn">Export</button>
+    <button type="button" id="btn-admin" class="btn" title="Admin: projects, cable types, device types, setup templates">⚙ Admin</button>
+    <span class="zoom-cluster">
+      <span id="zoom-pct" title="Zoom — scroll on canvas, or 0/Home to reset">100%</span>
+      <button type="button" id="btn-fit" class="btn btn-tiny" title="Fit content to view">Fit</button>
+    </span>
     <span id="toast" class="toast" hidden></span>
   </header>
 
@@ -31,12 +36,6 @@
       <section class="legend">
         <h2 class="sidebar-heading">Cable types</h2>
         <ul id="legend-list" class="legend-list"></ul>
-        <button type="button" id="btn-add-type" class="btn btn-tiny">+ Type</button>
-      </section>
-      <section class="requirements">
-        <h2 class="sidebar-heading">Requirements</h2>
-        <ul id="requirement-list" class="requirement-list"></ul>
-        <button type="button" id="btn-add-requirement" class="btn btn-tiny">+ Requirement</button>
       </section>
       <section class="tools">
         <h2 class="sidebar-heading">Tools</h2>
@@ -44,6 +43,7 @@
           <li><button type="button" id="tool-frame"  class="btn btn-tiny" data-tool="frame">+ Frame</button></li>
           <li><button type="button" id="tool-device" class="btn btn-tiny" data-tool="device">+ Device</button></li>
           <li><button type="button" id="tool-io"     class="btn btn-tiny" data-tool="io">+ IO</button></li>
+          <li><button type="button" id="tool-clamp"  class="btn btn-tiny" data-tool="clamp" title="Click canvas to drop a clamp. Cables can then route through it.">+ Clamp</button></li>
           <li><button type="button" id="tool-req"    class="btn btn-tiny" data-tool="req">Drag req A→B</button></li>
           <li><button type="button" id="tool-cable"  class="btn btn-tiny" data-tool="cable" title="Click a port to start, then click another port / device / IO marker">Draw cable</button></li>
         </ul>
@@ -52,10 +52,13 @@
 
     <section class="canvas-wrap" aria-label="Diagram">
       <svg id="canvas" viewBox="0 0 2000 1500" preserveAspectRatio="xMidYMid meet">
+        <defs id="canvas-defs"></defs>
         <g id="canvas-frames"></g>
         <g id="canvas-devices"></g>
         <g id="canvas-ports"></g>
         <g id="canvas-cables"></g>
+        <g id="canvas-bundles"></g>
+        <g id="canvas-clamps"></g>
         <g id="canvas-io"></g>
       </svg>
       <p id="empty-hint" class="empty-hint">
@@ -224,6 +227,24 @@
     </form>
   </dialog>
 
+  <!-- Admin: projects + cable types + device types + setup templates -->
+  <dialog id="modal-admin" class="modal modal-wide" aria-labelledby="adm-title">
+    <div class="admin-shell">
+      <header class="admin-header">
+        <h2 id="adm-title">Admin</h2>
+        <button type="button" class="btn btn-link admin-close" data-close>✕</button>
+      </header>
+      <nav class="admin-tabs" role="tablist">
+        <button type="button" class="admin-tab" data-admin-tab="projects" role="tab" aria-selected="true">Projects</button>
+        <button type="button" class="admin-tab" data-admin-tab="cable-types" role="tab">Cable types</button>
+        <button type="button" class="admin-tab" data-admin-tab="device-types" role="tab">Device types</button>
+        <button type="button" class="admin-tab" data-admin-tab="setup-templates" role="tab">Setup templates</button>
+        <button type="button" class="admin-tab" data-admin-tab="requirements" role="tab">Requirements</button>
+      </nav>
+      <section class="admin-body" id="admin-body" role="tabpanel"></section>
+    </div>
+  </dialog>
+
   <script type="module" src="/main.js"></script>
 </body>
 </html>

web/static/style.css

@@ -180,17 +180,43 @@ body {
   fill: var(--accent);
   font-size: 13px;
   font-weight: 600;
-  pointer-events: none;
+  cursor: grab;
 }
 
+/* Frame bottom-right resize affordance. Mirrors .device-resize-handle
+   but uses the accent-on-frame palette so it reads as part of the frame
+   chrome rather than the device. */
+.frame-resize-handle {
+  fill: rgba(0, 0, 0, 0.15);
+  stroke: rgba(0, 0, 0, 0.25);
+  stroke-width: 1;
+  cursor: nwse-resize;
+}
+.frame-resize-handle:hover {
+  fill: rgba(0, 0, 0, 0.3);
+}
+
+/* Stroke + fill come from the device's user-set colour, written as
+   inline style in renderCanvas — leaving them out of .device-rect so
+   the author CSS doesn't override the inline style. */
 .device-rect {
-  fill: #fff;
-  stroke: var(--text);
   stroke-width: 1.5;
 }
 .device-rect.selected { stroke-width: 3; }
 .device-rect:hover { filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.15)); }
 
+/* Bottom-right resize affordance per device. Subtle grey by default,
+   stronger on hover so m can find it without it dominating the rect. */
+.device-resize-handle {
+  fill: rgba(120, 120, 120, 0.35);
+  stroke: rgba(60, 60, 60, 0.45);
+  stroke-width: 1;
+  cursor: nwse-resize;
+}
+.device-resize-handle:hover {
+  fill: rgba(60, 60, 60, 0.65);
+}
+
 .device-label {
   fill: var(--text);
   font-size: 12px;
@@ -214,11 +240,44 @@ body {
 .canvas-wrap.tool-device #canvas *,
 .canvas-wrap.tool-io     #canvas,
 .canvas-wrap.tool-io     #canvas *,
-.canvas-wrap.tool-port   #canvas,
-.canvas-wrap.tool-port   #canvas *,
+.canvas-wrap.tool-clamp  #canvas,
+.canvas-wrap.tool-clamp  #canvas *,
 .canvas-wrap.tool-cable  #canvas,
 .canvas-wrap.tool-cable  #canvas * { cursor: crosshair !important; }
 
+/* Clamps — small grey rounded squares (v5 §11). Cables route through
+   them in `ord` sequence. */
+.clamp {
+  fill: rgba(120, 120, 120, 0.85);
+  stroke: rgba(40, 40, 40, 0.85);
+  stroke-width: 1.5;
+  cursor: grab;
+}
+.clamp.selected {
+  stroke-width: 3;
+  filter: drop-shadow(0 0 4px var(--accent));
+}
+.clamp-label {
+  fill: var(--text-muted);
+  font-size: 10px;
+  pointer-events: none;
+}
+/* Shared-segment count badge — m sees ×N next to clamps that route
+   ≥ 2 cables. */
+.clamp-badge {
+  fill: var(--text);
+  font-size: 10px;
+  font-weight: 700;
+  pointer-events: none;
+}
+/* Bundle overlay — thick striped polyline drawn on top of individual
+   cables along shared segments. v5 §11.3. */
+.bundle-line {
+  fill: none;
+  pointer-events: none;
+  opacity: 0.85;
+}
+
 .btn-link {
   background: transparent;
   border: 0;
@@ -236,6 +295,27 @@ body {
   filter: drop-shadow(0 0 4px var(--accent));
 }
 
+/* Zoom cluster — % + Fit button next to Admin. */
+.zoom-cluster {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  margin-left: 8px;
+  padding-left: 12px;
+  border-left: 1px solid var(--border);
+}
+#zoom-pct {
+  font-size: 12px;
+  color: var(--text-muted);
+  min-width: 38px;
+  text-align: right;
+  font-variant-numeric: tabular-nums;
+}
+.canvas-wrap.panning #canvas,
+.canvas-wrap.panning #canvas * { cursor: grabbing !important; }
+.canvas-wrap.space-pan-ready #canvas,
+.canvas-wrap.space-pan-ready #canvas * { cursor: grab !important; }
+
 /* Header toast — slice 8 export feedback */
 .toast {
   display: inline-block;
@@ -295,8 +375,11 @@ body {
   align-items: center;
   gap: 6px;
   font-size: 12px;
-  padding: 2px 0;
+  padding: 2px 4px;
+  border-radius: 4px;
+  cursor: pointer;
 }
+.port-row:hover { background: var(--surface-2); }
 .port-row .swatch,
 .swatch {
   display: inline-block;
@@ -372,8 +455,121 @@ body {
 .cable-line:hover { stroke-width: 4; }
 .cable-line.selected { stroke-width: 4; }
 
+/* Endpoint handles — only rendered for the currently-selected cable.
+   Grab cursor on idle, grabbing while dragging (.replugging on root). */
+.cable-handle {
+  cursor: grab;
+  stroke-width: 2;
+  filter: drop-shadow(0 0 2px rgba(0, 0, 0, 0.35));
+}
+.cable-handle:hover { stroke-width: 3; }
+.canvas-wrap.replugging .cable-handle,
+.canvas-wrap.replugging #canvas * { cursor: grabbing !important; }
+
 /* Solve preview-diff modal */
 .modal-wide { width: 560px; }
+
+/* Admin modal — wider, tabbed */
+.modal-wide.admin-shell-host { width: 760px; }
+#modal-admin { width: 760px; max-width: 90vw; }
+.admin-shell { padding: 16px; min-height: 460px; }
+.admin-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+}
+.admin-header h2 { margin: 0; }
+.admin-close { font-size: 16px; padding: 4px 8px; }
+.admin-tabs {
+  display: flex;
+  gap: 2px;
+  border-bottom: 1px solid var(--border);
+  margin-bottom: 12px;
+}
+.admin-tab {
+  background: transparent;
+  border: 0;
+  border-bottom: 2px solid transparent;
+  padding: 8px 12px;
+  font: inherit;
+  color: var(--text-muted);
+  cursor: pointer;
+}
+.admin-tab:hover { color: var(--text); }
+.admin-tab[aria-selected="true"] {
+  color: var(--text);
+  border-bottom-color: var(--accent);
+}
+.admin-body {
+  font-size: 13px;
+  max-height: 60vh;
+  overflow-y: auto;
+}
+.admin-row {
+  display: grid;
+  gap: 6px 12px;
+  padding: 8px 0;
+  border-bottom: 1px solid var(--border);
+}
+.admin-row:last-child { border-bottom: 0; }
+.admin-row .field { display: grid; grid-template-columns: 110px 1fr; align-items: center; }
+.admin-row .field span { color: var(--text-muted); font-size: 12px; }
+.admin-row .field input,
+.admin-row .field textarea,
+.admin-row .field select {
+  width: 100%;
+  font: inherit;
+  padding: 4px 6px;
+  border: 1px solid var(--border);
+  border-radius: 4px;
+  background: var(--bg);
+  color: var(--text);
+}
+.admin-row .actions { display: flex; gap: 6px; justify-content: flex-end; }
+.admin-row.locked { opacity: 0.85; }
+.admin-row .locked-badge {
+  display: inline-block;
+  font-size: 11px;
+  padding: 1px 6px;
+  border-radius: 3px;
+  background: var(--surface-2);
+  color: var(--text-muted);
+}
+.admin-row-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-weight: 600;
+  margin-bottom: 4px;
+}
+.admin-row-title .swatch { display: inline-block; }
+.admin-empty { color: var(--text-muted); padding: 16px 0; }
+.admin-add-row {
+  margin-top: 12px;
+  padding-top: 12px;
+  border-top: 1px solid var(--border);
+}
+.port-profile-list {
+  margin: 4px 0 0 0;
+  padding: 0;
+  list-style: none;
+  font-size: 12px;
+  color: var(--text-muted);
+}
+.port-profile-list li {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 2px 0;
+}
+.tmpl-detail {
+  margin: 4px 0 0 0;
+  font-size: 12px;
+  color: var(--text-muted);
+}
+.tmpl-detail ul { margin: 4px 0 0 16px; padding: 0; }
+
 .sv-body { font-size: 13px; }
 .sv-body h3 {
   font-size: 11px;

web/web.go

@@ -1,5 +1,5 @@
 // Package web bundles the frontend (HTML/JS/CSS) into the Go binary
-// via embed.FS so deploying mCables means shipping one file.
+// via embed.FS so deploying CableGUI means shipping one file.
 package web
 
 import (