Adding Attachment Points

app/api/attachment_points.py

@@ -0,0 +1,118 @@
+from fastapi import APIRouter, Depends, HTTPException, status
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.database import get_db
+from app.crud import attachment_point as attachment_point_crud
+from app.crud import audit as audit_crud
+from app.deps import require_permission
+from app.models.user import User
+from app.schemas.attachment_point import (
+    AttachmentPointCreate,
+    AttachmentPointRead,
+    AttachmentPointUpdate,
+)
+
+router = APIRouter()
+
+
+def _connection_label(ap) -> str:
+    if ap.iso_thread:
+        return f"M{ap.iso_thread.diameter_mm}×{ap.iso_thread.pitch_mm}"
+    if ap.unc_thread:
+        return f"{ap.unc_thread.diameter_fraction}-{ap.unc_thread.tpi} {ap.unc_thread.series}"
+    if ap.clamp_connection:
+        cc = ap.clamp_connection
+        if cc.min_mm is not None:
+            return f"{cc.min_mm}–{cc.max_mm} mm"
+        return f"{cc.min_in}–{cc.max_in} in"
+    if ap.static_connection:
+        return f"{ap.static_connection.od_mm} mm OD"
+    return "—"
+
+
+@router.get("", response_model=list[AttachmentPointRead])
+async def list_attachment_points(
+    skip: int = 0,
+    limit: int = 100,
+    db: AsyncSession = Depends(get_db),
+    _: User = Depends(require_permission("attachment_points:read")),
+):
+    return await attachment_point_crud.list_all(db, skip=skip, limit=limit)
+
+
+@router.post("", response_model=AttachmentPointRead, status_code=status.HTTP_201_CREATED)
+async def create_attachment_point(
+    payload: AttachmentPointCreate,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(require_permission("attachment_points:write")),
+):
+    conn_ids = [
+        payload.iso_thread_id,
+        payload.unc_thread_id,
+        payload.clamp_connection_id,
+        payload.static_connection_id,
+    ]
+    if sum(v is not None for v in conn_ids) != 1:
+        raise HTTPException(
+            status_code=400,
+            detail="Exactly one connection (iso_thread, unc_thread, clamp_connection, or static_connection) must be provided.",
+        )
+    ap = await attachment_point_crud.create(db, **payload.model_dump())
+    await audit_crud.log(
+        db, actor=actor, action="create", resource_type="AttachmentPoint",
+        resource_id=ap.id,
+        description=audit_crud.describe_create(
+            "AttachmentPoint", ap.id, _connection_label(ap)
+        ),
+    )
+    return ap
+
+
+@router.get("/{attachment_point_id}", response_model=AttachmentPointRead)
+async def get_attachment_point(
+    attachment_point_id: int,
+    db: AsyncSession = Depends(get_db),
+    _: User = Depends(require_permission("attachment_points:read")),
+):
+    ap = await attachment_point_crud.get(db, attachment_point_id)
+    if ap is None:
+        raise HTTPException(status_code=404, detail="Attachment point not found")
+    return ap
+
+
+@router.patch("/{attachment_point_id}", response_model=AttachmentPointRead)
+async def update_attachment_point(
+    attachment_point_id: int,
+    payload: AttachmentPointUpdate,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(require_permission("attachment_points:write")),
+):
+    ap = await attachment_point_crud.get(db, attachment_point_id)
+    if ap is None:
+        raise HTTPException(status_code=404, detail="Attachment point not found")
+    changes = payload.model_dump(exclude_unset=True)
+    ap = await attachment_point_crud.update(db, ap, changes)
+    await audit_crud.log(
+        db, actor=actor, action="update", resource_type="AttachmentPoint",
+        resource_id=ap.id,
+        description=audit_crud.describe_update("AttachmentPoint", ap.id, changes),
+    )
+    return ap
+
+
+@router.delete("/{attachment_point_id}", status_code=status.HTTP_204_NO_CONTENT)
+async def delete_attachment_point(
+    attachment_point_id: int,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(require_permission("attachment_points:delete")),
+):
+    ap = await attachment_point_crud.get(db, attachment_point_id)
+    if ap is None:
+        raise HTTPException(status_code=404, detail="Attachment point not found")
+    label = _connection_label(ap)
+    await attachment_point_crud.delete(db, ap)
+    await audit_crud.log(
+        db, actor=actor, action="delete", resource_type="AttachmentPoint",
+        resource_id=attachment_point_id,
+        description=audit_crud.describe_delete("AttachmentPoint", attachment_point_id, label),
+    )

app/api/router.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from app.api import attachment_point_names, audit_log, augmented_parts, auth, clamp_connections, imported_parts, iso_threads, manufacturers, part_colours, part_types, roles, scope_models, static_connections, sub_part_types, unc_threads, users
+from app.api import attachment_point_names, attachment_points, audit_log, augmented_parts, auth, clamp_connections, imported_parts, iso_threads, manufacturers, part_colours, part_types, roles, scope_models, static_connections, sub_part_types, unc_threads, users
 
 api_router = APIRouter()
 api_router.include_router(auth.router, prefix="/auth", tags=["auth"])
@@ -16,6 +16,7 @@ api_router.include_router(sub_part_types.router, prefix="/sub-part-types", tags=
 api_router.include_router(static_connections.router, prefix="/static-connections", tags=["static-connections"])
 api_router.include_router(clamp_connections.router, prefix="/clamp-connections", tags=["clamp-connections"])
 api_router.include_router(attachment_point_names.router, prefix="/attachment-point-names", tags=["attachment-point-names"])
+api_router.include_router(attachment_points.router, prefix="/attachment-points", tags=["attachment-points"])
 api_router.include_router(imported_parts.router, prefix="/imported-parts", tags=["imported-parts"])
 api_router.include_router(augmented_parts.router, prefix="/augmented-parts", tags=["augmented-parts"])
 api_router.include_router(audit_log.router, prefix="/audit-log", tags=["audit-log"])

app/crud/attachment_point.py

@@ -0,0 +1,67 @@
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.models.attachment_point import AttachmentPoint
+
+_RELATIONSHIPS = [
+    "attachment_point_name",
+    "iso_thread",
+    "unc_thread",
+    "clamp_connection",
+    "static_connection",
+]
+
+
+async def get(db: AsyncSession, attachment_point_id: int) -> AttachmentPoint | None:
+    return await db.get(AttachmentPoint, attachment_point_id)
+
+
+async def list_all(
+    db: AsyncSession, skip: int = 0, limit: int = 100
+) -> list[AttachmentPoint]:
+    result = await db.execute(
+        select(AttachmentPoint)
+        .order_by(AttachmentPoint.augmented_part_id, AttachmentPoint.id)
+        .offset(skip)
+        .limit(limit)
+    )
+    return list(result.scalars().all())
+
+
+async def create(
+    db: AsyncSession,
+    *,
+    augmented_part_id: int,
+    attachment_point_name_id: int,
+    iso_thread_id: int | None = None,
+    unc_thread_id: int | None = None,
+    clamp_connection_id: int | None = None,
+    static_connection_id: int | None = None,
+) -> AttachmentPoint:
+    ap = AttachmentPoint(
+        augmented_part_id=augmented_part_id,
+        attachment_point_name_id=attachment_point_name_id,
+        iso_thread_id=iso_thread_id,
+        unc_thread_id=unc_thread_id,
+        clamp_connection_id=clamp_connection_id,
+        static_connection_id=static_connection_id,
+    )
+    db.add(ap)
+    await db.commit()
+    await db.refresh(ap, attribute_names=_RELATIONSHIPS)
+    return ap
+
+
+async def update(
+    db: AsyncSession, ap: AttachmentPoint, data: dict
+) -> AttachmentPoint:
+    for field, value in data.items():
+        setattr(ap, field, value)
+    await db.commit()
+    await db.refresh(ap, attribute_names=_RELATIONSHIPS)
+    return ap
+
+
+async def delete(db: AsyncSession, ap: AttachmentPoint) -> None:
+    await db.delete(ap)
+    await db.commit()

app/models/__init__.py

@@ -1,6 +1,7 @@
 """Import all models so they register with ``Base.metadata``."""
 
 from app.models.associations import augmented_part_imported_parts, role_permissions, user_roles
+from app.models.attachment_point import AttachmentPoint
 from app.models.attachment_point_name import AttachmentPointName
 from app.models.audit_log import AuditLog
 from app.models.augmented_part import AugmentedPart
@@ -21,6 +22,7 @@ from app.models.unc_thread import UncThread
 from app.models.user import User
 
 __all__ = [
+    "AttachmentPoint",
     "AttachmentPointName",
     "AuditLog",
     "AugmentedPart",

app/models/attachment_point.py

@@ -0,0 +1,42 @@
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.core.database import Base
+from app.models.attachment_point_name import AttachmentPointName
+from app.models.clamp_connection import ClampConnection
+from app.models.iso_thread import IsoThread
+from app.models.static_connection import StaticConnection
+from app.models.unc_thread import UncThread
+
+
+class AttachmentPoint(Base):
+    __tablename__ = "attachment_points"
+
+    id: Mapped[int] = mapped_column(primary_key=True)
+
+    augmented_part_id: Mapped[int] = mapped_column(
+        ForeignKey("augmented_parts.id", ondelete="CASCADE"), nullable=False
+    )
+    attachment_point_name_id: Mapped[int] = mapped_column(
+        ForeignKey("attachment_point_names.id", ondelete="RESTRICT"), nullable=False
+    )
+
+    # Exactly one of the four below must be non-null (enforced in application layer)
+    iso_thread_id: Mapped[int | None] = mapped_column(
+        ForeignKey("iso_threads.id", ondelete="RESTRICT"), nullable=True, default=None
+    )
+    unc_thread_id: Mapped[int | None] = mapped_column(
+        ForeignKey("unc_threads.id", ondelete="RESTRICT"), nullable=True, default=None
+    )
+    clamp_connection_id: Mapped[int | None] = mapped_column(
+        ForeignKey("clamp_connections.id", ondelete="RESTRICT"), nullable=True, default=None
+    )
+    static_connection_id: Mapped[int | None] = mapped_column(
+        ForeignKey("static_connections.id", ondelete="RESTRICT"), nullable=True, default=None
+    )
+
+    attachment_point_name: Mapped[AttachmentPointName] = relationship(lazy="selectin")
+    iso_thread: Mapped[IsoThread | None] = relationship(lazy="selectin")
+    unc_thread: Mapped[UncThread | None] = relationship(lazy="selectin")
+    clamp_connection: Mapped[ClampConnection | None] = relationship(lazy="selectin")
+    static_connection: Mapped[StaticConnection | None] = relationship(lazy="selectin")

app/schemas/attachment_point.py

@@ -0,0 +1,39 @@
+from pydantic import BaseModel, ConfigDict
+
+from app.schemas.attachment_point_name import AttachmentPointNameRead
+from app.schemas.clamp_connection import ClampConnectionRead
+from app.schemas.iso_thread import IsoThreadRead
+from app.schemas.static_connection import StaticConnectionRead
+from app.schemas.unc_thread import UncThreadRead
+
+
+class AttachmentPointBase(BaseModel):
+    augmented_part_id: int
+    attachment_point_name_id: int
+    iso_thread_id: int | None = None
+    unc_thread_id: int | None = None
+    clamp_connection_id: int | None = None
+    static_connection_id: int | None = None
+
+
+class AttachmentPointCreate(AttachmentPointBase):
+    pass
+
+
+class AttachmentPointUpdate(BaseModel):
+    augmented_part_id: int | None = None
+    attachment_point_name_id: int | None = None
+    iso_thread_id: int | None = None
+    unc_thread_id: int | None = None
+    clamp_connection_id: int | None = None
+    static_connection_id: int | None = None
+
+
+class AttachmentPointRead(AttachmentPointBase):
+    model_config = ConfigDict(from_attributes=True)
+    id: int
+    attachment_point_name: AttachmentPointNameRead
+    iso_thread: IsoThreadRead | None = None
+    unc_thread: UncThreadRead | None = None
+    clamp_connection: ClampConnectionRead | None = None
+    static_connection: StaticConnectionRead | None = None

app/templates/_nav.html

@@ -3,7 +3,7 @@
 {% set can_admin = su or "users:read" in p or "roles:read" in p or "audit_log:read" in p %}
 {% set can_connections = su or "clamp_connections:read" in p or "iso_threads:read" in p or "static_connections:read" in p or "unc_threads:read" in p %}
 {% set can_labels = su or "attachment_point_names:read" in p or "manufacturers:read" in p or "part_colours:read" in p or "part_types:read" in p or "scope_models:read" in p or "sub_part_types:read" in p %}
-{% set can_database = su or "imported_parts:read" in p or "augmented_parts:read" in p %}
+{% set can_database = su or "imported_parts:read" in p or "augmented_parts:read" in p or "attachment_points:read" in p %}
 {% set can_parts = can_connections or can_labels or can_database %}
 
 {# ── SVG icon sprite ───────────────────────────────────────────────────────── #}
@@ -107,6 +107,11 @@
     <path d="M20 10c0 6-8 12-8 12s-8-6-8-12a8 8 0 0 1 16 0Z"/>
     <circle cx="12" cy="10" r="3"/>
   </symbol>
+  <symbol id="icon-anchor" viewBox="0 0 24 24">
+    <circle cx="12" cy="5" r="3"/>
+    <line x1="12" x2="12" y1="8" y2="22"/>
+    <path d="M5 12H2a10 10 0 0 0 20 0h-3"/>
+  </symbol>
 </svg>
 
 {# ── Nav macro for DRY icon use ────────────────────────────────────────────── #}
@@ -195,6 +200,9 @@
             {% if su or "augmented_parts:read" in p %}
               <a href="/admin/augmented-parts">{{ icon("layers") }} Augmented Parts</a>
             {% endif %}
+            {% if su or "attachment_points:read" in p %}
+              <a href="/admin/attachment-points">{{ icon("anchor") }} Attachment Points</a>
+            {% endif %}
             {% if su or "augmented_parts:write" in p %}
               <a href="/admin/augmented-parts/skipped">{{ icon("alert-circle") }} Skipped Parts</a>
             {% endif %}

app/templates/admin/_attachment_point_connection_select.html

@@ -0,0 +1,51 @@
+{% if connection_type == "iso_thread" %}
+<label>ISO Thread
+  <select name="iso_thread_id" required>
+    <option value="">— select —</option>
+    {% for t in iso_threads %}
+      <option value="{{ t.id }}"
+        {% if ap and ap.iso_thread_id == t.id %}selected{% endif %}>
+        M{{ t.diameter_mm }}×{{ t.pitch_mm }}{% if t.depth_mm %} ({{ t.depth_mm }} mm deep){% endif %}
+      </option>
+    {% endfor %}
+  </select>
+</label>
+{% elif connection_type == "unc_thread" %}
+<label>UNC Thread
+  <select name="unc_thread_id" required>
+    <option value="">— select —</option>
+    {% for t in unc_threads %}
+      <option value="{{ t.id }}"
+        {% if ap and ap.unc_thread_id == t.id %}selected{% endif %}>
+        {{ t.diameter_fraction }}-{{ t.tpi }} {{ t.series.value }}{% if t.depth_in %} ({{ t.depth_in }} in deep){% endif %}
+      </option>
+    {% endfor %}
+  </select>
+</label>
+{% elif connection_type == "clamp_connection" %}
+<label>Clamp Connection
+  <select name="clamp_connection_id" required>
+    <option value="">— select —</option>
+    {% for c in clamp_connections %}
+      <option value="{{ c.id }}"
+        {% if ap and ap.clamp_connection_id == c.id %}selected{% endif %}>
+        #{{ c.id }}
+        {% if c.min_mm is not none %} {{ c.min_mm }}–{{ c.max_mm }} mm{% endif %}
+        {% if c.min_in is not none %} / {{ c.min_in }}–{{ c.max_in }} in{% endif %}
+      </option>
+    {% endfor %}
+  </select>
+</label>
+{% elif connection_type == "static_connection" %}
+<label>Static Connection
+  <select name="static_connection_id" required>
+    <option value="">— select —</option>
+    {% for s in static_connections %}
+      <option value="{{ s.id }}"
+        {% if ap and ap.static_connection_id == s.id %}selected{% endif %}>
+        {{ s.od_mm }} mm / {{ s.od_in }} in OD
+      </option>
+    {% endfor %}
+  </select>
+</label>
+{% endif %}

app/templates/admin/_attachment_point_row.html

@@ -0,0 +1,38 @@
+{% if ap.iso_thread %}
+  {% set conn_type = "ISO Thread" %}
+  {% set conn_label = "M" ~ ap.iso_thread.diameter_mm ~ "×" ~ ap.iso_thread.pitch_mm %}
+{% elif ap.unc_thread %}
+  {% set conn_type = "UNC Thread" %}
+  {% set conn_label = ap.unc_thread.diameter_fraction ~ "-" ~ ap.unc_thread.tpi ~ " " ~ ap.unc_thread.series.value %}
+{% elif ap.clamp_connection %}
+  {% set conn_type = "Clamp Connection" %}
+  {% if ap.clamp_connection.min_mm is not none %}
+    {% set conn_label = ap.clamp_connection.min_mm ~ "–" ~ ap.clamp_connection.max_mm ~ " mm" %}
+  {% else %}
+    {% set conn_label = ap.clamp_connection.min_in ~ "–" ~ ap.clamp_connection.max_in ~ " in" %}
+  {% endif %}
+{% elif ap.static_connection %}
+  {% set conn_type = "Static Connection" %}
+  {% set conn_label = ap.static_connection.od_mm ~ " mm OD" %}
+{% else %}
+  {% set conn_type = "—" %}
+  {% set conn_label = "—" %}
+{% endif %}
+<tr id="attachment-point-{{ ap.id }}">
+  <td>{{ ap.id }}</td>
+  <td>{{ ap.augmented_part.description | truncate(40) }}</td>
+  <td>{{ ap.attachment_point_name.name }}</td>
+  <td>{{ conn_type }}</td>
+  <td><code>{{ conn_label }}</code></td>
+  <td class="row-actions">
+    <button class="btn btn-ghost"
+            hx-get="/admin/attachment-points/{{ ap.id }}/edit"
+            hx-target="#attachment-point-{{ ap.id }}"
+            hx-swap="outerHTML">Edit</button>
+    <button class="btn btn-danger"
+            hx-delete="/admin/attachment-points/{{ ap.id }}"
+            hx-target="#attachment-point-{{ ap.id }}"
+            hx-swap="outerHTML"
+            hx-confirm="Delete attachment point #{{ ap.id }}?">Delete</button>
+  </td>
+</tr>

app/templates/admin/_attachment_point_row_edit.html

@@ -0,0 +1,59 @@
+{% if ap.iso_thread_id %}{% set current_type = "iso_thread" %}
+{% elif ap.unc_thread_id %}{% set current_type = "unc_thread" %}
+{% elif ap.clamp_connection_id %}{% set current_type = "clamp_connection" %}
+{% elif ap.static_connection_id %}{% set current_type = "static_connection" %}
+{% else %}{% set current_type = "" %}{% endif %}
+<tr id="attachment-point-{{ ap.id }}">
+  <td colspan="6">
+    <form hx-post="/admin/attachment-points/{{ ap.id }}"
+          hx-target="#attachment-point-{{ ap.id }}"
+          hx-swap="outerHTML"
+          class="inline-edit">
+      <span class="muted">#{{ ap.id }}</span>
+      <label>Part
+        <select name="augmented_part_id" required>
+          {% for part in augmented_parts %}
+            <option value="{{ part.id }}"
+              {% if part.id == ap.augmented_part_id %}selected{% endif %}>
+              {{ part.description | truncate(50) }}
+            </option>
+          {% endfor %}
+        </select>
+      </label>
+      <label>Point Name
+        <select name="attachment_point_name_id" required>
+          {% for apn in attachment_point_names %}
+            <option value="{{ apn.id }}"
+              {% if apn.id == ap.attachment_point_name_id %}selected{% endif %}>
+              {{ apn.name }}
+            </option>
+          {% endfor %}
+        </select>
+      </label>
+      <label>Connection Type
+        <select name="connection_type" required
+                hx-get="/admin/attachment-points/connection-options"
+                hx-target="#edit-connection-options-{{ ap.id }}"
+                hx-trigger="change"
+                hx-include="[name='connection_type']">
+          <option value="">— select type —</option>
+          <option value="iso_thread" {% if current_type == "iso_thread" %}selected{% endif %}>ISO Thread</option>
+          <option value="unc_thread" {% if current_type == "unc_thread" %}selected{% endif %}>UNC Thread</option>
+          <option value="clamp_connection" {% if current_type == "clamp_connection" %}selected{% endif %}>Clamp Connection</option>
+          <option value="static_connection" {% if current_type == "static_connection" %}selected{% endif %}>Static Connection</option>
+        </select>
+      </label>
+      {# Render the current connection select pre-filled #}
+      <div id="edit-connection-options-{{ ap.id }}">
+        {% include "admin/_attachment_point_connection_select.html" %}
+      </div>
+      <div class="row-actions">
+        <button type="submit" class="btn btn-primary">Save</button>
+        <button type="button" class="btn btn-ghost"
+                hx-get="/admin/attachment-points/{{ ap.id }}/row"
+                hx-target="#attachment-point-{{ ap.id }}"
+                hx-swap="outerHTML">Cancel</button>
+      </div>
+    </form>
+  </td>
+</tr>

app/templates/admin/_attachment_points_table.html

@@ -0,0 +1,21 @@
+<div id="attachment-point-list" class="card" style="overflow-x:auto">
+  <table class="table">
+    <thead>
+      <tr>
+        <th>ID</th>
+        <th>Augmented Part</th>
+        <th>Point Name</th>
+        <th>Connection Type</th>
+        <th>Connection</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for ap in attachment_points %}
+        {% include "admin/_attachment_point_row.html" %}
+      {% else %}
+        <tr><td colspan="6" class="muted">No attachment points recorded.</td></tr>
+      {% endfor %}
+    </tbody>
+  </table>
+</div>

app/templates/admin/attachment_points.html

@@ -0,0 +1,50 @@
+{% extends "base.html" %}
+{% block title %}Attachment Points · {{ app_name }}{% endblock %}
+{% block body %}
+{% include "_nav.html" %}
+<main class="container">
+  <h1>Attachment Points</h1>
+
+  <div class="card">
+    <h2>Add attachment point</h2>
+    <form hx-post="/admin/attachment-points"
+          hx-target="#attachment-point-list"
+          hx-swap="outerHTML"
+          class="form-grid">
+      <label>Augmented Part
+        <select name="augmented_part_id" required>
+          <option value="">— select —</option>
+          {% for part in augmented_parts %}
+            <option value="{{ part.id }}">{{ part.description }}</option>
+          {% endfor %}
+        </select>
+      </label>
+      <label>Point Name
+        <select name="attachment_point_name_id" required>
+          <option value="">— select —</option>
+          {% for apn in attachment_point_names %}
+            <option value="{{ apn.id }}">{{ apn.name }}</option>
+          {% endfor %}
+        </select>
+      </label>
+      <label>Connection Type
+        <select name="connection_type" required
+                hx-get="/admin/attachment-points/connection-options"
+                hx-target="#add-connection-options"
+                hx-trigger="change"
+                hx-include="[name='connection_type']">
+          <option value="">— select type —</option>
+          <option value="iso_thread">ISO Thread</option>
+          <option value="unc_thread">UNC Thread</option>
+          <option value="clamp_connection">Clamp Connection</option>
+          <option value="static_connection">Static Connection</option>
+        </select>
+      </label>
+      <div id="add-connection-options"></div>
+      <button type="submit" class="btn btn-primary">Add</button>
+    </form>
+  </div>
+
+  {% include "admin/_attachment_points_table.html" %}
+</main>
+{% endblock %}

app/web/admin.py

@@ -15,6 +15,7 @@ from app.crud import part_colour as part_colour_crud
 from app.crud import part_type as part_type_crud
 from app.crud import role as role_crud
 from app.crud import scope_model as scope_model_crud
+from app.crud import attachment_point as attachment_point_crud
 from app.crud import attachment_point_name as apn_crud
 from app.crud import clamp_connection as clamp_connection_crud
 from app.crud import static_connection as static_connection_crud
@@ -1600,6 +1601,203 @@ async def delete_attachment_point_name(
     return Response(status_code=status.HTTP_200_OK)
 
 
+# --- Attachment Points --------------------------------------------------------
+
+
+async def _attachment_point_form_ctx(db: AsyncSession) -> dict:
+    return {
+        "augmented_parts": await augmented_part_crud.list_all(db),
+        "attachment_point_names": await apn_crud.list_all(db),
+        "iso_threads": await iso_thread_crud.list_all(db),
+        "unc_threads": await unc_thread_crud.list_all(db),
+        "clamp_connections": await clamp_connection_crud.list_all(db),
+        "static_connections": await static_connection_crud.list_all(db),
+    }
+
+
+def _ap_connection_label(ap) -> str:
+    if ap.iso_thread:
+        return f"M{ap.iso_thread.diameter_mm}×{ap.iso_thread.pitch_mm}"
+    if ap.unc_thread:
+        return f"{ap.unc_thread.diameter_fraction}-{ap.unc_thread.tpi} {ap.unc_thread.series.value}"
+    if ap.clamp_connection:
+        cc = ap.clamp_connection
+        if cc.min_mm is not None:
+            return f"{cc.min_mm}–{cc.max_mm} mm"
+        return f"{cc.min_in}–{cc.max_in} in"
+    if ap.static_connection:
+        return f"{ap.static_connection.od_mm} mm OD"
+    return "—"
+
+
+@router.get("/attachment-points", response_class=HTMLResponse)
+async def attachment_points_page(
+    request: Request,
+    db: AsyncSession = Depends(get_db),
+    user: User = Depends(web_require("attachment_points:read")),
+):
+    ctx = await _attachment_point_form_ctx(db)
+    ctx["user"] = user
+    ctx["attachment_points"] = await attachment_point_crud.list_all(db)
+    return templates.TemplateResponse(request, "admin/attachment_points.html", ctx)
+
+
+# Must come before /{attachment_point_id}
+@router.get("/attachment-points/connection-options", response_class=HTMLResponse)
+async def attachment_point_connection_options(
+    request: Request,
+    connection_type: str = "",
+    db: AsyncSession = Depends(get_db),
+    _: User = Depends(web_require("attachment_points:write")),
+):
+    ctx = await _attachment_point_form_ctx(db)
+    ctx["connection_type"] = connection_type
+    ctx["ap"] = None
+    return templates.TemplateResponse(
+        request, "admin/_attachment_point_connection_select.html", ctx
+    )
+
+
+@router.post("/attachment-points", response_class=HTMLResponse)
+async def create_attachment_point(
+    request: Request,
+    augmented_part_id: int = Form(...),
+    attachment_point_name_id: int = Form(...),
+    connection_type: str = Form(""),
+    iso_thread_id: str = Form(""),
+    unc_thread_id: str = Form(""),
+    clamp_connection_id: str = Form(""),
+    static_connection_id: str = Form(""),
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("attachment_points:write")),
+):
+    iso_id = int(iso_thread_id) if iso_thread_id else None
+    unc_id = int(unc_thread_id) if unc_thread_id else None
+    clamp_id = int(clamp_connection_id) if clamp_connection_id else None
+    static_id = int(static_connection_id) if static_connection_id else None
+    ap = await attachment_point_crud.create(
+        db,
+        augmented_part_id=augmented_part_id,
+        attachment_point_name_id=attachment_point_name_id,
+        iso_thread_id=iso_id,
+        unc_thread_id=unc_id,
+        clamp_connection_id=clamp_id,
+        static_connection_id=static_id,
+    )
+    await audit_crud.log(
+        db, actor=actor, action="create", resource_type="AttachmentPoint",
+        resource_id=ap.id,
+        description=audit_crud.describe_create(
+            "AttachmentPoint", ap.id, _ap_connection_label(ap)
+        ),
+    )
+    ctx = await _attachment_point_form_ctx(db)
+    ctx["attachment_points"] = await attachment_point_crud.list_all(db)
+    return templates.TemplateResponse(
+        request, "admin/_attachment_points_table.html", ctx
+    )
+
+
+@router.get("/attachment-points/{attachment_point_id}/edit", response_class=HTMLResponse)
+async def edit_attachment_point_row(
+    request: Request,
+    attachment_point_id: int,
+    db: AsyncSession = Depends(get_db),
+    _: User = Depends(web_require("attachment_points:write")),
+):
+    ap = await attachment_point_crud.get(db, attachment_point_id)
+    if ap is None:
+        raise HTTPException(status_code=404, detail="Attachment point not found")
+    ctx = await _attachment_point_form_ctx(db)
+    ctx["ap"] = ap
+    if ap.iso_thread_id:
+        ctx["connection_type"] = "iso_thread"
+    elif ap.unc_thread_id:
+        ctx["connection_type"] = "unc_thread"
+    elif ap.clamp_connection_id:
+        ctx["connection_type"] = "clamp_connection"
+    elif ap.static_connection_id:
+        ctx["connection_type"] = "static_connection"
+    else:
+        ctx["connection_type"] = ""
+    return templates.TemplateResponse(
+        request, "admin/_attachment_point_row_edit.html", ctx
+    )
+
+
+@router.get("/attachment-points/{attachment_point_id}/row", response_class=HTMLResponse)
+async def attachment_point_row(
+    request: Request,
+    attachment_point_id: int,
+    db: AsyncSession = Depends(get_db),
+    _: User = Depends(web_require("attachment_points:read")),
+):
+    ap = await attachment_point_crud.get(db, attachment_point_id)
+    if ap is None:
+        raise HTTPException(status_code=404, detail="Attachment point not found")
+    return templates.TemplateResponse(
+        request, "admin/_attachment_point_row.html", {"ap": ap}
+    )
+
+
+@router.post("/attachment-points/{attachment_point_id}", response_class=HTMLResponse)
+async def update_attachment_point(
+    request: Request,
+    attachment_point_id: int,
+    augmented_part_id: int = Form(...),
+    attachment_point_name_id: int = Form(...),
+    connection_type: str = Form(""),
+    iso_thread_id: str = Form(""),
+    unc_thread_id: str = Form(""),
+    clamp_connection_id: str = Form(""),
+    static_connection_id: str = Form(""),
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("attachment_points:write")),
+):
+    ap = await attachment_point_crud.get(db, attachment_point_id)
+    if ap is None:
+        raise HTTPException(status_code=404, detail="Attachment point not found")
+    changes = {
+        "augmented_part_id": augmented_part_id,
+        "attachment_point_name_id": attachment_point_name_id,
+        "iso_thread_id": int(iso_thread_id) if iso_thread_id else None,
+        "unc_thread_id": int(unc_thread_id) if unc_thread_id else None,
+        "clamp_connection_id": int(clamp_connection_id) if clamp_connection_id else None,
+        "static_connection_id": int(static_connection_id) if static_connection_id else None,
+    }
+    ap = await attachment_point_crud.update(db, ap, changes)
+    await audit_crud.log(
+        db, actor=actor, action="update", resource_type="AttachmentPoint",
+        resource_id=attachment_point_id,
+        description=audit_crud.describe_update(
+            "AttachmentPoint", attachment_point_id, changes
+        ),
+    )
+    return templates.TemplateResponse(
+        request, "admin/_attachment_point_row.html", {"ap": ap}
+    )
+
+
+@router.delete("/attachment-points/{attachment_point_id}")
+async def delete_attachment_point(
+    attachment_point_id: int,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("attachment_points:delete")),
+):
+    ap = await attachment_point_crud.get(db, attachment_point_id)
+    if ap is not None:
+        label = _ap_connection_label(ap)
+        await attachment_point_crud.delete(db, ap)
+        await audit_crud.log(
+            db, actor=actor, action="delete", resource_type="AttachmentPoint",
+            resource_id=attachment_point_id,
+            description=audit_crud.describe_delete(
+                "AttachmentPoint", attachment_point_id, label
+            ),
+        )
+    return Response(status_code=status.HTTP_200_OK)
+
+
 # --- Static Connections -------------------------------------------------------