Making adding a part manually less exhausting

.claude/settings.local.json

@@ -34,7 +34,12 @@
       "Bash(curl -s -b /tmp/fg_cookies.txt http://localhost:8000__TRACKED_VAR__)",
       "Bash(sqlite3 app.db \"PRAGMA foreign_keys=ON; SELECT scope_model_id FROM augmented_parts WHERE id=1862;\")",
       "Bash(sqlite3 app.db \"SELECT id, name FROM scope_models WHERE name='Viper';\")",
-      "Bash(sqlite3 app.db \"SELECT COUNT\\(*\\) FROM augmented_parts WHERE scope_model_id=\\(SELECT id FROM scope_models WHERE name='Viper'\\);\")"
+      "Bash(sqlite3 app.db \"SELECT COUNT\\(*\\) FROM augmented_parts WHERE scope_model_id=\\(SELECT id FROM scope_models WHERE name='Viper'\\);\")",
+      "Bash(sqlite3 app.db \"PRAGMA wal_checkpoint\\(FULL\\);\")",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" http://127.0.0.1:8000/login)",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" http://127.0.0.1:8000/admin/imported-parts)",
+      "Bash(rg -n \"hx-delete|router.delete\" app/web/admin.py app/templates/admin/*.html)",
+      "Bash(rg -n \"is_superuser\" tests/conftest.py tests/*.py)"
     ]
   }
 }

.env.example

@@ -25,6 +25,9 @@ AUTO_CREATE_TABLES=true
 COOKIE_NAME=access_token
 # Set true when serving over HTTPS.
 COOKIE_SECURE=false
+# How long a browser login lasts before being bounced back to /login.
+# Independent of ACCESS_TOKEN_EXPIRE_MINUTES, which governs JSON API tokens.
+SESSION_TIMEOUT_HOURS=24
 
 # --- LDAP (optional; direct-bind) ---
 # When enabled, the login page and /api/auth/ldap-login accept a directory

Makefile

@@ -1,4 +1,4 @@
-VERSION := $(shell git describe --tags --always)
+VERSION := $(shell git tag | tail -1)
 IMAGE_NAME := fitguide
 
 sync:
@@ -8,7 +8,7 @@ seed:
 	uv run alembic upgrade head
 	uv run python -m scripts.seed
 
-dev:
+dev: migrate
 	uv run uvicorn app.main:app --reload
 	open http://localhost:8000
 

README.md

@@ -149,8 +149,9 @@ Every setting is read from an environment variable first, then `.env`
 |----------|---------|-------|
 | `SECRET_KEY` | dev placeholder | **set a strong value in production** |
 | `DATABASE_URL` | `sqlite+aiosqlite:///./app.db` | use `postgresql+asyncpg://...` for Postgres |
-| `ACCESS_TOKEN_EXPIRE_MINUTES` | `15` | |
+| `ACCESS_TOKEN_EXPIRE_MINUTES` | `15` | JSON API bearer token lifetime |
 | `REFRESH_TOKEN_EXPIRE_DAYS` | `7` | |
+| `SESSION_TIMEOUT_HOURS` | `24` | browser login (HTMX UI cookie) lifetime |
 | `AUTO_CREATE_TABLES` | `true` | create tables on startup (dev); use Alembic in prod |
 | `COOKIE_SECURE` | `false` | set `true` behind HTTPS |
 | `FIRST_SUPERUSER_EMAIL` / `_PASSWORD` | admin@example.com / changethis | used by seed |

TODO

@@ -0,0 +1,7 @@
+[ ] Drop 'id' from UI tables, add 'date added / updated'
+[x] Adapter Rings should get two attachment points
+[ ] Add 'on_website' boolean to augmented part
+[x] API: allow updating parts by ID or by SKU
+[ ] Add `preferred_part` to augmented parts, used to order matches (e.g. double tab vs single tab)
+[ ] Adapter Rings
+  [ ] Should be married to a specific flip cover (a, b), not (a)x(b) cartesian product

alembic/versions/04425ce3d4d5_add_jobs_table.py

@@ -0,0 +1,45 @@
+"""add jobs table
+
+Revision ID: 04425ce3d4d5
+Revises: a3f7c19b2d40
+Create Date: 2026-08-05 15:21:09.527442
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "04425ce3d4d5"
+down_revision: str | None = "a3f7c19b2d40"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "jobs",
+        sa.Column("id", sa.String(length=32), nullable=False),
+        sa.Column("kind", sa.String(length=64), nullable=False),
+        sa.Column("status", sa.String(length=16), nullable=False),
+        sa.Column("message", sa.Text(), nullable=False),
+        sa.Column("result", sa.JSON(), nullable=True),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("(CURRENT_TIMESTAMP)"),
+            nullable=False,
+        ),
+        sa.Column("finished_at", sa.DateTime(timezone=True), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("jobs")
+    # ### end Alembic commands ###

alembic/versions/0c3d1a5cff1f_add_part_colours.py

@@ -5,25 +5,28 @@ Revises: 5b6a7817b408
 Create Date: 2026-07-02 12:22:24.106795
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "0c3d1a5cff1f"
-down_revision: Union[str, None] = "5b6a7817b408"
+down_revision: str | None = "5b6a7817b408"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
-    pass
+        "part_colours",
-    # ### end Alembic commands ###
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("name"),
+    )
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("part_colours")
-    pass
-    # ### end Alembic commands ###

alembic/versions/0fec09fb6ae6_manufacturers_url_nullable.py

@@ -0,0 +1,37 @@
+"""manufacturers_url_nullable
+
+Revision ID: 0fec09fb6ae6
+Revises: 9a1c2f6e0b3d
+Create Date: 2026-09-04 23:05:18.990806
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "0fec09fb6ae6"
+down_revision: str | None = "9a1c2f6e0b3d"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("manufacturers", schema=None) as batch_op:
+        batch_op.alter_column(
+            "url",
+            existing_type=sa.String(),
+            nullable=True,
+        )
+
+
+def downgrade() -> None:
+    op.execute("UPDATE manufacturers SET url = '' WHERE url IS NULL")
+    with op.batch_alter_table("manufacturers", schema=None) as batch_op:
+        batch_op.alter_column(
+            "url",
+            existing_type=sa.String(),
+            nullable=False,
+        )

alembic/versions/1b99be8a9b1e_add_fits_tables.py

@@ -5,16 +5,17 @@ Revises: adf4a5b9493e
 Create Date: 2026-07-14 15:00:00.000000
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "1b99be8a9b1e"
-down_revision: Union[str, None] = "adf4a5b9493e"
+down_revision: str | None = "adf4a5b9493e"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:

alembic/versions/1c2d3e4f5a6b_augmented_parts_sku_unique.py

@@ -0,0 +1,26 @@
+"""augmented_parts_sku_unique
+
+Revision ID: 1c2d3e4f5a6b
+Revises: 0fec09fb6ae6
+Create Date: 2026-09-21 00:00:00.000000
+"""
+
+from collections.abc import Sequence
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "1c2d3e4f5a6b"
+down_revision: str | None = "0fec09fb6ae6"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("augmented_parts", schema=None) as batch_op:
+        batch_op.create_index("ix_augmented_parts_sku", ["sku"], unique=True)
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("augmented_parts", schema=None) as batch_op:
+        batch_op.drop_index("ix_augmented_parts_sku")

alembic/versions/235d823a56ee_drop_objective_thread_pitch_from_scope_.py

@@ -0,0 +1,30 @@
+"""drop_objective_thread_pitch_from_scope_infos
+
+Revision ID: 235d823a56ee
+Revises: 04425ce3d4d5
+Create Date: 2026-08-17 15:18:26.763831
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "235d823a56ee"
+down_revision: str | None = "04425ce3d4d5"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("scope_infos", schema=None) as batch_op:
+        batch_op.drop_column("objective_thread_pitch")
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("scope_infos", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column("objective_thread_pitch", sa.String(), nullable=True)
+        )

alembic/versions/2b3c4d5e6f7a_imported_parts_uac_diameter_range.py

@@ -0,0 +1,28 @@
+"""imported_parts_uac_diameter_range
+
+Revision ID: 2b3c4d5e6f7a
+Revises: 1c2d3e4f5a6b
+Create Date: 2026-09-21 00:00:00.000000
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "2b3c4d5e6f7a"
+down_revision: str | None = "1c2d3e4f5a6b"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("imported_parts", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("UACDiameterRangemm", sa.String(), nullable=True))
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("imported_parts", schema=None) as batch_op:
+        batch_op.drop_column("UACDiameterRangemm")

alembic/versions/3c4d5e6f7a8b_augmented_parts_uac_diameter_range.py

@@ -0,0 +1,30 @@
+"""augmented_parts_uac_diameter_range
+
+Revision ID: 3c4d5e6f7a8b
+Revises: 2b3c4d5e6f7a
+Create Date: 2026-09-21 00:00:00.000000
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "3c4d5e6f7a8b"
+down_revision: str | None = "2b3c4d5e6f7a"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("augmented_parts", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column("uac_diameter_range_mm", sa.String(), nullable=True)
+        )
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("augmented_parts", schema=None) as batch_op:
+        batch_op.drop_column("uac_diameter_range_mm")

alembic/versions/4d5e6f7a8b9c_augmented_parts_on_website_preferred.py

@@ -0,0 +1,41 @@
+"""augmented_parts_on_website_preferred
+
+Revision ID: 4d5e6f7a8b9c
+Revises: 3c4d5e6f7a8b
+Create Date: 2026-09-21 00:00:00.000000
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "4d5e6f7a8b9c"
+down_revision: str | None = "3c4d5e6f7a8b"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("augmented_parts", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "on_website", sa.Boolean(), nullable=False, server_default=sa.false()
+            )
+        )
+        batch_op.add_column(
+            sa.Column(
+                "preferred_part",
+                sa.Boolean(),
+                nullable=False,
+                server_default=sa.false(),
+            )
+        )
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("augmented_parts", schema=None) as batch_op:
+        batch_op.drop_column("preferred_part")
+        batch_op.drop_column("on_website")

alembic/versions/5b6a7817b408_add_static_connections.py

@@ -5,25 +5,29 @@ Revises: 7be5ef599d3f
 Create Date: 2026-07-02 11:57:13.095417
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "5b6a7817b408"
-down_revision: Union[str, None] = "7be5ef599d3f"
+down_revision: str | None = "7be5ef599d3f"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
-    pass
+        "static_connections",
-    # ### end Alembic commands ###
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("od_mm", sa.Float(), nullable=False),
+        sa.Column("od_in", sa.Float(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("od_mm"),
+    )
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("static_connections")
-    pass
-    # ### end Alembic commands ###

alembic/versions/627d4460a94f_add_iso_threads_table.py

@@ -6,16 +6,15 @@ Create Date: 2026-06-24 21:50:05.340235
 """
 
 from collections.abc import Sequence
-from typing import Union
 
 import sqlalchemy as sa
 
 from alembic import op
 
 revision: str = "627d4460a94f"
-down_revision: Union[str, None] = "0001_initial"
+down_revision: str | None = "0001_initial"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:

alembic/versions/70e48bda8829_add_attachment_point_names.py

@@ -5,25 +5,28 @@ Revises: c7882cedc9ae
 Create Date: 2026-07-02 13:54:58.335394
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "70e48bda8829"
-down_revision: Union[str, None] = "c7882cedc9ae"
+down_revision: str | None = "c7882cedc9ae"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
-    pass
+        "attachment_point_names",
-    # ### end Alembic commands ###
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("name"),
+    )
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("attachment_point_names")
-    pass
-    # ### end Alembic commands ###

alembic/versions/7be5ef599d3f_add_imported_parts_tables.py

@@ -5,25 +5,42 @@ Revises: b60d0aa3ceda
 Create Date: 2026-06-25 15:29:20.685050
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "7be5ef599d3f"
-down_revision: Union[str, None] = "b60d0aa3ceda"
+down_revision: str | None = "b60d0aa3ceda"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
-    pass
+        "imported_parts",
-    # ### end Alembic commands ###
+        sa.Column("InventoryID", sa.String(), nullable=False),
+        sa.Column("Description", sa.String(), nullable=True),
+        sa.Column("TBXColour", sa.String(), nullable=True),
+        sa.Column("ProductMaxThreadDepthmm", sa.String(), nullable=True),
+        sa.Column("ProductMaxThreadDepthin", sa.String(), nullable=True),
+        sa.Column("ProductODmm", sa.String(), nullable=True),
+        sa.Column("ProductODin", sa.String(), nullable=True),
+        sa.Column("TBXThreadAttribute", sa.String(), nullable=True),
+        sa.PrimaryKeyConstraint("InventoryID"),
+    )
+    op.create_table(
+        "imported_part_config",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("odata_url", sa.String(), nullable=True),
+        sa.Column("username", sa.String(), nullable=True),
+        sa.Column("password", sa.String(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+    )
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("imported_part_config")
-    pass
+    op.drop_table("imported_parts")
-    # ### end Alembic commands ###

alembic/versions/8012c00b0c04_add_augmented_part_notes_table.py

@@ -5,16 +5,17 @@ Revises: d1e2f3a4b5c6
 Create Date: 2026-07-31 09:07:06.137175
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "8012c00b0c04"
-down_revision: Union[str, None] = "d1e2f3a4b5c6"
+down_revision: str | None = "d1e2f3a4b5c6"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:

alembic/versions/8bc411b5814e_add_augmented_parts.py

@@ -5,25 +5,48 @@ Revises: 0c3d1a5cff1f
 Create Date: 2026-07-02 12:37:59.457033
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "8bc411b5814e"
-down_revision: Union[str, None] = "0c3d1a5cff1f"
+down_revision: str | None = "0c3d1a5cff1f"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
-    pass
+        "augmented_parts",
-    # ### end Alembic commands ###
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("sku", sa.String(), nullable=True),
+        sa.Column("description", sa.String(), nullable=False),
+        sa.Column("colour_id", sa.Integer(), nullable=False),
+        sa.Column("manufacturer_id", sa.Integer(), nullable=False),
+        sa.Column("scope_model_id", sa.Integer(), nullable=True),
+        sa.Column("part_type_id", sa.Integer(), nullable=False),
+        sa.Column("sub_part_type_id", sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["colour_id"], ["part_colours.id"], ondelete="RESTRICT"
+        ),
+        sa.ForeignKeyConstraint(
+            ["manufacturer_id"], ["manufacturers.id"], ondelete="RESTRICT"
+        ),
+        sa.ForeignKeyConstraint(
+            ["scope_model_id"], ["scope_models.id"], ondelete="SET NULL"
+        ),
+        sa.ForeignKeyConstraint(
+            ["part_type_id"], ["part_types.id"], ondelete="RESTRICT"
+        ),
+        sa.ForeignKeyConstraint(
+            ["sub_part_type_id"], ["sub_part_types.id"], ondelete="SET NULL"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("augmented_parts")
-    pass
-    # ### end Alembic commands ###

alembic/versions/9a1c2f6e0b3d_add_archived_to_augmented_parts.py

@@ -0,0 +1,32 @@
+"""add_archived_to_augmented_parts
+
+Revision ID: 9a1c2f6e0b3d
+Revises: 235d823a56ee
+Create Date: 2026-08-17 21:30:00.000000
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "9a1c2f6e0b3d"
+down_revision: str | None = "235d823a56ee"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("augmented_parts", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "archived", sa.Boolean(), nullable=False, server_default=sa.false()
+            )
+        )
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("augmented_parts", schema=None) as batch_op:
+        batch_op.drop_column("archived")

alembic/versions/a192abbf4091_add_manufacturers_table.py

@@ -5,16 +5,17 @@ Revises: 627d4460a94f
 Create Date: 2026-06-25 10:32:11.398529
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "a192abbf4091"
-down_revision: Union[str, None] = "627d4460a94f"
+down_revision: str | None = "627d4460a94f"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
@@ -27,12 +28,19 @@ def upgrade() -> None:
         sa.Column("logo_url", sa.String(), nullable=True),
         sa.PrimaryKeyConstraint("id"),
     )
+    # batch_alter_table's alter_column doesn't emit CREATE TYPE for the new
+    # Enum on its own (unlike create_table, which ties enum creation to the
+    # table-create DDL event) - create it explicitly first, or Postgres fails
+    # with `type "uncseries" does not exist`. checkfirst / no-op on SQLite.
+    uncseries = sa.Enum("UNC", "UNF", "UNEF", "UN", "UNS", name="uncseries")
+    uncseries.create(op.get_bind(), checkfirst=True)
     with op.batch_alter_table("unc_threads", schema=None) as batch_op:
         batch_op.alter_column(
             "series",
             existing_type=sa.VARCHAR(length=8),
-            type_=sa.Enum("UNC", "UNF", "UNEF", "UN", "UNS", name="uncseries"),
+            type_=uncseries,
             existing_nullable=False,
+            postgresql_using="series::uncseries",
         )
 
     # ### end Alembic commands ###
@@ -46,7 +54,9 @@ def downgrade() -> None:
             existing_type=sa.Enum("UNC", "UNF", "UNEF", "UN", "UNS", name="uncseries"),
             type_=sa.VARCHAR(length=8),
             existing_nullable=False,
+            postgresql_using="series::varchar(8)",
         )
+    sa.Enum(name="uncseries").drop(op.get_bind(), checkfirst=True)
 
     op.drop_table("manufacturers")
     # ### end Alembic commands ###

alembic/versions/a3f7c19b2d40_add_objective_lens_diameter_to_scope_infos.py

@@ -5,16 +5,17 @@ Revises: 8012c00b0c04
 Create Date: 2026-08-04 00:00:00.000000
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "a3f7c19b2d40"
-down_revision: Union[str, None] = "8012c00b0c04"
+down_revision: str | None = "8012c00b0c04"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:

alembic/versions/a52e7ca7a925_add_scope_models_table.py

@@ -5,16 +5,17 @@ Revises: a192abbf4091
 Create Date: 2026-06-25 10:35:40.227253
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "a52e7ca7a925"
-down_revision: Union[str, None] = "a192abbf4091"
+down_revision: str | None = "a192abbf4091"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:

alembic/versions/adf4a5b9493e_add_attachment_points.py

@@ -5,25 +5,52 @@ Revises: 70e48bda8829
 Create Date: 2026-07-02 14:03:23.561253
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "adf4a5b9493e"
-down_revision: Union[str, None] = "70e48bda8829"
+down_revision: str | None = "70e48bda8829"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
-    pass
+        "attachment_points",
-    # ### end Alembic commands ###
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("augmented_part_id", sa.Integer(), nullable=False),
+        sa.Column("attachment_point_name_id", sa.Integer(), nullable=False),
+        sa.Column("iso_thread_id", sa.Integer(), nullable=True),
+        sa.Column("unc_thread_id", sa.Integer(), nullable=True),
+        sa.Column("clamp_connection_id", sa.Integer(), nullable=True),
+        sa.Column("static_connection_id", sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["augmented_part_id"], ["augmented_parts.id"], ondelete="CASCADE"
+        ),
+        sa.ForeignKeyConstraint(
+            ["attachment_point_name_id"],
+            ["attachment_point_names.id"],
+            ondelete="RESTRICT",
+        ),
+        sa.ForeignKeyConstraint(
+            ["iso_thread_id"], ["iso_threads.id"], ondelete="RESTRICT"
+        ),
+        sa.ForeignKeyConstraint(
+            ["unc_thread_id"], ["unc_threads.id"], ondelete="RESTRICT"
+        ),
+        sa.ForeignKeyConstraint(
+            ["clamp_connection_id"], ["clamp_connections.id"], ondelete="RESTRICT"
+        ),
+        sa.ForeignKeyConstraint(
+            ["static_connection_id"], ["static_connections.id"], ondelete="RESTRICT"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("attachment_points")
-    pass
-    # ### end Alembic commands ###

alembic/versions/b60d0aa3ceda_add_sub_part_types_table.py

@@ -5,25 +5,32 @@ Revises: fd5379986da4
 Create Date: 2026-06-25 11:29:20.420056
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "b60d0aa3ceda"
-down_revision: Union[str, None] = "fd5379986da4"
+down_revision: str | None = "fd5379986da4"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
-    pass
+        "sub_part_types",
-    # ### end Alembic commands ###
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.Column("part_type_id", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["part_type_id"], ["part_types.id"], ondelete="RESTRICT"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("name", "part_type_id"),
+    )
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("sub_part_types")
-    pass
-    # ### end Alembic commands ###

alembic/versions/bfbce324cd5f_add_augmented_part_imported_parts.py

@@ -5,25 +5,33 @@ Revises: 8bc411b5814e
 Create Date: 2026-07-02 12:46:27.493942
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "bfbce324cd5f"
-down_revision: Union[str, None] = "8bc411b5814e"
+down_revision: str | None = "8bc411b5814e"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
-    pass
+        "augmented_part_imported_parts",
-    # ### end Alembic commands ###
+        sa.Column("augmented_part_id", sa.Integer(), nullable=False),
+        sa.Column("imported_part_id", sa.String(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["augmented_part_id"], ["augmented_parts.id"], ondelete="CASCADE"
+        ),
+        sa.ForeignKeyConstraint(
+            ["imported_part_id"], ["imported_parts.InventoryID"], ondelete="CASCADE"
+        ),
+        sa.PrimaryKeyConstraint("augmented_part_id", "imported_part_id"),
+    )
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("augmented_part_imported_parts")
-    pass
-    # ### end Alembic commands ###

alembic/versions/c7882cedc9ae_add_clamp_connections.py

@@ -5,25 +5,30 @@ Revises: bfbce324cd5f
 Create Date: 2026-07-02 13:31:57.064381
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "c7882cedc9ae"
-down_revision: Union[str, None] = "bfbce324cd5f"
+down_revision: str | None = "bfbce324cd5f"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
-    pass
+        "clamp_connections",
-    # ### end Alembic commands ###
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("min_mm", sa.Float(), nullable=True),
+        sa.Column("max_mm", sa.Float(), nullable=True),
+        sa.Column("min_in", sa.Float(), nullable=True),
+        sa.Column("max_in", sa.Float(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+    )
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("clamp_connections")
-    pass
-    # ### end Alembic commands ###

alembic/versions/d1e2f3a4b5c6_add_scope_infos_table.py

@@ -5,16 +5,17 @@ Revises: c9f1a2b3d4e5
 Create Date: 2026-07-16 20:00:00.000000
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "d1e2f3a4b5c6"
-down_revision: Union[str, None] = "c9f1a2b3d4e5"
+down_revision: str | None = "c9f1a2b3d4e5"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:

alembic/versions/e23aa8dd2536_add_part_types_table.py

@@ -5,16 +5,17 @@ Revises: a52e7ca7a925
 Create Date: 2026-06-25 10:49:56.463466
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "e23aa8dd2536"
-down_revision: Union[str, None] = "a52e7ca7a925"
+down_revision: str | None = "a52e7ca7a925"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:

alembic/versions/fd5379986da4_add_audit_logs_table.py

@@ -5,25 +5,43 @@ Revises: e23aa8dd2536
 Create Date: 2026-06-25 11:06:13.028067
 """
 
-from typing import Sequence, Union
+from collections.abc import Sequence
+
+import sqlalchemy as sa
 
 from alembic import op
-import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision: str = "fd5379986da4"
-down_revision: Union[str, None] = "e23aa8dd2536"
+down_revision: str | None = "e23aa8dd2536"
-branch_labels: Union[str, Sequence[str], None] = None
+branch_labels: str | Sequence[str] | None = None
-depends_on: Union[str, Sequence[str], None] = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
-    pass
+        "audit_logs",
-    # ### end Alembic commands ###
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.func.now(),
+            nullable=False,
+        ),
+        sa.Column("user_id", sa.Integer(), nullable=True),
+        sa.Column("user_email", sa.String(length=255), nullable=False),
+        sa.Column("action", sa.String(length=16), nullable=False),
+        sa.Column("resource_type", sa.String(length=64), nullable=False),
+        sa.Column("resource_id", sa.Integer(), nullable=True),
+        sa.Column("description", sa.String(), nullable=False),
+        sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="SET NULL"),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_index("ix_audit_logs_created_at", "audit_logs", ["created_at"])
+    op.create_index("ix_audit_logs_user_id", "audit_logs", ["user_id"])
 
 
 def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index("ix_audit_logs_user_id", table_name="audit_logs")
-    pass
+    op.drop_index("ix_audit_logs_created_at", table_name="audit_logs")
-    # ### end Alembic commands ###
+    op.drop_table("audit_logs")

app/api/attachment_point_names.py

@@ -33,6 +33,10 @@ async def create_attachment_point_name(
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(require_permission("attachment_point_names:write")),
 ):
+    if await apn_crud.get_by_name(db, payload.name):
+        raise HTTPException(
+            status_code=409, detail="Attachment point name already exists"
+        )
     apn = await apn_crud.create(db, name=payload.name)
     await audit_crud.log(
         db,
@@ -68,6 +72,12 @@ async def update_attachment_point_name(
     if apn is None:
         raise HTTPException(status_code=404, detail="Attachment point name not found")
     changes = payload.model_dump(exclude_unset=True)
+    if "name" in changes:
+        existing = await apn_crud.get_by_name(db, changes["name"])
+        if existing is not None and existing.id != apn.id:
+            raise HTTPException(
+                status_code=409, detail="Attachment point name already exists"
+            )
     apn = await apn_crud.update(db, apn, changes)
     await audit_crud.log(
         db,

app/api/attachment_points.py

@@ -27,7 +27,7 @@ def _connection_label(ap) -> str:
         return f"{cc.min_in}–{cc.max_in} in"
     if ap.static_connection:
         return f"{ap.static_connection.od_mm} mm OD"
-    return "—"
+    return "Manual"
 
 
 @router.get("", response_model=list[AttachmentPointRead])
@@ -54,10 +54,14 @@ async def create_attachment_point(
         payload.clamp_connection_id,
         payload.static_connection_id,
     ]
-    if sum(v is not None for v in conn_ids) != 1:
+    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.",
+            detail=(
+                "At most one connection (iso_thread, unc_thread, clamp_connection, "
+                "or static_connection) may be provided. Leave all unset for a "
+                "manual attachment point."
+            ),
         )
     ap = await attachment_point_crud.create(db, **payload.model_dump())
     await audit_crud.log(

app/api/augmented_parts.py

@@ -20,14 +20,26 @@ from app.services import augmented_part_sync
 router = APIRouter()
 
 
+async def _get_augmented_part_by_identifier(db: AsyncSession, identifier: str):
+    """Resolve an AugmentedPart by numeric id, falling back to sku."""
+    if identifier.isdigit():
+        ap = await augmented_part_crud.get(db, int(identifier))
+        if ap is not None:
+            return ap
+    return await augmented_part_crud.get_by_sku(db, identifier)
+
+
 @router.get("", response_model=list[AugmentedPartRead])
 async def list_augmented_parts(
     skip: int = 0,
     limit: int = 100,
+    include_archived: bool = False,
     db: AsyncSession = Depends(get_db),
     _: User = Depends(require_permission("augmented_parts:read")),
 ):
-    return await augmented_part_crud.list_all(db, skip=skip, limit=limit)
+    return await augmented_part_crud.list_all(
+        db, skip=skip, limit=limit, include_archived=include_archived
+    )
 
 
 @router.post("", response_model=AugmentedPartRead, status_code=status.HTTP_201_CREATED)
@@ -36,6 +48,8 @@ async def create_augmented_part(
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(require_permission("augmented_parts:write")),
 ):
+    if payload.sku and await augmented_part_crud.get_by_sku(db, payload.sku):
+        raise HTTPException(status_code=409, detail="SKU already in use")
     ap = await augmented_part_crud.create(
         db,
         sku=payload.sku,
@@ -45,6 +59,8 @@ async def create_augmented_part(
         scope_model_id=payload.scope_model_id,
         part_type_id=payload.part_type_id,
         sub_part_type_id=payload.sub_part_type_id,
+        on_website=payload.on_website,
+        preferred_part=payload.preferred_part,
     )
     await audit_crud.log(
         db,
@@ -72,8 +88,8 @@ async def sync_augmented_parts(
         resource_type="AugmentedPart",
         resource_id=None,
         description=(
-            f"Sync: {result.created} created, {result.deleted} deleted, "
+            f"Sync: {result.created} created, {result.updated} updated, "
-            f"{result.skipped} skipped (no type match)"
+            f"{result.archived} archived, {result.skipped} skipped (no type match)"
         ),
     )
     return result
@@ -91,17 +107,21 @@ async def get_augmented_part(
     return ap
 
 
-@router.patch("/{augmented_part_id}", response_model=AugmentedPartRead)
+@router.patch("/{identifier}", response_model=AugmentedPartRead)
 async def update_augmented_part(
-    augmented_part_id: int,
+    identifier: str,
     payload: AugmentedPartUpdate,
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(require_permission("augmented_parts:write")),
 ):
-    ap = await augmented_part_crud.get(db, augmented_part_id)
+    ap = await _get_augmented_part_by_identifier(db, identifier)
     if ap is None:
         raise HTTPException(status_code=404, detail="Augmented part not found")
     changes = payload.model_dump(exclude_unset=True)
+    if changes.get("sku"):
+        existing = await augmented_part_crud.get_by_sku(db, changes["sku"])
+        if existing is not None and existing.id != ap.id:
+            raise HTTPException(status_code=409, detail="SKU already in use")
     ap = await augmented_part_crud.update(db, ap, changes)
     await audit_crud.log(
         db,
@@ -114,15 +134,16 @@ async def update_augmented_part(
     return ap
 
 
-@router.delete("/{augmented_part_id}", status_code=status.HTTP_204_NO_CONTENT)
+@router.delete("/{identifier}", status_code=status.HTTP_204_NO_CONTENT)
 async def delete_augmented_part(
-    augmented_part_id: int,
+    identifier: str,
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(require_permission("augmented_parts:delete")),
 ):
-    ap = await augmented_part_crud.get(db, augmented_part_id)
+    ap = await _get_augmented_part_by_identifier(db, identifier)
     if ap is None:
         raise HTTPException(status_code=404, detail="Augmented part not found")
+    resolved_id = ap.id
     label = ap.sku or ap.description
     await augmented_part_crud.delete(db, ap)
     await audit_crud.log(
@@ -130,10 +151,8 @@ async def delete_augmented_part(
         actor=actor,
         action="delete",
         resource_type="AugmentedPart",
-        resource_id=augmented_part_id,
+        resource_id=resolved_id,
-        description=audit_crud.describe_delete(
+        description=audit_crud.describe_delete("AugmentedPart", resolved_id, label),
-            "AugmentedPart", augmented_part_id, label
-        ),
     )
 
 

app/api/imported_parts.py

@@ -13,6 +13,7 @@ from app.schemas.imported_part import (
     ImportedPartRead,
     SyncResult,
 )
+from app.services import augmented_part_sync
 from app.services import odata as odata_service
 
 router = APIRouter()
@@ -128,7 +129,9 @@ async def delete_imported_part(
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="Imported part not found"
         )
-    await imported_part_crud.delete(db, part)
+    archived = await augmented_part_sync.delete_imported_part_and_archive_orphans(
+        db, part
+    )
     await audit_crud.log(
         db,
         actor=actor,
@@ -137,3 +140,15 @@ async def delete_imported_part(
         resource_id=None,
         description=audit_crud.describe_delete("ImportedPart", 0, inventory_id),
     )
+    if archived:
+        await audit_crud.log(
+            db,
+            actor=actor,
+            action="update",
+            resource_type="AugmentedPart",
+            resource_id=None,
+            description=(
+                f"Archived {archived} augmented part(s) left with no remaining "
+                f"imported parts after deleting {inventory_id!r}"
+            ),
+        )

app/api/part_colours.py

@@ -27,6 +27,8 @@ async def create_part_colour(
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(require_permission("part_colours:write")),
 ):
+    if await part_colour_crud.get_by_name(db, payload.name):
+        raise HTTPException(status_code=409, detail="Part colour already exists")
     pc = await part_colour_crud.create(db, name=payload.name)
     await audit_crud.log(
         db,
@@ -62,6 +64,10 @@ async def update_part_colour(
     if pc is None:
         raise HTTPException(status_code=404, detail="Part colour not found")
     changes = payload.model_dump(exclude_unset=True)
+    if "name" in changes:
+        existing = await part_colour_crud.get_by_name(db, changes["name"])
+        if existing is not None and existing.id != pc.id:
+            raise HTTPException(status_code=409, detail="Part colour already exists")
     pc = await part_colour_crud.update(db, pc, changes)
     await audit_crud.log(
         db,

app/api/part_types.py

@@ -27,6 +27,10 @@ async def create_part_type(
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(require_permission("part_types:write")),
 ):
+    if await part_type_crud.get_by_name(db, payload.name):
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT, detail="Part type already exists"
+        )
     pt = await part_type_crud.create(db, name=payload.name)
     await audit_crud.log(
         db,
@@ -66,6 +70,12 @@ async def update_part_type(
             status_code=status.HTTP_404_NOT_FOUND, detail="Part type not found"
         )
     changes = payload.model_dump(exclude_unset=True)
+    if "name" in changes:
+        existing = await part_type_crud.get_by_name(db, changes["name"])
+        if existing is not None and existing.id != pt.id:
+            raise HTTPException(
+                status_code=status.HTTP_409_CONFLICT, detail="Part type already exists"
+            )
     pt = await part_type_crud.update(db, pt, changes)
     await audit_crud.log(
         db,

app/api/roles.py

@@ -81,6 +81,12 @@ async def update_role(
             status_code=status.HTTP_404_NOT_FOUND, detail="Role not found"
         )
     changes = payload.model_dump(exclude_unset=True)
+    if "name" in changes:
+        existing = await role_crud.get_by_name(db, changes["name"])
+        if existing is not None and existing.id != role.id:
+            raise HTTPException(
+                status_code=status.HTTP_409_CONFLICT, detail="Role already exists"
+            )
     role = await role_crud.update(db, role, changes)
     await audit_crud.log(
         db,

app/api/static_connections.py

@@ -33,6 +33,8 @@ async def create_static_connection(
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(require_permission("static_connections:write")),
 ):
+    if await static_connection_crud.get_by_od_mm(db, payload.od_mm):
+        raise HTTPException(status_code=409, detail="Static connection already exists")
     sc = await static_connection_crud.create(
         db, od_mm=payload.od_mm, od_in=payload.od_in
     )
@@ -72,6 +74,12 @@ async def update_static_connection(
     if sc is None:
         raise HTTPException(status_code=404, detail="Static connection not found")
     changes = payload.model_dump(exclude_unset=True)
+    if "od_mm" in changes:
+        existing = await static_connection_crud.get_by_od_mm(db, changes["od_mm"])
+        if existing is not None and existing.id != sc.id:
+            raise HTTPException(
+                status_code=409, detail="Static connection already exists"
+            )
     sc = await static_connection_crud.update(db, sc, changes)
     await audit_crud.log(
         db,

app/api/sub_part_types.py

@@ -31,6 +31,10 @@ async def create_sub_part_type(
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(require_permission("sub_part_types:write")),
 ):
+    if await sub_part_type_crud.get_by_name_and_part_type(
+        db, payload.name, payload.part_type_id
+    ):
+        raise HTTPException(status_code=409, detail="Sub part type already exists")
     spt = await sub_part_type_crud.create(
         db, name=payload.name, part_type_id=payload.part_type_id
     )
@@ -72,6 +76,14 @@ async def update_sub_part_type(
             status_code=status.HTTP_404_NOT_FOUND, detail="Sub part type not found"
         )
     changes = payload.model_dump(exclude_unset=True)
+    if "name" in changes or "part_type_id" in changes:
+        name = changes.get("name", spt.name)
+        part_type_id = changes.get("part_type_id", spt.part_type_id)
+        existing = await sub_part_type_crud.get_by_name_and_part_type(
+            db, name, part_type_id
+        )
+        if existing is not None and existing.id != spt.id:
+            raise HTTPException(status_code=409, detail="Sub part type already exists")
     spt = await sub_part_type_crud.update(db, spt, changes)
     await audit_crud.log(
         db,

app/api/users.py

@@ -82,6 +82,12 @@ async def update_user(
             status_code=status.HTTP_404_NOT_FOUND, detail="User not found"
         )
     changes = payload.model_dump(exclude_unset=True)
+    if "email" in changes:
+        existing = await user_crud.get_by_email(db, changes["email"])
+        if existing is not None and existing.id != target.id:
+            raise HTTPException(
+                status_code=status.HTTP_409_CONFLICT, detail="Email already registered"
+            )
     target = await user_crud.update(db, target, changes)
     await audit_crud.log(
         db,

app/core/config.py

@@ -33,9 +33,13 @@ class Settings(BaseSettings):
     database_url: str = "sqlite+aiosqlite:///./app.db"
     auto_create_tables: bool = True
 
-    # Web / cookies (the HTMX UI stores the access token in an httpOnly cookie)
+    # Web / cookies (the HTMX UI stores the access token in an httpOnly cookie).
+    # session_timeout_hours governs how long a browser login lasts before the
+    # user is bounced back to /login; it's independent of the JSON API's
+    # short-lived access_token_expire_minutes.
     cookie_name: str = "access_token"
     cookie_secure: bool = False
+    session_timeout_hours: int = 24
 
     # LDAP (direct-bind). When enabled, the login page offers an LDAP option.
     # At login the user's DN is built from ``ldap_bind_dn_template`` (with

app/core/security.py

@@ -47,10 +47,12 @@ def _create_token(
     return token, payload
 
 
-def create_access_token(subject: str | int) -> str:
+def create_access_token(
+    subject: str | int, expires_delta: timedelta | None = None
+) -> str:
     token, _ = _create_token(
         subject,
-        timedelta(minutes=settings.access_token_expire_minutes),
+        expires_delta or timedelta(minutes=settings.access_token_expire_minutes),
         ACCESS_TOKEN_TYPE,
     )
     return token

app/crud/augmented_part.py

@@ -1,4 +1,4 @@
-from sqlalchemy import distinct, select
+from sqlalchemy import distinct, or_, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.models.associations import augmented_part_imported_parts
@@ -10,7 +10,14 @@ from app.models.part_type import PartType
 from app.models.scope_model import ScopeModel
 from app.models.sub_part_type import SubPartType
 
-_RELATIONSHIPS = ["colour", "manufacturer", "scope_model", "part_type", "sub_part_type"]
+_RELATIONSHIPS = [
+    "colour",
+    "manufacturer",
+    "scope_model",
+    "part_type",
+    "sub_part_type",
+    "notes",
+]
 
 # Sortable columns for the admin list, keyed by the query-string "sort" value.
 # Columns backed by a related table's name require an outer join (the FK may be
@@ -58,14 +65,15 @@ async def get_by_sku(db: AsyncSession, sku: str) -> AugmentedPart | None:
 
 
 async def list_all(
-    db: AsyncSession, skip: int = 0, limit: int = 100
+    db: AsyncSession,
+    skip: int = 0,
+    limit: int = 100,
+    include_archived: bool = False,
 ) -> list[AugmentedPart]:
-    result = await db.execute(
+    q = select(AugmentedPart).order_by(AugmentedPart.description)
-        select(AugmentedPart)
+    if not include_archived:
-        .order_by(AugmentedPart.description)
+        q = q.where(AugmentedPart.archived.is_(False))
-        .offset(skip)
+    result = await db.execute(q.offset(skip).limit(limit))
-        .limit(limit)
-    )
     return list(result.scalars().all())
 
 
@@ -85,6 +93,8 @@ async def list_filtered(
     scope_model_id: int | None = None,
     part_type_id: int | None = None,
     sub_part_type_id: int | None = None,
+    include_archived: bool = False,
+    on_website: bool = False,
     sort: str = "description",
     direction: str = "asc",
     skip: int = 0,
@@ -92,7 +102,10 @@ async def list_filtered(
 ) -> list[AugmentedPart]:
     q = select(AugmentedPart)
     if description.strip():
-        q = q.where(AugmentedPart.description.ilike(f"%{description.strip()}%"))
+        term = f"%{description.strip()}%"
+        q = q.where(
+            or_(AugmentedPart.description.ilike(term), AugmentedPart.sku.ilike(term))
+        )
     if colour_id is not None:
         q = q.where(AugmentedPart.colour_id == colour_id)
     if manufacturer_id is not None:
@@ -103,6 +116,10 @@ async def list_filtered(
         q = q.where(AugmentedPart.part_type_id == part_type_id)
     if sub_part_type_id is not None:
         q = q.where(AugmentedPart.sub_part_type_id == sub_part_type_id)
+    if not include_archived:
+        q = q.where(AugmentedPart.archived.is_(False))
+    if on_website:
+        q = q.where(AugmentedPart.on_website.is_(True))
     q = _apply_sort(q, sort, direction)
     result = await db.execute(q.offset(skip).limit(limit))
     return list(result.scalars().all())
@@ -116,12 +133,17 @@ async def count_filtered(
     scope_model_id: int | None = None,
     part_type_id: int | None = None,
     sub_part_type_id: int | None = None,
+    include_archived: bool = False,
+    on_website: bool = False,
 ) -> int:
     from sqlalchemy import func
 
     q = select(func.count()).select_from(AugmentedPart)
     if description.strip():
-        q = q.where(AugmentedPart.description.ilike(f"%{description.strip()}%"))
+        term = f"%{description.strip()}%"
+        q = q.where(
+            or_(AugmentedPart.description.ilike(term), AugmentedPart.sku.ilike(term))
+        )
     if colour_id is not None:
         q = q.where(AugmentedPart.colour_id == colour_id)
     if manufacturer_id is not None:
@@ -132,6 +154,10 @@ async def count_filtered(
         q = q.where(AugmentedPart.part_type_id == part_type_id)
     if sub_part_type_id is not None:
         q = q.where(AugmentedPart.sub_part_type_id == sub_part_type_id)
+    if not include_archived:
+        q = q.where(AugmentedPart.archived.is_(False))
+    if on_website:
+        q = q.where(AugmentedPart.on_website.is_(True))
     result = await db.execute(q)
     return result.scalar_one()
 
@@ -207,6 +233,8 @@ async def create(
     scope_model_id: int | None,
     part_type_id: int,
     sub_part_type_id: int | None,
+    on_website: bool = False,
+    preferred_part: bool = False,
 ) -> AugmentedPart:
     ap = AugmentedPart(
         sku=sku,
@@ -216,6 +244,8 @@ async def create(
         scope_model_id=scope_model_id,
         part_type_id=part_type_id,
         sub_part_type_id=sub_part_type_id,
+        on_website=on_website,
+        preferred_part=preferred_part,
     )
     db.add(ap)
     await db.commit()
@@ -245,6 +275,15 @@ async def get_unlinked_imported_parts(db: AsyncSession) -> list[ImportedPart]:
     return list(result.scalars().all())
 
 
+async def set_archived(
+    db: AsyncSession, ap: AugmentedPart, archived: bool
+) -> AugmentedPart:
+    ap.archived = archived
+    await db.commit()
+    await db.refresh(ap, attribute_names=_RELATIONSHIPS)
+    return ap
+
+
 async def delete(db: AsyncSession, ap: AugmentedPart) -> None:
     await db.delete(ap)
     await db.commit()

app/crud/clamp_connection.py

@@ -22,6 +22,17 @@ async def list_all(
     return list(result.scalars().all())
 
 
+async def get_by_values(
+    db: AsyncSession, *, min_mm: float | None, max_mm: float | None
+) -> ClampConnection | None:
+    result = await db.execute(
+        select(ClampConnection).where(
+            ClampConnection.min_mm == min_mm, ClampConnection.max_mm == max_mm
+        )
+    )
+    return result.scalars().first()
+
+
 async def create(
     db: AsyncSession,
     *,

app/crud/imported_part.py

@@ -1,4 +1,4 @@
-from sqlalchemy import distinct, insert, select, update
+from sqlalchemy import distinct, insert, or_, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.models.imported_part import ImportedPart
@@ -13,6 +13,7 @@ _FIELDS = frozenset(
         "ProductODmm",
         "ProductODin",
         "TBXThreadAttribute",
+        "UACDiameterRangemm",
     }
 )
 
@@ -26,6 +27,7 @@ SORT_COLUMNS = {
     "ProductODmm": ImportedPart.ProductODmm,
     "ProductODin": ImportedPart.ProductODin,
     "TBXThreadAttribute": ImportedPart.TBXThreadAttribute,
+    "UACDiameterRangemm": ImportedPart.UACDiameterRangemm,
 }
 
 
@@ -61,7 +63,13 @@ async def list_filtered(
 ) -> list[ImportedPart]:
     q = select(ImportedPart)
     if description.strip():
-        q = q.where(ImportedPart.Description.ilike(f"%{description.strip()}%"))
+        term = f"%{description.strip()}%"
+        q = q.where(
+            or_(
+                ImportedPart.Description.ilike(term),
+                ImportedPart.InventoryID.ilike(term),
+            )
+        )
     q = _apply_sort(q, sort, direction)
     result = await db.execute(q.offset(skip).limit(limit))
     return list(result.scalars().all())
@@ -88,16 +96,17 @@ async def count_filtered(db: AsyncSession, description: str = "") -> int:
 
     q = select(func.count()).select_from(ImportedPart)
     if description.strip():
-        q = q.where(ImportedPart.Description.ilike(f"%{description.strip()}%"))
+        term = f"%{description.strip()}%"
+        q = q.where(
+            or_(
+                ImportedPart.Description.ilike(term),
+                ImportedPart.InventoryID.ilike(term),
+            )
+        )
     result = await db.execute(q)
     return result.scalar_one()
 
 
-async def delete(db: AsyncSession, part: ImportedPart) -> None:
-    await db.delete(part)
-    await db.commit()
-
-
 async def upsert_bulk(db: AsyncSession, records: list[dict]) -> tuple[int, int]:
     """Insert-or-update records keyed on InventoryID. Returns (created, updated)."""
     if not records:

app/crud/manufacturer.py

@@ -26,7 +26,7 @@ async def create(
     db: AsyncSession,
     *,
     name: str,
-    url: str,
+    url: str | None = None,
     logo_url: str | None = None,
 ) -> Manufacturer:
     m = Manufacturer(name=name, url=url, logo_url=logo_url)

app/crud/scope_info.py

@@ -37,7 +37,6 @@ async def create(
     magnification_max: float | None = None,
     model_suffix: str | None = None,
     objective_lens_diameter_mm: float | None = None,
-    objective_thread_pitch: str | None = None,
 ) -> ScopeInfo:
     info = ScopeInfo(
         augmented_part_id=augmented_part_id,
@@ -45,7 +44,6 @@ async def create(
         magnification_max=magnification_max,
         model_suffix=model_suffix,
         objective_lens_diameter_mm=objective_lens_diameter_mm,
-        objective_thread_pitch=objective_thread_pitch,
     )
     db.add(info)
     await db.commit()

app/main.py

@@ -49,7 +49,7 @@ def create_app() -> FastAPI:
         # Preserve the originally requested URL so we can return there after
         # login. Only meaningful for GET navigations (the ones users deep-link).
         login_url = "/login"
-        if request.method == "GET" and request.url.path not in ("/", "/login"):
+        if request.method == "GET" and request.url.path != "/login":
             target = request.url.path
             if request.url.query:
                 target += "?" + request.url.query

app/models/__init__.py

@@ -14,16 +14,17 @@ from app.models.fit import Fit, FitLabel, FitNote
 from app.models.imported_part import ImportedPart
 from app.models.imported_part_config import ImportedPartConfig
 from app.models.iso_thread import IsoThread
+from app.models.job import Job
 from app.models.manufacturer import Manufacturer
 from app.models.part_colour import PartColour
 from app.models.part_type import PartType
 from app.models.permission import Permission
+from app.models.refresh_token import RefreshToken
+from app.models.role import Role
 from app.models.scope_info import ScopeInfo
 from app.models.scope_model import ScopeModel
 from app.models.static_connection import StaticConnection
 from app.models.sub_part_type import SubPartType
-from app.models.refresh_token import RefreshToken
-from app.models.role import Role
 from app.models.unc_thread import UncThread
 from app.models.user import User
 
@@ -40,6 +41,7 @@ __all__ = [
     "ImportedPart",
     "ImportedPartConfig",
     "IsoThread",
+    "Job",
     "Manufacturer",
     "PartColour",
     "PartType",

app/models/attachment_point.py

@@ -21,7 +21,10 @@ class AttachmentPoint(Base):
         ForeignKey("attachment_point_names.id", ondelete="RESTRICT"), nullable=False
     )
 
-    # Exactly one of the four below must be non-null (enforced in application layer)
+    # At most one of the four below is non-null (enforced in application layer).
+    # All four null means a "Manual" attachment point: no connection details,
+    # used to let a user assert a Fit by hand without the fit-matching algorithm
+    # (app.services.fit_matching) ever auto-matching it.
     iso_thread_id: Mapped[int | None] = mapped_column(
         ForeignKey("iso_threads.id", ondelete="RESTRICT"), nullable=True, default=None
     )

app/models/augmented_part.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from sqlalchemy import DateTime, ForeignKey, String, Text, func
+from sqlalchemy import Boolean, DateTime, ForeignKey, String, Text, func
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from app.core.database import Base
@@ -17,7 +17,9 @@ class AugmentedPart(Base):
     __tablename__ = "augmented_parts"
 
     id: Mapped[int] = mapped_column(primary_key=True)
-    sku: Mapped[str | None] = mapped_column(String, nullable=True, default=None)
+    sku: Mapped[str | None] = mapped_column(
+        String, nullable=True, unique=True, default=None
+    )
     description: Mapped[str] = mapped_column(String, nullable=False)
     colour_id: Mapped[int] = mapped_column(
         ForeignKey("part_colours.id", ondelete="RESTRICT"), nullable=False
@@ -36,6 +38,17 @@ class AugmentedPart(Base):
         nullable=True,
         default=None,
     )
+    # "##.##-##.##" mm, derived from ImportedPart.UACDiameterRangemm by the sync
+    # service. Read-only — never set outside app/services/augmented_part_sync.py.
+    uac_diameter_range_mm: Mapped[str | None] = mapped_column(
+        String, nullable=True, default=None
+    )
+    # Set instead of deleting the row when the last backing ImportedPart is
+    # removed, so fit/attachment-point history is preserved. Hidden from list
+    # views by default.
+    archived: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    on_website: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+    preferred_part: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
 
     # linked imported parts — not eagerly loaded; used by sync service only
     imported_parts: Mapped[list[ImportedPart]] = relationship(

app/models/fit.py

@@ -7,7 +7,7 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship
 from app.core.database import Base
 
 
-class FitLabel(str, enum.Enum):
+class FitLabel(enum.StrEnum):
     POSSIBLE = "possible"
     EXACT = "exact"
     NONE = "none"

app/models/imported_part.py

@@ -19,3 +19,4 @@ class ImportedPart(Base):
     ProductODmm: Mapped[str | None] = mapped_column(nullable=True, default=None)
     ProductODin: Mapped[str | None] = mapped_column(nullable=True, default=None)
     TBXThreadAttribute: Mapped[str | None] = mapped_column(nullable=True, default=None)
+    UACDiameterRangemm: Mapped[str | None] = mapped_column(nullable=True, default=None)

app/models/job.py

@@ -0,0 +1,31 @@
+from datetime import datetime
+
+from sqlalchemy import JSON, DateTime, String, Text, func
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.core.database import Base
+
+
+class Job(Base):
+    """Tracks a long-running admin operation (sync, import, fit recompute).
+
+    Persisted (rather than kept in a module-level dict) so that any worker
+    process/replica handling a status-poll request can see progress recorded
+    by whichever process is actually running the job.
+    """
+
+    __tablename__ = "jobs"
+
+    id: Mapped[str] = mapped_column(String(32), primary_key=True)
+    kind: Mapped[str] = mapped_column(String(64), nullable=False)
+    status: Mapped[str] = mapped_column(
+        String(16), nullable=False, default="running"
+    )  # running | done | error
+    message: Mapped[str] = mapped_column(Text, nullable=False, default="Working…")
+    result: Mapped[dict | None] = mapped_column(JSON, nullable=True, default=None)
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now()
+    )
+    finished_at: Mapped[datetime | None] = mapped_column(
+        DateTime(timezone=True), nullable=True, default=None
+    )

app/models/manufacturer.py

@@ -8,5 +8,5 @@ class Manufacturer(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     name: Mapped[str] = mapped_column(nullable=False)
-    url: Mapped[str] = mapped_column(nullable=False)
+    url: Mapped[str | None] = mapped_column(nullable=True)
     logo_url: Mapped[str | None] = mapped_column(nullable=True, default=None)

app/models/scope_info.py

@@ -32,8 +32,3 @@ class ScopeInfo(Base):
     objective_lens_diameter_mm: Mapped[float | None] = mapped_column(
         Float, nullable=True, default=None
     )
-    # Kept as the raw string from the sheet (e.g. "0.75", "1/16") so no precision
-    # or notation is lost; the parsed thread lives on its own AttachmentPoint.
-    objective_thread_pitch: Mapped[str | None] = mapped_column(
-        String, nullable=True, default=None
-    )

app/models/unc_thread.py

@@ -6,7 +6,7 @@ from sqlalchemy.orm import Mapped, mapped_column
 from app.core.database import Base
 
 
-class UncSeries(str, enum.Enum):
+class UncSeries(enum.StrEnum):
     UNC = "UNC"
     UNF = "UNF"
     UNEF = "UNEF"

app/schemas/augmented_part.py

@@ -39,6 +39,8 @@ class AugmentedPartBase(BaseModel):
     scope_model_id: int | None = None
     part_type_id: int
     sub_part_type_id: int | None = None
+    on_website: bool = False
+    preferred_part: bool = False
 
 
 class AugmentedPartCreate(AugmentedPartBase):
@@ -53,11 +55,15 @@ class AugmentedPartUpdate(BaseModel):
     scope_model_id: int | None = None
     part_type_id: int | None = None
     sub_part_type_id: int | None = None
+    archived: bool | None = None
+    on_website: bool | None = None
+    preferred_part: bool | None = None
 
 
 class AugmentedPartSyncResult(BaseModel):
     created: int
-    deleted: int
+    updated: int
+    archived: int
     skipped: int
 
 
@@ -65,6 +71,8 @@ class AugmentedPartRead(AugmentedPartBase):
     model_config = ConfigDict(from_attributes=True)
 
     id: int
+    archived: bool
+    uac_diameter_range_mm: str | None
     colour: PartColourRead
     manufacturer: ManufacturerRead
     scope_model: ScopeModelRead | None

app/schemas/imported_part.py

@@ -12,6 +12,7 @@ class ImportedPartRead(BaseModel):
     ProductODmm: str | None
     ProductODin: str | None
     TBXThreadAttribute: str | None
+    UACDiameterRangemm: str | None
 
 
 class ImportedPartConfigRead(BaseModel):

app/schemas/manufacturer.py

@@ -1,11 +1,19 @@
-from pydantic import BaseModel, ConfigDict, HttpUrl
+from pydantic import BaseModel, ConfigDict, HttpUrl, field_validator
+
+
+def _blank_to_none(value: str | None) -> str | None:
+    if isinstance(value, str) and not value.strip():
+        return None
+    return value
 
 
 class ManufacturerBase(BaseModel):
     name: str
-    url: HttpUrl
+    url: HttpUrl | None = None
     logo_url: HttpUrl | None = None
 
+    _normalize_url = field_validator("url", "logo_url", mode="before")(_blank_to_none)
+
 
 class ManufacturerCreate(ManufacturerBase):
     pass
@@ -16,6 +24,8 @@ class ManufacturerUpdate(BaseModel):
     url: HttpUrl | None = None
     logo_url: HttpUrl | None = None
 
+    _normalize_url = field_validator("url", "logo_url", mode="before")(_blank_to_none)
+
 
 class ManufacturerRead(ManufacturerBase):
     model_config = ConfigDict(from_attributes=True)

app/schemas/scope_info.py

@@ -6,7 +6,6 @@ class ScopeInfoBase(BaseModel):
     magnification_max: float | None = None
     model_suffix: str | None = None
     objective_lens_diameter_mm: float | None = None
-    objective_thread_pitch: str | None = None
 
 
 class ScopeInfoRead(ScopeInfoBase):

app/services/augmented_part_sync.py

@@ -2,13 +2,31 @@
 
 Algorithm
 ---------
-Phase 1 – prune stale entries
+Phase 1 – archive stale entries
   • Find association rows whose imported_part_id no longer exists.
   • Delete those rows.
-  • Delete any AugmentedPart that ends up with zero remaining associations
+  • Archive (rather than delete) any AugmentedPart that ends up with zero
-    (i.e. it was created purely from now-deleted ImportedParts).
+    remaining associations (i.e. it was created purely from now-deleted
+    ImportedParts), preserving its fit/attachment-point history.
 
-Phase 2 – create entries for new ImportedParts
+Phase 2 – refresh entries for already-linked ImportedParts
+  • For each ImportedPart already linked to an AugmentedPart (from a prior
+    sync run), refresh the fields sync itself owns — description, colour,
+    and uac_diameter_range_mm (see field mapping below) — to match the
+    ImportedPart's current values.
+  • Never touches "extra"/admin-owned AugmentedPart fields: part_type_id,
+    sub_part_type_id, scope_model_id, manufacturer_id, sku, archived. Those
+    are only ever set once, at creation (phase 3) or via the admin API/UI.
+  • Adds an "Ocular" and/or "Objective" attachment point if the part doesn't
+    already have one of that name and the current ImportedPart data now
+    supports deriving one. Never deletes or modifies an existing attachment
+    point, even if the source data that produced it has since changed.
+  • If an AugmentedPart has more than one backing ImportedPart, the one with
+    the lexicographically smallest InventoryID is used as the source (this
+    doesn't happen via any current creation path, but the data model and
+    phase 1's archiving logic both allow for it).
+
+Phase 3 – create entries for new ImportedParts
   • Any ImportedPart not yet linked to an AugmentedPart gets one created.
   • Description   ← ImportedPart.Description (fallback: InventoryID)
   • Colour        ← ImportedPart.TBXColour   (fallback: "Unknown"; created if needed)
@@ -17,13 +35,19 @@ Phase 2 – create entries for new ImportedParts
   • Type          ← first PartType whose name is a substring of the description
                     (longest name wins; skipped if no match)
   • SubType       ← null
-  • Attachment point ← always named "Occular"; one of:
+  • Attachment point ← always named "Ocular"; one of:
                     - ISO/UNC thread parsed from TBXThreadAttribute (using the
                       matching ProductMaxThreadDepth mm/in if populated), or
                     - StaticConnection from ProductODmm/ProductODin (whichever
                       unit is missing is derived via mm/in conversion) if the
                       thread attribute is absent or unparseable
                     Skipped entirely if none of those fields are usable.
+  UAC diameter range ← ImportedPart.UACDiameterRangemm, an 8-digit string with
+                    no separators (2 leading digits + 2 decimal digits for the
+                    minimum, then the same for the maximum) reformatted as
+                    AugmentedPart.uac_diameter_range_mm = "##.##-##.##". When
+                    present, also adds a second attachment point named
+                    "Objective" with a ClampConnection spanning that range.
 """
 
 import re
@@ -33,6 +57,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.crud import attachment_point as attachment_point_crud
 from app.crud import attachment_point_name as attachment_point_name_crud
+from app.crud import augmented_part as augmented_part_crud
+from app.crud import clamp_connection as clamp_connection_crud
 from app.crud import iso_thread as iso_thread_crud
 from app.crud import manufacturer as manufacturer_crud
 from app.crud import part_colour as part_colour_crud
@@ -46,7 +72,8 @@ from app.models.part_type import PartType
 from app.models.unc_thread import UncSeries
 from app.schemas.augmented_part import AugmentedPartSyncResult
 
-ATTACHMENT_POINT_NAME = "Occular"
+ATTACHMENT_POINT_NAME = "Ocular"
+UAC_ATTACHMENT_POINT_NAME = "Objective"
 MM_PER_INCH = 25.4
 
 # e.g.
@@ -70,6 +97,11 @@ _UNC_THREAD_RE = re.compile(
     re.IGNORECASE,
 )
 
+_CLAMP_RANGE_RE = re.compile(
+    r"\((?P<min_diameter>\d*\.?\d+)\s*-\s*(?P<max_diameter>\d*\.?\d+)\s*mm\)",
+    re.IGNORECASE,
+)
+
 
 def _parse_float(value: str | None) -> float | None:
     if value is None:
@@ -101,9 +133,59 @@ def _parse_thread_attribute(value: str) -> tuple[str, dict] | None:
             "series": series,
         }
 
+    if m := _CLAMP_RANGE_RE.match(value):
+        # Source data often omits the series letters; UNS ("unified special") is the
+        # correct designation when the diameter/TPI pairing isn't a standard pitch.
+        return "clamp", {
+            "min_diametere": float(m.group("min_diameter")),
+            "max_diameter": float(m.group("max_diameter")),
+        }
     return None
 
 
+def _parse_uac_diameter_range(value: str | None) -> tuple[str, float, float] | None:
+    """Parse an 8-digit UACDiameterRangemm value into ("##.##-##.##", min, max).
+
+    The source field is 8 digits with no separators: the first 4 are the
+    minimum diameter (2 whole + 2 decimal), the last 4 the maximum, e.g.
+    "03505500" -> ("03.50-55.00", 3.5, 55.0).
+    """
+    if not value:
+        return None
+    digits = "".join(re.findall(r"\d", value))
+    if len(digits) != 8:
+        return None
+    min_str = f"{digits[0:2]}.{digits[2:4]}"
+    max_str = f"{digits[4:6]}.{digits[6:8]}"
+    return f"{min_str}-{max_str}", float(min_str), float(max_str)
+
+
+async def _add_uac_clamp_attachment_point(
+    db: AsyncSession, ap: AugmentedPart, ip: ImportedPart
+) -> None:
+    """Add a second, "Objective"-named clamp attachment point derived from
+    ImportedPart.UACDiameterRangemm, if that field is populated."""
+    parsed = _parse_uac_diameter_range(ip.UACDiameterRangemm)
+    if parsed is None:
+        return
+    _, min_mm, max_mm = parsed
+    min_in = min_mm / MM_PER_INCH
+    max_in = max_mm / MM_PER_INCH
+
+    apn = await _get_or_create_attachment_point_name(db, UAC_ATTACHMENT_POINT_NAME)
+    clamp = await clamp_connection_crud.get_by_values(db, min_mm=min_mm, max_mm=max_mm)
+    if clamp is None:
+        clamp = await clamp_connection_crud.create(
+            db, min_mm=min_mm, max_mm=max_mm, min_in=min_in, max_in=max_in
+        )
+    await attachment_point_crud.create(
+        db,
+        augmented_part_id=ap.id,
+        attachment_point_name_id=apn.id,
+        clamp_connection_id=clamp.id,
+    )
+
+
 async def _get_or_create_attachment_point_name(db: AsyncSession, name: str):
     apn = await attachment_point_name_crud.get_by_name(db, name)
     if apn is None:
@@ -144,6 +226,7 @@ async def _add_attachment_point(
                 attachment_point_name_id=apn.id,
                 iso_thread_id=thread.id,
             )
+            return
         elif kind == "unc":
             depth_in = _parse_float(ip.ProductMaxThreadDepthin)
             thread = await unc_thread_crud.get_by_values(
@@ -157,9 +240,21 @@ async def _add_attachment_point(
                 attachment_point_name_id=apn.id,
                 unc_thread_id=thread.id,
             )
+            return
+        elif kind == "clamp":
+            clamp = await clamp_connection_crud.get_by_values(db, **fields)
+            if clamp is None:
+                clamp = await clamp_connection_crud.create(db, **fields)
+            await attachment_point_crud.create(
+                db,
+                augmented_part_id=ap.id,
+                attachment_point_name_id=apn.id,
+                clamp_connection_id=clamp.id,
+            )
+            return
         else:
+            # Unable to determine
             pass
-        return
 
     od_mm = _parse_float(ip.ProductODmm)
     od_in = _parse_float(ip.ProductODin)
@@ -206,6 +301,8 @@ async def sync_one(
     if manufacturer is None:
         manufacturer = await manufacturer_crud.create(db, name="Armament", url="")
 
+    uac_range = _parse_uac_diameter_range(ip.UACDiameterRangemm)
+
     ap = AugmentedPart(
         sku=ip.InventoryID,
         description=description,
@@ -214,6 +311,7 @@ async def sync_one(
         scope_model_id=None,
         part_type_id=part_type_id,
         sub_part_type_id=sub_part_type_id,
+        uac_diameter_range_mm=uac_range[0] if uac_range else None,
     )
     db.add(ap)
     await db.flush()
@@ -225,6 +323,7 @@ async def sync_one(
         )
     )
     await _add_attachment_point(db, ap, ip)
+    await _add_uac_clamp_attachment_point(db, ap, ip)
     await db.commit()
     return ap
 
@@ -242,6 +341,137 @@ def _infer_part_type(description: str, part_types: list[PartType]) -> PartType |
     return None
 
 
+async def _archive_orphans(db: AsyncSession, candidate_ap_ids: set[int]) -> int:
+    """Archive any of `candidate_ap_ids` left with zero linked ImportedParts.
+
+    Idempotent: already-archived parts and parts that still have a link are
+    left untouched. Does not commit — the caller commits as part of its own
+    transaction.
+    """
+    archived = 0
+    for ap_id in candidate_ap_ids:
+        result = await db.execute(
+            select(func.count())
+            .select_from(augmented_part_imported_parts)
+            .where(augmented_part_imported_parts.c.augmented_part_id == ap_id)
+        )
+        if result.scalar() == 0:
+            ap = await db.get(AugmentedPart, ap_id)
+            if ap is not None and not ap.archived:
+                ap.archived = True
+                archived += 1
+    return archived
+
+
+async def _detach_and_archive_orphans(
+    db: AsyncSession, imported_part_ids: set[str]
+) -> int:
+    """Detach `imported_part_ids` from any AugmentedPart association and archive
+    AugmentedParts left with zero remaining ImportedPart links as a result.
+
+    Deletes the association rows directly rather than relying on the
+    ImportedPart row's ON DELETE CASCADE, since SQLite (this app's dev/test
+    database) doesn't enforce FK actions by default. Safe to call whether or
+    not the ImportedPart row(s) still exist. Does not commit — the caller
+    commits as part of its own transaction.
+    """
+    if not imported_part_ids:
+        return 0
+
+    result = await db.execute(
+        select(augmented_part_imported_parts.c.augmented_part_id).where(
+            augmented_part_imported_parts.c.imported_part_id.in_(imported_part_ids)
+        )
+    )
+    candidate_ap_ids: set[int] = {row[0] for row in result.all()}
+
+    await db.execute(
+        augmented_part_imported_parts.delete().where(
+            augmented_part_imported_parts.c.imported_part_id.in_(imported_part_ids)
+        )
+    )
+    await db.flush()
+
+    return await _archive_orphans(db, candidate_ap_ids)
+
+
+async def delete_imported_part_and_archive_orphans(
+    db: AsyncSession, imported_part: ImportedPart
+) -> int:
+    """Delete `imported_part` and archive any AugmentedPart left with no
+    remaining ImportedPart links as a result.
+
+    Captures affected AugmentedPart ids before deleting so this is correct
+    regardless of whether the DB enforces the association table's ON DELETE
+    CASCADE. Returns the number of AugmentedParts newly archived.
+    """
+    inventory_id = imported_part.InventoryID
+    result = await db.execute(
+        select(augmented_part_imported_parts.c.augmented_part_id).where(
+            augmented_part_imported_parts.c.imported_part_id == inventory_id
+        )
+    )
+    candidate_ap_ids: set[int] = {row[0] for row in result.all()}
+
+    await db.delete(imported_part)
+    await db.execute(
+        augmented_part_imported_parts.delete().where(
+            augmented_part_imported_parts.c.imported_part_id == inventory_id
+        )
+    )
+    await db.flush()
+
+    archived = await _archive_orphans(db, candidate_ap_ids)
+    await db.commit()
+    return archived
+
+
+async def _refresh_augmented_part(
+    db: AsyncSession, ap: AugmentedPart, ip: ImportedPart
+) -> bool:
+    """Refresh the AugmentedPart fields sync owns (description, colour, UAC
+    diameter range) from the current state of `ip`, and add an "Ocular"
+    and/or "Objective" attachment point if the part doesn't already have one
+    and the current data now supports deriving one.
+
+    Never touches "extra" AugmentedPart fields (part_type_id, sub_part_type_id,
+    scope_model_id, manufacturer_id, sku, archived) and never deletes or
+    replaces an attachment point that already exists. Returns True if
+    anything changed.
+    """
+    description = (ip.Description or "").strip() or ip.InventoryID
+
+    colour_name = (ip.TBXColour or "").strip() or "Unknown"
+    colour = await part_colour_crud.get_by_name(db, colour_name)
+    if colour is None:
+        colour = await part_colour_crud.create(db, name=colour_name)
+
+    uac_range = _parse_uac_diameter_range(ip.UACDiameterRangemm)
+    uac_value = uac_range[0] if uac_range else None
+
+    changes = {}
+    if ap.description != description:
+        changes["description"] = description
+    if ap.colour_id != colour.id:
+        changes["colour_id"] = colour.id
+    if ap.uac_diameter_range_mm != uac_value:
+        changes["uac_diameter_range_mm"] = uac_value
+    if changes:
+        await augmented_part_crud.update(db, ap, changes)
+
+    existing_points = await attachment_point_crud.list_for_augmented_part(db, ap.id)
+    existing_names = {p.attachment_point_name.name for p in existing_points}
+    points_before = len(existing_points)
+
+    if ATTACHMENT_POINT_NAME not in existing_names:
+        await _add_attachment_point(db, ap, ip)
+    if UAC_ATTACHMENT_POINT_NAME not in existing_names:
+        await _add_uac_clamp_attachment_point(db, ap, ip)
+
+    points_after = await attachment_point_crud.list_for_augmented_part(db, ap.id)
+    return bool(changes) or len(points_after) > points_before
+
+
 async def sync(db: AsyncSession) -> AugmentedPartSyncResult:
     # ------------------------------------------------------------------ phase 1
 
@@ -256,59 +486,53 @@ async def sync(db: AsyncSession) -> AugmentedPartSyncResult:
     current_ids: set[str] = {row[0] for row in result.all()}
 
     orphaned_import_ids = all_linked_ids - current_ids
-    deleted = 0
+    archived = 0
 
     if orphaned_import_ids:
-        # Which AugmentedParts are affected?
+        archived = await _detach_and_archive_orphans(db, orphaned_import_ids)
-        result = await db.execute(
-            select(augmented_part_imported_parts.c.augmented_part_id).where(
-                augmented_part_imported_parts.c.imported_part_id.in_(
-                    orphaned_import_ids
-                )
-            )
-        )
-        orphaned_ap_ids: set[int] = {row[0] for row in result.all()}
-
-        # Remove the stale association rows
-        await db.execute(
-            augmented_part_imported_parts.delete().where(
-                augmented_part_imported_parts.c.imported_part_id.in_(
-                    orphaned_import_ids
-                )
-            )
-        )
-        await db.flush()
-
-        # Delete AugmentedParts that now have no remaining associations
-        for ap_id in orphaned_ap_ids:
-            result = await db.execute(
-                select(func.count())
-                .select_from(augmented_part_imported_parts)
-                .where(augmented_part_imported_parts.c.augmented_part_id == ap_id)
-            )
-            if result.scalar() == 0:
-                ap = await db.get(AugmentedPart, ap_id)
-                if ap is not None:
-                    await db.delete(ap)
-                    deleted += 1
-
         await db.commit()
 
     # ------------------------------------------------------------------ phase 2
 
-    # Re-query linked IDs after phase 1 cleanup
+    # Re-query linked IDs after phase 1 cleanup — these are the ImportedParts
+    # already linked to an AugmentedPart from a prior run (not created below).
     result = await db.execute(
         select(augmented_part_imported_parts.c.imported_part_id).distinct()
     )
     now_linked_ids: set[str] = {row[0] for row in result.all()}
     unlinked_ids = current_ids - now_linked_ids
 
+    updated = 0
+
+    if now_linked_ids:
+        result = await db.execute(
+            select(
+                augmented_part_imported_parts.c.augmented_part_id,
+                augmented_part_imported_parts.c.imported_part_id,
+            ).where(
+                augmented_part_imported_parts.c.imported_part_id.in_(now_linked_ids)
+            )
+        )
+        ip_ids_by_ap_id: dict[int, list[str]] = {}
+        for ap_id, ip_id in result.all():
+            ip_ids_by_ap_id.setdefault(ap_id, []).append(ip_id)
+
+        for ap_id, ip_ids in ip_ids_by_ap_id.items():
+            ap = await db.get(AugmentedPart, ap_id)
+            ip = await db.get(ImportedPart, min(ip_ids))
+            if ap is None or ip is None:
+                continue
+            if await _refresh_augmented_part(db, ap, ip):
+                updated += 1
+
+    # ------------------------------------------------------------------ phase 3
+
     created = 0
     skipped = 0
 
     if not unlinked_ids:
         return AugmentedPartSyncResult(
-            created=created, deleted=deleted, skipped=skipped
+            created=created, updated=updated, archived=archived, skipped=skipped
         )
 
     result = await db.execute(
@@ -336,6 +560,8 @@ async def sync(db: AsyncSession) -> AugmentedPartSyncResult:
         if colour is None:
             colour = await part_colour_crud.create(db, name=colour_name)
 
+        uac_range = _parse_uac_diameter_range(ip.UACDiameterRangemm)
+
         ap = AugmentedPart(
             sku=ip.InventoryID,
             description=description,
@@ -344,6 +570,7 @@ async def sync(db: AsyncSession) -> AugmentedPartSyncResult:
             scope_model_id=None,
             part_type_id=part_type.id,
             sub_part_type_id=None,
+            uac_diameter_range_mm=uac_range[0] if uac_range else None,
         )
         db.add(ap)
         await db.flush()
@@ -355,8 +582,11 @@ async def sync(db: AsyncSession) -> AugmentedPartSyncResult:
             )
         )
         await _add_attachment_point(db, ap, ip)
+        await _add_uac_clamp_attachment_point(db, ap, ip)
         created += 1
 
     await db.commit()
 
-    return AugmentedPartSyncResult(created=created, deleted=deleted, skipped=skipped)
+    return AugmentedPartSyncResult(
+        created=created, updated=updated, archived=archived, skipped=skipped
+    )

app/services/auth.py

@@ -1,5 +1,7 @@
 """Token issuance / rotation shared by the JSON API and the HTMX UI."""
 
+from datetime import timedelta
+
 import jwt
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -13,9 +15,16 @@ from app.crud import token as token_crud
 from app.models.user import User
 
 
-async def issue_token_pair(db: AsyncSession, user: User) -> tuple[str, str]:
+async def issue_token_pair(
-    """Create an access + refresh token and persist the refresh token for revocation."""
+    db: AsyncSession, user: User, access_expires_delta: timedelta | None = None
-    access = create_access_token(user.id)
+) -> tuple[str, str]:
+    """Create an access + refresh token and persist the refresh token for revocation.
+
+    ``access_expires_delta`` overrides the access token's default lifetime
+    (``settings.access_token_expire_minutes``) — used by the web login flow to
+    issue a longer-lived session cookie without affecting API bearer tokens.
+    """
+    access = create_access_token(user.id, access_expires_delta)
     refresh, payload = create_refresh_token(user.id)
     await token_crud.store(
         db,

app/services/danger_zone.py

@@ -16,12 +16,9 @@ from app.models.fit import Fit, FitNote
 from app.models.imported_part import ImportedPart
 from app.models.iso_thread import IsoThread
 from app.models.manufacturer import Manufacturer
-from app.models.part_colour import PartColour
-from app.models.part_type import PartType
 from app.models.scope_info import ScopeInfo
 from app.models.scope_model import ScopeModel
 from app.models.static_connection import StaticConnection
-from app.models.sub_part_type import SubPartType
 from app.models.unc_thread import UncThread
 
 # Children before the RESTRICT-protected reference tables they point to.

app/services/fit_matching.py

@@ -76,9 +76,15 @@ def _static_clamp_match(ap_a: AttachmentPoint, ap_b: AttachmentPoint) -> bool:
 
 
 def attachment_points_match(ap_a: AttachmentPoint, ap_b: AttachmentPoint) -> bool:
-    """True if these two attachment points satisfy the fit-matching algorithm."""
+    """True if these two attachment points satisfy the fit-matching algorithm.
-    if ap_a.attachment_point_name_id == ap_b.attachment_point_name_id:
+
-        return False
+    A "Manual" attachment point (all four connections null) always returns
+    False here — it never participates in algorithmic matching, only in
+    fits a user asserts by hand.
+    """
+    # Disabled for now, the attachment_point_names should not be considered for the purposes of matching
+    # if ap_a.attachment_point_name_id == ap_b.attachment_point_name_id:
+    #     return False
     return (
         _iso_match(ap_a, ap_b)
         or _unc_match(ap_a, ap_b)

app/services/jobs.py

@@ -1,11 +1,12 @@
-"""Lightweight in-process tracking for long-running admin operations.
+"""DB-backed tracking for long-running admin operations.
 
-Jobs live in a module-level dict, so this only works correctly for a single
+Jobs are persisted to the ``jobs`` table rather than kept in a module-level
-OS process (the app's current deployment: one uvicorn worker, no multi-process
+dict, so that a status-poll request landing on a *different* worker
-or multi-replica setup — see ``entrypoint.sh`` / ``docker-compose.yml``). If
+process/replica than the one running the job can still see its progress —
-the app is ever scaled to multiple workers/replicas, this needs to move to
+required once the app runs with more than one uvicorn worker or replica
-shared storage (a DB table, Redis) so a poll request landing on a different
+(a module-level dict is process-local and would report "not found" for a job
-process can still see the job.
+started elsewhere, even while that job is still running and writing to the
+shared database).
 """
 
 from __future__ import annotations
@@ -13,62 +14,83 @@ from __future__ import annotations
 import asyncio
 import uuid
 from collections.abc import Awaitable, Callable
-from dataclasses import dataclass, field
+from datetime import UTC, datetime, timedelta
-from datetime import UTC, datetime
 
-_MAX_FINISHED_AGE_SECONDS = 3600
+from sqlalchemy import delete
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.database import AsyncSessionLocal
+from app.models.job import Job
+
+_MAX_FINISHED_AGE = timedelta(hours=1)
 
 
-@dataclass
+async def get(db: AsyncSession, job_id: str) -> Job | None:
-class Job:
+    return await db.get(Job, job_id)
-    id: str
-    kind: str
-    status: str = "running"  # running | done | error
-    message: str = "Working…"
-    result: object | None = None
-    created_at: datetime = field(default_factory=lambda: datetime.now(UTC))
-    finished_at: datetime | None = None
 
 
-_jobs: dict[str, Job] = {}
+async def start(kind: str, run: Callable[[str], Awaitable[None]]) -> Job:
+    """Create a job row, launch ``run(job_id)`` in the background, and return
+    the job immediately.
 
-
+    ``run`` is responsible for calling ``mark_done``/``mark_error`` to record
-def get(job_id: str) -> Job | None:
+    the outcome, including on its own errors. Any exception that escapes
-    return _jobs.get(job_id)
+    anyway is caught here as a last resort so the job doesn't hang forever in
-
+    "running" state.
-
-def _evict_stale() -> None:
-    now = datetime.now(UTC)
-    stale = [
-        job_id
-        for job_id, job in _jobs.items()
-        if job.finished_at
-        and (now - job.finished_at).total_seconds() > _MAX_FINISHED_AGE_SECONDS
-    ]
-    for job_id in stale:
-        del _jobs[job_id]
-
-
-def start(kind: str, run: Callable[[Job], Awaitable[None]]) -> Job:
-    """Create a job, launch ``run(job)`` in the background, and return it immediately.
-
-    ``run`` is responsible for updating ``job.status``/``job.message``/``job.result``
-    to reflect the outcome, including catching its own errors. Any exception that
-    escapes anyway is caught here as a last resort so the job doesn't hang forever
-    in "running" state.
     """
-    _evict_stale()
+    async with AsyncSessionLocal() as db:
-    job = Job(id=uuid.uuid4().hex, kind=kind)
+        await _evict_stale(db)
-    _jobs[job.id] = job
+        job = Job(id=uuid.uuid4().hex, kind=kind, status="running", message="Working…")
+        db.add(job)
+        await db.commit()
 
     async def _runner() -> None:
         try:
-            await run(job)
+            await run(job.id)
         except Exception as exc:
-            job.status = "error"
+            await mark_error(job.id, f"{kind} failed: {exc}")
-            job.message = f"{kind} failed: {exc}"
-        finally:
-            job.finished_at = datetime.now(UTC)
 
     asyncio.create_task(_runner())
     return job
+
+
+async def mark_done(job_id: str, message: str, result: dict | None = None) -> None:
+    await _update(job_id, status="done", message=message, result=result)
+
+
+async def mark_error(job_id: str, message: str) -> None:
+    await _update(job_id, status="error", message=message)
+
+
+async def set_message(job_id: str, message: str) -> None:
+    await _update(job_id, message=message)
+
+
+async def _update(
+    job_id: str,
+    *,
+    status: str | None = None,
+    message: str | None = None,
+    result: dict | None = None,
+) -> None:
+    async with AsyncSessionLocal() as db:
+        job = await db.get(Job, job_id)
+        if job is None:
+            return
+        if status is not None:
+            job.status = status
+            if status in ("done", "error"):
+                job.finished_at = datetime.now(UTC)
+        if message is not None:
+            job.message = message
+        if result is not None:
+            job.result = result
+        await db.commit()
+
+
+async def _evict_stale(db: AsyncSession) -> None:
+    cutoff = datetime.now(UTC) - _MAX_FINISHED_AGE
+    await db.execute(
+        delete(Job).where(Job.finished_at.is_not(None), Job.finished_at < cutoff)
+    )
+    await db.commit()

app/services/ldap.py

@@ -7,7 +7,6 @@ successful profile is provisioned locally on first sign-in.
 """
 
 import logging
-
 from dataclasses import dataclass
 
 from fastapi.concurrency import run_in_threadpool
@@ -43,7 +42,7 @@ def _bind_and_fetch(username: str, password: str) -> LdapIdentity | None:
     )
     try:
         conn = ldap3.Connection(server, user=user_dn, password=password, auto_bind=True)
-    except LDAPException as e:
+    except LDAPException:
         logging.exception("Failed to log into LDAP for user %s", user_dn)
         # Wrong credentials, unreachable server, or a refused bind.
         return None

app/services/scope_guide.py

@@ -29,13 +29,21 @@ async def build(
     scope_model_id: int | None = None,
     sub_part_type_id: int | None = None,
     fits_part_type_id: int | None = None,
+    only_exact: bool = False,
 ) -> dict:
     """Return the context for ``scopes.html``.
 
     The scope rows are narrowed by the scope-attribute filters (``description``
-    matches the scope's description; the ``*_id`` filters match exactly).
+    matches either the scope's description or its SKU/product ID; the ``*_id``
-    ``fits_part_type_id`` keeps only scopes that have at least one (non-``none``)
+    filters match exactly). ``fits_part_type_id`` keeps only scopes that have
-    fit for that part type.
+    at least one (non-``none``)
+    fit for that part type. Callers that paginate should slice ``rows``
+    themselves — this always returns the full filtered set, since
+    ``fits_part_type_id`` is a post-filter that can't be pushed into the DB query.
+
+    ``only_exact`` drops ``possible`` fits entirely, keeping only user-confirmed
+    ``exact`` ones — used for anonymous visitors, who shouldn't see unconfirmed
+    fit candidates.
 
     Shape::
 
@@ -77,6 +85,8 @@ async def build(
     fits = await fit_crud.list_for_parts(
         db, list(scope_ids), exclude_label=FitLabel.NONE
     )
+    if only_exact:
+        fits = [f for f in fits if f.label == FitLabel.EXACT]
 
     # Resolve the "other" (non-scope) part on each fit in a single batched query.
     other_ids: set[int] = set()
@@ -110,6 +120,8 @@ async def build(
         other = other_parts.get(other_id)
         if other is None or other.part_type_id == scope_type.id:
             continue  # scope-to-scope fits have no column
+        if other.archived:
+            continue  # archived parts don't show up as compatible accessories
         by_type = cell_map[scope_id].setdefault(other.part_type_id, {})
         existing = by_type.get(other.id)
         label = fit.label.value

app/services/scope_import.py

@@ -15,7 +15,6 @@ sub_part_type                       → SubPartType (get-or-create under "Scope"
 product_number                      → AugmentedPart.sku  (also the upsert / fit-lookup key)
 magnification_min / _max            → ScopeInfo
 objective_lens_diameter_mm          → ScopeInfo (descriptive only, no attachment point)
-objective_thread_pitch              → ScopeInfo
 ocular_outer_diameter_mm            → StaticConnection + AttachmentPoint "Ocular"
 objective_thread                    → ISO/UNC thread + AttachmentPoint "Objective"
 ocular_fit                          → Fit: scope's Ocular AP ↔ referenced part's first AP
@@ -26,8 +25,15 @@ and colour defaults to an "Unknown" PartColour, since the sheet carries neither.
 
 Fits are created with label POSSIBLE. The referenced part is looked up by
 ``product_number`` and linked to its first attachment point (chosen answer:
-"sole/first AP"). Both directions are resolved in a second pass so a fit between
+"sole/first AP"). If the referenced part has no attachment points at all, one
-two scopes in the same spreadsheet resolves regardless of row order.
+is created for it that mirrors the scope's attachment point's connection, so
+the fit has something valid to attach to. If the scope itself has no Ocular/
+Objective attachment point (no ocular_outer_diameter_mm/objective_thread, or
+an unparseable one), a Manual attachment point — no connection details, never
+picked up by the fit-matching algorithm — is created on the scope under the
+appropriate label so the fit still has somewhere to attach. Both directions
+are resolved in a second pass so a fit between two scopes in the same
+spreadsheet resolves regardless of row order.
 
 Bad rows (missing key, unknown fit target, unparseable thread) are skipped and
 reported per-row; good rows are committed as they go.
@@ -75,7 +81,6 @@ EXPECTED_COLUMNS = [
     "url",
     "ocular_outer_diameter_mm",
     "ocular_fit",
-    "objective_thread_pitch",
     "objective_thread",
     "objective_fit",
 ]
@@ -140,11 +145,15 @@ def parse_workbook(data: bytes) -> list[dict]:
         wb.close()
 
 
-async def _static_ap(db: AsyncSession, *, augmented_part_id: int, label: str, od_mm: float):
+async def _static_ap(
+    db: AsyncSession, *, augmented_part_id: int, label: str, od_mm: float
+):
     """Create an attachment point carrying a StaticConnection for ``od_mm``."""
     sc = await static_connection_crud.get_by_od_mm(db, od_mm)
     if sc is None:
-        sc = await static_connection_crud.create(db, od_mm=od_mm, od_in=od_mm / MM_PER_INCH)
+        sc = await static_connection_crud.create(
+            db, od_mm=od_mm, od_in=od_mm / MM_PER_INCH
+        )
     apn = await apn_crud.get_by_name(db, label)
     if apn is None:
         apn = await apn_crud.create(db, name=label)
@@ -156,7 +165,9 @@ async def _static_ap(db: AsyncSession, *, augmented_part_id: int, label: str, od
     )
 
 
-async def _thread_ap(db: AsyncSession, *, augmented_part_id: int, label: str, spec: str):
+async def _thread_ap(
+    db: AsyncSession, *, augmented_part_id: int, label: str, spec: str
+):
     """Create an attachment point for a parsed ISO/UNC thread, or None."""
     parsed = _parse_thread_attribute(spec)
     if parsed is None:
@@ -188,6 +199,54 @@ async def _thread_ap(db: AsyncSession, *, augmented_part_id: int, label: str, sp
     )
 
 
+async def _mirrored_ap(db: AsyncSession, *, augmented_part_id: int, scope_ap):
+    """Create an attachment point mirroring ``scope_ap``'s connection.
+
+    Used when the referenced part has no attachment point that already fits
+    the scope, so the explicit ocular_fit/objective_fit link has something
+    valid to attach to.
+    """
+    return await attachment_point_crud.create(
+        db,
+        augmented_part_id=augmented_part_id,
+        attachment_point_name_id=scope_ap.attachment_point_name_id,
+        iso_thread_id=scope_ap.iso_thread_id,
+        unc_thread_id=scope_ap.unc_thread_id,
+        clamp_connection_id=scope_ap.clamp_connection_id,
+        static_connection_id=scope_ap.static_connection_id,
+    )
+
+
+async def _ensure_manual_scope_ap(
+    db: AsyncSession,
+    *,
+    scope_ap,
+    augmented_part_id: int,
+    label: str,
+    messages: list[str],
+):
+    """Return ``scope_ap``, creating a Manual attachment point named ``label``
+    on the scope if it's None.
+
+    Used so an ocular_fit/objective_fit reference still has something to link
+    from even when the scope has no ocular_outer_diameter_mm/objective_thread
+    of its own.
+    """
+    if scope_ap is not None:
+        return scope_ap
+    apn = await apn_crud.get_by_name(db, label)
+    if apn is None:
+        apn = await apn_crud.create(db, name=label)
+    messages.append(
+        f"scope has no {label.lower()} attachment point; created a manual one to record the fit"
+    )
+    return await attachment_point_crud.create(
+        db,
+        augmented_part_id=augmented_part_id,
+        attachment_point_name_id=apn.id,
+    )
+
+
 async def _link_fit(
     db: AsyncSession,
     *,
@@ -197,12 +256,13 @@ async def _link_fit(
     scope_part_id: int,
     messages: list[str],
 ) -> None:
-    """Create a POSSIBLE fit from the scope's AP to the referenced part's first AP."""
+    """Create a POSSIBLE fit from the scope's AP to the referenced part's first AP.
-    if scope_ap is None:
+
-        messages.append(
+    ``scope_ap`` must already exist — callers ensure this via
-            f"{scope_role}_fit '{target_sku}' skipped: scope has no {scope_role} attachment point"
+    ``_ensure_manual_scope_ap`` before calling. If the referenced part has no
-        )
+    attachment points at all, one is created mirroring the scope's attachment
-        return
+    point's connection.
+    """
     target = await augmented_part_crud.get_by_sku(db, target_sku)
     if target is None:
         messages.append(f"{scope_role}_fit references unknown product '{target_sku}'")
@@ -211,15 +271,21 @@ async def _link_fit(
         messages.append(f"{scope_role}_fit '{target_sku}' skipped: self-reference")
         return
     target_aps = await attachment_point_crud.list_for_augmented_part(db, target.id)
-    if not target_aps:
+    if target_aps:
+        target_ap = target_aps[0]
+    else:
+        target_ap = await _mirrored_ap(
+            db, augmented_part_id=target.id, scope_ap=scope_ap
+        )
         messages.append(
-            f"{scope_role}_fit '{target_sku}' skipped: referenced part has no attachment points"
+            f"{scope_role}_fit '{target_sku}': referenced part had no attachment points, "
+            "created one matching the scope's attachment point"
         )
-        return
-    target_ap = target_aps[0]
     existing = await fit_crud.get_by_attachment_points(db, scope_ap, target_ap)
     if existing is None:
-        await fit_crud.create(db, ap_a=scope_ap, ap_b=target_ap, label=FitLabel.POSSIBLE)
+        await fit_crud.create(
+            db, ap_a=scope_ap, ap_b=target_ap, label=FitLabel.POSSIBLE
+        )
 
 
 async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult:
@@ -241,7 +307,21 @@ async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult
         # +2: 1-based, and the header occupies row 1.
         row_num = offset + 2
         model_suffix = _text(row.get("model_suffix"))
-        default_product_number = f"{_text(row.get('model'))} {row.get('magnification_min')}-{row.get('magnification_max')}x{row.get('objective_lens_diameter_mm')} {row.get('model_suffix')}".strip()
+        model = _text(row.get("model"))
+        magnification_min = _num(row.get("magnification_min"))
+        magnification_max = _num(row.get("magnification_max"))
+        objective_lens_diameter_mm = _num(
+            row.get("objective_lens_diameter_mm")
+        ) or _num(row.get("objective_lens"))
+
+        # Construct the model number
+        default_product_number = model
+        if magnification_min:
+            default_product_number += f" {magnification_min}-{magnification_max}"
+        if objective_lens_diameter_mm:
+            default_product_number += f"x{objective_lens_diameter_mm}"
+        if model_suffix:
+            default_product_number += f" {model_suffix}"
         product_number = _text(row.get("product_number")) or default_product_number
         result = ScopeImportRowResult(
             row=row_num, product_number=product_number, status="skipped", messages=[]
@@ -263,7 +343,9 @@ async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult
 
             manufacturer = await manufacturer_crud.get_by_name(db, manufacturer_name)
             if manufacturer is None:
-                manufacturer = await manufacturer_crud.create(db, name=manufacturer_name, url="")
+                manufacturer = await manufacturer_crud.create(
+                    db, name=manufacturer_name, url=""
+                )
 
             model_name = _text(row.get("model"))
             url = _text(row.get("url"))
@@ -321,12 +403,13 @@ async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult
                 magnification_max=_num(row.get("magnification_max")),
                 model_suffix=model_suffix,
                 objective_lens_diameter_mm=_num(row.get("objective_lens_diameter_mm")),
-                objective_thread_pitch=_text(row.get("objective_thread_pitch")),
             )
 
             # Rebuild attachment points from scratch so re-imports stay idempotent
             # (cascades delete any fits that referenced the old points).
-            for old_ap in await attachment_point_crud.list_for_augmented_part(db, part.id):
+            for old_ap in await attachment_point_crud.list_for_augmented_part(
+                db, part.id
+            ):
                 await attachment_point_crud.delete(db, old_ap)
 
             ocular_ap = None
@@ -368,24 +451,50 @@ async def import_scopes(db: AsyncSession, rows: list[dict]) -> ScopeImportResult
         try:
             ocular_fit = _text(row.get("ocular_fit"))
             if ocular_fit:
-                await _link_fit(
+                ocular_ap = await _ensure_manual_scope_ap(
                     db,
                     scope_ap=ocular_ap,
-                    scope_role=OCULAR_LABEL.lower(),
+                    augmented_part_id=part_id,
-                    target_sku=ocular_fit,
+                    label=OCULAR_LABEL,
-                    scope_part_id=part_id,
                     messages=result.messages,
                 )
+                fits = ocular_fit
+                if "/" in fits:
+                    fits = [x.strip() for x in fits.split("/")]
+                else:
+                    fits = [fits]
+                for ocular_fit in fits:
+                    await _link_fit(
+                        db,
+                        scope_ap=ocular_ap,
+                        scope_role=OCULAR_LABEL.lower(),
+                        target_sku=ocular_fit,
+                        scope_part_id=part_id,
+                        messages=result.messages,
+                    )
             objective_fit = _text(row.get("objective_fit"))
             if objective_fit:
-                await _link_fit(
+                objective_ap = await _ensure_manual_scope_ap(
                     db,
                     scope_ap=objective_ap,
-                    scope_role=OBJECTIVE_LABEL.lower(),
+                    augmented_part_id=part_id,
-                    target_sku=objective_fit,
+                    label=OBJECTIVE_LABEL,
-                    scope_part_id=part_id,
                     messages=result.messages,
                 )
+                fits = objective_fit
+                if "/" in fits:
+                    fits = [x.strip() for x in fits.split("/")]
+                else:
+                    fits = [fits]
+                for objective_fit in fits:
+                    await _link_fit(
+                        db,
+                        scope_ap=objective_ap,
+                        scope_role=OBJECTIVE_LABEL.lower(),
+                        target_sku=objective_fit,
+                        scope_part_id=part_id,
+                        messages=result.messages,
+                    )
         except Exception as exc:  # noqa: BLE001
             result.messages.append(f"fit resolution error: {exc}")
 

app/static/css/style.css

@@ -486,43 +486,89 @@ textarea:focus {
   margin-bottom: 0.5rem;
 }
 
-.ap-item-name { font-weight: 500; flex: 0 0 auto; }
+.ap-item-name {
-.ap-item-type { color: var(--muted); flex: 0 0 auto; font-size: 0.8rem; }
+  font-weight: 500;
-.ap-item-conn { flex: 1; }
+  flex: 0 0 auto;
-.ap-item .row-actions { margin-left: auto; }
-
-.fit-item {
-  padding: 0.5rem 0;
-  border-bottom: 1px solid var(--border);
-  font-size: 0.9rem;
 }
 
-.fit-item:last-of-type { border-bottom: none; }
+.ap-item-type {
-
+  color: var(--muted);
-.fit-item-main {
+  flex: 0 0 auto;
-  display: flex;
+  font-size: 0.8rem;
-  align-items: center;
-  gap: 0.5rem;
-  flex-wrap: wrap;
-  margin-bottom: 0.3rem;
 }
 
-.fit-item-arrow { color: var(--muted); }
+.ap-item-conn {
+  flex: 1;
+}
+
+.ap-item .row-actions {
+  margin-left: auto;
+}
+
+.fit-item-arrow {
+  color: var(--muted);
+  text-align: center;
+}
 
 .fit-badge {
-  font-size: 0.7rem;
   text-transform: uppercase;
-  letter-spacing: 0.03em;
-  padding: 0.1rem 0.5rem;
-  border-radius: 999px;
-  font-weight: 600;
 }
 
-.fit-badge-possible { background: var(--surface-2); color: var(--muted); }
+/* Fits table on the augmented part detail page */
-.fit-badge-exact { background: #16a34a26; color: #16a34a; }
+.fit-table select,
-.fit-badge-none { background: #dc262626; color: #dc2626; }
+.fit-table input[type="text"] {
+  min-width: 8rem;
+}
 
-.fit-notes { margin-top: 0.4rem; padding-left: 0.25rem; }
+.fit-table .fit-add-row {
+  background: var(--surface-2);
+}
+
+.fit-table .fit-add-row td {
+  vertical-align: top;
+}
+
+.fit-notes-cell {
+  min-width: 14rem;
+}
+
+.fit-badge-possible {
+  background: var(--surface-2);
+  color: var(--muted);
+}
+
+.fit-badge-exact {
+  background: #16a34a26;
+  color: #16a34a;
+}
+
+.fit-badge-none {
+  background: #dc262626;
+  color: #dc2626;
+}
+
+
+
+.fit-badge-possible a {
+  background: var(--surface-2);
+  color: var(--muted);
+}
+
+.fit-badge-exact a {
+  background: #16a34a26;
+  color: #16a34a;
+}
+
+.fit-badge-none a {
+  background: #dc262626;
+  color: #dc2626;
+}
+
+
+.fit-notes {
+  margin-top: 0.4rem;
+  padding-left: 0.25rem;
+}
 
 /* Scope guide: stacked matching-part entries within a fit column cell. */
 .fit-cell-item {
@@ -532,14 +578,33 @@ textarea:focus {
   font-size: 0.85rem;
   white-space: nowrap;
 }
-.fit-cell-item + .fit-cell-item { margin-top: 0.3rem; }
 
-.fit-note { font-size: 0.85rem; margin-bottom: 0.3rem; }
+.fit-cell-item+.fit-cell-item {
-.fit-note-meta { color: var(--muted); font-size: 0.75rem; }
+  margin-top: 0.3rem;
-.fit-note-body { margin: 0.1rem 0 0; }
+}
 
-.fit-note-form { margin-top: 0.3rem; }
+.fit-note {
-.fit-note-form input[type="text"] { flex: 1; min-width: 12rem; }
+  font-size: 0.85rem;
+  margin-bottom: 0.3rem;
+}
+
+.fit-note-meta {
+  color: var(--muted);
+  font-size: 0.75rem;
+}
+
+.fit-note-body {
+  margin: 0.1rem 0 0;
+}
+
+.fit-note-form {
+  margin-top: 0.3rem;
+}
+
+.fit-note-form input[type="text"] {
+  flex: 1;
+  min-width: 12rem;
+}
 
 /* Pagination */
 .pagination {
@@ -567,6 +632,18 @@ textarea:focus {
   margin-bottom: 0.75rem;
 }
 
+/* Bulk actions (e.g. delete-selected above a checkbox table) */
+.bulk-actions {
+  margin-bottom: 0.75rem;
+}
+
+.dashboard-sync-actions {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5rem;
+  margin-top: 0.75rem;
+}
+
 .filter-bar form {
   display: flex;
   flex-wrap: wrap;
@@ -665,7 +742,9 @@ textarea:focus {
   gap: 0.4rem;
 }
 
-.local-login-panel summary::-webkit-details-marker { display: none; }
+.local-login-panel summary::-webkit-details-marker {
+  display: none;
+}
 
 .local-login-panel summary::before {
   content: '›';

app/templates/_dashboard_sync_card.html

@@ -0,0 +1,32 @@
+<div id="dashboard-sync-card" class="card">
+  <h2>Data sync</h2>
+  <dl class="kv">
+    <dt>Scopes</dt>
+    <dd>{{ scope_count }}</dd>
+    <dt>Imported parts skipped</dt>
+    <dd>{% if can_sync_augmented_parts %}<a href="/admin/augmented-parts/skipped">{{ skipped_count }}</a>{% else %}{{ skipped_count }}{% endif %}</dd>
+  </dl>
+
+  {% if status_message %}<p class="muted">✅ {{ status_message }}</p>{% endif %}
+  {% if status_error %}<p class="muted">⚠️ {{ status_error }}</p>{% endif %}
+
+  {% if can_refresh_odata or can_sync_augmented_parts or can_recompute_fits %}
+  <div class="dashboard-sync-actions">
+    {% if can_refresh_odata %}
+    <form hx-post="/dashboard/refresh-odata" hx-target="#dashboard-sync-card" hx-swap="outerHTML">
+      <button type="submit" class="btn btn-primary">Refresh from OData</button>
+    </form>
+    {% endif %}
+    {% if can_sync_augmented_parts %}
+    <form hx-post="/dashboard/sync-augmented-parts" hx-target="#dashboard-sync-card" hx-swap="outerHTML">
+      <button type="submit" class="btn btn-primary">Sync augmented parts</button>
+    </form>
+    {% endif %}
+    {% if can_recompute_fits %}
+    <form hx-post="/dashboard/recompute-fits" hx-target="#dashboard-sync-card" hx-swap="outerHTML">
+      <button type="submit" class="btn btn-primary">Recompute possible fits</button>
+    </form>
+    {% endif %}
+  </div>
+  {% endif %}
+</div>

app/templates/_nav.html

@@ -1,11 +1,12 @@
-{% set su = user.is_superuser %}
+{% set su = user.is_superuser if user else False %}
-{% set p = user.permissions %}
+{% set p = user.permissions if user else [] %}
 {% 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 or "attachment_points:read" in p %}
 {% set can_parts = can_connections or can_labels or can_database %}
-{% set can_scopes = su or ("augmented_parts:read" in p and "fits:read" in p) %}
+{# /scopes is public, so anonymous visitors see the link too; logged-in users still need the read perms. #}
+{% set can_scopes = (not user) or su or ("augmented_parts:read" in p and "fits:read" in p) %}
 
 {# ── SVG icon sprite ───────────────────────────────────────────────────────── #}
 <svg xmlns="http://www.w3.org/2000/svg" style="display:none">
@@ -232,8 +233,12 @@
 
     <a href="/docs" target="_blank">{{ icon("book-open") }} API docs</a>
   </nav>
+  {% if user %}
   <form method="post" action="/logout" class="logout">
     <span class="muted">{{ user.email }}</span>
     <button type="submit" class="btn btn-ghost">Sign out</button>
   </form>
+  {% else %}
+  <a href="/login" class="btn btn-ghost">Sign in</a>
+  {% endif %}
 </header>

app/templates/_scopes_table_card.html

@@ -18,12 +18,14 @@
   {%- endif -%}
 {%- endmacro -%}
 <div id="scopes-table-card" class="card" style="overflow-x:auto">
+  {% include "admin/_pagination.html" %}
   <table class="table sortable">
     <thead>
       <tr>
+        {% if can_write_scopes %}
+          <th data-sort-off><input type="checkbox" id="scopes-select-all" title="Select all"></th>
+        {% endif %}
         <th>Scope</th>
-        <th>Manufacturer</th>
-        <th>Model</th>
         <th>Type</th>
         <th>Magnification</th>
         <th>Objective thread</th>
@@ -36,30 +38,30 @@
       {% for row in rows %}
         {% set scope = row.scope %}
         {% set info = row.info %}
-        <tr>
+        <tr id="scope-row-{{ scope.id }}">
+          {% if can_write_scopes %}
+            <td><input type="checkbox" name="scope_ids" value="{{ scope.id }}"></td>
+          {% endif %}
           <td>
             <strong><a href="/admin/augmented-parts/{{ scope.id }}">{{ scope.description }}</a></strong>
             {% if scope.sku %}<br><span class="muted">{{ scope.sku }}</span>{% endif %}
           </td>
-          <td>{{ scope.manufacturer.name if scope.manufacturer else "—" }}</td>
-          <td>{{ scope.scope_model.name if scope.scope_model else "—" }}</td>
           <td>{{ scope.sub_part_type.name if scope.sub_part_type else "—" }}</td>
           <td>{{ magnification(info) }}</td>
           <td>
             {% if row.objective_attachment_point %}
-              <code>{{ connection_spec(row.objective_attachment_point) }}</code>
+              {{ connection_spec(row.objective_attachment_point) }}
-            {% elif info and info.objective_thread_pitch %}
-              {{ info.objective_thread_pitch }}
             {% else %}<span class="muted">—</span>{% endif %}
           </td>
           {% for ct in column_types %}
             {% set entries = row.cells.get(ct.id) %}
             <td>
               {% if entries %}
-                {% for e in entries %}
+              {% for e in entries %}
                   <div class="fit-cell-item">
-                    <span class="fit-badge fit-badge-{{ e.label }}">{{ e.label | capitalize }}</span>
+                    <span class="fit-badge fit-badge-{{ e.label }}">
-                    <a href="/admin/augmented-parts/{{ e.part.id }}">{{ e.part.description | truncate(48) }}</a>
+                      <a href="/admin/augmented-parts/{{ e.part.id }}" title="{{ e.part.description | truncate(48) }}">{{ e.part.sku }}</a>
+                    </span>
                   </div>
                 {% endfor %}
               {% else %}
@@ -70,7 +72,7 @@
         </tr>
       {% else %}
         <tr>
-          <td colspan="{{ 6 + column_types | length }}" class="muted">
+          <td colspan="{{ 6 + column_types | length + (1 if can_write_scopes else 0) }}" class="muted">
             No scopes match your search.
           </td>
         </tr>

app/templates/admin/_attachment_point_connection_select.html

@@ -48,4 +48,6 @@
     {% endfor %}
   </select>
 </label>
+{% elif connection_type == "manual" %}
+<p>No connection details — fits for this attachment point must be asserted manually.</p>
 {% endif %}

app/templates/admin/_attachment_point_row.html

@@ -15,7 +15,7 @@
   {% set conn_type = "Static Connection" %}
   {% set conn_label = ap.static_connection.od_mm ~ " mm OD" %}
 {% else %}
-  {% set conn_type = "—" %}
+  {% set conn_type = "Manual" %}
   {% set conn_label = "—" %}
 {% endif %}
 <tr id="attachment-point-{{ ap.id }}">

app/templates/admin/_attachment_point_row_edit.html

@@ -2,7 +2,7 @@
 {% 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 %}
+{% else %}{% set current_type = "manual" %}{% endif %}
 <tr id="attachment-point-{{ ap.id }}">
   <td colspan="6">
     <form hx-post="/admin/attachment-points/{{ ap.id }}"
@@ -41,6 +41,7 @@
           <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>
+          <option value="manual" {% if current_type == "manual" %}selected{% endif %}>Manual</option>
         </select>
       </label>
       {# Render the current connection select pre-filled #}

app/templates/admin/_augmented_part_ap_row.html

@@ -15,7 +15,7 @@
   {% set conn_type = "Static" %}
   {% set conn_label = apoint.static_connection.od_mm ~ " mm OD" %}
 {% else %}
-  {% set conn_type = "—" %}
+  {% set conn_type = "Manual" %}
   {% set conn_label = "—" %}
 {% endif %}
 <div id="augmented-part-ap-{{ apoint.id }}" class="ap-item">

app/templates/admin/_augmented_part_ap_row_edit.html

@@ -2,7 +2,7 @@
 {% elif apoint.unc_thread_id %}{% set current_type = "unc_thread" %}
 {% elif apoint.clamp_connection_id %}{% set current_type = "clamp_connection" %}
 {% elif apoint.static_connection_id %}{% set current_type = "static_connection" %}
-{% else %}{% set current_type = "" %}{% endif %}
+{% else %}{% set current_type = "manual" %}{% endif %}
 {# _attachment_point_connection_select.html expects `ap` for pre-selection #}
 {% set ap = apoint %}
 {% set connection_type = current_type %}
@@ -29,6 +29,7 @@
         <option value="unc_thread" {{ "selected" if current_type == "unc_thread" }}>UNC Thread</option>
         <option value="clamp_connection" {{ "selected" if current_type == "clamp_connection" }}>Clamp Connection</option>
         <option value="static_connection" {{ "selected" if current_type == "static_connection" }}>Static Connection</option>
+        <option value="manual" {{ "selected" if current_type == "manual" }}>Manual</option>
       </select>
     </label>
     <div id="edit-ap-{{ apoint.id }}-connection-options">

app/templates/admin/_augmented_part_attachment_points.html

@@ -31,6 +31,7 @@
         <option value="unc_thread">UNC Thread</option>
         <option value="clamp_connection">Clamp Connection</option>
         <option value="static_connection">Static Connection</option>
+        <option value="manual">Manual</option>
       </select>
     </label>
     <div id="ap-{{ augmented_part_id }}-add-connection-options"></div>

app/templates/admin/_augmented_part_fit_row.html

@@ -8,46 +8,22 @@
   {%- elif ap.static_connection -%}
     Static {{ ap.static_connection.od_mm }} mm OD
   {%- else -%}
-    —
+    Manual
   {%- endif -%}
 {%- endmacro %}
 
-<div id="fit-{{ fit.id }}" class="fit-item">
+<tr id="fit-{{ fit.id }}" class="fit-row">
-  <div class="fit-item-main">
+  <td><span class="fit-badge fit-badge-{{ fit.label.value }}">{{ fit.label.value | capitalize }}</span></td>
-    <span class="fit-badge fit-badge-{{ fit.label.value }}">{{ fit.label.value | capitalize }}</span>
+  <td>
-    <span class="fit-item-side"><strong>{{ own_ap.attachment_point_name.name }}</strong> ({{ conn_desc(own_ap) }})</span>
+    <strong>{{ own_ap.attachment_point_name.name }}</strong>
-    <span class="fit-item-arrow">↔</span>
+    <div class="muted" style="font-size:0.8rem">{{ conn_desc(own_ap) }}</div>
-    <span class="fit-item-side">{{ other_part.description if other_part else "Unknown part" }} — <strong>{{ other_ap.attachment_point_name.name }}</strong> ({{ conn_desc(other_ap) }})</span>
+  </td>
-  </div>
+  <td class="fit-item-arrow">↔</td>
-  {% if can_write %}
+  <td>
-  <div class="row-actions">
+    <a href="/admin/augmented-parts/{{ other_part.id }}" title="{{ other_part.description }}">{{ other_part.sku or other_part.description }}</a>
-    {% if fit.label.value != "exact" %}
+    <div class="muted" style="font-size:0.8rem">{{ other_part.part_type.name }}</div>
-      <button class="btn btn-ghost"
+  </td>
-              hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits/{{ fit.id }}/label"
+  <td class="fit-notes-cell">
-              hx-vals='{"label": "exact"}'
-              hx-target="#fit-{{ fit.id }}" hx-swap="outerHTML">Mark Exact</button>
-    {% endif %}
-    {% if fit.label.value != "possible" %}
-      <button class="btn btn-ghost"
-              hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits/{{ fit.id }}/label"
-              hx-vals='{"label": "possible"}'
-              hx-target="#fit-{{ fit.id }}" hx-swap="outerHTML">Mark Possible</button>
-    {% endif %}
-    {% if fit.label.value != "none" %}
-      <button class="btn btn-ghost"
-              hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits/{{ fit.id }}/label"
-              hx-vals='{"label": "none"}'
-              hx-target="#fit-{{ fit.id }}" hx-swap="outerHTML">Mark Impossible</button>
-    {% endif %}
-    <button class="btn btn-danger"
-            hx-delete="/admin/augmented-parts/{{ augmented_part_id }}/fits/{{ fit.id }}"
-            hx-target="#ap-{{ augmented_part_id }}-fits"
-            hx-swap="outerHTML"
-            hx-confirm="Delete this fit?">Delete</button>
-  </div>
-  {% endif %}
-
-  <div class="fit-notes">
     {% for note in fit.notes %}
       <div class="fit-note">
         <span class="fit-note-meta">{{ note.username }} · {{ note.created_at.strftime("%Y-%m-%d %H:%M") }}</span>
@@ -59,8 +35,37 @@
           hx-target="#fit-{{ fit.id }}" hx-swap="outerHTML"
           class="inline-edit fit-note-form">
       <input type="text" name="body" placeholder="Add a note…" required>
-      <button type="submit" class="btn btn-ghost">Add note</button>
+      <button type="submit" class="btn btn-ghost btn-sm">Add note</button>
     </form>
     {% endif %}
-  </div>
+  </td>
-</div>
+  {% if can_write %}
+  <td>
+    <div class="row-actions">
+      {% if fit.label.value != "exact" %}
+        <button class="btn btn-ghost btn-sm"
+                hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits/{{ fit.id }}/label"
+                hx-vals='{"label": "exact"}'
+                hx-target="#fit-{{ fit.id }}" hx-swap="outerHTML">Mark Exact</button>
+      {% endif %}
+      {% if fit.label.value != "possible" %}
+        <button class="btn btn-ghost btn-sm"
+                hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits/{{ fit.id }}/label"
+                hx-vals='{"label": "possible"}'
+                hx-target="#fit-{{ fit.id }}" hx-swap="outerHTML">Mark Possible</button>
+      {% endif %}
+      {% if fit.label.value != "none" %}
+        <button class="btn btn-ghost btn-sm"
+                hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits/{{ fit.id }}/label"
+                hx-vals='{"label": "none"}'
+                hx-target="#fit-{{ fit.id }}" hx-swap="outerHTML">Mark Impossible</button>
+      {% endif %}
+      <button class="btn btn-danger btn-sm"
+              hx-delete="/admin/augmented-parts/{{ augmented_part_id }}/fits/{{ fit.id }}"
+              hx-target="#ap-{{ augmented_part_id }}-fits"
+              hx-swap="outerHTML"
+              hx-confirm="Delete this fit?">Delete</button>
+    </div>
+  </td>
+  {% endif %}
+</tr>

app/templates/admin/_augmented_part_fits.html

@@ -4,13 +4,77 @@
   {% if message %}<p class="alert alert-success">{{ message }}</p>{% endif %}
   {% if error %}<p class="alert alert-error">{{ error }}</p>{% endif %}
 
-  {% for view in fit_views %}
+  {% set add_form_id = "ap-" ~ augmented_part_id ~ "-fit-add-form" %}
-    {% with fit=view.fit, own_ap=view.own_ap, other_ap=view.other_ap, other_part=view.other_part %}
+  {% if can_write %}
-      {% include "admin/_augmented_part_fit_row.html" %}
+  <form id="{{ add_form_id }}"
-    {% endwith %}
+        hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits"
-  {% else %}
+        hx-target="#ap-{{ augmented_part_id }}-fits"
-    <p class="muted" style="font-size:0.85rem;margin:0 0 0.5rem">No fits recorded yet.</p>
+        hx-swap="outerHTML"></form>
-  {% endfor %}
+  {% endif %}
+
+  <table class="table fit-table">
+    <thead>
+      <tr>
+        <th>Type</th>
+        <th>This part's point</th>
+        <th></th>
+        <th>Fits with part</th>
+        <th>Notes</th>
+        {% if can_write %}<th></th>{% endif %}
+      </tr>
+    </thead>
+    <tbody>
+      {% if can_write %}
+      <tr class="fit-add-row">
+        <td>
+          <select form="{{ add_form_id }}" name="label">
+            <option value="exact" selected>Exact</option>
+            <option value="possible">Possible</option>
+            <option value="none">None</option>
+          </select>
+        </td>
+        <td>
+          <select form="{{ add_form_id }}" name="own_attachment_point_id" required>
+            <option value="">— select —</option>
+            {% for p in own_points %}
+              <option value="{{ p.id }}">{{ p.attachment_point_name.name }}</option>
+            {% endfor %}
+          </select>
+        </td>
+        <td class="fit-item-arrow">↔</td>
+        <td>
+          <select form="{{ add_form_id }}" name="other_augmented_part_id" required
+                  hx-get="/admin/augmented-parts/{{ augmented_part_id }}/fits/other-points"
+                  hx-target="#ap-{{ augmented_part_id }}-fit-other-points"
+                  hx-trigger="change"
+                  hx-include="[name='other_augmented_part_id']">
+            <option value="">— select —</option>
+            {% for p in other_parts %}
+              <option value="{{ p.id }}">{{ p.description | truncate(40) }}</option>
+            {% endfor %}
+          </select>
+          <div id="ap-{{ augmented_part_id }}-fit-other-points"></div>
+        </td>
+        <td>
+          <input form="{{ add_form_id }}" type="text" name="note" placeholder="Add a note…">
+        </td>
+        <td>
+          <button type="submit" form="{{ add_form_id }}" class="btn btn-primary btn-sm">Add fit</button>
+        </td>
+      </tr>
+      {% endif %}
+
+      {% for view in fit_views %}
+        {% with fit=view.fit, own_ap=view.own_ap, other_ap=view.other_ap, other_part=view.other_part %}
+          {% include "admin/_augmented_part_fit_row.html" %}
+        {% endwith %}
+      {% else %}
+        <tr>
+          <td colspan="{{ 6 if can_write else 5 }}" class="muted" style="font-size:0.85rem">No fits recorded yet.</td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 
   {% if can_write %}
   <div class="row-actions" style="margin:0.5rem 0">
@@ -19,43 +83,5 @@
       <button type="submit" class="btn btn-ghost">Recompute possible fits</button>
     </form>
   </div>
-
-  <form hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits"
-        hx-target="#ap-{{ augmented_part_id }}-fits"
-        hx-swap="outerHTML"
-        class="inline-edit" style="margin-top:0.5rem">
-    <label>This part's point
-      <select name="own_attachment_point_id" required>
-        <option value="">— select —</option>
-        {% for p in own_points %}
-          <option value="{{ p.id }}">{{ p.attachment_point_name.name }}</option>
-        {% endfor %}
-      </select>
-    </label>
-    <label>Fits with part
-      <select name="other_augmented_part_id" required
-              hx-get="/admin/augmented-parts/{{ augmented_part_id }}/fits/other-points"
-              hx-target="#ap-{{ augmented_part_id }}-fit-other-points"
-              hx-trigger="change"
-              hx-include="[name='other_augmented_part_id']">
-        <option value="">— select —</option>
-        {% for p in other_parts %}
-          <option value="{{ p.id }}">{{ p.description | truncate(40) }}</option>
-        {% endfor %}
-      </select>
-    </label>
-    <div id="ap-{{ augmented_part_id }}-fit-other-points"></div>
-    <label>Fit type
-      <select name="label">
-        <option value="exact" selected>Exact</option>
-        <option value="possible">Possible</option>
-        <option value="none">None</option>
-      </select>
-    </label>
-    <label>Note (optional)
-      <input type="text" name="note" placeholder="Add a note…">
-    </label>
-    <button type="submit" class="btn btn-primary">Add fit</button>
-  </form>
   {% endif %}
 </div>

app/templates/admin/_augmented_part_row.html

@@ -7,11 +7,26 @@
   <td>{{ ap.scope_model.name if ap.scope_model else '—' }}</td>
   <td>{{ ap.part_type.name }}</td>
   <td>{{ ap.sub_part_type.name if ap.sub_part_type else '—' }}</td>
+  <td>{% if ap.archived %}<span class="tag">Archived</span>{% else %}—{% endif %}</td>
+  <td>{% if ap.on_website %}<span class="tag">Yes</span>{% else %}—{% endif %}</td>
+  <td>{% if ap.preferred_part %}<span class="tag">Yes</span>{% else %}—{% endif %}</td>
   <td class="row-actions">
     <button class="btn btn-ghost"
             hx-get="/admin/augmented-parts/{{ ap.id }}/edit"
             hx-target="#augmented-part-{{ ap.id }}"
             hx-swap="outerHTML">Edit</button>
+    {% if ap.archived %}
+    <button class="btn btn-ghost"
+            hx-post="/admin/augmented-parts/{{ ap.id }}/unarchive"
+            hx-target="#augmented-part-{{ ap.id }}"
+            hx-swap="outerHTML">Unarchive</button>
+    {% else %}
+    <button class="btn btn-ghost"
+            hx-post="/admin/augmented-parts/{{ ap.id }}/archive"
+            hx-target="#augmented-part-{{ ap.id }}"
+            hx-swap="outerHTML"
+            hx-confirm="Archive {{ ap.sku or ap.description }}?">Archive</button>
+    {% endif %}
     <button class="btn btn-danger"
             hx-delete="/admin/augmented-parts/{{ ap.id }}"
             hx-target="#augmented-part-{{ ap.id }}"

app/templates/admin/_augmented_part_row_edit.html

@@ -1,5 +1,5 @@
 <tr id="augmented-part-{{ ap.id }}">
-  <td colspan="9">
+  <td colspan="12">
     <form id="augmented-part-edit-form-{{ ap.id }}"
           hx-post="/admin/augmented-parts/{{ ap.id }}"
           hx-target="#augmented-part-{{ ap.id }}"
@@ -45,6 +45,8 @@
           {% endfor %}
         </select>
       </label>
+      <label class="check"><input type="checkbox" name="on_website" value="true" {{ "checked" if ap.on_website }}> On website</label>
+      <label class="check"><input type="checkbox" name="preferred_part" value="true" {{ "checked" if ap.preferred_part }}> Preferred part</label>
       <div class="row-actions">
         <button type="submit" class="btn btn-primary">Save</button>
         <button type="button" class="btn btn-ghost"

app/templates/admin/_augmented_parts_table.html

@@ -12,7 +12,7 @@
         hx-swap="outerHTML">
     <input type="hidden" name="sort" value="{{ sort }}">
     <input type="hidden" name="dir" value="{{ dir }}">
-    <input type="text" name="description" placeholder="Filter by description…" value="{{ filter_description or '' }}">
+    <input type="text" name="description" placeholder="Filter by description or SKU…" value="{{ filter_description or '' }}">
     <select name="colour_id">
       <option value="">All colours</option>
       {% for pc in part_colours %}
@@ -43,6 +43,8 @@
         <option value="{{ spt.id }}" {{ "selected" if filter_sub_part_type_id and filter_sub_part_type_id|int == spt.id }}>{{ spt.name }}</option>
       {% endfor %}
     </select>
+    <label><input type="checkbox" name="include_archived" {{ "checked" if include_archived }}> Show archived</label>
+    <label><input type="checkbox" name="on_website" {{ "checked" if on_website }}> On website</label>
   </form>
 </div>
 

app/templates/admin/_augmented_parts_table_card.html

@@ -12,6 +12,9 @@
         {{ sort_th("scope_model", "Model", sort_headers) }}
         {{ sort_th("part_type", "Type", sort_headers) }}
         {{ sort_th("sub_part_type", "Sub Type", sort_headers) }}
+        <th>Archived</th>
+        <th>On Website</th>
+        <th>Preferred</th>
         <th></th>
       </tr>
     </thead>
@@ -19,7 +22,7 @@
       {% for ap in augmented_parts %}
         {% include "admin/_augmented_part_row.html" %}
       {% else %}
-        <tr><td colspan="9" class="muted">No augmented parts recorded.</td></tr>
+        <tr><td colspan="12" class="muted">No augmented parts recorded.</td></tr>
       {% endfor %}
     </tbody>
   </table>

app/templates/admin/_fit_other_points_select.html

@@ -1,12 +1,12 @@
 {% if points %}
-<select name="other_attachment_point_id" required>
+<select name="other_attachment_point_id" form="{{ form_id }}" required>
   <option value="">— select —</option>
   {% for p in points %}
     <option value="{{ p.id }}">{{ p.attachment_point_name.name }}</option>
   {% endfor %}
 </select>
 {% else %}
-<input type="hidden" name="other_attachment_point_id" value="">
+<input type="hidden" name="other_attachment_point_id" value="" form="{{ form_id }}">
 <p class="muted" style="font-size:0.85rem;margin:0">
   This part has no attachment points yet — one matching yours will be created automatically.
 </p>

app/templates/admin/_imported_parts_table.html

@@ -13,7 +13,7 @@
           hx-swap="outerHTML">
       <input type="hidden" name="sort" value="{{ sort }}">
       <input type="hidden" name="dir" value="{{ dir }}">
-      <input type="text" name="description" placeholder="Filter by description…" value="{{ filter_description or '' }}">
+      <input type="text" name="description" placeholder="Filter by description or SKU…" value="{{ filter_description or '' }}">
     </form>
   </div>
 

app/templates/admin/_imported_parts_table_card.html

@@ -12,6 +12,7 @@
         {{ sort_th("ProductODmm", "OD (mm)", sort_headers) }}
         {{ sort_th("ProductODin", "OD (in)", sort_headers) }}
         {{ sort_th("TBXThreadAttribute", "Thread Attribute", sort_headers) }}
+        {{ sort_th("UACDiameterRangemm", "UAC Diameter Range (mm)", sort_headers) }}
       </tr>
     </thead>
     <tbody>
@@ -25,9 +26,10 @@
         <td>{{ p.ProductODmm or '—' }}</td>
         <td>{{ p.ProductODin or '—' }}</td>
         <td>{{ p.TBXThreadAttribute or '—' }}</td>
+        <td>{{ p.UACDiameterRangemm or '—' }}</td>
       </tr>
       {% else %}
-      <tr><td colspan="8" class="muted">No imported parts. Use Refresh to sync from OData.</td></tr>
+      <tr><td colspan="9" class="muted">No imported parts. Use Refresh to sync from OData.</td></tr>
       {% endfor %}
     </tbody>
   </table>

app/templates/admin/_skipped_parts_table.html

@@ -3,6 +3,21 @@
   {% if sync_error %}<p class="alert alert-error">{{ sync_error }}</p>{% endif %}
 
   {% if any_unlinked %}
+  <div class="filter-bar">
+    <form hx-get="/admin/augmented-parts/skipped/filter"
+          hx-target="#skipped-parts-table-card"
+          hx-trigger="input delay:300ms, change"
+          hx-swap="outerHTML">
+      <input type="text" name="description" placeholder="Filter by description…" value="{{ filter_description or '' }}">
+      <select name="colour">
+        <option value="">All colours</option>
+        {% for c in skipped_colours %}
+          <option value="{{ c }}" {{ "selected" if filter_colour == c }}>{{ c }}</option>
+        {% endfor %}
+      </select>
+    </form>
+  </div>
+
   <form hx-post="/admin/augmented-parts/skipped"
         hx-target="#skipped-parts-list"
         hx-swap="outerHTML">
@@ -29,21 +44,6 @@
       </div>
     </div>
 
-    <div class="filter-bar">
-      <form hx-get="/admin/augmented-parts/skipped/filter"
-            hx-target="#skipped-parts-table-card"
-            hx-trigger="input delay:300ms, change"
-            hx-swap="outerHTML">
-        <input type="text" name="description" placeholder="Filter by description…" value="{{ filter_description or '' }}">
-        <select name="colour">
-          <option value="">All colours</option>
-          {% for c in skipped_colours %}
-            <option value="{{ c }}" {{ "selected" if filter_colour == c }}>{{ c }}</option>
-          {% endfor %}
-        </select>
-      </form>
-    </div>
-
     {% include "admin/_skipped_parts_table_card.html" %}
 
   </form>

app/templates/admin/attachment_points.html

@@ -38,6 +38,7 @@
           <option value="unc_thread">UNC Thread</option>
           <option value="clamp_connection">Clamp Connection</option>
           <option value="static_connection">Static Connection</option>
+          <option value="manual">Manual</option>
         </select>
       </label>
       <div id="add-connection-options"></div>

app/templates/admin/augmented_part_detail.html

@@ -6,11 +6,14 @@
 <main class="container">
   <p><a href="/admin/augmented-parts" class="btn btn-ghost">← Augmented Parts</a></p>
 
-  <h1>{{ ap.description }}</h1>
+  <h1> {% if ap.sku %} {{ ap.sku }} {% else %} {{ ap.description }} {% endif %} </h1>
   <p class="muted">
     <span class="tag">{{ ap.part_type.name }}</span>
     {% if ap.sub_part_type %}<span class="tag">{{ ap.sub_part_type.name }}</span>{% endif %}
-    {% if ap.sku %}· SKU {{ ap.sku }}{% endif %}
+    {% if ap.archived %}<span class="tag">Archived</span>{% endif %}
+    {% if ap.on_website %}<span class="tag">On website</span>{% endif %}
+    {% if ap.preferred_part %}<span class="tag">Preferred</span>{% endif %}
+    {% if ap.description %}{{ ap.description }}{% endif %}
   </p>
 
   <div class="grid">
@@ -50,7 +53,6 @@
             {{ scope_info.objective_lens_diameter_mm }} mm
           {% else %}—{% endif %}
         </dd>
-        <dt>Objective thread</dt><dd>{{ scope_info.objective_thread_pitch or "—" }}</dd>
       </dl>
     </div>
     {% endif %}

app/templates/admin/augmented_parts.html

@@ -5,8 +5,8 @@
 <main class="container">
   <h1>Augmented Parts</h1>
 
-  <div class="card">
+  <details class=card>
-    <h2>Add part</h2>
+    <summary>Add a part</summary>
     <form hx-post="/admin/augmented-parts" hx-target="#augmented-part-list" hx-swap="outerHTML" class="form-grid">
       <label>SKU <input type="text" name="sku" placeholder="optional"></label>
       <label>Description <input type="text" name="description" required></label>
@@ -50,13 +50,15 @@
           {% endfor %}
         </select>
       </label>
+      <label class="check"><input type="checkbox" name="on_website" value="true"> On website</label>
+      <label class="check"><input type="checkbox" name="preferred_part" value="true"> Preferred part</label>
       <button type="submit" class="btn btn-primary">Add</button>
     </form>
-  </div>
+  </details>
 
   <div class="card">
     <h2>Sync with Imported Parts</h2>
-    <p class="muted">Creates Augmented Part entries for new Imported Parts, and removes entries for deleted Imported Parts.</p>
+    <p class="muted">Creates Augmented Part entries for new Imported Parts, and archives entries for deleted Imported Parts.</p>
     <div class="row-actions">
       <form hx-post="/admin/augmented-parts/sync" hx-target="#augmented-part-list" hx-swap="outerHTML">
         <button type="submit" class="btn btn-primary">Sync now</button>

app/templates/admin/danger_zone.html

@@ -8,15 +8,15 @@
   <div class="card" style="border: 1px solid var(--color-danger, #c00)">
     <h2>Purge database</h2>
     <p>
-      Permanently deletes every part, taxonomy entry, attachment point, fit,
+      Permanently deletes every part, attachment point, fit, and imported
-      and imported part in the database — manufacturers, part colours, part
+      part in the database — manufacturers, scope models, ISO/UNC threads,
-      types, sub part types, scope models, ISO/UNC threads, clamp/static
+      clamp/static connections, attachment point names, augmented parts,
-      connections, attachment point names, augmented parts, scope info,
+      scope info, attachment points, fits, fit notes, and imported parts.
-      attachment points, fits, fit notes, and imported parts.
     </p>
     <p>
       <strong>Not</strong> deleted: users, roles &amp; permissions, refresh
-      tokens, the audit log, and the OData connection configuration.
+      tokens, the audit log, the OData connection configuration, and part
+      taxonomy (part colours, part types, sub part types).
     </p>
     <p class="muted">This cannot be undone. Take a database backup first if you might need this data again.</p>
     <button class="btn btn-danger"

app/templates/admin/imported_parts.html

@@ -29,11 +29,9 @@
     <button class="btn btn-primary"
             hx-post="/admin/imported-parts/refresh"
             hx-target="#imported-parts-section"
-            hx-swap="outerHTML"
+            hx-swap="outerHTML">
-            hx-indicator="#refresh-indicator">
       Refresh from OData
     </button>
-    <span id="refresh-indicator" class="htmx-indicator muted"> Loading…</span>
   </div>
 
   {% include "admin/_imported_parts_table.html" %}

app/templates/dashboard.html

@@ -35,6 +35,8 @@
         <li><a href="/redoc" target="_blank">API reference (ReDoc)</a></li>
       </ul>
     </div>
+
+    {% include "_dashboard_sync_card.html" %}
   </div>
 </main>
 {% endblock %}

app/templates/scopes.html

@@ -7,7 +7,8 @@
   <p class="muted">
     Every scope on record, with the accessories that fit it. Each part-type
     column lists matching parts; <span class="fit-badge fit-badge-exact">Exact</span>
-    is a confirmed fit, <span class="fit-badge fit-badge-possible">Possible</span> a candidate.
+    is a confirmed fit{% if not only_exact %}, <span class="fit-badge fit-badge-possible">Possible</span> a candidate{% endif %}.
+    {% if only_exact %}<a href="/login">Sign in</a> to also see unconfirmed candidate fits.{% endif %}
   </p>
 
   <div class="filter-bar">
@@ -15,7 +16,7 @@
           hx-target="#scopes-table-card"
           hx-trigger="input delay:300ms, change"
           hx-swap="outerHTML">
-      <input type="text" name="description" placeholder="Search scopes…"
+      <input type="text" name="description" placeholder="Search by description or product ID…"
              value="{{ filters.description or '' }}">
       <select name="manufacturer_id">
         <option value="">All manufacturers</option>
@@ -44,6 +45,50 @@
     </form>
   </div>
 
+  {% if can_write_scopes %}
+    <div class="bulk-actions">
+      <button id="delete-selected-scopes-btn" type="button" class="btn btn-danger" disabled
+              hx-post="/scopes/bulk-delete"
+              hx-include="[name='scope_ids']:checked, [name='description'], [name='manufacturer_id'], [name='scope_model_id'], [name='sub_part_type_id'], [name='fits_part_type_id']"
+              hx-target="#scopes-table-card"
+              hx-swap="outerHTML"
+              hx-confirm="Delete selected scopes?">Delete selected</button>
+    </div>
+  {% endif %}
+
   {% include "_scopes_table_card.html" %}
 </main>
+
+{% if can_write_scopes %}
+<script>
+(function () {
+  function updateDeleteButton() {
+    var count = document.querySelectorAll('input[name="scope_ids"]:checked').length;
+    var btn = document.getElementById('delete-selected-scopes-btn');
+    if (!btn) return;
+    btn.textContent = count > 0 ? 'Delete selected (' + count + ')' : 'Delete selected';
+    btn.disabled = count === 0;
+    btn.setAttribute('hx-confirm', 'Delete ' + count + ' selected scope' + (count === 1 ? '' : 's') + '?');
+  }
+
+  document.addEventListener('change', function (e) {
+    if (!e.target) return;
+
+    if (e.target.id === 'scopes-select-all') {
+      document.querySelectorAll('input[name="scope_ids"]').forEach(function (cb) {
+        cb.checked = e.target.checked;
+      });
+    }
+
+    if (e.target.id === 'scopes-select-all' || e.target.name === 'scope_ids') {
+      updateDeleteButton();
+    }
+  });
+
+  // Re-run after every HTMX swap (filter results, post-delete) so the button
+  // state reflects the freshly rendered checkboxes, which start unchecked.
+  document.addEventListener('htmx:afterSwap', updateDeleteButton);
+}());
+</script>
+{% endif %}
 {% endblock %}

app/web/admin.py

@@ -1,8 +1,5 @@
 """HTMX-driven admin dashboard for users, roles, and thread standards."""
 
-import math
-import urllib.parse
-
 from fastapi import (
     APIRouter,
     Depends,
@@ -17,9 +14,14 @@ from fastapi.responses import HTMLResponse, RedirectResponse, Response
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.core.database import AsyncSessionLocal, get_db
+from app.crud import attachment_point as attachment_point_crud
+from app.crud import attachment_point_name as apn_crud
 from app.crud import audit as audit_crud
 from app.crud import augmented_part as augmented_part_crud
 from app.crud import augmented_part_note as augmented_part_note_crud
+from app.crud import clamp_connection as clamp_connection_crud
+from app.crud import fit as fit_crud
+from app.crud import fit_note as fit_note_crud
 from app.crud import imported_part as imported_part_crud
 from app.crud import imported_part_config as imported_part_config_crud
 from app.crud import iso_thread as iso_thread_crud
@@ -29,11 +31,6 @@ from app.crud import part_type as part_type_crud
 from app.crud import role as role_crud
 from app.crud import scope_info as scope_info_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 fit as fit_crud
-from app.crud import fit_note as fit_note_crud
 from app.crud import static_connection as static_connection_crud
 from app.crud import sub_part_type as sub_part_type_crud
 from app.crud import unc_thread as unc_thread_crud
@@ -48,6 +45,8 @@ from app.services import fit_matching as fit_matching_service
 from app.services import jobs
 from app.services import odata as odata_service
 from app.services import scope_import as scope_import_service
+from app.web.pagination import paginate as _paginate
+from app.web.pagination import query_url as _query_url
 from app.web.templates import templates
 
 router = APIRouter(prefix="/admin", include_in_schema=False)
@@ -55,42 +54,6 @@ router = APIRouter(prefix="/admin", include_in_schema=False)
 _PAGE_SIZE = 50
 
 
-def _query_url(base_path: str, params: dict) -> str:
-    clean = {k: v for k, v in params.items() if v not in (None, "", 0)}
-    return f"{base_path}?{urllib.parse.urlencode(clean)}"
-
-
-def _paginate(
-    base_path: str,
-    filter_params: dict,
-    page: int,
-    page_size: int,
-    total: int,
-    target_id: str,
-) -> dict:
-    total_pages = max(1, math.ceil(total / page_size))
-    page = max(1, min(page, total_pages))
-    skip = (page - 1) * page_size
-
-    def _url(p: int) -> str:
-        return _query_url(
-            base_path, {**filter_params, "page": p, "page_size": page_size}
-        )
-
-    return {
-        "page": page,
-        "page_size": page_size,
-        "total": total,
-        "total_pages": total_pages,
-        "skip": skip,
-        "showing_from": skip + 1 if total > 0 else 0,
-        "showing_to": min(skip + page_size, total),
-        "prev_url": _url(page - 1) if page > 1 else None,
-        "next_url": _url(page + 1) if page < total_pages else None,
-        "target_id": target_id,
-    }
-
-
 def _sort_headers(
     base_path: str,
     filter_params: dict,
@@ -765,7 +728,7 @@ async def create_manufacturer(
     created = await manufacturer_crud.create(
         db,
         name=name,
-        url=url,
+        url=url.strip() or None,
         logo_url=logo_url.strip() or None,
     )
     await audit_crud.log(
@@ -826,7 +789,11 @@ async def update_manufacturer(
     m = await manufacturer_crud.get(db, manufacturer_id)
     if m is None:
         raise HTTPException(status_code=404, detail="Manufacturer not found")
-    changes = {"name": name, "url": url, "logo_url": logo_url.strip() or None}
+    changes = {
+        "name": name,
+        "url": url.strip() or None,
+        "logo_url": logo_url.strip() or None,
+    }
     await manufacturer_crud.update(db, m, changes)
     await audit_crud.log(
         db,
@@ -1080,6 +1047,9 @@ async def update_part_type(
     pt = await part_type_crud.get(db, part_type_id)
     if pt is None:
         raise HTTPException(status_code=404, detail="Part type not found")
+    existing = await part_type_crud.get_by_name(db, name)
+    if existing is not None and existing.id != pt.id:
+        raise HTTPException(status_code=409, detail="Part type already exists")
     changes = {"name": name}
     await part_type_crud.update(db, pt, changes)
     await audit_crud.log(
@@ -1207,6 +1177,11 @@ async def update_sub_part_type(
     spt = await sub_part_type_crud.get(db, sub_part_type_id)
     if spt is None:
         raise HTTPException(status_code=404, detail="Sub part type not found")
+    existing = await sub_part_type_crud.get_by_name_and_part_type(
+        db, name, part_type_id
+    )
+    if existing is not None and existing.id != spt.id:
+        raise HTTPException(status_code=409, detail="Sub part type already exists")
     changes = {"name": name, "part_type_id": part_type_id}
     await sub_part_type_crud.update(db, spt, changes)
     await audit_crud.log(
@@ -1258,6 +1233,7 @@ _IMPORTED_PARTS_SORT_COLUMNS = [
     "ProductODmm",
     "ProductODin",
     "TBXThreadAttribute",
+    "UACDiameterRangemm",
 ]
 
 
@@ -1366,6 +1342,19 @@ async def save_imported_part_config(
     return HTMLResponse("Configuration saved.", status_code=200)
 
 
+_IMPORTED_PARTS_REFRESH_TARGET_ID = "imported-parts-section"
+
+
+async def _imported_parts_table_ctx(
+    db: AsyncSession, *, sync_result: str | None = None, sync_error: str | None = None
+) -> dict:
+    return {
+        **await _default_imported_parts_table_ctx(db),
+        "sync_result": sync_result,
+        "sync_error": sync_error,
+    }
+
+
 @router.post("/imported-parts/refresh", response_class=HTMLResponse)
 async def refresh_imported_parts(
     request: Request,
@@ -1373,46 +1362,95 @@ async def refresh_imported_parts(
     actor: User = Depends(web_require("imported_parts:write")),
 ):
     config = await imported_part_config_crud.get(db)
-
-    async def _imported_table_ctx(sync_result=None, sync_error=None):
-        return {
-            **await _default_imported_parts_table_ctx(db),
-            "sync_result": sync_result,
-            "sync_error": sync_error,
-        }
-
     if not config or not config.odata_url:
         return templates.TemplateResponse(
             request,
             "admin/_imported_parts_table.html",
-            await _imported_table_ctx(sync_error="OData URL is not configured."),
+            await _imported_parts_table_ctx(
-        )
+                db, sync_error="OData URL is not configured."
-    try:
-        records = await odata_service.fetch(
-            config.odata_url, config.username, config.password
-        )
-        created, updated = await imported_part_crud.upsert_bulk(db, records)
-        await audit_crud.log(
-            db,
-            actor=actor,
-            action="update",
-            resource_type="ImportedPart",
-            resource_id=None,
-            description=f"OData sync: {created} created, {updated} updated ({len(records)} total records)",
-        )
-        return templates.TemplateResponse(
-            request,
-            "admin/_imported_parts_table.html",
-            await _imported_table_ctx(
-                sync_result=f"Sync complete: {created} created, {updated} updated."
             ),
         )
-    except Exception as exc:
+
+    actor_id = actor.id
+
+    async def _run(job_id: str) -> None:
+        async with AsyncSessionLocal() as db:
+            config = await imported_part_config_crud.get(db)
+            if not config or not config.odata_url:
+                await jobs.mark_error(job_id, "OData URL is not configured.")
+                return
+            try:
+                records = await odata_service.fetch(
+                    config.odata_url, config.username, config.password
+                )
+                created, updated = await imported_part_crud.upsert_bulk(db, records)
+            except Exception as exc:
+                await jobs.mark_error(job_id, f"Sync failed: {exc}")
+                return
+            actor_row = await user_crud.get(db, actor_id)
+            await audit_crud.log(
+                db,
+                actor=actor_row,
+                action="update",
+                resource_type="ImportedPart",
+                resource_id=None,
+                description=(
+                    f"OData sync: {created} created, {updated} updated "
+                    f"({len(records)} total records)"
+                ),
+            )
+            await jobs.mark_done(
+                job_id,
+                message=f"Sync complete: {created} created, {updated} updated.",
+            )
+
+    job = await jobs.start("imported_parts_refresh", _run)
+    return templates.TemplateResponse(
+        request,
+        "admin/_job_progress.html",
+        {
+            "container_id": _IMPORTED_PARTS_REFRESH_TARGET_ID,
+            "poll_url": f"/admin/imported-parts/refresh/jobs/{job.id}",
+            "job": job,
+        },
+    )
+
+
+@router.get("/imported-parts/refresh/jobs/{job_id}", response_class=HTMLResponse)
+async def imported_parts_refresh_job_status(
+    request: Request,
+    job_id: str,
+    db: AsyncSession = Depends(get_db),
+    _: User = Depends(web_require("imported_parts:write")),
+):
+    job = await jobs.get(db, job_id)
+    if job is None:
         return templates.TemplateResponse(
             request,
             "admin/_imported_parts_table.html",
-            await _imported_table_ctx(sync_error=f"Sync failed: {exc}"),
+            await _imported_parts_table_ctx(
+                db, sync_error="Refresh job not found — it may have expired."
+            ),
         )
+    if job.status == "running":
+        return templates.TemplateResponse(
+            request,
+            "admin/_job_progress.html",
+            {
+                "container_id": _IMPORTED_PARTS_REFRESH_TARGET_ID,
+                "poll_url": f"/admin/imported-parts/refresh/jobs/{job_id}",
+                "job": job,
+            },
+        )
+    return templates.TemplateResponse(
+        request,
+        "admin/_imported_parts_table.html",
+        await _imported_parts_table_ctx(
+            db,
+            sync_result=job.message if job.status == "done" else None,
+            sync_error=job.message if job.status == "error" else None,
+        ),
+    )
 
 
 @router.get("/imported-parts/filter", response_class=HTMLResponse)
@@ -1511,13 +1549,12 @@ async def upload_scope_import(
     data = await file.read()
     actor_id = actor.id
 
-    async def _run(job: jobs.Job) -> None:
+    async def _run(job_id: str) -> None:
         async with AsyncSessionLocal() as db:
             try:
                 result = await scope_import_service.import_from_bytes(db, data)
             except Exception as exc:  # noqa: BLE001
-                job.status = "error"
+                await jobs.mark_error(job_id, f"Could not read spreadsheet: {exc}")
-                job.message = f"Could not read spreadsheet: {exc}"
                 return
             actor_row = await user_crud.get(db, actor_id)
             await audit_crud.log(
@@ -1532,10 +1569,16 @@ async def upload_scope_import(
                     f"{result.errors} errors"
                 ),
             )
-            job.status = "done"
+            await jobs.mark_done(
-            job.result = result
+                job_id,
+                message=(
+                    f"Scope import complete: {result.created} created, "
+                    f"{result.updated} updated."
+                ),
+                result=result.model_dump(mode="json"),
+            )
 
-    job = jobs.start("scope_import", _run)
+    job = await jobs.start("scope_import", _run)
     return templates.TemplateResponse(
         request, "admin/_job_progress.html", _scope_import_progress_ctx(job)
     )
@@ -1545,9 +1588,10 @@ async def upload_scope_import(
 async def scope_import_job_status(
     request: Request,
     job_id: str,
+    db: AsyncSession = Depends(get_db),
     _: User = Depends(web_require("augmented_parts:write")),
 ):
-    job = jobs.get(job_id)
+    job = await jobs.get(db, job_id)
     if job is None:
         return templates.TemplateResponse(
             request,
@@ -1629,6 +1673,8 @@ async def _default_augmented_parts_table_ctx(db: AsyncSession) -> dict:
         ),
         "sort": "description",
         "dir": "asc",
+        "include_archived": False,
+        "on_website": False,
     }
 
 
@@ -1637,17 +1683,31 @@ async def augmented_parts_page(
     request: Request,
     sort: str = "description",
     dir: str = "asc",
+    include_archived: bool = False,
+    on_website: bool = False,
     db: AsyncSession = Depends(get_db),
     user: User = Depends(web_require("augmented_parts:read")),
 ):
     ctx = await _augmented_part_form_ctx(db)
-    total = await augmented_part_crud.count_filtered(db)
+    total = await augmented_part_crud.count_filtered(
+        db, include_archived=include_archived, on_website=on_website
+    )
     ctx["augmented_parts"] = await augmented_part_crud.list_filtered(
-        db, sort=sort, direction=dir, limit=_PAGE_SIZE
+        db,
+        sort=sort,
+        direction=dir,
+        include_archived=include_archived,
+        on_website=on_website,
+        limit=_PAGE_SIZE,
     )
     ctx["pagination"] = _paginate(
         "/admin/augmented-parts/filter",
-        {"sort": sort, "dir": dir},
+        {
+            "sort": sort,
+            "dir": dir,
+            "include_archived": include_archived,
+            "on_website": on_website,
+        },
         1,
         _PAGE_SIZE,
         total,
@@ -1655,7 +1715,7 @@ async def augmented_parts_page(
     )
     ctx["sort_headers"] = _sort_headers(
         "/admin/augmented-parts/filter",
-        {},
+        {"include_archived": include_archived, "on_website": on_website},
         _AUGMENTED_PARTS_SORT_COLUMNS,
         sort,
         dir,
@@ -1663,6 +1723,8 @@ async def augmented_parts_page(
     )
     ctx["sort"] = sort
     ctx["dir"] = dir
+    ctx["include_archived"] = include_archived
+    ctx["on_website"] = on_website
     ctx["user"] = user
     return templates.TemplateResponse(request, "admin/augmented_parts.html", ctx)
 
@@ -1677,18 +1739,25 @@ async def create_augmented_part(
     scope_model_id: str = Form(""),
     part_type_id: int = Form(...),
     sub_part_type_id: str = Form(""),
+    on_website: bool = Form(False),
+    preferred_part: bool = Form(False),
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(web_require("augmented_parts:write")),
 ):
+    clean_sku = sku.strip() or None
+    if clean_sku and await augmented_part_crud.get_by_sku(db, clean_sku):
+        raise HTTPException(status_code=409, detail="SKU already in use")
     created = await augmented_part_crud.create(
         db,
-        sku=sku.strip() or None,
+        sku=clean_sku,
         description=description,
         colour_id=colour_id,
         manufacturer_id=manufacturer_id,
         scope_model_id=int(scope_model_id) if scope_model_id else None,
         part_type_id=part_type_id,
         sub_part_type_id=int(sub_part_type_id) if sub_part_type_id else None,
+        on_website=on_website,
+        preferred_part=preferred_part,
     )
     await audit_crud.log(
         db,
@@ -1718,13 +1787,12 @@ async def sync_augmented_parts(
 ):
     actor_id = actor.id
 
-    async def _run(job: jobs.Job) -> None:
+    async def _run(job_id: str) -> None:
         async with AsyncSessionLocal() as db:
             try:
                 result = await augmented_part_sync_service.sync(db)
             except Exception as exc:
-                job.status = "error"
+                await jobs.mark_error(job_id, f"Sync failed: {exc}")
-                job.message = f"Sync failed: {exc}"
                 return
             actor_row = await user_crud.get(db, actor_id)
             await audit_crud.log(
@@ -1734,22 +1802,27 @@ async def sync_augmented_parts(
                 resource_type="AugmentedPart",
                 resource_id=None,
                 description=(
-                    f"Sync: {result.created} created, {result.deleted} deleted, "
+                    f"Sync: {result.created} created, {result.updated} updated, "
+                    f"{result.archived} archived, "
                     f"{result.skipped} skipped (no type match)"
                 ),
             )
-            job.status = "done"
+            await jobs.mark_done(
-            job.message = (
+                job_id,
-                f"Sync complete: {result.created} created, {result.deleted} deleted"
+                message=(
-                + (
+                    f"Sync complete: {result.created} created, "
-                    f", {result.skipped} skipped (type not recognised)"
+                    f"{result.updated} updated, "
-                    if result.skipped
+                    f"{result.archived} archived"
-                    else ""
+                    + (
-                )
+                        f", {result.skipped} skipped (type not recognised)"
-                + "."
+                        if result.skipped
+                        else ""
+                    )
+                    + "."
+                ),
             )
 
-    job = jobs.start("augmented_part_sync", _run)
+    job = await jobs.start("augmented_part_sync", _run)
     return templates.TemplateResponse(
         request,
         "admin/_job_progress.html",
@@ -1768,7 +1841,7 @@ async def augmented_parts_sync_job_status(
     db: AsyncSession = Depends(get_db),
     _: User = Depends(web_require("augmented_parts:write")),
 ):
-    job = jobs.get(job_id)
+    job = await jobs.get(db, job_id)
     if job is None:
         form_ctx = await _augmented_part_form_ctx(db)
         return templates.TemplateResponse(
@@ -1813,6 +1886,8 @@ async def filter_augmented_parts(
     scope_model_id: str = "",
     part_type_id: str = "",
     sub_part_type_id: str = "",
+    include_archived: bool = False,
+    on_website: bool = False,
     sort: str = "description",
     dir: str = "asc",
     page: int = 1,
@@ -1833,6 +1908,8 @@ async def filter_augmented_parts(
         scope_model_id=scope_model_id_int,
         part_type_id=part_type_id_int,
         sub_part_type_id=sub_part_type_id_int,
+        include_archived=include_archived,
+        on_website=on_website,
     )
     filter_params = {
         "description": description,
@@ -1841,6 +1918,8 @@ async def filter_augmented_parts(
         "scope_model_id": scope_model_id,
         "part_type_id": part_type_id,
         "sub_part_type_id": sub_part_type_id,
+        "include_archived": include_archived,
+        "on_website": on_website,
     }
     pagination = _paginate(
         "/admin/augmented-parts/filter",
@@ -1858,6 +1937,8 @@ async def filter_augmented_parts(
         scope_model_id=scope_model_id_int,
         part_type_id=part_type_id_int,
         sub_part_type_id=sub_part_type_id_int,
+        include_archived=include_archived,
+        on_website=on_website,
         sort=sort,
         direction=dir,
         skip=pagination["skip"],
@@ -1880,6 +1961,8 @@ async def filter_augmented_parts(
             "sort_headers": sort_headers,
             "sort": sort,
             "dir": dir,
+            "include_archived": include_archived,
+            "on_website": on_website,
         },
     )
 
@@ -2123,20 +2206,29 @@ async def update_augmented_part(
     scope_model_id: str = Form(""),
     part_type_id: int = Form(...),
     sub_part_type_id: str = Form(""),
+    on_website: bool = Form(False),
+    preferred_part: bool = Form(False),
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(web_require("augmented_parts:write")),
 ):
     ap = await augmented_part_crud.get(db, augmented_part_id)
     if ap is None:
         raise HTTPException(status_code=404, detail="Augmented part not found")
+    clean_sku = sku.strip() or None
+    if clean_sku:
+        existing = await augmented_part_crud.get_by_sku(db, clean_sku)
+        if existing is not None and existing.id != ap.id:
+            raise HTTPException(status_code=409, detail="SKU already in use")
     changes = {
-        "sku": sku.strip() or None,
+        "sku": clean_sku,
         "description": description,
         "colour_id": colour_id,
         "manufacturer_id": manufacturer_id,
         "scope_model_id": int(scope_model_id) if scope_model_id else None,
         "part_type_id": part_type_id,
         "sub_part_type_id": int(sub_part_type_id) if sub_part_type_id else None,
+        "on_website": on_website,
+        "preferred_part": preferred_part,
     }
     await augmented_part_crud.update(db, ap, changes)
     await audit_crud.log(
@@ -2177,6 +2269,60 @@ async def delete_augmented_part(
     return Response(status_code=status.HTTP_200_OK)
 
 
+async def _set_augmented_part_archived(
+    request: Request,
+    augmented_part_id: int,
+    archived: bool,
+    db: AsyncSession,
+    actor: User,
+):
+    ap = await augmented_part_crud.get(db, augmented_part_id)
+    if ap is None:
+        raise HTTPException(status_code=404, detail="Augmented part not found")
+    ap = await augmented_part_crud.set_archived(db, ap, archived)
+    await audit_crud.log(
+        db,
+        actor=actor,
+        action="update",
+        resource_type="AugmentedPart",
+        resource_id=augmented_part_id,
+        description=audit_crud.describe_update(
+            "AugmentedPart", augmented_part_id, {"archived": archived}
+        ),
+    )
+    return templates.TemplateResponse(
+        request, "admin/_augmented_part_row.html", {"ap": ap}
+    )
+
+
+@router.post(
+    "/augmented-parts/{augmented_part_id}/archive", response_class=HTMLResponse
+)
+async def archive_augmented_part(
+    request: Request,
+    augmented_part_id: int,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("augmented_parts:write")),
+):
+    return await _set_augmented_part_archived(
+        request, augmented_part_id, True, db, actor
+    )
+
+
+@router.post(
+    "/augmented-parts/{augmented_part_id}/unarchive", response_class=HTMLResponse
+)
+async def unarchive_augmented_part(
+    request: Request,
+    augmented_part_id: int,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("augmented_parts:write")),
+):
+    return await _set_augmented_part_archived(
+        request, augmented_part_id, False, db, actor
+    )
+
+
 def _can_write_attachment_points(user: User) -> bool:
     return user.is_superuser or "attachment_points:write" in user.permissions
 
@@ -2286,7 +2432,7 @@ async def edit_augmented_part_attachment_point(
     elif apoint.static_connection_id:
         ctx["connection_type"] = "static_connection"
     else:
-        ctx["connection_type"] = ""
+        ctx["connection_type"] = "manual"
     return templates.TemplateResponse(
         request, "admin/_augmented_part_ap_row_edit.html", ctx
     )
@@ -2483,7 +2629,7 @@ async def recompute_augmented_part_fits(
 ):
     actor_id = actor.id
 
-    async def _run(job: jobs.Job) -> None:
+    async def _run(job_id: str) -> None:
         async with AsyncSessionLocal() as db:
             result = await fit_matching_service.recompute_for_part(
                 db, augmented_part_id
@@ -2500,10 +2646,11 @@ async def recompute_augmented_part_fits(
                     f"{result.created} created, {result.removed} removed"
                 ),
             )
-            job.status = "done"
+            await jobs.mark_done(
-            job.message = f"{result.created} created, {result.removed} removed."
+                job_id, f"{result.created} created, {result.removed} removed."
+            )
 
-    job = jobs.start("fit_recompute_part", _run)
+    job = await jobs.start("fit_recompute_part", _run)
     return templates.TemplateResponse(
         request,
         "admin/_job_progress.html",
@@ -2527,7 +2674,7 @@ async def augmented_part_fits_recompute_job_status(
     db: AsyncSession = Depends(get_db),
     actor: User = Depends(web_require("fits:write")),
 ):
-    job = jobs.get(job_id)
+    job = await jobs.get(db, job_id)
     if job is None:
         ctx = await _augmented_part_fits_ctx(
             db,
@@ -2580,7 +2727,12 @@ async def fit_other_points(
         else []
     )
     return templates.TemplateResponse(
-        request, "admin/_fit_other_points_select.html", {"points": points}
+        request,
+        "admin/_fit_other_points_select.html",
+        {
+            "points": points,
+            "form_id": f"ap-{augmented_part_id}-fit-add-form",
+        },
     )
 
 
@@ -2774,7 +2926,7 @@ async def recompute_all_fits(
 ):
     actor_id = actor.id
 
-    async def _run(job: jobs.Job) -> None:
+    async def _run(job_id: str) -> None:
         async with AsyncSessionLocal() as db:
             result = await fit_matching_service.recompute_all(db)
             actor_row = await user_crud.get(db, actor_id)
@@ -2789,13 +2941,15 @@ async def recompute_all_fits(
                     f"{result.removed} removed"
                 ),
             )
-            job.status = "done"
+            await jobs.mark_done(
-            job.message = (
+                job_id,
-                f"Recompute complete: {result.created} created, "
+                message=(
-                f"{result.removed} removed."
+                    f"Recompute complete: {result.created} created, "
+                    f"{result.removed} removed."
+                ),
             )
 
-    job = jobs.start("fit_recompute_all", _run)
+    job = await jobs.start("fit_recompute_all", _run)
     return templates.TemplateResponse(
         request,
         "admin/_job_progress_inline.html",
@@ -2813,9 +2967,10 @@ async def recompute_all_fits(
 async def recompute_all_fits_job_status(
     request: Request,
     job_id: str,
+    db: AsyncSession = Depends(get_db),
     _: User = Depends(web_require("fits:write")),
 ):
-    job = jobs.get(job_id)
+    job = await jobs.get(db, job_id)
     if job is None:
         return HTMLResponse("Recompute job not found — it may have expired.")
     if job.status == "running":
@@ -2951,6 +3106,9 @@ async def update_part_colour(
     pc = await part_colour_crud.get(db, part_colour_id)
     if pc is None:
         raise HTTPException(status_code=404, detail="Part colour not found")
+    existing = await part_colour_crud.get_by_name(db, name)
+    if existing is not None and existing.id != pc.id:
+        raise HTTPException(status_code=409, detail="Part colour already exists")
     changes = {"name": name}
     await part_colour_crud.update(db, pc, changes)
     await audit_crud.log(
@@ -3070,6 +3228,11 @@ async def update_attachment_point_name(
     apn = await apn_crud.get(db, apn_id)
     if apn is None:
         raise HTTPException(status_code=404, detail="Attachment point name not found")
+    existing = await apn_crud.get_by_name(db, name)
+    if existing is not None and existing.id != apn.id:
+        raise HTTPException(
+            status_code=409, detail="Attachment point name already exists"
+        )
     changes = {"name": name}
     await apn_crud.update(db, apn, changes)
     await audit_crud.log(
@@ -3132,7 +3295,7 @@ def _ap_connection_label(ap) -> str:
         return f"{cc.min_in}–{cc.max_in} in"
     if ap.static_connection:
         return f"{ap.static_connection.od_mm} mm OD"
-    return "—"
+    return "Manual"
 
 
 @router.get("/attachment-points", response_class=HTMLResponse)
@@ -3229,7 +3392,7 @@ async def edit_attachment_point_row(
     elif ap.static_connection_id:
         ctx["connection_type"] = "static_connection"
     else:
-        ctx["connection_type"] = ""
+        ctx["connection_type"] = "manual"
     return templates.TemplateResponse(
         request, "admin/_attachment_point_row_edit.html", ctx
     )
@@ -3407,6 +3570,9 @@ async def update_static_connection(
     sc = await static_connection_crud.get(db, static_connection_id)
     if sc is None:
         raise HTTPException(status_code=404, detail="Static connection not found")
+    existing = await static_connection_crud.get_by_od_mm(db, od_mm)
+    if existing is not None and existing.id != sc.id:
+        raise HTTPException(status_code=409, detail="Static connection already exists")
     changes = {"od_mm": od_mm, "od_in": od_in}
     await static_connection_crud.update(db, sc, changes)
     await audit_crud.log(

app/web/pages.py

@@ -1,18 +1,33 @@
+from datetime import timedelta
+
 from fastapi import APIRouter, Depends, Form, HTTPException, Query, Request, status
 from fastapi.responses import HTMLResponse, RedirectResponse, Response
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.core.config import settings
-from app.core.database import get_db
+from app.core.database import AsyncSessionLocal, get_db
+from app.crud import audit as audit_crud
+from app.crud import augmented_part as augmented_part_crud
+from app.crud import imported_part as imported_part_crud
+from app.crud import imported_part_config as imported_part_config_crud
+from app.crud import part_type as part_type_crud
 from app.crud import user as user_crud
-from app.deps import get_current_web_user
+from app.deps import get_optional_web_user
 from app.models.user import User
+from app.services import augmented_part_sync as augmented_part_sync_service
+from app.services import fit_matching as fit_matching_service
+from app.services import jobs
 from app.services import ldap as ldap_service
+from app.services import odata as odata_service
+from app.services import scope_guide as scope_guide_service
 from app.services.auth import issue_token_pair
+from app.web.admin import web_require
 from app.web.templates import templates
 
 router = APIRouter(include_in_schema=False)
 
+_SYNC_CARD_ID = "dashboard-sync-card"
+
 
 def _safe_next(next_url: str) -> str:
     """Return next_url only if it's a safe same-site path, else "/".
@@ -36,17 +51,346 @@ def _set_auth_cookie(response: Response, access_token: str) -> None:
         httponly=True,
         secure=settings.cookie_secure,
         samesite="lax",
-        max_age=settings.access_token_expire_minutes * 60,
+        max_age=settings.session_timeout_hours * 3600,
         path="/",
     )
 
 
+async def _dashboard_stats(db: AsyncSession) -> dict:
+    scope_type = await part_type_crud.get_by_name(
+        db, scope_guide_service.SCOPE_TYPE_NAME
+    )
+    scope_count = (
+        await augmented_part_crud.count_filtered(db, part_type_id=scope_type.id)
+        if scope_type is not None
+        else 0
+    )
+    return {
+        "scope_count": scope_count,
+        "skipped_count": await augmented_part_crud.count_unlinked_filtered(db),
+    }
+
+
+def _dashboard_permissions(user: User) -> dict:
+    return {
+        "can_refresh_odata": user.is_superuser
+        or "imported_parts:write" in user.permissions,
+        "can_sync_augmented_parts": user.is_superuser
+        or "augmented_parts:write" in user.permissions,
+        "can_recompute_fits": user.is_superuser or "fits:write" in user.permissions,
+    }
+
+
+async def _sync_card_ctx(
+    db: AsyncSession,
+    user: User,
+    status_message: str | None = None,
+    status_error: str | None = None,
+) -> dict:
+    return {
+        **(await _dashboard_stats(db)),
+        **_dashboard_permissions(user),
+        "status_message": status_message,
+        "status_error": status_error,
+    }
+
+
 @router.get("/", response_class=HTMLResponse)
 async def dashboard(
     request: Request,
-    user: User = Depends(get_current_web_user),
+    db: AsyncSession = Depends(get_db),
+    user: User | None = Depends(get_optional_web_user),
 ):
-    return templates.TemplateResponse(request, "dashboard.html", {"user": user})
+    # Anonymous visitors land on the public Scopes page instead of being
+    # bounced to login; the dashboard itself requires an account.
+    if user is None:
+        return RedirectResponse(url="/scopes", status_code=status.HTTP_302_FOUND)
+    return templates.TemplateResponse(
+        request,
+        "dashboard.html",
+        {"user": user, **(await _sync_card_ctx(db, user))},
+    )
+
+
+@router.post("/dashboard/refresh-odata", response_class=HTMLResponse)
+async def dashboard_refresh_odata(
+    request: Request,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("imported_parts:write")),
+):
+    config = await imported_part_config_crud.get(db)
+    if not config or not config.odata_url:
+        return templates.TemplateResponse(
+            request,
+            "_dashboard_sync_card.html",
+            await _sync_card_ctx(
+                db, actor, status_error="OData URL is not configured."
+            ),
+        )
+
+    actor_id = actor.id
+
+    async def _run(job_id: str) -> None:
+        async with AsyncSessionLocal() as db:
+            config = await imported_part_config_crud.get(db)
+            if not config or not config.odata_url:
+                await jobs.mark_error(job_id, "OData URL is not configured.")
+                return
+            try:
+                records = await odata_service.fetch(
+                    config.odata_url, config.username, config.password
+                )
+                created, updated = await imported_part_crud.upsert_bulk(db, records)
+            except Exception as exc:
+                await jobs.mark_error(job_id, f"Sync failed: {exc}")
+                return
+            actor_row = await user_crud.get(db, actor_id)
+            await audit_crud.log(
+                db,
+                actor=actor_row,
+                action="update",
+                resource_type="ImportedPart",
+                resource_id=None,
+                description=(
+                    f"OData sync: {created} created, {updated} updated "
+                    f"({len(records)} total records)"
+                ),
+            )
+            await jobs.mark_done(
+                job_id,
+                message=f"Sync complete: {created} created, {updated} updated.",
+            )
+
+    job = await jobs.start("imported_parts_refresh", _run)
+    return templates.TemplateResponse(
+        request,
+        "admin/_job_progress.html",
+        {
+            "container_id": _SYNC_CARD_ID,
+            "poll_url": f"/dashboard/refresh-odata/jobs/{job.id}",
+            "job": job,
+        },
+    )
+
+
+@router.get("/dashboard/refresh-odata/jobs/{job_id}", response_class=HTMLResponse)
+async def dashboard_refresh_odata_job_status(
+    request: Request,
+    job_id: str,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("imported_parts:write")),
+):
+    job = await jobs.get(db, job_id)
+    if job is None:
+        return templates.TemplateResponse(
+            request,
+            "_dashboard_sync_card.html",
+            await _sync_card_ctx(
+                db, actor, status_error="Refresh job not found — it may have expired."
+            ),
+        )
+    if job.status == "running":
+        return templates.TemplateResponse(
+            request,
+            "admin/_job_progress.html",
+            {
+                "container_id": _SYNC_CARD_ID,
+                "poll_url": f"/dashboard/refresh-odata/jobs/{job_id}",
+                "job": job,
+            },
+        )
+    return templates.TemplateResponse(
+        request,
+        "_dashboard_sync_card.html",
+        await _sync_card_ctx(
+            db,
+            actor,
+            status_message=job.message if job.status == "done" else None,
+            status_error=job.message if job.status == "error" else None,
+        ),
+    )
+
+
+@router.post("/dashboard/sync-augmented-parts", response_class=HTMLResponse)
+async def dashboard_sync_augmented_parts(
+    request: Request,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("augmented_parts:write")),
+):
+    actor_id = actor.id
+
+    async def _run(job_id: str) -> None:
+        async with AsyncSessionLocal() as db:
+            try:
+                result = await augmented_part_sync_service.sync(db)
+            except Exception as exc:
+                await jobs.mark_error(job_id, f"Sync failed: {exc}")
+                return
+            actor_row = await user_crud.get(db, actor_id)
+            await audit_crud.log(
+                db,
+                actor=actor_row,
+                action="update",
+                resource_type="AugmentedPart",
+                resource_id=None,
+                description=(
+                    f"Sync: {result.created} created, {result.updated} updated, "
+                    f"{result.archived} archived, "
+                    f"{result.skipped} skipped (no type match)"
+                ),
+            )
+            await jobs.mark_done(
+                job_id,
+                message=(
+                    f"Sync complete: {result.created} created, "
+                    f"{result.updated} updated, "
+                    f"{result.archived} archived"
+                    + (
+                        f", {result.skipped} skipped (type not recognised)"
+                        if result.skipped
+                        else ""
+                    )
+                    + "."
+                ),
+            )
+
+    job = await jobs.start("augmented_part_sync", _run)
+    return templates.TemplateResponse(
+        request,
+        "admin/_job_progress.html",
+        {
+            "container_id": _SYNC_CARD_ID,
+            "poll_url": f"/dashboard/sync-augmented-parts/jobs/{job.id}",
+            "job": job,
+        },
+    )
+
+
+@router.get(
+    "/dashboard/sync-augmented-parts/jobs/{job_id}", response_class=HTMLResponse
+)
+async def dashboard_sync_augmented_parts_job_status(
+    request: Request,
+    job_id: str,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("augmented_parts:write")),
+):
+    job = await jobs.get(db, job_id)
+    if job is None:
+        return templates.TemplateResponse(
+            request,
+            "_dashboard_sync_card.html",
+            await _sync_card_ctx(
+                db, actor, status_error="Sync job not found — it may have expired."
+            ),
+        )
+    if job.status == "running":
+        return templates.TemplateResponse(
+            request,
+            "admin/_job_progress.html",
+            {
+                "container_id": _SYNC_CARD_ID,
+                "poll_url": f"/dashboard/sync-augmented-parts/jobs/{job_id}",
+                "job": job,
+            },
+        )
+    return templates.TemplateResponse(
+        request,
+        "_dashboard_sync_card.html",
+        await _sync_card_ctx(
+            db,
+            actor,
+            status_message=job.message if job.status == "done" else None,
+            status_error=job.message if job.status == "error" else None,
+        ),
+    )
+
+
+@router.post("/dashboard/recompute-fits", response_class=HTMLResponse)
+async def dashboard_recompute_fits(
+    request: Request,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("fits:write")),
+):
+    actor_id = actor.id
+
+    async def _run(job_id: str) -> None:
+        async with AsyncSessionLocal() as db:
+            try:
+                result = await fit_matching_service.recompute_all(db)
+            except Exception as exc:
+                await jobs.mark_error(job_id, f"Recompute failed: {exc}")
+                return
+            actor_row = await user_crud.get(db, actor_id)
+            await audit_crud.log(
+                db,
+                actor=actor_row,
+                action="update",
+                resource_type="Fit",
+                resource_id=None,
+                description=(
+                    f"Recomputed fits for all parts: {result.created} created, "
+                    f"{result.removed} removed"
+                ),
+            )
+            await jobs.mark_done(
+                job_id,
+                message=(
+                    f"Recompute complete: {result.created} created, "
+                    f"{result.removed} removed."
+                ),
+            )
+
+    job = await jobs.start("fit_recompute_all", _run)
+    return templates.TemplateResponse(
+        request,
+        "admin/_job_progress.html",
+        {
+            "container_id": _SYNC_CARD_ID,
+            "poll_url": f"/dashboard/recompute-fits/jobs/{job.id}",
+            "job": job,
+        },
+    )
+
+
+@router.get("/dashboard/recompute-fits/jobs/{job_id}", response_class=HTMLResponse)
+async def dashboard_recompute_fits_job_status(
+    request: Request,
+    job_id: str,
+    db: AsyncSession = Depends(get_db),
+    actor: User = Depends(web_require("fits:write")),
+):
+    job = await jobs.get(db, job_id)
+    if job is None:
+        return templates.TemplateResponse(
+            request,
+            "_dashboard_sync_card.html",
+            await _sync_card_ctx(
+                db,
+                actor,
+                status_error="Recompute job not found — it may have expired.",
+            ),
+        )
+    if job.status == "running":
+        return templates.TemplateResponse(
+            request,
+            "admin/_job_progress.html",
+            {
+                "container_id": _SYNC_CARD_ID,
+                "poll_url": f"/dashboard/recompute-fits/jobs/{job_id}",
+                "job": job,
+            },
+        )
+    return templates.TemplateResponse(
+        request,
+        "_dashboard_sync_card.html",
+        await _sync_card_ctx(
+            db,
+            actor,
+            status_message=job.message if job.status == "done" else None,
+            status_error=job.message if job.status == "error" else None,
+        ),
+    )
 
 
 @router.get("/login", response_class=HTMLResponse)
@@ -79,7 +423,9 @@ async def login_submit(
             },
             status_code=status.HTTP_401_UNAUTHORIZED,
         )
-    access, _ = await issue_token_pair(db, user)
+    access, _ = await issue_token_pair(
+        db, user, timedelta(hours=settings.session_timeout_hours)
+    )
     response = RedirectResponse(
         url=_safe_next(next_url), status_code=status.HTTP_303_SEE_OTHER
     )
@@ -110,7 +456,9 @@ async def login_ldap_submit(
             },
             status_code=status.HTTP_401_UNAUTHORIZED,
         )
-    access, _ = await issue_token_pair(db, user)
+    access, _ = await issue_token_pair(
+        db, user, timedelta(hours=settings.session_timeout_hours)
+    )
     response = RedirectResponse(
         url=_safe_next(next_url), status_code=status.HTTP_303_SEE_OTHER
     )

app/web/pagination.py

@@ -0,0 +1,40 @@
+"""Shared pagination helpers for HTMX table cards (admin screens, scopes page)."""
+
+import math
+import urllib.parse
+
+
+def query_url(base_path: str, params: dict) -> str:
+    clean = {k: v for k, v in params.items() if v not in (None, "", 0)}
+    return f"{base_path}?{urllib.parse.urlencode(clean)}"
+
+
+def paginate(
+    base_path: str,
+    filter_params: dict,
+    page: int,
+    page_size: int,
+    total: int,
+    target_id: str,
+) -> dict:
+    total_pages = max(1, math.ceil(total / page_size))
+    page = max(1, min(page, total_pages))
+    skip = (page - 1) * page_size
+
+    def _url(p: int) -> str:
+        return query_url(
+            base_path, {**filter_params, "page": p, "page_size": page_size}
+        )
+
+    return {
+        "page": page,
+        "page_size": page_size,
+        "total": total,
+        "total_pages": total_pages,
+        "skip": skip,
+        "showing_from": skip + 1 if total > 0 else 0,
+        "showing_to": min(skip + page_size, total),
+        "prev_url": _url(page - 1) if page > 1 else None,
+        "next_url": _url(page + 1) if page < total_pages else None,
+        "target_id": target_id,
+    }