docs: update roadmap status for completed Tier 0 items

- Unit test suite: complete (137 tests across 20 files) - Date segment type: complete (#79) - Part number validation: complete (#80) - Link remaining tasks to issue numbers (#81-#91) - Update Appendix B checklists and Partially Implemented table
test(api): add revision, schema, audit, and auth handler tests (#78 )
2026-02-14 08:54:14 -06:00 · 2026-02-13 15:22:28 -06:00 · 2026-02-13 15:20:20 -06:00 · 2026-02-13 15:18:46 -06:00 · 2026-02-13 15:17:38 -06:00 · 2026-02-13 20:59:59 +00:00
92 changed files with 8096 additions and 1942 deletions
--- a/.env.example
+++ b/.env.example
@@ -1,12 +1,26 @@
 # Silo Environment Configuration
-# Copy this file to .env and update values as needed
+# Copy to .env (or deployments/.env) and update values as needed.
+# For automated setup, run: ./scripts/setup-docker.sh

 # PostgreSQL
 POSTGRES_PASSWORD=silodev

 # MinIO
-MINIO_ACCESS_KEY=minioadmin
-MINIO_SECRET_KEY=minioadmin
+MINIO_ACCESS_KEY=silominio
+MINIO_SECRET_KEY=silominiosecret

-# Silo API (optional overrides)
-# SILO_SERVER_PORT=8080
+# OpenLDAP
+LDAP_ADMIN_PASSWORD=ldapadmin
+LDAP_USERS=siloadmin
+LDAP_PASSWORDS=siloadmin
+
+# Silo Authentication
+SILO_SESSION_SECRET=change-me-in-production
+SILO_ADMIN_USERNAME=admin
+SILO_ADMIN_PASSWORD=admin
+
+# Optional: OIDC (Keycloak)
+# SILO_OIDC_CLIENT_SECRET=
+
+# Optional: LDAP service account
+# SILO_LDAP_BIND_PASSWORD=
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ Thumbs.db
 # Config with secrets
 config.yaml
 *.env
+deployments/config.docker.yaml

 # Python
 __pycache__/
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ silo/
 │   ├── silo/              # CLI tool
 │   └── silod/             # API server
 ├── internal/
-│   ├── api/               # HTTP handlers and routes (75 endpoints)
+│   ├── api/               # HTTP handlers and routes (78 endpoints)
 │   ├── auth/              # Authentication (local, LDAP, OIDC)
 │   ├── config/            # Configuration loading
 │   ├── db/                # PostgreSQL repositories
@@ -53,15 +53,20 @@ silo/

 ## Quick Start

-```bash
-# Docker Compose (quickest)
-cp config.example.yaml config.yaml
-# Edit config.yaml with your database, MinIO, and auth settings
-make docker-up
+See the **[Installation Guide](docs/INSTALL.md)** for complete setup instructions.

-# Or manual setup
-psql -h localhost -U silo -d silo -f migrations/*.sql
-go run ./cmd/silod -config config.yaml
+**Docker Compose (quickest — includes PostgreSQL, MinIO, OpenLDAP, and Silo):**
+
+```bash
+./scripts/setup-docker.sh
+docker compose -f deployments/docker-compose.allinone.yaml up -d
+```
+
+**Development (local Go + Docker services):**
+
+```bash
+make docker-up    # Start PostgreSQL + MinIO in Docker
+make run          # Run silo locally with Go
 ```

 When auth is enabled, a default admin account is created on first startup using the credentials in `config.yaml` under `auth.local.default_admin_username` and `auth.local.default_admin_password`.
@@ -104,15 +109,16 @@ The server provides the REST API and ODS endpoints consumed by these clients.

 | Document | Description |
 |----------|-------------|
+| [docs/INSTALL.md](docs/INSTALL.md) | Installation guide (Docker Compose and daemon) |
 | [docs/SPECIFICATION.md](docs/SPECIFICATION.md) | Full design specification and API reference |
 | [docs/STATUS.md](docs/STATUS.md) | Implementation status |
-| [docs/DEPLOYMENT.md](docs/DEPLOYMENT.md) | Production deployment guide |
+| [docs/DEPLOYMENT.md](docs/DEPLOYMENT.md) | Production deployment and operations guide |
 | [docs/CONFIGURATION.md](docs/CONFIGURATION.md) | Configuration reference (all `config.yaml` options) |
 | [docs/AUTH.md](docs/AUTH.md) | Authentication system design |
 | [docs/AUTH_USER_GUIDE.md](docs/AUTH_USER_GUIDE.md) | User guide for login, tokens, and roles |
 | [docs/GAP_ANALYSIS.md](docs/GAP_ANALYSIS.md) | Gap analysis and revision control roadmap |
 | [docs/COMPONENT_AUDIT.md](docs/COMPONENT_AUDIT.md) | Component audit tool design |
-| [ROADMAP.md](ROADMAP.md) | Feature roadmap and SOLIDWORKS PDM comparison |
+| [docs/ROADMAP.md](docs/ROADMAP.md) | Platform roadmap, dependency tiers, and gap summary |
 | [frontend-spec.md](frontend-spec.md) | React SPA frontend specification |

 ## License
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,536 +0,0 @@
-# Silo Roadmap
-
-**Version:** 1.1  
-**Date:** February 2026  
-**Purpose:** Project inventory, SOLIDWORKS PDM gap analysis, and development roadmap
-
---
-
-## Table of Contents
-
-1. [Executive Summary](#executive-summary)
-2. [Current Project Inventory](#current-project-inventory)
-3. [SOLIDWORKS PDM Gap Analysis](#solidworks-pdm-gap-analysis)
-4. [Feature Roadmap](#feature-roadmap)
-5. [Implementation Phases](#implementation-phases)
-
---
-
-## Executive Summary
-
-Silo is an R&D-oriented item database and part management system. It provides configurable part number generation, revision tracking, BOM management, and file versioning through MinIO storage. CAD integration (FreeCAD workbench, LibreOffice Calc extension) is maintained in separate repositories ([silo-mod](https://git.kindred-systems.com/kindred/silo-mod), [silo-calc](https://git.kindred-systems.com/kindred/silo-calc)).
-
-This document compares Silo's current capabilities against SOLIDWORKS PDM—the industry-leading product data management solution—to identify gaps and prioritize future development.
-
-### Key Differentiators
-
-| Aspect | Silo | SOLIDWORKS PDM |
-|--------|------|----------------|
-| **Target CAD** | FreeCAD / Kindred Create (open source) | SOLIDWORKS (proprietary) |
-| **Part Numbering** | Schema-as-configuration (YAML) | Fixed format with some customization |
-| **Licensing** | Open source / Kindred Proprietary | Commercial ($3,000-$10,000+ per seat) |
-| **Storage** | PostgreSQL + MinIO (S3-compatible) | SQL Server + File Archive |
-| **Philosophy** | R&D-oriented, lightweight | Enterprise-grade, comprehensive |
-
---
-
-## Current Project Inventory
-
-### Implemented Features (MVP Complete)
-
-#### Core Database System
- PostgreSQL schema with 11 migrations
- UUID-based identifiers throughout
- Soft delete support via `archived_at` timestamps
- Atomic sequence generation for part numbers
-
-#### Part Number Generation
- YAML schema parser with validation
- Segment types: `string`, `enum`, `serial`, `constant`
- Scope templates for serial counters (e.g., `{category}`, `{project}`)
- Format templates for custom output
-
-#### Item Management
- Full CRUD operations for items
- Item types: part, assembly, drawing, document, tooling, purchased, electrical, software
- Custom properties via JSONB storage
- Project tagging with many-to-many relationships
-
-#### Revision Control
- Append-only revision history
- Revision metadata: properties, file reference, checksum, comment
- Status tracking: draft, review, released, obsolete
- Labels/tags per revision
- Revision comparison (diff)
- Rollback functionality
-
-#### File Management
- MinIO integration with versioning
- File upload/download via REST API
- SHA256 checksums for integrity
- Storage path: `items/{partNumber}/rev{N}.FCStd`
-
-#### Bill of Materials (BOM)
- Relationship types: component, alternate, reference
- Multi-level BOM (recursive expansion with configurable depth)
- Where-used queries (reverse parent lookup)
- BOM CSV and ODS export/import with cycle detection
- Reference designators for electronics
- Quantity tracking with units
- Revision-specific child linking
-
-#### Project Management
- Project CRUD operations
- Unique project codes (2-10 characters)
- Item-to-project tagging
- Project-filtered queries
-
-#### Data Import/Export
- CSV export with configurable properties
- CSV import with dry-run validation
- ODS spreadsheet import/export (items, BOMs, project sheets)
- Template generation for import formatting
-
-#### API & Web Interface
- REST API with 75 endpoints
- Authentication: local (bcrypt), LDAP/FreeIPA, OIDC/Keycloak
- Role-based access control (admin > editor > viewer)
- API token management (SHA-256 hashed)
- Session management (PostgreSQL-backed, 24h lifetime)
- CSRF protection (nosurf on web forms)
- Middleware: logging, CORS, recovery, request ID
- Web UI — React SPA (Vite + TypeScript, Catppuccin Mocha theme)
- Fuzzy search
- Health and readiness probes
-
-#### Audit & Completeness
- Audit logging (database table with user/action/resource tracking)
- Item completeness scoring with weighted fields
- Category-specific property validation
- Tier classification (critical/low/partial/good/complete)
-
-#### Configuration
- YAML configuration with environment variable overrides
- Multi-schema support
- Docker Compose deployment ready
-
-### Partially Implemented
-
-| Feature | Status | Notes |
-|---------|--------|-------|
-| Odoo ERP integration | Partial | Config and sync-log CRUD functional; push/pull sync operations are stubs |
-| Date segment type | Not started | Schema parser placeholder exists |
-| Part number validation | Not started | API accepts but doesn't validate format |
-| Location hierarchy CRUD | Schema only | Tables exist, no API endpoints |
-| Inventory tracking | Schema only | Tables exist, no API endpoints |
-| Unit tests | Partial | 9 Go test files across api, db, ods, partnum, schema packages |
-
-### Infrastructure Status
-
-| Component | Status |
-|-----------|--------|
-| PostgreSQL | Running (psql.kindred.internal) |
-| MinIO | Configured in Docker Compose |
-| Silo API Server | Builds successfully |
-| Docker Compose | Complete (dev and production) |
-| systemd service | Unit file and env template ready |
-| Deployment scripts | setup-host, deploy, init-db, setup-ipa-nginx |
-
---
-
-## SOLIDWORKS PDM Gap Analysis
-
-This section compares Silo's capabilities against SOLIDWORKS PDM features. Gaps are categorized by priority and implementation complexity.
-
-### Legend
- **Silo Status:** Full / Partial / None
- **Priority:** Critical / High / Medium / Low
- **Complexity:** Simple / Moderate / Complex
-
---
-
-### 1. Version Control & Revision Management
-
-| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
-|---------|---------------|-------------|----------|------------|
-| Check-in/check-out | Full pessimistic locking | None | High | Moderate |
-| Version history | Complete with branching | Full (linear) | - | - |
-| Revision labels | A, B, C or custom schemes | Full (custom labels) | - | - |
-| Rollback/restore | Full | Full | - | - |
-| Compare revisions | Visual + metadata diff | Metadata diff only | Medium | Complex |
-| Get Latest Revision | One-click retrieval | Partial (API only) | Medium | Simple |
-
-**Gap Analysis:**
-Silo lacks pessimistic locking (check-out), which is critical for multi-user CAD environments where file merging is impractical. Visual diff comparison would require FreeCAD integration for CAD file visualization.
-
---
-
-### 2. Workflow Management
-
-| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
-|---------|---------------|-------------|----------|------------|
-| Custom workflows | Full visual designer | None | Critical | Complex |
-| State transitions | Configurable with permissions | Basic (status field only) | Critical | Complex |
-| Parallel approvals | Multiple approvers required | None | High | Complex |
-| Automatic transitions | Timer/condition-based | None | Medium | Moderate |
-| Email notifications | On state change | None | High | Moderate |
-| ECO process | Built-in change management | None | High | Complex |
-| Child state conditions | Block parent if children invalid | None | Medium | Moderate |
-
-**Gap Analysis:**
-Workflow management is the largest functional gap. SOLIDWORKS PDM offers sophisticated state machines with parallel approvals, automatic transitions, and deep integration with engineering change processes. Silo currently has only a simple status field (draft/review/released/obsolete) with no transition rules or approval processes.
-
---
-
-### 3. User Management & Security
-
-| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
-|---------|---------------|-------------|----------|------------|
-| User authentication | Windows AD, LDAP | Full (local, LDAP, OIDC) | - | - |
-| Role-based permissions | Granular per folder/state | Partial (3-tier role model) | Medium | Moderate |
-| Group management | Full | None | Medium | Moderate |
-| Folder permissions | Read/write/delete per folder | None | Medium | Moderate |
-| State permissions | Actions allowed per state | None | High | Moderate |
-| Audit trail | Complete action logging | Full | - | - |
-| Private files | Pre-check-in visibility control | None | Low | Simple |
-
-**Gap Analysis:**
-Authentication is implemented with three backends (local, LDAP/FreeIPA, OIDC/Keycloak) and a 3-tier role model (admin > editor > viewer). Audit logging captures user actions. Remaining gaps: group management, folder-level permissions, and state-based permission rules.
-
---
-
-### 4. Search & Discovery
-
-| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
-|---------|---------------|-------------|----------|------------|
-| Metadata search | Full with custom cards | Partial (API query params + fuzzy) | High | Moderate |
-| Full-text content search | iFilters for Office, CAD | None | Medium | Complex |
-| Quick search | Toolbar with history | Partial (fuzzy search API) | Medium | Simple |
-| Saved searches | User-defined favorites | None | Medium | Simple |
-| Advanced operators | AND, OR, NOT, wildcards | None | Medium | Simple |
-| Multi-variable search | Search across multiple fields | None | Medium | Simple |
-| Where-used search | Find all assemblies using part | Full | - | - |
-
-**Gap Analysis:**
-Silo has API-level filtering, fuzzy search, and where-used queries. Remaining gaps: saved searches, advanced search operators, and a richer search UI. Content search (searching within CAD files) is not planned for the server.
-
---
-
-### 5. BOM Management
-
-| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
-|---------|---------------|-------------|----------|------------|
-| Single-level BOM | Yes | Full | - | - |
-| Multi-level BOM | Indented/exploded views | Full (recursive, configurable depth) | - | - |
-| BOM comparison | Between revisions | None | Medium | Moderate |
-| BOM export | Excel, XML, ERP formats | Full (CSV, ODS) | - | - |
-| BOM import | Bulk BOM loading | Full (CSV with upsert) | - | - |
-| Calculated BOMs | Quantities rolled up | None | Medium | Moderate |
-| Reference designators | Full support | Full | - | - |
-| Alternate parts | Substitute tracking | Full | - | - |
-
-**Gap Analysis:**
-Multi-level BOM retrieval (recursive CTE with configurable depth) and BOM export (CSV, ODS) are implemented. BOM import supports CSV with upsert and cycle detection. Remaining gap: BOM comparison between revisions.
-
---
-
-### 6. CAD Integration
-
-| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
-|---------|---------------|-------------|----------|------------|
-| Native CAD add-in | Deep SOLIDWORKS integration | FreeCAD workbench (silo-mod) | Medium | Complex |
-| Property mapping | Bi-directional sync | Planned (silo-mod) | Medium | Moderate |
-| Task pane | Embedded in CAD UI | Auth dock panel (silo-mod) | Medium | Complex |
-| Lightweight components | Handle without full load | N/A | - | - |
-| Drawing/model linking | Automatic association | Manual | Medium | Moderate |
-| Multi-CAD support | Third-party formats | FreeCAD only | Low | - |
-
-**Gap Analysis:**
-CAD integration is maintained in separate repositories ([silo-mod](https://git.kindred-systems.com/kindred/silo-mod), [silo-calc](https://git.kindred-systems.com/kindred/silo-calc)). The Silo server provides the REST API endpoints consumed by those clients.
-
---
-
-### 7. External Integrations
-
-| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
-|---------|---------------|-------------|----------|------------|
-| ERP integration | SAP, Dynamics, etc. | Partial (Odoo stubs) | Medium | Complex |
-| API access | Full COM/REST API | Full REST API (75 endpoints) | - | - |
-| Dispatch scripts | Automation without coding | None | Medium | Moderate |
-| Task scheduler | Background processing | None | Medium | Moderate |
-| Email system | SMTP integration | None | High | Simple |
-| Web portal | Browser access | Full (React SPA + auth) | - | - |
-
-**Gap Analysis:**
-Silo has a comprehensive REST API (75 endpoints) and a full web UI with authentication. Odoo ERP integration has config/sync-log scaffolding but push/pull operations are stubs. Remaining gaps: email notifications, task scheduler, dispatch automation.
-
---
-
-### 8. Reporting & Analytics
-
-| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
-|---------|---------------|-------------|----------|------------|
-| Standard reports | Inventory, usage, activity | None | Medium | Moderate |
-| Custom reports | User-defined queries | None | Medium | Moderate |
-| Dashboard | Visual KPIs | None | Low | Moderate |
-| Export formats | PDF, Excel, CSV | CSV and ODS | Medium | Simple |
-
-**Gap Analysis:**
-Reporting capabilities are absent. Basic reports (item counts, revision activity, where-used) would provide immediate value.
-
---
-
-### 9. File Handling
-
-| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
-|---------|---------------|-------------|----------|------------|
-| File versioning | Automatic | Full (MinIO) | - | - |
-| File preview | Thumbnails, 3D preview | None | Medium | Complex |
-| File conversion | PDF, DXF generation | None | Medium | Complex |
-| Replication | Multi-site sync | None | Low | Complex |
-| File copy with refs | Copy tree with references | None | Medium | Moderate |
-
-**Gap Analysis:**
-File storage works well. Thumbnail generation and file preview would significantly improve the web UI experience. Automatic conversion to PDF/DXF is valuable for sharing with non-CAD users.
-
---
-
-### Gap Summary by Priority
-
-#### Completed (Previously Critical/High)
-1. ~~**User authentication**~~ - Implemented: local, LDAP, OIDC
-2. ~~**Role-based permissions**~~ - Implemented: 3-tier role model (admin/editor/viewer)
-3. ~~**Audit trail**~~ - Implemented: audit_log table with completeness scoring
-4. ~~**Where-used search**~~ - Implemented: reverse parent lookup API
-5. ~~**Multi-level BOM API**~~ - Implemented: recursive expansion with configurable depth
-6. ~~**BOM export**~~ - Implemented: CSV and ODS formats
-
-#### Critical Gaps (Required for Team Use)
-1. **Workflow engine** - State machines with transitions and approvals
-2. **Check-out locking** - Pessimistic locking for CAD files
-
-#### High Priority Gaps (Significant Value)
-1. **Email notifications** - Alert users on state changes
-2. **Web UI search** - Advanced search interface with saved searches
-3. **Folder/state permissions** - Granular access control beyond role model
-
-#### Medium Priority Gaps (Nice to Have)
-1. **Saved searches** - Frequently used queries
-2. **File preview/thumbnails** - Visual browsing
-3. **Reporting** - Activity and inventory reports
-4. **Scheduled tasks** - Background automation
-5. **BOM comparison** - Revision diff for assemblies
-
---
-
-## Feature Roadmap
-
-### Phase 1: Foundation (Current - Q2 2026)
-*Complete MVP and stabilize core functionality*
-
-| Feature | Description | Status |
-|---------|-------------|--------|
-| MinIO integration | File upload/download with versioning and checksums | Complete |
-| Revision control | Rollback, comparison, status/labels | Complete |
-| CSV import/export | Dry-run validation, template generation | Complete |
-| ODS import/export | Items, BOMs, project sheets, templates | Complete |
-| Project management | CRUD, many-to-many item tagging | Complete |
-| Multi-level BOM | Recursive expansion, where-used, export | Complete |
-| Authentication | Local, LDAP, OIDC with role-based access | Complete |
-| Audit logging | Action logging, completeness scoring | Complete |
-| Unit tests | Core API and database operations | Not Started |
-| Date segment type | Support date-based part number segments | Not Started |
-| Part number validation | Validate format on creation | Not Started |
-| Location CRUD API | Expose location hierarchy via REST | Not Started |
-| Inventory API | Expose inventory operations via REST | Not Started |
-
-### Phase 2: Multi-User (Q2-Q3 2026)
-*Enable team collaboration*
-
-| Feature | Description | Status |
-|---------|-------------|--------|
-| LDAP authentication | Integrate with FreeIPA/Active Directory | **Complete** |
-| OIDC authentication | Keycloak / OpenID Connect | **Complete** |
-| Audit logging | Record all user actions with timestamps | **Complete** |
-| Session management | Token-based and session-based API authentication | **Complete** |
-| User/group management | Create, assign, manage users and groups | Not Started |
-| Folder permissions | Read/write/delete per folder hierarchy | Not Started |
-| Check-out locking | Pessimistic locks with timeout | Not Started |
-
-### Phase 3: Workflow Engine (Q3-Q4 2026)
-*Implement engineering change processes*
-
-| Feature | Description | Complexity |
-|---------|-------------|------------|
-| Workflow designer | YAML-defined state machines | Complex |
-| State transitions | Configurable transition rules | Complex |
-| Transition permissions | Who can execute which transitions | Moderate |
-| Single approvals | Basic approval workflow | Moderate |
-| Parallel approvals | Multi-approver gates | Complex |
-| Automatic transitions | Timer and condition-based | Complex |
-| Email notifications | SMTP integration for alerts | Simple |
-| Child state conditions | Block parent transitions | Moderate |
-
-### Phase 4: Search & Discovery (Q4 2026 - Q1 2027)
-*Improve findability and navigation*
-
-| Feature | Description | Status |
-|---------|-------------|--------|
-| Where-used queries | Find parent assemblies | **Complete** |
-| Fuzzy search | Quick search across items | **Complete** |
-| Advanced search UI | Web interface with filters | Not Started |
-| Search operators | AND, OR, NOT, wildcards | Not Started |
-| Saved searches | User favorites | Not Started |
-| Content search | Search within file content | Not Started |
-
-### Phase 5: BOM & Reporting (Q1-Q2 2027)
-*Enhanced BOM management and analytics*
-
-| Feature | Description | Status |
-|---------|-------------|--------|
-| Multi-level BOM API | Recursive assembly retrieval | **Complete** |
-| BOM export | CSV and ODS formats | **Complete** |
-| BOM import | CSV with upsert and cycle detection | **Complete** |
-| BOM comparison | Diff between revisions | Not Started |
-| Standard reports | Activity, inventory, usage | Not Started |
-| Custom queries | User-defined report builder | Not Started |
-| Dashboard | Visual KPIs and metrics | Not Started |
-
-### Phase 6: Advanced Features (Q2-Q4 2027)
-*Enterprise capabilities*
-
-| Feature | Description | Complexity |
-|---------|-------------|------------|
-| File preview | Thumbnail generation | Complex |
-| File conversion | Auto-generate PDF/DXF | Complex |
-| ERP integration | Adapter framework | Complex |
-| Task scheduler | Background job processing | Moderate |
-| Webhooks | Event notifications to external systems | Moderate |
-| API rate limiting | Protect against abuse | Simple |
-
---
-
-## Implementation Phases
-
-### Phase 1 Detailed Tasks
-
-#### 1.1 MinIO Integration -- COMPLETE
- [x] MinIO service configured in Docker Compose
- [x] File upload via REST API
- [x] File download via REST API (latest and by revision)
- [x] SHA256 checksums on upload
-
-#### 1.2 Authentication & Authorization -- COMPLETE
- [x] Local authentication (bcrypt)
- [x] LDAP/FreeIPA authentication
- [x] OIDC/Keycloak authentication
- [x] Role-based access control (admin/editor/viewer)
- [x] API token management (SHA-256 hashed)
- [x] Session management (PostgreSQL-backed)
- [x] CSRF protection (nosurf)
- [x] Audit logging (database table)
-
-#### 1.3 Multi-level BOM & Export -- COMPLETE
- [x] Recursive BOM expansion with configurable depth
- [x] Where-used reverse lookup
- [x] BOM CSV export/import with cycle detection
- [x] BOM ODS export
- [x] ODS item export/import/template
-
-#### 1.4 Unit Test Suite
- [ ] Database connection and transaction tests
- [ ] Item CRUD operation tests
- [ ] Revision creation and retrieval tests
- [ ] Part number generation tests
- [ ] File upload/download tests
- [ ] CSV import/export tests
- [ ] API endpoint tests
-
-#### 1.5 Missing Segment Types
- [ ] Implement date segment type
- [ ] Add strftime-style format support
-
-#### 1.6 Location & Inventory APIs
- [ ] `GET /api/locations` - List locations
- [ ] `POST /api/locations` - Create location
- [ ] `GET /api/locations/{path}` - Get location
- [ ] `DELETE /api/locations/{path}` - Delete location
- [ ] `GET /api/inventory/{partNumber}` - Get inventory
- [ ] `POST /api/inventory/{partNumber}/adjust` - Adjust quantity
- [ ] `POST /api/inventory/{partNumber}/move` - Move between locations
-
---
-
-## Success Metrics
-
-### Phase 1 (Foundation)
- All existing tests pass
- File upload/download works end-to-end
- FreeCAD users can checkout, modify, commit parts
-
-### Phase 2 (Multi-User)
- 5+ concurrent users supported
- No data corruption under concurrent access
- Audit log captures all modifications
-
-### Phase 3 (Workflow)
- Engineering change process completable in Silo
- Email notifications delivered reliably
- Workflow state visible in web UI
-
-### Phase 4+ (Advanced)
- Search returns results in <2 seconds
- Where-used queries complete in <5 seconds
- BOM export matches assembly structure
-
---
-
-## References
-
-### SOLIDWORKS PDM Documentation
- [SOLIDWORKS PDM Product Page](https://www.solidworks.com/product/solidworks-pdm)
- [What's New in SOLIDWORKS PDM 2025](https://blogs.solidworks.com/solidworksblog/2024/10/whats-new-in-solidworks-pdm-2025.html)
- [Top 5 Enhancements in SOLIDWORKS PDM 2024](https://blogs.solidworks.com/solidworksblog/2023/10/top-5-enhancements-in-solidworks-pdm-2024.html)
- [SOLIDWORKS PDM Workflow Transitions](https://help.solidworks.com/2023/english/EnterprisePDM/Admin/c_workflow_transition.htm)
- [Ultimate Guide to SOLIDWORKS PDM Permissions](https://www.goengineer.com/blog/ultimate-guide-to-solidworks-pdm-permissions)
- [Searching in SOLIDWORKS PDM](https://help.solidworks.com/2021/english/EnterprisePDM/fileexplorer/c_searches.htm)
- [SOLIDWORKS PDM API Getting Started](https://3dswym.3dexperience.3ds.com/wiki/solidworks-news-info/getting-started-with-the-solidworks-pdm-api-solidpractices_gBCYaM75RgORBcpSO1m_Mw)
-
-### Silo Documentation
- [Specification](docs/SPECIFICATION.md)
- [Development Status](docs/STATUS.md)
- [Deployment Guide](docs/DEPLOYMENT.md)
- [Gap Analysis](docs/GAP_ANALYSIS.md)
-
---
-
-## Appendix: Feature Comparison Matrix
-
-| Category | Feature | SW PDM Standard | SW PDM Pro | Silo Current | Silo Planned |
-|----------|---------|-----------------|------------|--------------|--------------|
-| **Version Control** | Check-in/out | Yes | Yes | No | Phase 2 |
-| | Version history | Yes | Yes | Yes | - |
-| | Rollback | Yes | Yes | Yes | - |
-| | Revision labels/status | Yes | Yes | Yes | - |
-| | Revision comparison | Yes | Yes | Yes (metadata) | - |
-| **Workflow** | Custom workflows | Limited | Yes | No | Phase 3 |
-| | Parallel approval | No | Yes | No | Phase 3 |
-| | Notifications | No | Yes | No | Phase 3 |
-| **Security** | User auth | Windows | Windows/LDAP | Yes (local, LDAP, OIDC) | - |
-| | Permissions | Basic | Granular | Partial (role-based) | Phase 2 |
-| | Audit trail | Basic | Full | Yes | - |
-| **Search** | Metadata search | Yes | Yes | Partial (API + fuzzy) | Phase 4 |
-| | Content search | No | Yes | No | Phase 4 |
-| | Where-used | Yes | Yes | Yes | - |
-| **BOM** | Single-level | Yes | Yes | Yes | - |
-| | Multi-level | Yes | Yes | Yes (recursive) | - |
-| | BOM export | Yes | Yes | Yes (CSV, ODS) | - |
-| **Data** | CSV import/export | Yes | Yes | Yes | - |
-| | ODS import/export | No | No | Yes | - |
-| | Project management | Yes | Yes | Yes | - |
-| **Integration** | API | Limited | Full | Full REST (75) | - |
-| | ERP connectors | No | Yes | Partial (Odoo stubs) | Phase 6 |
-| | Web access | No | Yes | Yes (React SPA + auth) | - |
-| **Files** | Versioning | Yes | Yes | Yes | - |
-| | Preview | Yes | Yes | No | Phase 6 |
-| | Multi-site | No | Yes | No | Not Planned |
--- a/cmd/silo/main.go
+++ b/cmd/silo/main.go
@@ -66,7 +66,7 @@ Token subcommands:
  silo token revoke <id>                Revoke a token

 Environment variables for API access:
-  SILO_API_URL     Base URL of the Silo server (e.g., https://silo.kindred.internal)
+  SILO_API_URL     Base URL of the Silo server (e.g., https://silo.example.internal)
  SILO_API_TOKEN   API token for authentication

 Examples:
--- a/config.example.yaml
+++ b/config.example.yaml
@@ -8,20 +8,20 @@ server:
  # read_only: false  # Reject all write operations; toggle at runtime with SIGUSR1

 database:
-  host: "psql.kindred.internal"
+  host: "localhost" # Use "postgres" for Docker Compose
  port: 5432
  name: "silo"
  user: "silo"
  password: "" # Use SILO_DB_PASSWORD env var
-  sslmode: "require"
+  sslmode: "require" # Use "disable" for Docker Compose (internal network)
  max_connections: 10

 storage:
-  endpoint: "minio.kindred.internal:9000"
+  endpoint: "localhost:9000" # Use "minio:9000" for Docker Compose
  access_key: "" # Use SILO_MINIO_ACCESS_KEY env var
  secret_key: "" # Use SILO_MINIO_SECRET_KEY env var
  bucket: "silo-files"
-  use_ssl: true
+  use_ssl: true # Use false for Docker Compose (internal network)
  region: "us-east-1"

 schemas:
@@ -53,7 +53,7 @@ auth:
  # LDAP / FreeIPA
  ldap:
    enabled: false
-    url: "ldaps://ipa.kindred.internal"
+    url: "ldaps://ipa.example.internal"
    base_dn: "dc=kindred,dc=internal"
    user_search_dn: "cn=users,cn=accounts,dc=kindred,dc=internal"
    # Optional service account for user search (omit for direct user bind)
@@ -77,10 +77,10 @@ auth:
  # OIDC / Keycloak
  oidc:
    enabled: false
-    issuer_url: "https://keycloak.kindred.internal/realms/silo"
+    issuer_url: "https://keycloak.example.internal/realms/silo"
    client_id: "silo"
    client_secret: "" # Use SILO_OIDC_CLIENT_SECRET env var
-    redirect_url: "https://silo.kindred.internal/auth/callback"
+    redirect_url: "https://silo.example.internal/auth/callback"
    scopes: ["openid", "profile", "email"]
    # Map Keycloak realm roles to Silo roles
    admin_role: "silo-admin"
@@ -90,4 +90,4 @@ auth:
  # CORS origins (locked down when auth is enabled)
  cors:
    allowed_origins:
-      - "https://silo.kindred.internal"
+      - "https://silo.example.internal"
--- a/deployments/config.dev.yaml
+++ b/deployments/config.dev.yaml
@@ -0,0 +1,35 @@
+# Silo Development Configuration
+# Used by deployments/docker-compose.yaml — works with zero setup via `make docker-up`.
+# For production Docker installs, run scripts/setup-docker.sh instead.
+
+server:
+  host: "0.0.0.0"
+  port: 8080
+  base_url: "http://localhost:8080"
+
+database:
+  host: "postgres"
+  port: 5432
+  name: "silo"
+  user: "silo"
+  password: "${POSTGRES_PASSWORD:-silodev}"
+  sslmode: "disable"
+  max_connections: 10
+
+storage:
+  endpoint: "minio:9000"
+  access_key: "${MINIO_ACCESS_KEY:-silominio}"
+  secret_key: "${MINIO_SECRET_KEY:-silominiosecret}"
+  bucket: "silo-files"
+  use_ssl: false
+  region: "us-east-1"
+
+schemas:
+  directory: "/etc/silo/schemas"
+  default: "kindred-rd"
+
+freecad:
+  uri_scheme: "silo"
+
+auth:
+  enabled: false
--- a/deployments/config.prod.yaml
+++ b/deployments/config.prod.yaml
@@ -1,7 +1,7 @@
 # Silo Production Configuration
 # Single-binary deployment: silod serves API + React SPA
 #
-# Layout on silo.kindred.internal:
+# Layout on silo.example.internal:
 #   /opt/silo/bin/silod          - server binary
 #   /opt/silo/web/dist/          - built React frontend (served automatically)
 #   /opt/silo/schemas/           - part number schemas
@@ -18,10 +18,10 @@
 server:
  host: "0.0.0.0"
  port: 8080
-  base_url: "https://silo.kindred.internal"
+  base_url: "https://silo.example.internal"

 database:
-  host: "psql.kindred.internal"
+  host: "psql.example.internal"
  port: 5432
  name: "silo"
  user: "silo"
@@ -30,7 +30,7 @@ database:
  max_connections: 20

 storage:
-  endpoint: "minio.kindred.internal:9000"
+  endpoint: "minio.example.internal:9000"
  access_key: "" # Set via SILO_MINIO_ACCESS_KEY
  secret_key: "" # Set via SILO_MINIO_SECRET_KEY
  bucket: "silo-files"
@@ -53,7 +53,7 @@ auth:
    default_admin_password: "" # Set via SILO_ADMIN_PASSWORD
  ldap:
    enabled: true
-    url: "ldaps://ipa.kindred.internal"
+    url: "ldaps://ipa.example.internal"
    base_dn: "dc=kindred,dc=internal"
    user_search_dn: "cn=users,cn=accounts,dc=kindred,dc=internal"
    user_attr: "uid"
@@ -73,4 +73,4 @@ auth:
    enabled: false
  cors:
    allowed_origins:
-      - "https://silo.kindred.internal"
+      - "https://silo.example.internal"
--- a/deployments/docker-compose.allinone.yaml
+++ b/deployments/docker-compose.allinone.yaml
@@ -0,0 +1,172 @@
+# Silo All-in-One Stack
+# PostgreSQL + MinIO + OpenLDAP + Silo API + Nginx (optional)
+#
+# Quick start:
+#   ./scripts/setup-docker.sh
+#   docker compose -f deployments/docker-compose.allinone.yaml up -d
+#
+# With nginx reverse proxy:
+#   docker compose -f deployments/docker-compose.allinone.yaml --profile nginx up -d
+#
+# View logs:
+#   docker compose -f deployments/docker-compose.allinone.yaml logs -f
+#
+# Stop:
+#   docker compose -f deployments/docker-compose.allinone.yaml down
+#
+# Stop and delete data:
+#   docker compose -f deployments/docker-compose.allinone.yaml down -v
+
+services:
+  # ---------------------------------------------------------------------------
+  # PostgreSQL 16
+  # ---------------------------------------------------------------------------
+  postgres:
+    image: postgres:16-alpine
+    container_name: silo-postgres
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: silo
+      POSTGRES_USER: silo
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?Run ./scripts/setup-docker.sh first}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+      - ../migrations:/docker-entrypoint-initdb.d:ro
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U silo -d silo"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      - silo-net
+
+  # ---------------------------------------------------------------------------
+  # MinIO (S3-compatible object storage)
+  # ---------------------------------------------------------------------------
+  minio:
+    image: minio/minio:latest
+    container_name: silo-minio
+    restart: unless-stopped
+    command: server /data --console-address ":9001"
+    environment:
+      MINIO_ROOT_USER: ${MINIO_ACCESS_KEY:?Run ./scripts/setup-docker.sh first}
+      MINIO_ROOT_PASSWORD: ${MINIO_SECRET_KEY:?Run ./scripts/setup-docker.sh first}
+    volumes:
+      - minio_data:/data
+    ports:
+      - "9001:9001"           # MinIO console (remove in hardened setups)
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - silo-net
+
+  # ---------------------------------------------------------------------------
+  # OpenLDAP (user directory for LDAP authentication)
+  # ---------------------------------------------------------------------------
+  openldap:
+    image: bitnami/openldap:2.6
+    container_name: silo-openldap
+    restart: unless-stopped
+    environment:
+      LDAP_ROOT: "dc=silo,dc=local"
+      LDAP_ADMIN_USERNAME: "admin"
+      LDAP_ADMIN_PASSWORD: ${LDAP_ADMIN_PASSWORD:?Run ./scripts/setup-docker.sh first}
+      LDAP_USERS: ${LDAP_USERS:-siloadmin}
+      LDAP_PASSWORDS: ${LDAP_PASSWORDS:?Run ./scripts/setup-docker.sh first}
+      LDAP_GROUP: "silo-users"
+      LDAP_USER_OU: "users"
+      LDAP_GROUP_OU: "groups"
+    volumes:
+      - openldap_data:/bitnami/openldap
+      - ./ldap:/docker-entrypoint-initdb.d:ro
+    ports:
+      - "1389:1389"           # LDAP access for debugging (remove in hardened setups)
+    healthcheck:
+      test: ["CMD-SHELL", "ldapsearch -x -H ldap://localhost:1389 -b dc=silo,dc=local -D cn=admin,dc=silo,dc=local -w $${LDAP_ADMIN_PASSWORD} '(objectClass=organization)' >/dev/null 2>&1"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - silo-net
+
+  # ---------------------------------------------------------------------------
+  # Silo API Server
+  # ---------------------------------------------------------------------------
+  silo:
+    build:
+      context: ..
+      dockerfile: build/package/Dockerfile
+    container_name: silo-api
+    restart: unless-stopped
+    depends_on:
+      postgres:
+        condition: service_healthy
+      minio:
+        condition: service_healthy
+      openldap:
+        condition: service_healthy
+    env_file:
+      - .env
+    environment:
+      # These override values in config.docker.yaml via the Go config loader's
+      # direct env var support (see internal/config/config.go).
+      SILO_DB_HOST: postgres
+      SILO_DB_NAME: silo
+      SILO_DB_USER: silo
+      SILO_DB_PASSWORD: ${POSTGRES_PASSWORD}
+      SILO_MINIO_ENDPOINT: minio:9000
+      SILO_MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
+      SILO_MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
+    ports:
+      - "${SILO_PORT:-8080}:8080"
+    volumes:
+      - ../schemas:/etc/silo/schemas:ro
+      - ./config.docker.yaml:/etc/silo/config.yaml:ro
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://localhost:8080/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 15s
+    networks:
+      - silo-net
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+
+  # ---------------------------------------------------------------------------
+  # Nginx reverse proxy (optional — enable with --profile nginx)
+  # ---------------------------------------------------------------------------
+  nginx:
+    image: nginx:alpine
+    container_name: silo-nginx
+    restart: unless-stopped
+    profiles:
+      - nginx
+    depends_on:
+      silo:
+        condition: service_healthy
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+      # Uncomment to mount TLS certificates:
+      # - /path/to/cert.pem:/etc/nginx/ssl/cert.pem:ro
+      # - /path/to/key.pem:/etc/nginx/ssl/key.pem:ro
+    networks:
+      - silo-net
+
+volumes:
+  postgres_data:
+  minio_data:
+  openldap_data:
+
+networks:
+  silo-net:
+    driver: bridge
--- a/deployments/docker-compose.prod.yaml
+++ b/deployments/docker-compose.prod.yaml
@@ -1,5 +1,5 @@
 # Production Docker Compose for Silo
-# Uses external PostgreSQL (psql.kindred.internal) and MinIO (minio.kindred.internal)
+# Uses external PostgreSQL (psql.example.internal) and MinIO (minio.example.internal)
 #
 # Usage:
 #   export SILO_DB_PASSWORD=<your-password>
@@ -15,23 +15,23 @@ services:
    container_name: silod
    restart: unless-stopped
    environment:
-      # Database connection (psql.kindred.internal)
-      SILO_DB_HOST: psql.kindred.internal
-      SILO_DB_PORT: 5432
+      # Database connection (psql.example.internal)
+      # Supported as direct env var overrides in the Go config loader:
+      SILO_DB_HOST: psql.example.internal
      SILO_DB_NAME: silo
      SILO_DB_USER: silo
      SILO_DB_PASSWORD: ${SILO_DB_PASSWORD:?Database password required}
-      SILO_DB_SSLMODE: require
+      # Note: SILO_DB_PORT and SILO_DB_SSLMODE are NOT supported as direct
+      # env var overrides. Set these in config.yaml instead, or use ${VAR}
+      # syntax in the YAML file. See docs/CONFIGURATION.md for details.

-      # MinIO storage (minio.kindred.internal)
-      SILO_MINIO_ENDPOINT: minio.kindred.internal:9000
+      # MinIO storage (minio.example.internal)
+      # Supported as direct env var overrides:
+      SILO_MINIO_ENDPOINT: minio.example.internal:9000
      SILO_MINIO_ACCESS_KEY: ${SILO_MINIO_ACCESS_KEY:?MinIO access key required}
      SILO_MINIO_SECRET_KEY: ${SILO_MINIO_SECRET_KEY:?MinIO secret key required}
-      SILO_MINIO_BUCKET: silo-files
-      SILO_MINIO_USE_SSL: "true"
-
-      # Server settings
-      SILO_SERVER_BASE_URL: ${SILO_BASE_URL:-http://silo.kindred.internal:8080}
+      # Note: SILO_MINIO_BUCKET and SILO_MINIO_USE_SSL are NOT supported as
+      # direct env var overrides. Set these in config.yaml instead.
    ports:
      - "8080:8080"
    volumes:
--- a/deployments/docker-compose.yaml
+++ b/deployments/docker-compose.yaml
@@ -69,7 +69,7 @@ services:
      - "8080:8080"
    volumes:
      - ../schemas:/etc/silo/schemas:ro
-      - ../configs/config.yaml:/etc/silo/config.yaml:ro
+      - ./config.dev.yaml:/etc/silo/config.yaml:ro
    healthcheck:
      test: ["CMD", "wget", "-qO-", "http://localhost:8080/health"]
      interval: 10s
--- a/deployments/ldap/memberof.ldif
+++ b/deployments/ldap/memberof.ldif
@@ -0,0 +1,36 @@
+# Enable the memberOf overlay for OpenLDAP.
+# When a user is added to a groupOfNames, their entry automatically
+# gets a memberOf attribute pointing to the group DN.
+# This is required for Silo's LDAP role mapping.
+#
+# Loaded automatically by bitnami/openldap from /docker-entrypoint-initdb.d/
+
+dn: cn=module{0},cn=config
+changetype: modify
+add: olcModuleLoad
+olcModuleLoad: memberof
+
+dn: olcOverlay=memberof,olcDatabase={2}mdb,cn=config
+changetype: add
+objectClass: olcOverlayConfig
+objectClass: olcMemberOf
+olcOverlay: memberof
+olcMemberOfRefInt: TRUE
+olcMemberOfDangling: ignore
+olcMemberOfGroupOC: groupOfNames
+olcMemberOfMemberAD: member
+olcMemberOfMemberOfAD: memberOf
+
+# Enable refint overlay to maintain referential integrity
+# (removes memberOf when a user is removed from a group)
+dn: cn=module{0},cn=config
+changetype: modify
+add: olcModuleLoad
+olcModuleLoad: refint
+
+dn: olcOverlay=refint,olcDatabase={2}mdb,cn=config
+changetype: add
+objectClass: olcOverlayConfig
+objectClass: olcRefintConfig
+olcOverlay: refint
+olcRefintAttribute: memberOf member
--- a/deployments/ldap/silo-groups.ldif
+++ b/deployments/ldap/silo-groups.ldif
@@ -0,0 +1,34 @@
+# Create Silo role groups for LDAP-based access control.
+# These groups map to Silo roles via auth.ldap.role_mapping in config.yaml.
+#
+# Group hierarchy:
+#   silo-admins  -> admin role  (full access)
+#   silo-users   -> editor role (create/modify items)
+#   silo-viewers  -> viewer role (read-only)
+#
+# The initial LDAP user (set via LDAP_USERS env var) is added to silo-admins.
+# Additional users can be added with ldapadd or ldapmodify.
+#
+# Loaded automatically by bitnami/openldap from /docker-entrypoint-initdb.d/
+# Note: This runs after the default tree is created (users/groups OUs exist).
+
+# Admin group — initial user is a member
+dn: cn=silo-admins,ou=groups,dc=silo,dc=local
+objectClass: groupOfNames
+cn: silo-admins
+description: Silo administrators (full access)
+member: cn=siloadmin,ou=users,dc=silo,dc=local
+
+# Editor group
+dn: cn=silo-users,ou=groups,dc=silo,dc=local
+objectClass: groupOfNames
+cn: silo-users
+description: Silo editors (create and modify items)
+member: cn=placeholder,ou=users,dc=silo,dc=local
+
+# Viewer group
+dn: cn=silo-viewers,ou=groups,dc=silo,dc=local
+objectClass: groupOfNames
+cn: silo-viewers
+description: Silo viewers (read-only access)
+member: cn=placeholder,ou=users,dc=silo,dc=local
--- a/deployments/nginx/nginx-nossl.conf
+++ b/deployments/nginx/nginx-nossl.conf
@@ -0,0 +1,44 @@
+# Silo Nginx Reverse Proxy — HTTP only (no TLS)
+#
+# Use this when TLS is terminated by an external load balancer or when
+# running on a trusted internal network without HTTPS.
+
+upstream silo_backend {
+    server silo:8080;
+}
+
+server {
+    listen 80;
+    listen [::]:80;
+    server_name _;
+
+    location / {
+        proxy_pass http://silo_backend;
+        proxy_http_version 1.1;
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Port $server_port;
+
+        # SSE support
+        proxy_set_header Connection "";
+        proxy_buffering off;
+
+        # Timeouts
+        proxy_connect_timeout 60s;
+        proxy_send_timeout 60s;
+        proxy_read_timeout 300s;
+
+        # File uploads (CAD files can be large)
+        client_max_body_size 100M;
+    }
+
+    location /nginx-health {
+        access_log off;
+        return 200 "OK\n";
+        add_header Content-Type text/plain;
+    }
+}
--- a/deployments/nginx/nginx.conf
+++ b/deployments/nginx/nginx.conf
@@ -0,0 +1,103 @@
+# Silo Nginx Reverse Proxy (Docker)
+#
+# HTTP reverse proxy with optional HTTPS. To enable TLS:
+#   1. Uncomment the ssl server block below
+#   2. Mount your certificate and key in docker-compose:
+#        volumes:
+#          - /path/to/cert.pem:/etc/nginx/ssl/cert.pem:ro
+#          - /path/to/key.pem:/etc/nginx/ssl/key.pem:ro
+#   3. Uncomment the HTTP-to-HTTPS redirect in the port 80 block
+
+upstream silo_backend {
+    server silo:8080;
+}
+
+# HTTP server
+server {
+    listen 80;
+    listen [::]:80;
+    server_name _;
+
+    # Uncomment the next line to redirect all HTTP traffic to HTTPS
+    # return 301 https://$host$request_uri;
+
+    location / {
+        proxy_pass http://silo_backend;
+        proxy_http_version 1.1;
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Port $server_port;
+
+        # SSE support
+        proxy_set_header Connection "";
+        proxy_buffering off;
+
+        # Timeouts
+        proxy_connect_timeout 60s;
+        proxy_send_timeout 60s;
+        proxy_read_timeout 300s;
+
+        # File uploads (CAD files can be large)
+        client_max_body_size 100M;
+    }
+
+    # Health check endpoint for monitoring
+    location /nginx-health {
+        access_log off;
+        return 200 "OK\n";
+        add_header Content-Type text/plain;
+    }
+}
+
+# Uncomment for HTTPS (mount certs in docker-compose volumes)
+# server {
+#     listen 443 ssl http2;
+#     listen [::]:443 ssl http2;
+#     server_name _;
+#
+#     ssl_certificate /etc/nginx/ssl/cert.pem;
+#     ssl_certificate_key /etc/nginx/ssl/key.pem;
+#
+#     ssl_protocols TLSv1.2 TLSv1.3;
+#     ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305;
+#     ssl_prefer_server_ciphers off;
+#     ssl_session_timeout 1d;
+#     ssl_session_cache shared:SSL:10m;
+#     ssl_session_tickets off;
+#
+#     # Security headers
+#     add_header X-Frame-Options "SAMEORIGIN" always;
+#     add_header X-Content-Type-Options "nosniff" always;
+#     add_header Referrer-Policy "strict-origin-when-cross-origin" always;
+#
+#     location / {
+#         proxy_pass http://silo_backend;
+#         proxy_http_version 1.1;
+#
+#         proxy_set_header Host $host;
+#         proxy_set_header X-Real-IP $remote_addr;
+#         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+#         proxy_set_header X-Forwarded-Proto $scheme;
+#         proxy_set_header X-Forwarded-Host $host;
+#         proxy_set_header X-Forwarded-Port $server_port;
+#
+#         proxy_set_header Connection "";
+#         proxy_buffering off;
+#
+#         proxy_connect_timeout 60s;
+#         proxy_send_timeout 60s;
+#         proxy_read_timeout 300s;
+#
+#         client_max_body_size 100M;
+#     }
+#
+#     location /nginx-health {
+#         access_log off;
+#         return 200 "OK\n";
+#         add_header Content-Type text/plain;
+#     }
+# }
--- a/deployments/systemd/silod.env.example
+++ b/deployments/systemd/silod.env.example
@@ -2,11 +2,11 @@
 # Copy to /etc/silo/silod.env and fill in values
 # Permissions: chmod 600 /etc/silo/silod.env

-# Database credentials (psql.kindred.internal)
+# Database credentials (psql.example.internal)
 # Database: silo, User: silo
 SILO_DB_PASSWORD=

-# MinIO credentials (minio.kindred.internal)
+# MinIO credentials (minio.example.internal)
 # User: silouser
 SILO_MINIO_ACCESS_KEY=silouser
 SILO_MINIO_SECRET_KEY=
@@ -23,4 +23,4 @@ SILO_ADMIN_PASSWORD=
 # SILO_LDAP_BIND_PASSWORD=

 # Optional: Override server base URL
-# SILO_SERVER_BASE_URL=http://silo.kindred.internal:8080
+# SILO_SERVER_BASE_URL=http://silo.example.internal:8080
--- a/docs/AUTH_USER_GUIDE.md
+++ b/docs/AUTH_USER_GUIDE.md
@@ -38,7 +38,7 @@ API tokens allow the FreeCAD plugin, scripts, and CI pipelines to authenticate w
 ### Creating a Token (CLI)

 ```sh
-export SILO_API_URL=https://silo.kindred.internal
+export SILO_API_URL=https://silo.example.internal
 export SILO_API_TOKEN=silo_<your-existing-token>

 silo token create --name "CI pipeline"
@@ -140,7 +140,7 @@ auth:

  ldap:
    enabled: true
-    url: "ldaps://ipa.kindred.internal"
+    url: "ldaps://ipa.example.internal"
    base_dn: "dc=kindred,dc=internal"
    user_search_dn: "cn=users,cn=accounts,dc=kindred,dc=internal"
    user_attr: "uid"
@@ -170,10 +170,10 @@ auth:

  oidc:
    enabled: true
-    issuer_url: "https://keycloak.kindred.internal/realms/silo"
+    issuer_url: "https://keycloak.example.internal/realms/silo"
    client_id: "silo"
    client_secret: ""  # Set via SILO_OIDC_CLIENT_SECRET
-    redirect_url: "https://silo.kindred.internal/auth/callback"
+    redirect_url: "https://silo.example.internal/auth/callback"
    scopes: ["openid", "profile", "email"]
    admin_role: "silo-admin"
    editor_role: "silo-editor"
@@ -186,7 +186,7 @@ auth:
 auth:
  cors:
    allowed_origins:
-      - "https://silo.kindred.internal"
+      - "https://silo.example.internal"
 ```

 ## Environment Variables
@@ -254,4 +254,4 @@ UPDATE users SET password_hash = '<bcrypt-hash>', is_active = true WHERE usernam

 - Verify the token is set in FreeCAD preferences or `SILO_API_TOKEN`
 - Check the API URL points to the correct server
- Test with curl: `curl -H "Authorization: Bearer silo_..." https://silo.kindred.internal/api/items`
+- Test with curl: `curl -H "Authorization: Bearer silo_..." https://silo.example.internal/api/items`
--- a/docs/BOM_MERGE.md
+++ b/docs/BOM_MERGE.md
--- a/docs/DEPLOYMENT.md
+++ b/docs/DEPLOYMENT.md
@@ -1,5 +1,9 @@
 # Silo Production Deployment Guide

+> **First-time setup?** See the [Installation Guide](INSTALL.md) for step-by-step
+> instructions. This document covers ongoing maintenance and operations for an
+> existing deployment.
+
 This guide covers deploying Silo to a dedicated VM using external PostgreSQL and MinIO services.

 ## Table of Contents
@@ -17,7 +21,7 @@ This guide covers deploying Silo to a dedicated VM using external PostgreSQL and

 ```
 ┌─────────────────────────────────────────────────────────────────┐
-│                     silo.kindred.internal                       │
+│                     silo.example.internal                       │
 │  ┌───────────────────────────────────────────────────────────┐ │
 │  │                        silod                               │ │
 │  │                   (Silo API Server)                        │ │
@@ -27,7 +31,7 @@ This guide covers deploying Silo to a dedicated VM using external PostgreSQL and
              │                               │
              ▼                               ▼
 ┌─────────────────────────┐     ┌─────────────────────────────────┐
-│  psql.kindred.internal  │     │    minio.kindred.internal       │
+│  psql.example.internal  │     │    minio.example.internal       │
 │      PostgreSQL 16      │     │         MinIO S3                │
 │        :5432            │     │       :9000 (API)               │
 │                         │     │       :9001 (Console)           │
@@ -40,8 +44,8 @@ The following external services are already configured:

 | Service | Host | Database/Bucket | User |
 |---------|------|-----------------|------|
-| PostgreSQL | psql.kindred.internal:5432 | silo | silo |
-| MinIO | minio.kindred.internal:9000 | silo-files | silouser |
+| PostgreSQL | psql.example.internal:5432 | silo | silo |
+| MinIO | minio.example.internal:9000 | silo-files | silouser |

 Migrations have been applied to the database.

@@ -53,10 +57,10 @@ For a fresh VM, run these commands:

 ```bash
 # 1. SSH to the target host
-ssh root@silo.kindred.internal
+ssh root@silo.example.internal

 # 2. Download and run setup script
-curl -fsSL https://gitea.kindred.internal/kindred/silo-0062/raw/branch/main/scripts/setup-host.sh | bash
+curl -fsSL https://git.kindred-systems.com/kindred/silo/raw/branch/main/scripts/setup-host.sh | bash

 # 3. Configure credentials
 nano /etc/silo/silod.env
@@ -69,16 +73,16 @@ nano /etc/silo/silod.env

 ## Initial Setup

-Run the setup script once on `silo.kindred.internal` to prepare the host:
+Run the setup script once on `silo.example.internal` to prepare the host:

 ```bash
 # Option 1: If you have the repo locally
-scp scripts/setup-host.sh root@silo.kindred.internal:/tmp/
-ssh root@silo.kindred.internal 'bash /tmp/setup-host.sh'
+scp scripts/setup-host.sh root@silo.example.internal:/tmp/
+ssh root@silo.example.internal 'bash /tmp/setup-host.sh'

 # Option 2: Direct on the host
-ssh root@silo.kindred.internal
-curl -fsSL https://git.kindred.internal/kindred/silo/raw/branch/main/scripts/setup-host.sh -o /tmp/setup-host.sh
+ssh root@silo.example.internal
+curl -fsSL https://git.kindred-systems.com/kindred/silo/raw/branch/main/scripts/setup-host.sh -o /tmp/setup-host.sh
 bash /tmp/setup-host.sh
 ```

@@ -100,10 +104,10 @@ sudo nano /etc/silo/silod.env
 Fill in the values:

 ```bash
-# Database credentials (psql.kindred.internal)
+# Database credentials (psql.example.internal)
 SILO_DB_PASSWORD=your-database-password

-# MinIO credentials (minio.kindred.internal)
+# MinIO credentials (minio.example.internal)
 SILO_MINIO_ACCESS_KEY=silouser
 SILO_MINIO_SECRET_KEY=your-minio-secret-key
 ```
@@ -114,10 +118,10 @@ Before deploying, verify connectivity to external services:

 ```bash
 # Test PostgreSQL
-psql -h psql.kindred.internal -U silo -d silo -c 'SELECT 1'
+psql -h psql.example.internal -U silo -d silo -c 'SELECT 1'

 # Test MinIO
-curl -I http://minio.kindred.internal:9000/minio/health/live
+curl -I http://minio.example.internal:9000/minio/health/live
 ```

 ---
@@ -129,7 +133,7 @@ curl -I http://minio.kindred.internal:9000/minio/health/live
 To deploy or update Silo, run the deploy script on the target host:

 ```bash
-ssh root@silo.kindred.internal
+ssh root@silo.example.internal
 /opt/silo/src/scripts/deploy.sh
 ```

@@ -165,7 +169,7 @@ sudo /opt/silo/src/scripts/deploy.sh --status
 You can override the git repository URL and branch:

 ```bash
-export SILO_REPO_URL=https://git.kindred.internal/kindred/silo.git
+export SILO_REPO_URL=https://git.kindred-systems.com/kindred/silo.git
 export SILO_BRANCH=main
 sudo -E /opt/silo/src/scripts/deploy.sh
 ```
@@ -247,7 +251,7 @@ curl http://localhost:8080/ready
 To update to the latest version:

 ```bash
-ssh root@silo.kindred.internal
+ssh root@silo.example.internal
 /opt/silo/src/scripts/deploy.sh
 ```

@@ -269,7 +273,7 @@ When new migrations are added, run them manually:
 ls -la /opt/silo/src/migrations/

 # Run a specific migration
-psql -h psql.kindred.internal -U silo -d silo -f /opt/silo/src/migrations/008_new_feature.sql
+psql -h psql.example.internal -U silo -d silo -f /opt/silo/src/migrations/008_new_feature.sql
 ```

 ---
@@ -303,13 +307,13 @@ psql -h psql.kindred.internal -U silo -d silo -f /opt/silo/src/migrations/008_ne

 1. Test network connectivity:
   ```bash
-   nc -zv psql.kindred.internal 5432
+   nc -zv psql.example.internal 5432
   ```

 2. Test credentials:
   ```bash
   source /etc/silo/silod.env
-   PGPASSWORD=$SILO_DB_PASSWORD psql -h psql.kindred.internal -U silo -d silo -c 'SELECT 1'
+   PGPASSWORD=$SILO_DB_PASSWORD psql -h psql.example.internal -U silo -d silo -c 'SELECT 1'
   ```

 3. Check `pg_hba.conf` on PostgreSQL server allows connections from this host.
@@ -318,12 +322,12 @@ psql -h psql.kindred.internal -U silo -d silo -f /opt/silo/src/migrations/008_ne

 1. Test network connectivity:
   ```bash
-   nc -zv minio.kindred.internal 9000
+   nc -zv minio.example.internal 9000
   ```

 2. Test with curl:
   ```bash
-   curl -I http://minio.kindred.internal:9000/minio/health/live
+   curl -I http://minio.example.internal:9000/minio/health/live
   ```

 3. Check SSL settings in config match MinIO setup:
@@ -340,8 +344,8 @@ curl -v http://localhost:8080/health
 curl -v http://localhost:8080/ready

 # If ready fails but health passes, check external services
-psql -h psql.kindred.internal -U silo -d silo -c 'SELECT 1'
-curl http://minio.kindred.internal:9000/minio/health/live
+psql -h psql.example.internal -U silo -d silo -c 'SELECT 1'
+curl http://minio.example.internal:9000/minio/health/live
 ```

 ### Build Fails
@@ -391,14 +395,14 @@ This script:
   getcert list
   ```

-2. The silo config is already updated to use `https://silo.kindred.internal` as base URL. Restart silo:
+2. The silo config is already updated to use `https://silo.example.internal` as base URL. Restart silo:
   ```bash
   sudo systemctl restart silod
   ```

 3. Test the setup:
   ```bash
-   curl https://silo.kindred.internal/health
+   curl https://silo.example.internal/health
   ```

 ### Certificate Management
@@ -422,7 +426,7 @@ For clients to trust the Silo HTTPS certificate, they need the IPA CA:

 ```bash
 # Download CA cert
-curl -o /tmp/ipa-ca.crt https://ipa.kindred.internal/ipa/config/ca.crt
+curl -o /tmp/ipa-ca.crt https://ipa.example.internal/ipa/config/ca.crt

 # Ubuntu/Debian
 sudo cp /tmp/ipa-ca.crt /usr/local/share/ca-certificates/ipa-ca.crt
--- a/docs/GAP_ANALYSIS.md
+++ b/docs/GAP_ANALYSIS.md
@@ -1,13 +1,15 @@
-# Silo Gap Analysis and Revision Control Roadmap
+# Silo Gap Analysis

-**Date:** 2026-02-08  
+**Date:** 2026-02-13  
 **Status:** Analysis Complete (Updated)

 ---

 ## Executive Summary

-This document analyzes the current state of the Silo project against its specification, identifies documentation and feature gaps, and outlines a roadmap for enhanced revision control capabilities.
+This document analyzes the current state of the Silo project against its specification and against SOLIDWORKS PDM (the industry-leading product data management solution). It identifies documentation gaps, feature gaps, and outlines a roadmap for enhanced revision control capabilities.
+
+See [ROADMAP.md](ROADMAP.md) for the platform roadmap and dependency tier structure.

 ---

@@ -25,7 +27,7 @@ This document analyzes the current state of the Silo project against its specifi
 | `docs/AUTH.md` | Authentication system design | Current |
 | `docs/AUTH_USER_GUIDE.md` | User guide for login, tokens, and roles | Current |
 | `docs/GAP_ANALYSIS.md` | Revision control roadmap | Current |
-| `ROADMAP.md` | Feature roadmap and SOLIDWORKS PDM comparison | Current |
+| `docs/ROADMAP.md` | Platform roadmap and dependency tiers | Current |
 | `frontend-spec.md` | React SPA frontend specification | Current |

 ### 1.2 Documentation Gaps (Priority Order)
@@ -365,7 +367,7 @@ internal/
    handlers.go             # Items, schemas, projects, revisions
    middleware.go            # Auth middleware
    odoo_handlers.go        # Odoo integration endpoints
-    routes.go               # Route registration (75 endpoints)
+    routes.go               # Route registration (78 endpoints)
    search.go               # Fuzzy search
  auth/
    auth.go                 # Auth service: local, LDAP, OIDC
@@ -450,3 +452,163 @@ GET    /api/releases/{name}                 # Get release details
 POST   /api/releases/{name}/items           # Add items to release
 GET    /api/items/{pn}/thumbnail/{rev}      # Get thumbnail
 ```
+
+---
+
+## Appendix C: SOLIDWORKS PDM Comparison
+
+This section compares Silo's capabilities against SOLIDWORKS PDM features. Gaps are categorized by priority and implementation complexity.
+
+**Legend:** Silo Status = Full / Partial / None | Priority = Critical / High / Medium / Low | Complexity = Simple / Moderate / Complex
+
+### C.1 Version Control & Revision Management
+
+| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
+|---------|---------------|-------------|----------|------------|
+| Check-in/check-out | Full pessimistic locking | None | High | Moderate |
+| Version history | Complete with branching | Full (linear) | - | - |
+| Revision labels | A, B, C or custom schemes | Full (custom labels) | - | - |
+| Rollback/restore | Full | Full | - | - |
+| Compare revisions | Visual + metadata diff | Metadata diff only | Medium | Complex |
+| Get Latest Revision | One-click retrieval | Partial (API only) | Medium | Simple |
+
+Silo lacks pessimistic locking (check-out), which is critical for multi-user CAD environments where file merging is impractical. Visual diff comparison would require FreeCAD integration for CAD file visualization.
+
+### C.2 Workflow Management
+
+| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
+|---------|---------------|-------------|----------|------------|
+| Custom workflows | Full visual designer | None | Critical | Complex |
+| State transitions | Configurable with permissions | Basic (status field only) | Critical | Complex |
+| Parallel approvals | Multiple approvers required | None | High | Complex |
+| Automatic transitions | Timer/condition-based | None | Medium | Moderate |
+| Email notifications | On state change | None | High | Moderate |
+| ECO process | Built-in change management | None | High | Complex |
+| Child state conditions | Block parent if children invalid | None | Medium | Moderate |
+
+Workflow management is the largest functional gap. SOLIDWORKS PDM offers sophisticated state machines with parallel approvals, automatic transitions, and deep integration with engineering change processes. Silo currently has only a simple status field (draft/review/released/obsolete) with no transition rules or approval processes.
+
+### C.3 User Management & Security
+
+| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
+|---------|---------------|-------------|----------|------------|
+| User authentication | Windows AD, LDAP | Full (local, LDAP, OIDC) | - | - |
+| Role-based permissions | Granular per folder/state | Partial (3-tier role model) | Medium | Moderate |
+| Group management | Full | None | Medium | Moderate |
+| Folder permissions | Read/write/delete per folder | None | Medium | Moderate |
+| State permissions | Actions allowed per state | None | High | Moderate |
+| Audit trail | Complete action logging | Full | - | - |
+| Private files | Pre-check-in visibility control | None | Low | Simple |
+
+Authentication is implemented with three backends (local, LDAP/FreeIPA, OIDC/Keycloak) and a 3-tier role model (admin > editor > viewer). Audit logging captures user actions. Remaining gaps: group management, folder-level permissions, and state-based permission rules.
+
+### C.4 Search & Discovery
+
+| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
+|---------|---------------|-------------|----------|------------|
+| Metadata search | Full with custom cards | Partial (API query params + fuzzy) | High | Moderate |
+| Full-text content search | iFilters for Office, CAD | None | Medium | Complex |
+| Quick search | Toolbar with history | Partial (fuzzy search API) | Medium | Simple |
+| Saved searches | User-defined favorites | None | Medium | Simple |
+| Advanced operators | AND, OR, NOT, wildcards | None | Medium | Simple |
+| Multi-variable search | Search across multiple fields | None | Medium | Simple |
+| Where-used search | Find all assemblies using part | Full | - | - |
+
+Silo has API-level filtering, fuzzy search, and where-used queries. Remaining gaps: saved searches, advanced search operators, and a richer search UI. Content search (searching within CAD files) is not planned for the server.
+
+### C.5 BOM Management
+
+| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
+|---------|---------------|-------------|----------|------------|
+| Single-level BOM | Yes | Full | - | - |
+| Multi-level BOM | Indented/exploded views | Full (recursive, configurable depth) | - | - |
+| BOM comparison | Between revisions | None | Medium | Moderate |
+| BOM export | Excel, XML, ERP formats | Full (CSV, ODS) | - | - |
+| BOM import | Bulk BOM loading | Full (CSV with upsert) | - | - |
+| Calculated BOMs | Quantities rolled up | None | Medium | Moderate |
+| Reference designators | Full support | Full | - | - |
+| Alternate parts | Substitute tracking | Full | - | - |
+
+Multi-level BOM retrieval (recursive CTE with configurable depth) and BOM export (CSV, ODS) are implemented. BOM import supports CSV with upsert and cycle detection. Remaining gap: BOM comparison between revisions.
+
+### C.6 CAD Integration
+
+| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
+|---------|---------------|-------------|----------|------------|
+| Native CAD add-in | Deep SOLIDWORKS integration | FreeCAD workbench (silo-mod) | Medium | Complex |
+| Property mapping | Bi-directional sync | Planned (silo-mod) | Medium | Moderate |
+| Task pane | Embedded in CAD UI | Auth dock panel (silo-mod) | Medium | Complex |
+| Lightweight components | Handle without full load | N/A | - | - |
+| Drawing/model linking | Automatic association | Manual | Medium | Moderate |
+| Multi-CAD support | Third-party formats | FreeCAD only | Low | - |
+
+CAD integration is maintained in separate repositories ([silo-mod](https://git.kindred-systems.com/kindred/silo-mod), [silo-calc](https://git.kindred-systems.com/kindred/silo-calc)). The Silo server provides the REST API endpoints consumed by those clients.
+
+### C.7 External Integrations
+
+| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
+|---------|---------------|-------------|----------|------------|
+| ERP integration | SAP, Dynamics, etc. | Partial (Odoo stubs) | Medium | Complex |
+| API access | Full COM/REST API | Full REST API (78 endpoints) | - | - |
+| Dispatch scripts | Automation without coding | None | Medium | Moderate |
+| Task scheduler | Background processing | None | Medium | Moderate |
+| Email system | SMTP integration | None | High | Simple |
+| Web portal | Browser access | Full (React SPA + auth) | - | - |
+
+Silo has a comprehensive REST API (78 endpoints) and a full web UI with authentication. Odoo ERP integration has config/sync-log scaffolding but push/pull operations are stubs. Remaining gaps: email notifications, task scheduler, dispatch automation.
+
+### C.8 Reporting & Analytics
+
+| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
+|---------|---------------|-------------|----------|------------|
+| Standard reports | Inventory, usage, activity | None | Medium | Moderate |
+| Custom reports | User-defined queries | None | Medium | Moderate |
+| Dashboard | Visual KPIs | None | Low | Moderate |
+| Export formats | PDF, Excel, CSV | CSV and ODS | Medium | Simple |
+
+Reporting capabilities are absent. Basic reports (item counts, revision activity, where-used) would provide immediate value.
+
+### C.9 File Handling
+
+| Feature | SOLIDWORKS PDM | Silo Status | Priority | Complexity |
+|---------|---------------|-------------|----------|------------|
+| File versioning | Automatic | Full (MinIO) | - | - |
+| File preview | Thumbnails, 3D preview | None | Medium | Complex |
+| File conversion | PDF, DXF generation | None | Medium | Complex |
+| Replication | Multi-site sync | None | Low | Complex |
+| File copy with refs | Copy tree with references | None | Medium | Moderate |
+
+File storage works well. Thumbnail generation and file preview would significantly improve the web UI experience. Automatic conversion to PDF/DXF is valuable for sharing with non-CAD users.
+
+---
+
+## Appendix D: Feature Comparison Matrix
+
+| Category | Feature | SW PDM Standard | SW PDM Pro | Silo Current | Silo Planned |
+|----------|---------|-----------------|------------|--------------|--------------|
+| **Version Control** | Check-in/out | Yes | Yes | No | Tier 1 |
+| | Version history | Yes | Yes | Yes | - |
+| | Rollback | Yes | Yes | Yes | - |
+| | Revision labels/status | Yes | Yes | Yes | - |
+| | Revision comparison | Yes | Yes | Yes (metadata) | - |
+| **Workflow** | Custom workflows | Limited | Yes | No | Tier 4 |
+| | Parallel approval | No | Yes | No | Tier 4 |
+| | Notifications | No | Yes | No | Tier 1 |
+| **Security** | User auth | Windows | Windows/LDAP | Yes (local, LDAP, OIDC) | - |
+| | Permissions | Basic | Granular | Partial (role-based) | Tier 4 |
+| | Audit trail | Basic | Full | Yes | - |
+| **Search** | Metadata search | Yes | Yes | Partial (API + fuzzy) | Tier 0 |
+| | Content search | No | Yes | No | Tier 2 |
+| | Where-used | Yes | Yes | Yes | - |
+| **BOM** | Single-level | Yes | Yes | Yes | - |
+| | Multi-level | Yes | Yes | Yes (recursive) | - |
+| | BOM export | Yes | Yes | Yes (CSV, ODS) | - |
+| **Data** | CSV import/export | Yes | Yes | Yes | - |
+| | ODS import/export | No | No | Yes | - |
+| | Project management | Yes | Yes | Yes | - |
+| **Integration** | API | Limited | Full | Full REST (78) | - |
+| | ERP connectors | No | Yes | Partial (Odoo stubs) | Tier 6 |
+| | Web access | No | Yes | Yes (React SPA + auth) | - |
+| **Files** | Versioning | Yes | Yes | Yes | - |
+| | Preview | Yes | Yes | No | Tier 2 |
+| | Multi-site | No | Yes | No | Not Planned |
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -0,0 +1,518 @@
+# Installing Silo
+
+This guide covers two installation methods:
+
+- **[Option A: Docker Compose](#option-a-docker-compose)** — self-contained stack with all services. Recommended for evaluation, small teams, and environments where Docker is the standard.
+- **[Option B: Daemon Install](#option-b-daemon-install-systemd--external-services)** — systemd service with external PostgreSQL, MinIO, and optional LDAP/nginx. Recommended for production deployments integrated with existing infrastructure.
+
+Both methods produce the same result: a running Silo server with a web UI, REST API, and authentication.
+
+---
+
+## Table of Contents
+
+- [Prerequisites](#prerequisites)
+- [Option A: Docker Compose](#option-a-docker-compose)
+  - [A.1 Prerequisites](#a1-prerequisites)
+  - [A.2 Clone the Repository](#a2-clone-the-repository)
+  - [A.3 Run the Setup Script](#a3-run-the-setup-script)
+  - [A.4 Start the Stack](#a4-start-the-stack)
+  - [A.5 Verify the Installation](#a5-verify-the-installation)
+  - [A.6 LDAP Users and Groups](#a6-ldap-users-and-groups)
+  - [A.7 Optional: Enable Nginx Reverse Proxy](#a7-optional-enable-nginx-reverse-proxy)
+  - [A.8 Stopping, Starting, and Upgrading](#a8-stopping-starting-and-upgrading)
+- [Option B: Daemon Install (systemd + External Services)](#option-b-daemon-install-systemd--external-services)
+  - [B.1 Architecture Overview](#b1-architecture-overview)
+  - [B.2 Prerequisites](#b2-prerequisites)
+  - [B.3 Set Up External Services](#b3-set-up-external-services)
+  - [B.4 Prepare the Host](#b4-prepare-the-host)
+  - [B.5 Configure Credentials](#b5-configure-credentials)
+  - [B.6 Deploy](#b6-deploy)
+  - [B.7 Set Up Nginx and TLS](#b7-set-up-nginx-and-tls)
+  - [B.8 Verify the Installation](#b8-verify-the-installation)
+  - [B.9 Upgrading](#b9-upgrading)
+- [Post-Install Configuration](#post-install-configuration)
+- [Further Reading](#further-reading)
+
+---
+
+## Prerequisites
+
+Regardless of which method you choose:
+
+- **Git** to clone the repository
+- A machine with at least **2 GB RAM** and **10 GB free disk**
+- Network access to pull container images or download Go/Node toolchains
+
+---
+
+## Option A: Docker Compose
+
+A single Docker Compose file runs everything: PostgreSQL, MinIO, OpenLDAP, and Silo. An optional nginx container can be enabled for reverse proxying.
+
+### A.1 Prerequisites
+
+- [Docker Engine](https://docs.docker.com/engine/install/) 24+ with the [Compose plugin](https://docs.docker.com/compose/install/) (v2)
+- `openssl` (used by the setup script to generate secrets)
+
+Verify your installation:
+
+```bash
+docker --version        # Docker Engine 24+
+docker compose version  # Docker Compose v2+
+```
+
+### A.2 Clone the Repository
+
+```bash
+git clone https://git.kindred-systems.com/kindred/silo.git
+cd silo
+```
+
+### A.3 Run the Setup Script
+
+The setup script generates credentials and configuration files:
+
+```bash
+./scripts/setup-docker.sh
+```
+
+It prompts for:
+- Server domain (default: `localhost`)
+- PostgreSQL password (auto-generated if you press Enter)
+- MinIO credentials (auto-generated)
+- OpenLDAP admin password and initial user (auto-generated)
+- Silo local admin account (fallback when LDAP is unavailable)
+
+For automated/CI environments, use non-interactive mode:
+
+```bash
+./scripts/setup-docker.sh --non-interactive
+```
+
+The script writes two files:
+- `deployments/.env` — secrets for Docker Compose
+- `deployments/config.docker.yaml` — Silo server configuration
+
+### A.4 Start the Stack
+
+```bash
+docker compose -f deployments/docker-compose.allinone.yaml up -d
+```
+
+Wait for all services to become healthy:
+
+```bash
+docker compose -f deployments/docker-compose.allinone.yaml ps
+```
+
+You should see `silo-postgres`, `silo-minio`, `silo-openldap`, and `silo-api` all in a healthy state.
+
+View logs:
+
+```bash
+# All services
+docker compose -f deployments/docker-compose.allinone.yaml logs -f
+
+# Silo only
+docker compose -f deployments/docker-compose.allinone.yaml logs -f silo
+```
+
+### A.5 Verify the Installation
+
+```bash
+# Health check
+curl http://localhost:8080/health
+
+# Readiness check (includes database and storage connectivity)
+curl http://localhost:8080/ready
+```
+
+Open http://localhost:8080 in your browser. Log in with either:
+
+- **LDAP account**: the username and password shown by the setup script (default: `siloadmin`)
+- **Local admin**: the local admin credentials shown by the setup script (default: `admin`)
+
+The credentials were printed at the end of the setup script output and are stored in `deployments/.env`.
+
+### A.6 LDAP Users and Groups
+
+The Docker stack includes an OpenLDAP server with three preconfigured groups that map to Silo roles:
+
+| LDAP Group | Silo Role | Access Level |
+|------------|-----------|-------------|
+| `cn=silo-admins,ou=groups,dc=silo,dc=local` | admin | Full access |
+| `cn=silo-users,ou=groups,dc=silo,dc=local` | editor | Create and modify items |
+| `cn=silo-viewers,ou=groups,dc=silo,dc=local` | viewer | Read-only |
+
+The initial LDAP user (default: `siloadmin`) is added to `silo-admins`.
+
+**Add a new LDAP user:**
+
+```bash
+# From the host (using the exposed port)
+ldapadd -x -H ldap://localhost:1389 \
+  -D "cn=admin,dc=silo,dc=local" \
+  -w "YOUR_LDAP_ADMIN_PASSWORD" << EOF
+dn: cn=jdoe,ou=users,dc=silo,dc=local
+objectClass: inetOrgPerson
+cn: jdoe
+sn: Doe
+userPassword: changeme
+mail: jdoe@example.com
+EOF
+```
+
+**Add a user to a group:**
+
+```bash
+ldapmodify -x -H ldap://localhost:1389 \
+  -D "cn=admin,dc=silo,dc=local" \
+  -w "YOUR_LDAP_ADMIN_PASSWORD" << EOF
+dn: cn=silo-users,ou=groups,dc=silo,dc=local
+changetype: modify
+add: member
+member: cn=jdoe,ou=users,dc=silo,dc=local
+EOF
+```
+
+**List all users:**
+
+```bash
+ldapsearch -x -H ldap://localhost:1389 \
+  -b "ou=users,dc=silo,dc=local" \
+  -D "cn=admin,dc=silo,dc=local" \
+  -w "YOUR_LDAP_ADMIN_PASSWORD" "(objectClass=inetOrgPerson)" cn mail memberOf
+```
+
+### A.7 Optional: Enable Nginx Reverse Proxy
+
+To place nginx in front of Silo (for TLS termination or to serve on port 80):
+
+```bash
+docker compose -f deployments/docker-compose.allinone.yaml --profile nginx up -d
+```
+
+By default nginx listens on ports 80 and 443 and proxies to the Silo container. The configuration is at `deployments/nginx/nginx.conf`.
+
+**To enable HTTPS**, edit `deployments/docker-compose.allinone.yaml` and uncomment the TLS certificate volume mounts in the `nginx` service, then uncomment the HTTPS server block in `deployments/nginx/nginx.conf`. See the comments in those files for details.
+
+If you already have your own reverse proxy or load balancer, skip the nginx profile and point your proxy at port 8080.
+
+### A.8 Stopping, Starting, and Upgrading
+
+```bash
+# Stop the stack (data is preserved in Docker volumes)
+docker compose -f deployments/docker-compose.allinone.yaml down
+
+# Start again
+docker compose -f deployments/docker-compose.allinone.yaml up -d
+
+# Stop and delete all data (WARNING: destroys database, files, and LDAP data)
+docker compose -f deployments/docker-compose.allinone.yaml down -v
+```
+
+**To upgrade to a newer version:**
+
+```bash
+cd silo
+git pull
+docker compose -f deployments/docker-compose.allinone.yaml up -d --build
+```
+
+The Silo container is rebuilt from the updated source. Database migrations in `migrations/` are applied automatically on container startup via the PostgreSQL init mechanism.
+
+---
+
+## Option B: Daemon Install (systemd + External Services)
+
+This method runs Silo as a systemd service on a dedicated host, connecting to externally managed PostgreSQL, MinIO, and optionally LDAP services.
+
+### B.1 Architecture Overview
+
+```
+                    ┌──────────────────────┐
+                    │   Silo Host           │
+                    │  ┌────────────────┐  │
+     HTTPS (443) ──►│  │     nginx      │  │
+                    │  └───────┬────────┘  │
+                    │          │ :8080      │
+                    │  ┌───────▼────────┐  │
+                    │  │     silod       │  │
+                    │  │  (API server)   │  │
+                    │  └──┬─────────┬───┘  │
+                    └─────┼─────────┼──────┘
+                          │         │
+              ┌───────────▼──┐  ┌───▼──────────────┐
+              │ PostgreSQL 16│  │ MinIO (S3)        │
+              │   :5432      │  │ :9000 API         │
+              └──────────────┘  │ :9001 Console     │
+                                └──────────────────┘
+```
+
+### B.2 Prerequisites
+
+- Linux host (Debian/Ubuntu or RHEL/Fedora/AlmaLinux)
+- Root or sudo access
+- Network access to your PostgreSQL and MinIO servers
+
+The setup script installs Go and other build dependencies automatically.
+
+### B.3 Set Up External Services
+
+#### PostgreSQL 16
+
+Install PostgreSQL and create the Silo database:
+
+- [PostgreSQL downloads](https://www.postgresql.org/download/)
+
+```bash
+# After installing PostgreSQL, create the database and user:
+sudo -u postgres createuser silo
+sudo -u postgres createdb -O silo silo
+sudo -u postgres psql -c "ALTER USER silo WITH PASSWORD 'your-password';"
+```
+
+Ensure the Silo host can connect (check `pg_hba.conf` on the PostgreSQL server).
+
+Verify:
+
+```bash
+psql -h YOUR_PG_HOST -U silo -d silo -c 'SELECT 1'
+```
+
+#### MinIO
+
+Install MinIO and create a bucket and service account:
+
+- [MinIO quickstart](https://min.io/docs/minio/linux/index.html)
+
+```bash
+# Using the MinIO client (mc):
+mc alias set local http://YOUR_MINIO_HOST:9000 minioadmin minioadmin
+mc mb local/silo-files
+mc admin user add local silouser YOUR_MINIO_SECRET
+mc admin policy attach local readwrite --user silouser
+```
+
+Verify:
+
+```bash
+curl -I http://YOUR_MINIO_HOST:9000/minio/health/live
+```
+
+#### LDAP / FreeIPA (Optional)
+
+For LDAP authentication, you need an LDAP server with user and group entries. Options:
+
+- [FreeIPA](https://www.freeipa.org/page/Quick_Start_Guide) — full identity management (recommended for organizations already using it)
+- [OpenLDAP](https://www.openldap.org/doc/admin26/) — lightweight LDAP server
+
+Silo needs:
+- A base DN (e.g., `dc=example,dc=com`)
+- Users under a known OU (e.g., `cn=users,cn=accounts,dc=example,dc=com`)
+- Groups that map to Silo roles (`admin`, `editor`, `viewer`)
+- The `memberOf` overlay enabled (so user entries have `memberOf` attributes)
+
+See [CONFIGURATION.md — LDAP](CONFIGURATION.md#ldap--freeipa) for the full LDAP configuration reference.
+
+### B.4 Prepare the Host
+
+Run the setup script on the target host:
+
+```bash
+# Copy and run the script
+scp scripts/setup-host.sh root@YOUR_HOST:/tmp/
+ssh root@YOUR_HOST 'bash /tmp/setup-host.sh'
+```
+
+Or directly on the host:
+
+```bash
+sudo bash scripts/setup-host.sh
+```
+
+The script:
+1. Installs dependencies (git, Go 1.24)
+2. Creates the `silo` system user
+3. Creates directories (`/opt/silo`, `/etc/silo`)
+4. Clones the repository
+5. Creates the environment file template
+
+To override the default service hostnames:
+
+```bash
+SILO_DB_HOST=db.example.com SILO_MINIO_HOST=s3.example.com sudo -E bash scripts/setup-host.sh
+```
+
+### B.5 Configure Credentials
+
+Edit the environment file with your service credentials:
+
+```bash
+sudo nano /etc/silo/silod.env
+```
+
+```bash
+# Database
+SILO_DB_PASSWORD=your-database-password
+
+# MinIO
+SILO_MINIO_ACCESS_KEY=silouser
+SILO_MINIO_SECRET_KEY=your-minio-secret
+
+# Authentication
+SILO_SESSION_SECRET=generate-a-long-random-string
+SILO_ADMIN_USERNAME=admin
+SILO_ADMIN_PASSWORD=your-admin-password
+```
+
+Generate a session secret:
+
+```bash
+openssl rand -hex 32
+```
+
+Review the server configuration:
+
+```bash
+sudo nano /etc/silo/config.yaml
+```
+
+Update `database.host`, `storage.endpoint`, `server.base_url`, and authentication settings for your environment. See [CONFIGURATION.md](CONFIGURATION.md) for all options.
+
+### B.6 Deploy
+
+Run the deploy script:
+
+```bash
+sudo /opt/silo/src/scripts/deploy.sh
+```
+
+The script:
+1. Pulls latest code from git
+2. Builds the `silod` binary and React frontend
+3. Installs files to `/opt/silo` and `/etc/silo`
+4. Runs database migrations
+5. Installs and starts the systemd service
+
+Deploy options:
+
+```bash
+# Skip git pull (use current checkout)
+sudo /opt/silo/src/scripts/deploy.sh --no-pull
+
+# Skip build (use existing binary)
+sudo /opt/silo/src/scripts/deploy.sh --no-build
+
+# Just restart the service
+sudo /opt/silo/src/scripts/deploy.sh --restart-only
+
+# Check service status
+sudo /opt/silo/src/scripts/deploy.sh --status
+```
+
+To override the target host or database host:
+
+```bash
+SILO_DEPLOY_TARGET=silo.example.com SILO_DB_HOST=db.example.com sudo -E scripts/deploy.sh
+```
+
+### B.7 Set Up Nginx and TLS
+
+#### With FreeIPA (automated)
+
+If your organization uses FreeIPA, the included script handles nginx setup, IPA enrollment, and certificate issuance:
+
+```bash
+sudo /opt/silo/src/scripts/setup-ipa-nginx.sh
+```
+
+Override the hostname if needed:
+
+```bash
+SILO_HOSTNAME=silo.example.com sudo -E /opt/silo/src/scripts/setup-ipa-nginx.sh
+```
+
+The script installs nginx, enrolls the host in FreeIPA, requests a TLS certificate from the IPA CA (auto-renewed by certmonger), and configures nginx as an HTTPS reverse proxy.
+
+#### Manual nginx setup
+
+Install nginx and create a config:
+
+```bash
+sudo apt install nginx   # or: sudo dnf install nginx
+```
+
+Use the template at `deployments/nginx/nginx.conf` as a starting point. Copy it to `/etc/nginx/sites-available/silo`, update the `server_name` and certificate paths, then enable it:
+
+```bash
+sudo ln -sf /etc/nginx/sites-available/silo /etc/nginx/sites-enabled/silo
+sudo nginx -t
+sudo systemctl reload nginx
+```
+
+After enabling HTTPS, update `server.base_url` in `/etc/silo/config.yaml` to use `https://` and restart Silo:
+
+```bash
+sudo systemctl restart silod
+```
+
+### B.8 Verify the Installation
+
+```bash
+# Service status
+sudo systemctl status silod
+
+# Health check
+curl http://localhost:8080/health
+
+# Readiness check
+curl http://localhost:8080/ready
+
+# Follow logs
+sudo journalctl -u silod -f
+```
+
+Open your configured base URL in a browser and log in.
+
+### B.9 Upgrading
+
+```bash
+# Pull latest code and redeploy
+sudo /opt/silo/src/scripts/deploy.sh
+
+# Or deploy a specific version
+cd /opt/silo/src
+git fetch --all --tags
+git checkout v1.2.3
+sudo /opt/silo/src/scripts/deploy.sh --no-pull
+```
+
+New database migrations are applied automatically during deployment.
+
+---
+
+## Post-Install Configuration
+
+After a successful installation:
+
+- **Authentication**: Configure LDAP, OIDC, or local auth backends. See [CONFIGURATION.md — Authentication](CONFIGURATION.md#authentication).
+- **Schemas**: Part numbering schemas are loaded from YAML files. See the `schemas/` directory and [CONFIGURATION.md — Schemas](CONFIGURATION.md#schemas).
+- **Read-only mode**: Toggle write protection at runtime with `kill -USR1 $(pidof silod)` or by setting `server.read_only: true` in the config.
+- **Ongoing maintenance**: See [DEPLOYMENT.md](DEPLOYMENT.md) for service management, log viewing, troubleshooting, and the security checklist.
+
+---
+
+## Further Reading
+
+| Document | Description |
+|----------|-------------|
+| [CONFIGURATION.md](CONFIGURATION.md) | Complete `config.yaml` reference |
+| [DEPLOYMENT.md](DEPLOYMENT.md) | Operations guide: maintenance, troubleshooting, security |
+| [AUTH.md](AUTH.md) | Authentication system design |
+| [AUTH_USER_GUIDE.md](AUTH_USER_GUIDE.md) | User guide for login, tokens, and roles |
+| [SPECIFICATION.md](SPECIFICATION.md) | Full design specification and API reference |
+| [STATUS.md](STATUS.md) | Implementation status |
+| [GAP_ANALYSIS.md](GAP_ANALYSIS.md) | Gap analysis and revision control roadmap |
+| [COMPONENT_AUDIT.md](COMPONENT_AUDIT.md) | Component audit tool design |
--- a/docs/ROADMAP.md
+++ b/docs/ROADMAP.md
@@ -0,0 +1,445 @@
+# Silo Platform Roadmap
+
+**Version:** 2.0
+**Date:** February 2026
+
+Silo is the server component of the Kindred ecosystem. Its core function is storing and version-controlling engineering data (parts, assemblies, BOMs). This roadmap describes the expansion of Silo from a PDM server into a modular platform -- comparable to how Gitea/GitHub extend Git hosting with Actions, Wikis, Packages, and webhooks.
+
+For a detailed comparison against SOLIDWORKS PDM, see [GAP_ANALYSIS.md](GAP_ANALYSIS.md).
+
+---
+
+## Guiding Principles
+
+- **Modular architecture.** Every capability beyond core PDM is a module. Modules register against a central API endpoint registry and declare their menu entries, views, dependencies, and routes via a module manifest.
+- **Odoo-aligned UX.** The web UI follows Odoo's navigation patterns: a top-level app launcher grid, breadcrumb navigation (`Module > List > Record > Sub-view`), and standard view types (list, form, kanban, calendar, pivot). This alignment provides a familiar experience for shops already using Odoo as their ERP, and a clean integration path for those who adopt it later.
+- **Open by default.** Silo and all modules are open-source. Enterprise customers can fork, extend, and self-host. Developer tools for building and distributing custom Create forks are available to everyone, not just Kindred.
+- **Odoo as reference ERP.** For shops on Odoo, a bridge module syncs Silo data to Odoo models (`mrp.bom`, `mrp.production`, `quality.check`, etc.). For shops on other ERPs, the open API serves as a documented integration surface. Silo's web UI is fully self-sufficient with no ERP dependency required.
+
+---
+
+## Foundational Contracts
+
+### The .kc File Format
+
+Silo introduces the `.kc` file format as an enhanced superset of FreeCAD's `.fcstd`. Both are ZIP bundles. A `.kc` file contains everything an `.fcstd` does, plus a `silo/` directory with platform metadata.
+
+#### Standard FCStd contents (preserved as-is)
+
+- `Document.xml`, `GuiDocument.xml`
+- BREP geometry files (`.brp`)
+- `thumbnails/`
+
+#### Added .kc entries
+
+| Path | Purpose |
+|------|---------|
+| `silo/manifest.json` | Silo instance origin, part UUID, revision hash, .kc schema version |
+| `silo/metadata.json` | Custom schema field values, tags, lifecycle state |
+| `silo/history.json` | Local revision log (lightweight; full history is server-side) |
+| `silo/approvals.json` | ECO/approval state snapshot |
+| `silo/dependencies.json` | Assembly link references by Silo UUID (not filepath) |
+| `silo/macros/` | Embedded macro references or inline scripts bound to this part |
+| `silo/inspection/` | GD&T annotations, tolerance data, CMM linkage metadata |
+| `silo/thumbnails/` | Silo-generated renderings (separate from FreeCAD's built-in thumbnail) |
+
+#### Interoperability
+
+- **FCStd -> Silo:** On import, the `silo/` directory is generated with defaults. A UUID is assigned and the user is prompted for schema fields.
+- **Silo -> FCStd:** On export, the `silo/` directory is stripped. The remaining contents are a valid `.fcstd`.
+- **Round-trip safety:** FreeCAD ignores the `silo/` directory on save, so there is no risk of FreeCAD corrupting Silo metadata.
+- **Schema versioning:** `silo/manifest.json` carries a format version for forward-compatible migrations.
+
+### Module Manifest
+
+Each module ships a manifest declaring its integration surface:
+
+```
+id, name, version, description
+dependencies (other module IDs)
+menu_entries (app launcher icon, label, route)
+view_declarations (list, form, kanban, etc.)
+api_routes (REST endpoints the module registers)
+hooks (events the module listens to or emits)
+permissions (required roles/scopes)
+```
+
+The exact format (JSON, TOML, or Python-based a la Odoo's `__manifest__.py`) is TBD. The contract is: a module is anything that provides a valid manifest and registers against the endpoint registry.
+
+### Web UI Shell
+
+The Silo web application provides the chrome that all modules render within.
+
+- **App launcher:** Top-level grid of installed module icons. Driven by the API endpoint registry -- only enabled modules appear. Disabled modules show greyed with an "Enable" action for discoverability.
+- **Breadcrumbs:** Every view follows `Module > List > Record > Sub-view`. Consistent across all modules.
+- **View types:** List, form, kanban, calendar, pivot/reporting. Modules declare supported views in their manifest.
+- **Schema-driven forms:** The user-customizable schema engine maps directly to form views, enabling end-users to define part metadata fields through the web UI without code changes.
+
+---
+
+## Dependency Tiers
+
+Modules are organized into tiers based on what they depend on. Lower tiers must be stable before higher tiers are built.
+
+### Tier 0 -- Foundation
+
+Everything depends on these. They define what Silo *is*.
+
+| Component | Description | Status |
+|-----------|-------------|--------|
+| **Core Silo** | Part/assembly storage, version control, auth, base REST API | Complete |
+| **.kc Format Spec** | File format contract between Create and Silo | Not Started |
+| **API Endpoint Registry** | Module discovery, dynamic UI rendering, health checks | Not Started |
+| **Web UI Shell** | App launcher, breadcrumbs, view framework, module rendering | Partial |
+| **Python Scripting Engine** | Server-side hook execution, module extension point | Not Started |
+| **Job Queue Infrastructure** | Redis/NATS shared async service for all compute modules | Not Started |
+
+### Tier 1 -- Core Services
+
+Broad downstream dependencies. These should be built early because retrofitting is painful.
+
+| Module | Description | Depends On | Status |
+|--------|-------------|------------|--------|
+| **Headless Create** | API-driven FreeCAD instance for file manipulation, geometry queries, format conversion, rendering | Core Silo, Job Queue | Not Started |
+| **Notifications & Subscriptions** | Per-part watch lists, lifecycle event hooks, webhook delivery | Core Silo, Registry | Not Started |
+| **Audit Trail / Compliance** | ITAR, ISO 9001, AS9100 traceability; module-level event journaling | Core Silo | Partial |
+
+### Tier 2 -- File Intelligence & Collaboration
+
+High-visibility features. Mostly low-hanging fruit once Tier 1 is solid.
+
+| Module | Description | Depends On | Status |
+|--------|-------------|------------|--------|
+| **Intelligent FCStd Diffing** | XML-based structural diff of .kc bundles | Headless Create | Not Started |
+| **Thumbnail Generation** | Auto-rendered part/assembly previews | Headless Create | Not Started |
+| **Macro Store** | Shared macro library across Create instances | Core Silo, Registry | Not Started |
+| **Theme & Addon Manager** | Centralized distribution of UI themes and workbench addons | Core Silo, Registry | Not Started |
+| **User-Customizable Schemas** | End-user defined part/form metadata via web UI | Core Silo, Scripting Engine | Not Started |
+
+### Tier 3 -- Compute
+
+Heavy async workloads. All route through the shared job queue.
+
+| Module | Description | Depends On | Status |
+|--------|-------------|------------|--------|
+| **Batch Jobs (CPU/GPU)** | FEA, CFD, rendering, bulk export | Job Queue, Headless Create | Not Started |
+| **AI Broker** | LLM tasks (Ollama), GNN constraint optimization, appearance AI | Job Queue | Not Started |
+| **Reporting & Analytics** | Part reuse, revision frequency, compute usage dashboards, cost roll-ups | Audit Trail, Core Silo | Not Started |
+
+### Tier 4 -- Engineering Workflow
+
+Process modules that formalize how engineering work moves through an organization.
+
+| Module | Description | Depends On | Status |
+|--------|-------------|------------|--------|
+| **Approval / ECO Workflow** | Engineering change orders, multi-stage review gates, digital signatures | Notifications, Audit Trail, Schemas | Not Started |
+| **Shop Floor Drawing Distribution** | Controlled push-to-production drawings; web-based appliance displays on the floor | Headless Create, Approval Workflow | Not Started |
+| **Import/Export Bridge** | STEP, IGES, 3MF connectors; SOLIDWORKS migration tooling; ERP adapters | Headless Create | Not Started |
+| **Multi-tenant / Org Management** | Org boundaries, role-based permissioning, storage quotas | Core Auth, Audit Trail | Not Started |
+
+### Tier 5 -- Manufacturing & Quality
+
+Deep domain modules. Heavy spec work required independent of software dependencies.
+
+| Module | Description | Depends On | Status |
+|--------|-------------|------------|--------|
+| **MES Module** | Manufacturing execution -- internal module or bridge to external MES | Approval Workflow, Schemas, Shop Floor Drawings | Not Started |
+| **Quality / Tolerance Stackup** | Inspection data ingestion, CMM device linking, statistical tolerance analysis, material mapping | Schemas, Import Bridge | Not Started |
+| **Inspection Plan Generator** | Auto-generate CMM programs or inspection checklists from GD&T drawings | Headless Create, Quality Module | Not Started |
+| **BIM Inventory / Receiving** | Live facility model with real-time inventory location, explorable in a custom BIM-MES workbench in Create | Custom BIM-MES Workbench, Schemas, Notifications | Not Started |
+
+### Tier 6 -- Platform & Ecosystem
+
+Modules that serve the broader community and long-horizon use cases.
+
+| Module | Description | Depends On | Status |
+|--------|-------------|------------|--------|
+| **Developer Tools** | Managed Gitea instance for in-house Create fork development; CI/CD to build and distribute fork updates to configured clients | Tier 0-1 stability | Not Started |
+| **Digital Twin Sync** | Live sensor data mapped onto BIM/assembly models; operational monitoring | BIM Inventory, Reporting | Not Started |
+| **ERP Adapters (Odoo, SAP, etc.)** | Bidirectional sync of parts, BOMs, ECOs, production orders to external ERP | Import/Export Bridge, MES, Schemas | Partial (Odoo stubs) |
+
+---
+
+## Near-Term Priorities
+
+These are the concrete tasks that map to Tier 0 completion and the first steps into Tier 1. They replace the older Phase 1-6 calendar-based timelines.
+
+### Tier 0 Completion
+
+Complete MVP and stabilize core functionality.
+
+| Task | Description | Status |
+|------|-------------|--------|
+| Unit test suite | Core API, database, partnum, file, CSV/ODS handler tests | Complete (137 tests) |
+| Date segment type | Implement `date` segment with strftime-style formatting | Complete (#79) |
+| Part number validation | Validate format against schema on creation | Complete (#80) |
+| Location CRUD API | Expose location hierarchy via REST | Not Started (#81) |
+| Inventory API | Expose inventory operations via REST | Not Started (#82) |
+
+**Success metrics:**
+- All existing tests pass
+- File upload/download works end-to-end
+- FreeCAD users can checkout, modify, commit parts
+
+### Multi-User Enablement
+
+Enable team collaboration (feeds into Tier 1 and Tier 4).
+
+| Task | Description | Status |
+|------|-------------|--------|
+| Check-out locking | Pessimistic locks with timeout | Not Started (#87) |
+| User/group management | Create, assign, manage users and groups | Not Started (#88) |
+| Folder permissions | Read/write/delete per folder/project hierarchy | Not Started (#89) |
+
+**Success metrics:**
+- 5+ concurrent users supported
+- No data corruption under concurrent access
+- Audit log captures all modifications
+
+### Workflow Engine
+
+Implement engineering change processes (Tier 4: Approval/ECO Workflow).
+
+| Task | Description | Status |
+|------|-------------|--------|
+| Workflow designer | YAML-defined state machines | Not Started |
+| State transitions | Configurable transition rules with permissions | Not Started |
+| Approval workflows | Single and parallel approver gates | Not Started |
+| Email notifications | SMTP integration for alerts on state changes | Not Started |
+
+**Success metrics:**
+- Engineering change process completable in Silo
+- Email notifications delivered reliably
+- Workflow state visible in web UI
+
+### Search & Discovery
+
+Improve findability and navigation (Tier 0 Web UI Shell).
+
+| Task | Description | Status |
+|------|-------------|--------|
+| Advanced search UI | Web interface with filters and operators | Not Started (#90) |
+| Saved searches | User-defined query favorites | Not Started (#91) |
+
+**Success metrics:**
+- Search returns results in <2 seconds
+- Where-used queries complete in <5 seconds
+
+---
+
+## Gap Summary
+
+For full SOLIDWORKS PDM comparison tables, see [GAP_ANALYSIS.md Appendix C](GAP_ANALYSIS.md#appendix-c-solidworks-pdm-comparison).
+
+### Completed (Previously Critical/High)
+
+1. ~~User authentication~~ -- local, LDAP, OIDC
+2. ~~Role-based permissions~~ -- 3-tier role model (admin/editor/viewer)
+3. ~~Audit trail~~ -- audit_log table with completeness scoring
+4. ~~Where-used search~~ -- reverse parent lookup API
+5. ~~Multi-level BOM API~~ -- recursive expansion with configurable depth
+6. ~~BOM export~~ -- CSV and ODS formats
+
+### Critical Gaps (Required for Team Use)
+
+1. **Workflow engine** -- state machines with transitions and approvals
+2. **Check-out locking** -- pessimistic locking for CAD files
+
+### High Priority Gaps (Significant Value)
+
+1. **Email notifications** -- alert users on state changes
+2. **Web UI search** -- advanced search interface with saved searches
+3. **Folder/state permissions** -- granular access control beyond role model
+
+### Medium Priority Gaps (Nice to Have)
+
+1. **Saved searches** -- frequently used queries
+2. **File preview/thumbnails** -- visual browsing
+3. **Reporting** -- activity and inventory reports
+4. **Scheduled tasks** -- background automation
+5. **BOM comparison** -- revision diff for assemblies
+
+---
+
+## Priority Notes
+
+- **Headless Create** is the single highest-leverage Tier 1 item. It unblocks diffing, thumbnails, batch export, drawing distribution, and inspection plan generation.
+- **Audit Trail** is unglamorous but critical to build early. Retrofitting compliance logging after modules ship is expensive and error-prone.
+- **Tier 2** delivers visible, demo-able value quickly -- diffing, thumbnails, and the macro store are features users immediately understand.
+- **Tiers 5-6** carry heavy domain complexity. They need detailed specification and industry consultation well before implementation begins.
+- The **.kc format** and **module manifest** are the two foundational contracts. Getting these right determines how cleanly everything above them composes.
+
+---
+
+## Open Questions
+
+1. **Module manifest format** -- JSON, TOML, or Python-based? Tradeoffs between simplicity and expressiveness.
+2. **.kc thumbnail policy** -- Single canonical thumbnail vs. multi-view renders. Impacts file size and generation cost.
+3. **Job queue technology** -- Redis Streams vs. NATS. Redis is already in the stack; NATS offers better pub/sub semantics for event-driven modules.
+4. **Headless Create deployment** -- Sidecar container per Silo instance, or pool of workers behind the job queue?
+5. **BIM-MES workbench scope** -- How much of FreeCAD BIM is reusable vs. needs to be purpose-built for inventory/facility modeling?
+6. **Offline .kc workflow** -- How much of the `silo/` metadata is authoritative when disconnected? Reconciliation strategy on reconnect.
+
+---
+
+## Appendix A: Current Project Inventory
+
+### Implemented Features (MVP Complete)
+
+#### Core Database System
+- PostgreSQL schema with 13 migrations
+- UUID-based identifiers throughout
+- Soft delete support via `archived_at` timestamps
+- Atomic sequence generation for part numbers
+
+#### Part Number Generation
+- YAML schema parser with validation
+- Segment types: `string`, `enum`, `serial`, `constant`
+- Scope templates for serial counters (e.g., `{category}`, `{project}`)
+- Format templates for custom output
+
+#### Item Management
+- Full CRUD operations for items
+- Item types: part, assembly, drawing, document, tooling, purchased, electrical, software
+- Custom properties via JSONB storage
+- Project tagging with many-to-many relationships
+
+#### Revision Control
+- Append-only revision history
+- Revision metadata: properties, file reference, checksum, comment
+- Status tracking: draft, review, released, obsolete
+- Labels/tags per revision
+- Revision comparison (diff)
+- Rollback functionality
+
+#### File Management
+- MinIO integration with versioning
+- File upload/download via REST API
+- SHA256 checksums for integrity
+- Storage path: `items/{partNumber}/rev{N}.FCStd`
+
+#### Bill of Materials (BOM)
+- Relationship types: component, alternate, reference
+- Multi-level BOM (recursive expansion with configurable depth)
+- Where-used queries (reverse parent lookup)
+- BOM CSV and ODS export/import with cycle detection
+- Reference designators for electronics
+- Quantity tracking with units
+- Revision-specific child linking
+
+#### Project Management
+- Project CRUD operations
+- Unique project codes (2-10 characters)
+- Item-to-project tagging
+- Project-filtered queries
+
+#### Data Import/Export
+- CSV export with configurable properties
+- CSV import with dry-run validation
+- ODS spreadsheet import/export (items, BOMs, project sheets)
+- Template generation for import formatting
+
+#### API & Web Interface
+- REST API with 78 endpoints
+- Authentication: local (bcrypt), LDAP/FreeIPA, OIDC/Keycloak
+- Role-based access control (admin > editor > viewer)
+- API token management (SHA-256 hashed)
+- Session management (PostgreSQL-backed, 24h lifetime)
+- CSRF protection (nosurf on web forms)
+- Middleware: logging, CORS, recovery, request ID
+- Web UI -- React SPA (Vite + TypeScript, Catppuccin Mocha theme)
+- Fuzzy search
+- Health and readiness probes
+
+#### Audit & Completeness
+- Audit logging (database table with user/action/resource tracking)
+- Item completeness scoring with weighted fields
+- Category-specific property validation
+- Tier classification (critical/low/partial/good/complete)
+
+#### Configuration
+- YAML configuration with environment variable overrides
+- Multi-schema support
+- Docker Compose deployment ready
+
+### Partially Implemented
+
+| Feature | Status | Notes |
+|---------|--------|-------|
+| Odoo ERP integration | Partial | Config and sync-log CRUD functional; push/pull sync operations are stubs |
+| Date segment type | Complete | strftime-style formatting via Go time layout (#79) |
+| Part number validation | Complete | Validates against schema on creation (#80) |
+| Location hierarchy CRUD | Schema only | Tables exist, no API endpoints (#81) |
+| Inventory tracking | Schema only | Tables exist, no API endpoints (#82) |
+| Unit tests | Complete | 137 tests across 20 files covering api, db, ods, partnum, schema packages |
+
+---
+
+## Appendix B: Phase 1 Detailed Tasks
+
+### 1.1 MinIO Integration -- COMPLETE
+- [x] MinIO service configured in Docker Compose
+- [x] File upload via REST API
+- [x] File download via REST API (latest and by revision)
+- [x] SHA256 checksums on upload
+
+### 1.2 Authentication & Authorization -- COMPLETE
+- [x] Local authentication (bcrypt)
+- [x] LDAP/FreeIPA authentication
+- [x] OIDC/Keycloak authentication
+- [x] Role-based access control (admin/editor/viewer)
+- [x] API token management (SHA-256 hashed)
+- [x] Session management (PostgreSQL-backed)
+- [x] CSRF protection (nosurf)
+- [x] Audit logging (database table)
+
+### 1.3 Multi-level BOM & Export -- COMPLETE
+- [x] Recursive BOM expansion with configurable depth
+- [x] Where-used reverse lookup
+- [x] BOM CSV export/import with cycle detection
+- [x] BOM ODS export
+- [x] ODS item export/import/template
+
+### 1.4 Unit Test Suite -- COMPLETE
+- [x] Database connection and transaction tests
+- [x] Item CRUD operation tests (including edge cases: duplicate keys, pagination, search)
+- [x] Revision creation, retrieval, compare, rollback tests
+- [x] Part number generation tests (including date segments, validation)
+- [x] File upload/download handler tests
+- [x] CSV import/export tests (dry-run, commit, BOM export)
+- [x] ODS import/export tests (export, template, project sheet)
+- [x] API endpoint tests (revisions, schemas, audit, auth tokens)
+- [x] Item file CRUD tests
+- [x] BOM handler tests (get, flat, cost, add, delete)
+
+### 1.5 Missing Segment Types -- COMPLETE
+- [x] Implement date segment type
+- [x] Add strftime-style format support
+
+### 1.6 Location & Inventory APIs
+- [ ] `GET /api/locations` - List locations
+- [ ] `POST /api/locations` - Create location
+- [ ] `GET /api/locations/{path}` - Get location
+- [ ] `DELETE /api/locations/{path}` - Delete location
+- [ ] `GET /api/inventory/{partNumber}` - Get inventory
+- [ ] `POST /api/inventory/{partNumber}/adjust` - Adjust quantity
+- [ ] `POST /api/inventory/{partNumber}/move` - Move between locations
+
+---
+
+## Appendix C: References
+
+### SOLIDWORKS PDM Documentation
+- [SOLIDWORKS PDM Product Page](https://www.solidworks.com/product/solidworks-pdm)
+- [What's New in SOLIDWORKS PDM 2025](https://blogs.solidworks.com/solidworksblog/2024/10/whats-new-in-solidworks-pdm-2025.html)
+- [Top 5 Enhancements in SOLIDWORKS PDM 2024](https://blogs.solidworks.com/solidworksblog/2023/10/top-5-enhancements-in-solidworks-pdm-2024.html)
+- [SOLIDWORKS PDM Workflow Transitions](https://help.solidworks.com/2023/english/EnterprisePDM/Admin/c_workflow_transition.htm)
+- [Ultimate Guide to SOLIDWORKS PDM Permissions](https://www.goengineer.com/blog/ultimate-guide-to-solidworks-pdm-permissions)
+- [Searching in SOLIDWORKS PDM](https://help.solidworks.com/2021/english/EnterprisePDM/fileexplorer/c_searches.htm)
+- [SOLIDWORKS PDM API Getting Started](https://3dswym.3dexperience.3ds.com/wiki/solidworks-news-info/getting-started-with-the-solidworks-pdm-api-solidpractices_gBCYaM75RgORBcpSO1m_Mw)
+
+### Silo Documentation
+- [Specification](SPECIFICATION.md)
+- [Development Status](STATUS.md)
+- [Deployment Guide](DEPLOYMENT.md)
+- [Gap Analysis](GAP_ANALYSIS.md)
--- a/docs/SPECIFICATION.md
+++ b/docs/SPECIFICATION.md
@@ -37,7 +37,7 @@ Silo treats **part numbering schemas as configuration, not code**. Multiple numb
                              ▼
 ┌─────────────────────────────────────────────────────────────┐
 │                   Silo Server (silod)                        │
-│  - REST API (75 endpoints)                                  │
+│  - REST API (78 endpoints)                                  │
 │  - Authentication (local, LDAP, OIDC)                       │
 │  - Schema parsing and validation                            │
 │  - Part number generation engine                            │
@@ -50,7 +50,7 @@ Silo treats **part numbering schemas as configuration, not code**. Multiple numb
              ▼                               ▼
 ┌─────────────────────────┐     ┌─────────────────────────────┐
 │   PostgreSQL            │     │   MinIO                     │
-│   (psql.kindred.internal)│     │   - File storage            │
+│   (psql.example.internal)│     │   - File storage            │
 │   - Item metadata       │     │   - Versioned objects       │
 │   - Relationships       │     │   - Thumbnails              │
 │   - Revision history    │     │                             │
@@ -63,7 +63,7 @@ Silo treats **part numbering schemas as configuration, not code**. Multiple numb

 | Component | Technology | Notes |
 |-----------|------------|-------|
-| Database | PostgreSQL 16 | Existing instance at psql.kindred.internal |
+| Database | PostgreSQL 16 | Existing instance at psql.example.internal |
 | File Storage | MinIO | S3-compatible, versioning enabled |
 | CLI & API Server | Go (1.24) | chi/v5 router, pgx/v5 driver, zerolog |
 | Authentication | Multi-backend | Local (bcrypt), LDAP/FreeIPA, OIDC/Keycloak |
@@ -598,7 +598,7 @@ See [AUTH.md](AUTH.md) for full architecture details and [AUTH_USER_GUIDE.md](AU

 ## 11. API Design

-### 11.1 REST Endpoints (75 Implemented)
+### 11.1 REST Endpoints (78 Implemented)

 ```
 # Health (no auth)
@@ -615,6 +615,9 @@ GET    /auth/callback                                       # OIDC callback
 # Public API (no auth required)
 GET    /api/auth/config                                     # Auth backend configuration (for login UI)

+# Server-Sent Events (require auth)
+GET    /api/events                                          # SSE stream for real-time updates
+
 # Auth API (require auth)
 GET    /api/auth/me                                         # Current authenticated user
 GET    /api/auth/tokens                                     # List user's API tokens
@@ -627,7 +630,7 @@ POST   /api/uploads/presign                                 # Get presigned MinI
 # Schemas (read: viewer, write: editor)
 GET    /api/schemas                                         # List all schemas
 GET    /api/schemas/{name}                                  # Get schema details
-GET    /api/schemas/{name}/properties                       # Get property schema for category
+GET    /api/schemas/{name}/form                             # Get form descriptor (field groups, widgets, category picker)
 POST   /api/schemas/{name}/segments/{segment}/values        # Add enum value [editor]
 PUT    /api/schemas/{name}/segments/{segment}/values/{code} # Update enum value [editor]
 DELETE /api/schemas/{name}/segments/{segment}/values/{code} # Delete enum value [editor]
@@ -644,6 +647,7 @@ DELETE /api/projects/{code}                                 # Delete project [ed
 # Items (read: viewer, write: editor)
 GET    /api/items                                           # List/filter items
 GET    /api/items/search                                    # Fuzzy search
+GET    /api/items/by-uuid/{uuid}                            # Get item by UUID
 GET    /api/items/export.csv                                # Export items to CSV
 GET    /api/items/template.csv                              # CSV import template
 GET    /api/items/export.ods                                # Export items to ODS
@@ -689,6 +693,7 @@ GET    /api/items/{partNumber}/bom/export.csv               # Export BOM as CSV
 GET    /api/items/{partNumber}/bom/export.ods               # Export BOM as ODS
 POST   /api/items/{partNumber}/bom                          # Add BOM entry [editor]
 POST   /api/items/{partNumber}/bom/import                   # Import BOM from CSV [editor]
+POST   /api/items/{partNumber}/bom/merge                    # Merge BOM from ODS with conflict resolution [editor]
 PUT    /api/items/{partNumber}/bom/{childPartNumber}        # Update BOM entry [editor]
 DELETE /api/items/{partNumber}/bom/{childPartNumber}        # Remove BOM entry [editor]

@@ -734,11 +739,11 @@ POST   /api/inventory/{partNumber}/move

 ### 12.1 Implemented

- [x] PostgreSQL database schema (11 migrations)
+- [x] PostgreSQL database schema (13 migrations)
 - [x] YAML schema parser for part numbering
 - [x] Part number generation engine
 - [x] CLI tool (`cmd/silo`)
- [x] API server (`cmd/silod`) with 75 endpoints
+- [x] API server (`cmd/silod`) with 78 endpoints
 - [x] MinIO integration for file storage with versioning
 - [x] BOM relationships (component, alternate, reference)
 - [x] Multi-level BOM (recursive expansion with configurable depth)
--- a/docs/STATUS.md
+++ b/docs/STATUS.md
@@ -10,10 +10,10 @@

 | Component | Status | Notes |
 |-----------|--------|-------|
-| PostgreSQL schema | Complete | 11 migrations applied |
+| PostgreSQL schema | Complete | 13 migrations applied |
 | YAML schema parser | Complete | Supports enum, serial, constant, string segments |
 | Part number generator | Complete | Scoped sequences, category-based format |
-| API server (`silod`) | Complete | 75 REST endpoints via chi/v5 |
+| API server (`silod`) | Complete | 78 REST endpoints via chi/v5 |
 | CLI tool (`silo`) | Complete | Item registration and management |
 | MinIO file storage | Complete | Upload, download, versioning, checksums |
 | Revision control | Complete | Append-only history, rollback, comparison, status/labels |
@@ -55,7 +55,7 @@ FreeCAD workbench and LibreOffice Calc extension are maintained in separate repo

 | Service | Host | Status |
 |---------|------|--------|
-| PostgreSQL | psql.kindred.internal:5432 | Running |
+| PostgreSQL | psql.example.internal:5432 | Running |
 | MinIO | localhost:9000 (API) / :9001 (console) | Configured |
 | Silo API | localhost:8080 | Builds successfully |

@@ -92,5 +92,7 @@ The schema defines 170 category codes across 10 groups:
 | 007_revision_status.sql | Revision status and labels |
 | 008_odoo_integration.sql | Odoo ERP integration tables (integrations, sync_log) |
 | 009_auth.sql | Authentication system (users, api_tokens, sessions, audit_log, user tracking columns) |
-| 010_item_extended_fields.sql | Extended item fields (sourcing_type, sourcing_link, standard_cost, long_description) |
+| 010_item_extended_fields.sql | Extended item fields (sourcing_type, long_description) |
 | 011_item_files.sql | Item file attachments (item_files table, thumbnail_key column) |
+| 012_bom_source.sql | BOM entry source tracking |
+| 013_move_cost_sourcing_to_props.sql | Move sourcing_link and standard_cost from item columns to revision properties |
--- a/docs/STYLE.md
+++ b/docs/STYLE.md
@@ -0,0 +1,515 @@
+# Silo Style Guide
+
+> Living reference for the Silo web UI. All modules must follow these conventions to maintain visual consistency across the platform.
+
+---
+
+## Color System
+
+Silo uses the [Catppuccin Mocha](https://github.com/catppuccin/catppuccin) palette exclusively. All colors are referenced via CSS custom properties defined at `:root`.
+
+### Palette
+
+```
+--ctp-rosewater:  #f5e0dc
+--ctp-flamingo:   #f2cdcd
+--ctp-pink:       #f5c2e7
+--ctp-mauve:      #cba6f7
+--ctp-red:        #f38ba8
+--ctp-maroon:     #eba0ac
+--ctp-peach:      #fab387
+--ctp-yellow:     #f9e2af
+--ctp-green:      #a6e3a1
+--ctp-teal:       #94e2d5
+--ctp-sky:        #89dceb
+--ctp-sapphire:   #74c7ec
+--ctp-blue:       #89b4fa
+--ctp-lavender:   #b4befe
+--ctp-text:       #cdd6f4
+--ctp-subtext1:   #bac2de
+--ctp-subtext0:   #a6adc8
+--ctp-overlay2:   #9399b2
+--ctp-overlay1:   #7f849c
+--ctp-overlay0:   #6c7086
+--ctp-surface2:   #585b70
+--ctp-surface1:   #45475a
+--ctp-surface0:   #313244
+--ctp-base:       #1e1e2e
+--ctp-mantle:     #181825
+--ctp-crust:      #11111b
+```
+
+### Semantic Roles
+
+| Role | Token | Usage |
+|------|-------|-------|
+| Page background | `--ctp-base` | Main content area |
+| Panel background | `--ctp-mantle` | Sidebars, detail panes, headers |
+| Inset/input background | `--ctp-crust` | Form inputs, code blocks, drop zones |
+| Primary accent | `--ctp-mauve` | Primary buttons, active states, links, selection highlights |
+| Secondary accent | `--ctp-blue` | Informational highlights, secondary actions |
+| Success | `--ctp-green` | Confirmations, positive status |
+| Warning | `--ctp-yellow` | Caution states, pending actions |
+| Danger | `--ctp-red` | Destructive actions, errors, required indicators |
+| Informational | `--ctp-teal` | Auto-generated metadata, system-assigned values |
+| Body text | `--ctp-text` | Primary content |
+| Secondary text | `--ctp-subtext1` | Descriptions, timestamps |
+| Muted text | `--ctp-overlay1` | Placeholders, disabled states |
+| Borders | `--ctp-surface0` | Dividers, panel edges |
+| Hover borders | `--ctp-surface1` | Interactive element borders, row separators |
+| Focus ring | `rgba(203, 166, 247, 0.25)` | `box-shadow` on focused inputs (mauve at 25%) |
+
+### Accent Usage for Data Types
+
+| Data type | Color | Token |
+|-----------|-------|-------|
+| Assembly | `--ctp-mauve` | Badge, icon tint |
+| Part | `--ctp-green` | Badge, icon tint |
+| Document | `--ctp-blue` | Badge, icon tint |
+| Purchased | `--ctp-peach` | Badge, icon tint |
+| Phantom | `--ctp-overlay1` | Badge, icon tint |
+
+These mappings are used anywhere item types appear: list badges, detail pane headers, BOM entries, tree views.
+
+---
+
+## Typography
+
+### Scale
+
+| Role | Size | Weight | Token/Color | Transform |
+|------|------|--------|-------------|-----------|
+| Page title | 1.1rem | 600 | `--ctp-text` | None |
+| Section header | 11px | 600 | `--ctp-overlay0` | Uppercase, `letter-spacing: 0.06em` |
+| Form label | 11px | 600 | `--ctp-overlay1` | Uppercase, `letter-spacing: 0.05em` |
+| Body text | 13px | 400 | `--ctp-text` | None |
+| Table cell | 12px | 400 | `--ctp-text` | None |
+| Caption / metadata | 11px | 400 | `--ctp-subtext0` | None |
+| Badge text | 10px | 600 | Varies | Uppercase |
+| Breadcrumb segment | 13px | 500 | `--ctp-subtext1` | None |
+| Breadcrumb active | 13px | 600 | `--ctp-text` | None |
+
+### Font Stack
+
+```css
+font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, sans-serif;
+```
+
+No external font dependencies. System fonts ensure fast rendering and native feel across platforms.
+
+### Rules
+
+- Never use font sizes below 10px.
+- Use `font-weight: 600` for emphasis instead of bold (700). Reserve 700 for page titles only when extra weight is needed.
+- `text-transform: uppercase` is reserved for section headers, form labels, and badges. Never uppercase body text or descriptions.
+
+---
+
+## Spacing
+
+Base unit: **4px**. All spacing values are multiples of 4.
+
+| Token | Value | Usage |
+|-------|-------|-------|
+| `xs` | 4px (0.25rem) | Tight gaps: icon-to-label, tag internal padding |
+| `sm` | 8px (0.5rem) | Compact spacing: between related fields, badge padding |
+| `md` | 12px (0.75rem) | Standard: form group gaps, sidebar section padding |
+| `lg` | 16px (1rem) | Section separation, card padding |
+| `xl` | 24px (1.5rem) | Page-level padding, major section breaks |
+| `2xl` | 32px (2rem) | Page horizontal padding |
+
+### Application
+
+- **Page padding:** `1.5rem 2rem` (24px vertical, 32px horizontal)
+- **Sidebar section padding:** `1rem 1.25rem`
+- **Form grid gap:** `1.25rem 1.5rem` (row gap × column gap)
+- **Table row height:** 36px minimum (padding included)
+- **Table cell padding:** `0.4rem 0.75rem`
+
+---
+
+## Layout
+
+### Page Structure
+
+Every module page follows the same shell:
+
+```
+┌─────────────────────────────────────────────────┐
+│ Top Nav (52px)                                  │
+├──────────┬──────────────────────────────────────┤
+│ App Menu │ Page Header (58px)                   │
+│ (icons)  ├──────────────────────┬───────────────┤
+│          │ Content Area         │ Detail Pane   │
+│          │                      │ (360px)       │
+│          │                      │               │
+│          │                      │               │
+└──────────┴──────────────────────┴───────────────┘
+```
+
+- **Top nav:** `52px` height, `--ctp-mantle` background, `1px solid --ctp-surface0` bottom border.
+- **App menu sidebar:** Icon strip on the left. Module icons, tooltips on hover. Active module highlighted with `--ctp-mauve` indicator.
+- **Page header:** `58px` height, `--ctp-mantle` background. Contains page title (with module icon), action buttons right-aligned.
+- **Content area:** `--ctp-base` background. Scrollable. Contains list views, kanban boards, or other primary content.
+- **Detail pane:** `360px` fixed width, `--ctp-mantle` background, `1px solid --ctp-surface0` left border. Appears on record selection.
+
+### Grid Patterns
+
+**Two-column form:**
+```css
+display: grid;
+grid-template-columns: 1fr 1fr;
+gap: 1.25rem 1.5rem;
+max-width: 800px;
+```
+
+**List + detail:**
+```css
+display: grid;
+grid-template-columns: 1fr 360px;
+min-height: calc(100vh - 52px - 58px);
+```
+
+### Breakpoints
+
+Not currently required. Silo targets desktop browsers on engineering workstations. If mobile support is added later, breakpoints will be defined at `768px` and `1024px`.
+
+---
+
+## Components
+
+### Buttons
+
+Four tiers. All buttons share a base style:
+
+```css
+display: inline-flex;
+align-items: center;
+gap: 0.35rem;
+padding: 0.4rem 0.85rem;
+border-radius: 6px;
+font-size: 12px;
+font-weight: 500;
+cursor: pointer;
+transition: all 0.15s;
+```
+
+| Tier | Name | Background | Border | Text | Hover |
+|------|------|-----------|--------|------|-------|
+| Primary | `.btn-primary` | `--ctp-mauve` | `--ctp-mauve` | `--ctp-crust` | `--ctp-lavender` bg + border |
+| Secondary | `.btn` (default) | `--ctp-surface0` | `--ctp-surface1` | `--ctp-text` | `--ctp-surface1` bg, `--ctp-overlay0` border |
+| Ghost | `.btn-ghost` | transparent | transparent | `--ctp-subtext0` | `--ctp-surface0` bg, `--ctp-text` text |
+| Danger | `.btn-danger` | transparent | `--ctp-surface1` | `--ctp-red` | `rgba(243, 139, 168, 0.1)` bg, `--ctp-red` border |
+
+Primary is used once per visible context (the main action). All other actions use secondary or ghost. Danger is only for destructive actions and always requires confirmation.
+
+### Badges
+
+Used for type indicators, status labels, and tags.
+
+```css
+display: inline-flex;
+align-items: center;
+padding: 0.15rem 0.5rem;
+border-radius: 4px;
+font-size: 10px;
+font-weight: 600;
+text-transform: uppercase;
+letter-spacing: 0.03em;
+```
+
+Badges use a translucent background derived from their accent color:
+
+```css
+/* Example: assembly badge */
+background: rgba(203, 166, 247, 0.15);  /* --ctp-mauve at 15% */
+color: var(--ctp-mauve);
+```
+
+Standard badge colors follow the [accent usage table](#accent-usage-for-data-types). Status badges:
+
+| Status | Color |
+|--------|-------|
+| Active / Released | `--ctp-green` |
+| Draft / In Progress | `--ctp-blue` |
+| Review / Pending | `--ctp-yellow` |
+| Obsolete / Rejected | `--ctp-red` |
+| Locked | `--ctp-overlay1` |
+
+### Form Inputs
+
+All inputs share a base style:
+
+```css
+background: var(--ctp-crust);
+border: 1px solid var(--ctp-surface1);
+border-radius: 6px;
+padding: 0.45rem 0.65rem;
+font-size: 12px;
+color: var(--ctp-text);
+transition: border-color 0.15s;
+```
+
+| State | Border | Shadow |
+|-------|--------|--------|
+| Default | `--ctp-surface1` | None |
+| Hover | `--ctp-overlay0` | None |
+| Focus | `--ctp-mauve` | `0 0 0 0.2rem rgba(203, 166, 247, 0.25)` |
+| Error | `--ctp-red` | `0 0 0 0.2rem rgba(243, 139, 168, 0.15)` |
+| Disabled | `--ctp-surface0` | None, `opacity: 0.5` |
+
+Placeholder text: `--ctp-overlay0`. Labels sit above inputs (never inline or floating).
+
+### Tag Input
+
+Used for multi-value fields (projects, tags):
+
+```css
+display: flex;
+flex-wrap: wrap;
+gap: 0.3rem;
+padding: 0.35rem 0.5rem;
+background: var(--ctp-crust);
+border: 1px solid var(--ctp-surface1);
+border-radius: 6px;
+min-height: 36px;
+```
+
+Individual tags use the badge pattern: `rgba(accent, 0.15)` background with accent text. Remove button (×) at `opacity: 0.6`, `1.0` on hover.
+
+### Tables
+
+```css
+width: 100%;
+border-collapse: collapse;
+font-size: 12px;
+```
+
+| Element | Style |
+|---------|-------|
+| Header row | `background: --ctp-mantle`, `font-size: 11px`, uppercase, `--ctp-overlay1` text |
+| Body row | `border-bottom: 1px solid --ctp-surface0` |
+| Row hover | `background: --ctp-surface0` |
+| Row selected | `background: rgba(203, 166, 247, 0.08)` |
+| Cell padding | `0.4rem 0.75rem` |
+| Text columns | Left-aligned |
+| Number columns | Right-aligned |
+| Date columns | Right-aligned |
+| Action columns | Center-aligned |
+
+Row actions use icon buttons (not text links). Icons at 14px, `--ctp-overlay1` default, `--ctp-text` on hover.
+
+### Tabs
+
+Used in detail panes and module sub-views:
+
+```css
+display: flex;
+gap: 0;
+border-bottom: 2px solid var(--ctp-surface0);
+```
+
+| State | Style |
+|-------|-------|
+| Default | `padding: 0.5rem 1rem`, `--ctp-subtext0` text, no border |
+| Hover | `--ctp-text` text |
+| Active | `--ctp-text` text, `font-weight: 600`, `border-bottom: 2px solid --ctp-mauve` (overlaps container border) |
+
+### Section Dividers
+
+Used to visually group form fields:
+
+```css
+display: flex;
+align-items: center;
+gap: 0.75rem;
+grid-column: 1 / -1;   /* span full form grid */
+margin-top: 0.75rem;
+```
+
+Contains a label (`11px`, uppercase, `--ctp-overlay0`) and a horizontal line (`flex: 1`, `1px solid --ctp-surface0`).
+
+### Sidebar Sections
+
+Stacked vertically within detail panes:
+
+```css
+padding: 1rem 1.25rem;
+border-bottom: 1px solid var(--ctp-surface0);
+```
+
+Last section has no bottom border. Section titles follow the section header typography (11px, uppercase, `--ctp-overlay0`).
+
+### Tooltips
+
+Appear on hover after a 300ms delay. Position: above the target element by default, flip below if insufficient space.
+
+```css
+background: var(--ctp-surface0);
+border: 1px solid var(--ctp-surface1);
+border-radius: 4px;
+padding: 0.3rem 0.6rem;
+font-size: 11px;
+color: var(--ctp-text);
+box-shadow: 0 4px 12px rgba(17, 17, 27, 0.4);
+```
+
+### Breadcrumbs
+
+Module navigation breadcrumbs:
+
+```
+Module Name  >  List View  >  Record Name  >  Sub-view
+```
+
+Separator: `>` character in `--ctp-overlay0`. Segments are clickable links in `--ctp-subtext1`. Active (final) segment is `--ctp-text` at `font-weight: 600`.
+
+### Dropdowns / Selects
+
+Follow the input base style. The dropdown menu:
+
+```css
+background: var(--ctp-surface0);
+border: 1px solid var(--ctp-surface1);
+border-radius: 6px;
+box-shadow: 0 8px 24px rgba(17, 17, 27, 0.5);
+padding: 0.25rem;
+max-height: 240px;
+overflow-y: auto;
+```
+
+Menu items:
+
+```css
+padding: 0.4rem 0.65rem;
+border-radius: 4px;
+font-size: 12px;
+color: var(--ctp-text);
+cursor: pointer;
+```
+
+Hover: `background: --ctp-surface1`. Selected: `background: rgba(203, 166, 247, 0.12)`, `color: --ctp-mauve`, `font-weight: 600`.
+
+---
+
+## Icons
+
+Use [Lucide](https://lucide.dev) icons. Size: 14px for inline/table contexts, 16px for buttons and navigation, 20px for page headers and empty states.
+
+Stroke width: 1.5px (Lucide default). Color inherits from parent text color unless explicitly set.
+
+Do not mix icon libraries. If Lucide does not have a suitable icon, request one be added or create a custom SVG following Lucide's 24×24 grid and stroke conventions.
+
+---
+
+## Transitions & Animation
+
+All interactive state changes use `transition: all 0.15s ease`. This applies to hover, focus, active, and open/close states.
+
+No entrance animations on page load. Content renders immediately. Skeleton loaders are acceptable for async data using a pulsing `--ctp-surface0` → `--ctp-surface1` gradient.
+
+Dropdown menus and tooltips appear instantly (no slide/fade). Collapse/expand panels (if used) transition `max-height` at `0.2s ease`.
+
+---
+
+## Styling Implementation
+
+Silo's React frontend uses **inline `React.CSSProperties` objects** with `var(--ctp-*)` token references. This is the project convention and must not be changed.
+
+### Rules
+
+- No CSS modules, no Tailwind, no external CSS-in-JS libraries.
+- Styles are defined as `const` objects at the top of each component file.
+- Shared style patterns (button base, input base) can be extracted to a `styles/` directory as exported `CSSProperties` objects.
+- Use `as const` or `as React.CSSProperties` for type safety.
+- Pseudo-classes (`:hover`, `:focus`) require state-driven inline styles or a thin CSS file for the base pseudo-class rules.
+
+### Example
+
+```typescript
+const styles = {
+  container: {
+    display: 'grid',
+    gridTemplateColumns: '1fr 360px',
+    height: '100%',
+    overflow: 'hidden',
+  } as React.CSSProperties,
+
+  sidebar: {
+    background: 'var(--ctp-mantle)',
+    borderLeft: '1px solid var(--ctp-surface0)',
+    display: 'flex',
+    flexDirection: 'column' as const,
+    overflowY: 'auto' as const,
+  } as React.CSSProperties,
+};
+```
+
+### Pseudo-class CSS
+
+A single `silo-base.css` file provides pseudo-class rules that cannot be expressed inline:
+
+```css
+/* Hover, focus, and active states for core interactive elements */
+.silo-input:hover { border-color: var(--ctp-overlay0); }
+.silo-input:focus { border-color: var(--ctp-mauve); box-shadow: 0 0 0 0.2rem rgba(203, 166, 247, 0.25); }
+.silo-btn:hover { /* per-tier overrides */ }
+.silo-row:hover { background: var(--ctp-surface0); }
+```
+
+Components apply the corresponding class names alongside their inline styles. This is the only place class-based styling is used.
+
+---
+
+## Do / Don't
+
+| Do | Don't |
+|----|-------|
+| Use `var(--ctp-*)` for every color | Hardcode hex values |
+| Use the 4px spacing scale | Use arbitrary padding/margins |
+| Use Lucide icons at standard sizes | Mix icon libraries |
+| Use inline `CSSProperties` | Use CSS modules or Tailwind |
+| One primary button per visible context | Multiple competing primary buttons |
+| Use translucent accent backgrounds for badges | Use solid bright backgrounds for badges |
+| Use icon buttons for row-level table actions | Use text links in table rows |
+| Define styles as `const` at file top | Inline style objects in JSX |
+| Show tooltips on icon-only buttons | Leave icon buttons unlabeled |
+| Use section dividers to group form fields | Use cards or borders around field groups |
+| Follow the breadcrumb pattern for navigation | Use nested tab bars |
+
+---
+
+## Appendix: CSS Custom Properties Block
+
+Paste this at the root of the application stylesheet:
+
+```css
+:root {
+  --ctp-rosewater: #f5e0dc;
+  --ctp-flamingo: #f2cdcd;
+  --ctp-pink: #f5c2e7;
+  --ctp-mauve: #cba6f7;
+  --ctp-red: #f38ba8;
+  --ctp-maroon: #eba0ac;
+  --ctp-peach: #fab387;
+  --ctp-yellow: #f9e2af;
+  --ctp-green: #a6e3a1;
+  --ctp-teal: #94e2d5;
+  --ctp-sky: #89dceb;
+  --ctp-sapphire: #74c7ec;
+  --ctp-blue: #89b4fa;
+  --ctp-lavender: #b4befe;
+  --ctp-text: #cdd6f4;
+  --ctp-subtext1: #bac2de;
+  --ctp-subtext0: #a6adc8;
+  --ctp-overlay2: #9399b2;
+  --ctp-overlay1: #7f849c;
+  --ctp-overlay0: #6c7086;
+  --ctp-surface2: #585b70;
+  --ctp-surface1: #45475a;
+  --ctp-surface0: #313244;
+  --ctp-base: #1e1e2e;
+  --ctp-mantle: #181825;
+  --ctp-crust: #11111b;
+}
+```
--- a/frontend-spec.md
+++ b/frontend-spec.md
@@ -1,6 +1,6 @@
 # Silo Frontend Specification

-Current as of 2026-02-08. Documents the React + Vite + TypeScript frontend (migration from Go templates is complete).
+Current as of 2026-02-11. Documents the React + Vite + TypeScript frontend (migration from Go templates is complete).

 ## Overview

@@ -68,6 +68,7 @@ web/
    │   └── AuthContext.tsx                AuthProvider with login/logout/refresh methods
    ├── hooks/
    │   ├── useAuth.ts                    Context consumer hook
+    │   ├── useFormDescriptor.ts           Fetches form descriptor from /api/schemas/{name}/form (replaces useCategories)
    │   ├── useItems.ts                   Items fetching with search, filters, pagination, debounce
    │   └── useLocalStorage.ts            Typed localStorage persistence hook
    ├── styles/
@@ -271,63 +272,81 @@ Vite dev server runs on port 5173 with proxy config in `vite.config.ts` forwardi

 ## New Frontend Tasks

-# CreateItemPane Redesign Specification
+# CreateItemPane — Schema-Driven Dynamic Form

-**Date**: 2026-02-06
-**Scope**: Replace existing `CreateItemPane.tsx` with a two-column layout, multi-stage category picker, file attachment via MinIO, and full use of screen real estate.
+**Date**: 2026-02-10
+**Scope**: `CreateItemPane.tsx` renders a dynamic form driven entirely by the form descriptor API (`GET /api/schemas/{name}/form`). All field groups, field types, widgets, and category-specific fields are defined in YAML and resolved server-side.
 **Parent**: Items page (`ItemsPage.tsx`) — renders in the detail pane area per existing in-pane CRUD pattern.

 ---

 ## Layout

-The pane uses a CSS Grid two-column layout instead of the current single-column form:
+Single-column scrollable form with a green header bar. Field groups are rendered dynamically from the form descriptor. Category-specific field groups appear after global groups when a category is selected.

 ```
-┌──────────────────────────────────────────────────────┬──────────────┐
-│  Header: "New Item"  [green bar]      Cancel │ Create │              │
-├──────────────────────────────────────────────────────┤              │
-│                                                      │  Auto-       │
-│  ── Identity ──────────────────────────────────────  │  assigned    │
-│  [Part Number *]          [Type *        v]          │  metadata    │
-│  [Description                               ]        │              │
-│  Category * [Domain   │ Group    │ Subtype  ]        │──────────────│
-│             Mechanical│ Structural│ Bracket  │        │              │
-│             Electrical│ Bearings  │ Plate    │        │  Attachments │
-│             ...       │ ...       │ ...      │        │  ┌─ ─ ─ ─ ┐ │
-│  ── Sourcing ──────────────────────────────────────  │  │ Drop   │ │
-│  [Sourcing Type v]    [Standard Cost  $    ]         │  │ zone   │ │
-│  [Unit of Measure v]  [Sourcing Link       ]         │  └─ ─ ─ ─ ┘ │
-│                                                      │  file.FCStd  │
-│  ── Details ───────────────────────────────────────  │  drawing.pdf │
-│  [Long Description                          ]        │              │
-│  [Projects: [tag][tag] type to search...    ]        │──────────────│
-│                                                      │  Thumbnail   │
-│                                                      │  [preview]   │
-└──────────────────────────────────────────────────────┴──────────────┘
+┌──────────────────────────────────────────────────────────────────────┐
+│  Header: "New Item"  [green bar]                    Cancel │ Create │
+├──────────────────────────────────────────────────────────────────────┤
+│                                                                      │
+│  Category * [Domain buttons: F C R S E M T A P X]                   │
+│             [Subcategory search + filtered list]                     │
+│                                                                      │
+│  ── Identity ────────────────────────────────────────────────────── │
+│  [Type *   (auto-derived from category)]  [Description           ]  │
+│                                                                      │
+│  ── Sourcing ────────────────────────────────────────────────────── │
+│  [Sourcing Type v]  [Manufacturer]  [MPN]  [Supplier]  [SPN]       │
+│  [Sourcing Link]                                                     │
+│                                                                      │
+│  ── Cost & Lead Time ────────────────────────────────────────────── │
+│  [Standard Cost $]  [Lead Time Days]  [Min Order Qty]               │
+│                                                                      │
+│  ── Status ──────────────────────────────────────────────────────── │
+│  [Lifecycle Status v]  [RoHS Compliant ☐]  [Country of Origin]     │
+│                                                                      │
+│  ── Details ─────────────────────────────────────────────────────── │
+│  [Long Description                                              ]   │
+│  [Projects: [tag][tag] type to search...                       ]    │
+│  [Notes                                                         ]   │
+│                                                                      │
+│  ── Fastener Specifications (category-specific) ─────────────────── │
+│  [Material]  [Finish]  [Thread Size]  [Head Type]  [Drive Type] ... │
+│                                                                      │
+└──────────────────────────────────────────────────────────────────────┘
 ```

-Grid definition: `grid-template-columns: 1fr 320px`. The left column scrolls independently if content overflows. The right sidebar is a flex column with sections separated by `--ctp-surface1` borders.
+## Data Source — Form Descriptor API
+
+All form structure is fetched from `GET /api/schemas/kindred-rd/form`, which returns:
+
+- `category_picker`: Multi-stage picker config (domain → subcategory)
+- `item_fields`: Definitions for item-level fields (description, item_type, sourcing_type, etc.)
+- `field_groups`: Ordered groups with resolved field metadata (Identity, Sourcing, Cost, Status, Details)
+- `category_field_groups`: Per-category-prefix groups (e.g., Fastener Specifications for `F` prefix)
+- `field_overrides`: Widget hints (currency, url, select, checkbox)
+
+The YAML schema (`schemas/kindred-rd.yaml`) is the single source of truth. Adding a new field or category in YAML propagates to all clients with no code changes.

 ## File Location

-`web/src/components/items/CreateItemPane.tsx` (replaces existing file)
+`web/src/components/items/CreateItemPane.tsx`

-New supporting files:
+Supporting files:

 | File | Purpose |
 |------|---------|
-| `web/src/components/items/CategoryPicker.tsx` | Multi-stage category selector |
+| `web/src/components/items/CategoryPicker.tsx` | Multi-stage domain/subcategory selector |
 | `web/src/components/items/FileDropZone.tsx` | Drag-and-drop file upload with MinIO presigned URLs |
 | `web/src/components/items/TagInput.tsx` | Multi-select tag input for projects |
-| `web/src/hooks/useCategories.ts` | Fetches category tree from schema data |
+| `web/src/hooks/useFormDescriptor.ts` | Fetches and caches form descriptor from `/api/schemas/{name}/form` |
 | `web/src/hooks/useFileUpload.ts` | Manages presigned URL upload flow |

 ## Component Breakdown

 ### CreateItemPane

-Top-level orchestrator. Manages form state, submission, and layout.
+Top-level orchestrator. Renders dynamic form from the form descriptor.

 **Props** (unchanged interface):

@@ -341,68 +360,64 @@ interface CreateItemPaneProps {
 **State**:

 ```typescript
-const [form, setForm] = useState<CreateItemForm>({
-  part_number: '',
-  item_type: 'part',
-  description: '',
-  category_path: [],        // e.g. ['Mechanical', 'Structural', 'Bracket']
-  sourcing_type: 'manufactured',
-  standard_cost: '',
-  unit_of_measure: 'ea',
-  sourcing_link: '',
-  long_description: '',
-  project_ids: [],
-});
-const [attachments, setAttachments] = useState<PendingAttachment[]>([]);
-const [thumbnail, setThumbnail] = useState<PendingAttachment | null>(null);
+const { descriptor, categories, loading } = useFormDescriptor();
+const [category, setCategory] = useState('');           // selected category code, e.g. "F01"
+const [fields, setFields] = useState<Record<string, string>>({});  // all field values keyed by name
 const [error, setError] = useState<string | null>(null);
 const [submitting, setSubmitting] = useState(false);
 ```

+A single `fields` record holds all form values (both item-level and property fields). The `ITEM_LEVEL_FIELDS` set (`description`, `item_type`, `sourcing_type`, `long_description`) determines which fields go into the top-level request vs. the `properties` map on submission.
+
+**Auto-derivation**: When a category is selected, `item_type` is automatically set based on the `derived_from_category` mapping in the form descriptor (e.g., category prefix `A` → `assembly`, `T` → `tooling`, default → `part`).
+
+**Dynamic rendering**: A `renderField()` function maps each field's `widget` type to the appropriate input:
+
+| Widget | Rendered As |
+|--------|-------------|
+| `text` | `<input type="text">` |
+| `number` | `<input type="number">` |
+| `textarea` | `<textarea>` |
+| `select` | `<select>` with `<option>` elements from `field.options` |
+| `checkbox` | `<input type="checkbox">` |
+| `currency` | `<input type="number">` with currency prefix (e.g., "$") |
+| `url` | `<input type="url">` |
+| `tag_input` | `TagInput` component with search endpoint |
+
 **Submission flow**:

-1. Validate required fields (part_number, item_type, category_path length === 3).
-2. `POST /api/items` with form data → returns created `Item` with UUID.
-3. For each attachment in `attachments[]`, call the file association endpoint: `POST /api/items/{id}/files` with the MinIO object key returned from upload.
-4. If thumbnail exists, `PUT /api/items/{id}/thumbnail` with the object key.
-5. Call `onCreated(item)`.
+1. Validate required fields (category must be selected).
+2. Split `fields` into item-level fields and properties using `ITEM_LEVEL_FIELDS`.
+3. `POST /api/items` with `{ part_number: '', item_type, description, sourcing_type, long_description, category, properties: {...} }`.
+4. Call `onCreated(item)`.

-If step 2 fails, show error banner. If file association fails, show warning but still navigate (item was created, files can be re-attached).
-
-**Header bar**: Green (`--ctp-green` background, `--ctp-crust` text) per existing create-pane convention. "New Item" title on left, Cancel (ghost button) and Create Item (primary button, `--ctp-green` bg) on right.
+**Header bar**: Green (`--ctp-green` background, `--ctp-crust` text). "New Item" title on left, Cancel and Create Item buttons on right.

 ### CategoryPicker

-Three-column scrollable list for hierarchical category selection.
+Multi-stage category selector driven by the form descriptor's `category_picker.stages` config.

 **Props**:

 ```typescript
 interface CategoryPickerProps {
-  value: string[];                    // current selection path, e.g. ['Mechanical', 'Structural']
-  onChange: (path: string[]) => void;
-  categories: CategoryNode[];         // top-level nodes
-}
-
-interface CategoryNode {
-  name: string;
-  children?: CategoryNode[];
+  value: string;                              // selected category code, e.g. "F01"
+  onChange: (code: string) => void;
+  categories: Record<string, string>;         // flat code → description map
+  stages?: CategoryPickerStage[];             // from form descriptor
 }
 ```

-**Rendering**: Three side-by-side `<div>` columns inside a container with `border: 1px solid var(--ctp-surface1)` and `border-radius: 0.4rem`. Each column has:
+**Rendering**: Two-stage selection:

- A sticky header row (10px uppercase, `--ctp-overlay0` text, `--ctp-mantle` background) labeling the tier. Labels come from the schema definition if available, otherwise "Level 1", "Level 2", "Level 3".
- A scrollable list of options. Each option is a `<div>` row, 28px height, `0.85rem` font. Hover: `--ctp-surface0` background. Selected: translucent mauve background (`rgba(203, 166, 247, 0.12)`), `--ctp-mauve` text, weight 600.
- If a node has children, show a `›` chevron on the right side of the row.
+1. **Domain row**: Horizontal row of buttons, one per domain from `stages[0].values` (F=Fasteners, C=Fluid Fittings, etc.). Selected domain has mauve highlight.
+2. **Subcategory list**: Filtered list of categories matching the selected domain prefix. Includes a search input for filtering. Each row shows code and description.

-Column 1 always shows all top-level nodes. Column 2 shows children of the selected Column 1 node. Column 3 shows children of the selected Column 2 node. If nothing is selected in a column, the next column shows an empty state with muted text: "Select a [tier name]".
+If no `stages` prop is provided, falls back to a flat searchable list of all categories.

-Below the picker, render a breadcrumb trail: `Mechanical › Structural › Bracket` in `--ctp-mauve` with `›` separators in `--ctp-overlay0`. Only show segments that are selected.
+Below the picker, the selected category is shown as a breadcrumb: `Fasteners › F01 — Hex Cap Screw` in `--ctp-mauve`.

-**Data source**: Categories are derived from schemas. The `useCategories` hook calls `GET /api/schemas` and transforms the response into a `CategoryNode[]` tree. The exact mapping depends on how schemas define category hierarchies — if schemas don't currently support hierarchical categories, this requires a backend addition (see Backend Changes section).
-
-**Max height**: 180px per column with `overflow-y: auto`.
+**Data source**: Categories come from `useFormDescriptor()` which derives them from the `category_picker` stages and `values_by_domain` in the form descriptor response.

 ### FileDropZone

@@ -478,17 +493,17 @@ The dropdown is an absolutely-positioned `<div>` below the input container, `--c

 **For projects**: `searchFn` calls `GET /api/projects?q={query}` and maps to `{ id: project.id, label: project.code + ' — ' + project.name }`.

-### useCategories Hook
+### useFormDescriptor Hook

 ```typescript
-function useCategories(): {
-  categories: CategoryNode[];
+function useFormDescriptor(schemaName = "kindred-rd"): {
+  descriptor: FormDescriptor | null;
+  categories: Record<string, string>;   // flat code → description map derived from descriptor
  loading: boolean;
-  error: string | null;
 }
 ```

-Fetches `GET /api/schemas` on mount and transforms into a category tree. Caches in a module-level variable so repeated renders don't refetch. If the API doesn't currently support hierarchical categories, this returns a flat list as a single-tier picker until the backend is extended.
+Fetches `GET /api/schemas/{name}/form` on mount. Caches the result in a module-level variable so repeated renders/mounts don't refetch. Derives a flat `categories` map from the `category_picker` stages and `values_by_domain` in the response. Replaces the old `useCategories` hook (deleted).

 ### useFileUpload Hook

@@ -542,30 +557,32 @@ const styles = {

 ## Form Sections

-The form is visually divided by section headers. Each header is a flex row containing a label (11px uppercase, `--ctp-overlay0`) and a `flex: 1` horizontal line (`1px solid --ctp-surface0`). Sections span `grid-column: 1 / -1`.
+Form sections are rendered dynamically from the `field_groups` array in the form descriptor. Each section header is a flex row containing a label (11px uppercase, `--ctp-overlay0`) and a `flex: 1` horizontal line (`1px solid --ctp-surface0`).

-| Section | Fields |
-|---------|--------|
-| Identity | Part Number*, Type*, Description, Category* |
-| Sourcing | Sourcing Type, Standard Cost, Unit of Measure, Sourcing Link |
-| Details | Long Description, Projects |
+**Global field groups** (from `ui.field_groups` in YAML):

-## Sidebar Sections
+| Group Key | Label | Fields |
+|-----------|-------|--------|
+| identity | Identity | item_type, description |
+| sourcing | Sourcing | sourcing_type, manufacturer, manufacturer_pn, supplier, supplier_pn, sourcing_link |
+| cost | Cost & Lead Time | standard_cost, lead_time_days, minimum_order_qty |
+| status | Status | lifecycle_status, rohs_compliant, country_of_origin |
+| details | Details | long_description, projects, notes |

-The right sidebar is divided into three sections with `borderBottom: 1px solid var(--ctp-surface0)`:
+**Category-specific field groups** (from `ui.category_field_groups` in YAML, shown when a category is selected):

-**Auto-assigned metadata**: Read-only key-value rows showing:
- UUID: "On create" in `--ctp-teal` italic
- Revision: "A" (hardcoded initial)
- Created By: current user's display name from `useAuth()`
+| Prefix | Group | Example Fields |
+|--------|-------|----------------|
+| F | Fastener Specifications | material, finish, thread_size, head_type, drive_type, ... |
+| C | Fitting Specifications | material, connection_type, size_1, pressure_rating, ... |
+| R | Motion Specifications | bearing_type, bore_diameter, load_rating, ... |
+| ... | ... | (one group per category prefix, defined in YAML) |

-**Attachments**: `FileDropZone` component. Takes `flex: 1` to fill available space.
-
-**Thumbnail**: A 4:3 aspect ratio placeholder box (`--ctp-crust` bg, `--ctp-surface0` border) with centered text "Generated from CAD file or upload manually". Clicking opens file picker filtered to images. If a thumbnail is uploaded, show it as an `<img>` with `object-fit: cover`.
+Note: `sourcing_link` and `standard_cost` are revision properties (stored in the `properties` JSONB), not item-level DB columns. They were migrated from item-level fields in PR #1 (migration 013).

 ## Backend Changes

-Items 1-3 and 5 below are implemented (migration `011_item_files.sql`, `internal/api/file_handlers.go`). Item 4 (hierarchical categories) remains open.
+Items 1-5 below are implemented. Item 4 (hierarchical categories) is resolved by the form descriptor's multi-stage category picker.

 ### 1. Presigned Upload URL -- IMPLEMENTED

@@ -597,33 +614,14 @@ Response: 204

 Stores the thumbnail at `items/{item_id}/thumbnail.png` in MinIO. Updates `item.thumbnail_key` column.

-### 4. Hierarchical Categories -- NOT IMPLEMENTED
+### 4. Hierarchical Categories -- IMPLEMENTED (via Form Descriptor)

-If schemas don't currently support a hierarchical category tree, one of these approaches:
+Resolved by the schema-driven form descriptor (`GET /api/schemas/{name}/form`). The YAML schema's `ui.category_picker` section defines multi-stage selection:

-**Option A — Schema-driven**: Add a `category_tree` JSON column to the `schemas` table that defines the hierarchy. The `GET /api/schemas` response already returns schemas; the frontend transforms this into the picker tree.
+- **Stage 1 (domain)**: Groups categories by first character of category code (F=Fasteners, C=Fluid Fittings, etc.). Values defined in `ui.category_picker.stages[0].values`.
+- **Stage 2 (subcategory)**: Auto-derived by the Go backend's `ValuesByDomain()` method, which groups the category enum values by their first character.

-**Option B — Dedicated table**:
-
-```sql
-CREATE TABLE categories (
-  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-  name TEXT NOT NULL,
-  parent_id UUID REFERENCES categories(id),
-  sort_order INT NOT NULL DEFAULT 0,
-  UNIQUE(parent_id, name)
-);
-```
-
-With endpoints:
-```
-GET  /api/categories            → flat list with parent_id, frontend builds tree
-POST /api/categories            → { name, parent_id? }
-PUT  /api/categories/{id}       → { name, sort_order }
-DELETE /api/categories/{id}     → cascade check
-```
-
-**Recommendation**: Option B is more flexible and keeps categories as a first-class entity. The three-tier picker doesn't need to be limited to exactly three levels — it can render as many columns as the deepest category path, but three is the practical default (Domain → Group → Subtype).
+No separate `categories` table is needed — the existing schema enum values are the single source of truth. Adding a new category code to the YAML propagates to the picker automatically.

 ### 5. Database Schema Addition -- IMPLEMENTED

@@ -641,46 +639,89 @@ CREATE TABLE item_files (
 CREATE INDEX idx_item_files_item ON item_files(item_id);

 ALTER TABLE items ADD COLUMN thumbnail_key TEXT;
-ALTER TABLE items ADD COLUMN category_id UUID REFERENCES categories(id);
 ALTER TABLE items ADD COLUMN sourcing_type TEXT NOT NULL DEFAULT 'manufactured';
-ALTER TABLE items ADD COLUMN sourcing_link TEXT;
-ALTER TABLE items ADD COLUMN standard_cost NUMERIC(12,2);
 ALTER TABLE items ADD COLUMN unit_of_measure TEXT NOT NULL DEFAULT 'ea';
 ALTER TABLE items ADD COLUMN long_description TEXT;
 ```

 ## Implementation Order

-1. **TagInput component** — reusable, no backend changes needed, uses existing projects API.
-2. **CategoryPicker component** — start with flat/mock data, wire to real API after backend adds categories.
-3. **FileDropZone + useFileUpload** — requires presigned URL backend endpoint first.
-4. **CreateItemPane rewrite** — compose the above into the two-column layout.
-5. **Backend: categories table + endpoints** — unblocks real category data.
-6. **Backend: presigned uploads + item_files** — unblocks file attachments.
-7. **Backend: items table migration** — adds new columns (sourcing_type, standard_cost, etc.).
+1. **[DONE] Deduplicate sourcing_link/standard_cost** — Migrated from item-level DB columns to revision properties (migration 013). Removed from Go structs, API types, frontend types.
+2. **[DONE] Form descriptor API** — Added `ui` section to YAML, Go structs + validation, `GET /api/schemas/{name}/form` endpoint.
+3. **[DONE] useFormDescriptor hook** — Replaces `useCategories`, fetches and caches form descriptor.
+4. **[DONE] CategoryPicker rewrite** — Multi-stage domain/subcategory picker driven by form descriptor.
+5. **[DONE] CreateItemPane rewrite** — Dynamic form rendering from field groups, widget-based field rendering.
+6. **TagInput component** — reusable, no backend changes needed, uses existing projects API.
+7. **FileDropZone + useFileUpload** — requires presigned URL backend endpoint (already implemented).

-Steps 1-2 can start immediately. Steps 5-7 can run in parallel once specified. Step 4 ties it all together.
+## Types Added

-## Types to Add
-
-Add to `web/src/api/types.ts`:
+The following types were added to `web/src/api/types.ts` for the form descriptor system:

 ```typescript
-// Categories
-interface Category {
-  id: string;
+// Form descriptor types (from GET /api/schemas/{name}/form)
+interface FormFieldDescriptor {
  name: string;
-  parent_id: string | null;
-  sort_order: number;
+  type: string;
+  widget: string;
+  label: string;
+  required?: boolean;
+  default?: string;
+  unit?: string;
+  description?: string;
+  options?: string[];
+  currency?: string;
+  derived_from_category?: Record<string, string>;
+  search_endpoint?: string;
 }

-interface CategoryNode {
-  name: string;
-  id: string;
-  children?: CategoryNode[];
+interface FormFieldGroup {
+  key: string;
+  label: string;
+  order: number;
+  fields: FormFieldDescriptor[];
 }

-// File uploads
+interface CategoryPickerStage {
+  name: string;
+  label: string;
+  values?: Record<string, string>;
+  values_by_domain?: Record<string, Record<string, string>>;
+}
+
+interface CategoryPickerDescriptor {
+  style: string;
+  stages: CategoryPickerStage[];
+}
+
+interface ItemFieldDef {
+  type: string;
+  widget: string;
+  label: string;
+  required?: boolean;
+  default?: string;
+  options?: string[];
+  derived_from_category?: Record<string, string>;
+  search_endpoint?: string;
+}
+
+interface FieldOverride {
+  widget?: string;
+  currency?: string;
+  options?: string[];
+}
+
+interface FormDescriptor {
+  schema_name: string;
+  format: string;
+  category_picker: CategoryPickerDescriptor;
+  item_fields: Record<string, ItemFieldDef>;
+  field_groups: FormFieldGroup[];
+  category_field_groups: Record<string, FormFieldGroup[]>;
+  field_overrides: Record<string, FieldOverride>;
+}
+
+// File uploads (unchanged)
 interface PresignRequest {
  filename: string;
  content_type: string;
@@ -703,20 +744,6 @@ interface ItemFile {
  created_at: string;
 }

-// Extended create request
-interface CreateItemRequest {
-  part_number: string;
-  item_type: 'part' | 'assembly' | 'document';
-  description?: string;
-  category_id?: string;
-  sourcing_type?: 'manufactured' | 'purchased' | 'phantom';
-  standard_cost?: number;
-  unit_of_measure?: string;
-  sourcing_link?: string;
-  long_description?: string;
-  project_ids?: string[];
-}
-
 // Pending upload (frontend only, not an API type)
 interface PendingAttachment {
  file: File;
@@ -726,3 +753,5 @@ interface PendingAttachment {
  error?: string;
 }
 ```
+
+Note: `sourcing_link` and `standard_cost` have been removed from the `Item`, `CreateItemRequest`, and `UpdateItemRequest` interfaces — they are now stored as revision properties and rendered dynamically from the form descriptor.
--- a/internal/api/audit_handlers.go
+++ b/internal/api/audit_handlers.go
@@ -101,6 +101,8 @@ var manufacturedWeights = map[string]float64{
 	// Weight 1: engineering detail (category-specific default)
 	"sourcing_type":    1,
 	"lifecycle_status": 1,
+	// Weight 1: engineering detail
+	"has_files": 1,
 	// Weight 0.5: less relevant for in-house
 	"manufacturer":     0.5,
 	"supplier":         0.5,
@@ -112,8 +114,6 @@ var manufacturedWeights = map[string]float64{
 var itemLevelFields = map[string]bool{
 	"description":      true,
 	"sourcing_type":    true,
-	"sourcing_link":    true,
-	"standard_cost":    true,
 	"long_description": true,
 }

@@ -207,6 +207,7 @@ func scoreItem(
 	categoryProps map[string]schema.PropertyDefinition,
 	hasBOM bool,
 	bomChildCount int,
+	hasFiles bool,
 	categoryName string,
 	projects []string,
 	includeFields bool,
@@ -255,18 +256,6 @@ func scoreItem(
 	processField("description", "item", "string", item.Description)
 	processField("sourcing_type", "item", "string", item.SourcingType)

-	var sourcingLinkVal any
-	if item.SourcingLink != nil {
-		sourcingLinkVal = *item.SourcingLink
-	}
-	processField("sourcing_link", "item", "string", sourcingLinkVal)
-
-	var stdCostVal any
-	if item.StandardCost != nil {
-		stdCostVal = *item.StandardCost
-	}
-	processField("standard_cost", "item", "number", stdCostVal)
-
 	var longDescVal any
 	if item.LongDescription != nil {
 		longDescVal = *item.LongDescription
@@ -276,6 +265,7 @@ func scoreItem(
 	// Score has_bom for manufactured/assembly items.
 	if sourcingType == "manufactured" || isAssembly {
 		processField("has_bom", "computed", "boolean", hasBOM)
+		processField("has_files", "computed", "boolean", hasFiles)
 	}

 	// Score property fields from schema.
@@ -283,10 +273,6 @@ func scoreItem(
 		if skipFields[key] || itemLevelFields[key] {
 			continue
 		}
-		// sourcing_link and standard_cost are already handled at item level.
-		if key == "sourcing_link" || key == "standard_cost" {
-			continue
-		}
 		value := item.Properties[key]
 		processField(key, "property", def.Type, value)
 	}
@@ -412,6 +398,13 @@ func (s *Server) HandleAuditCompleteness(w http.ResponseWriter, r *http.Request)
 		return
 	}

+	fileStats, err := s.items.BatchGetFileStats(ctx, itemIDs)
+	if err != nil {
+		s.logger.Error().Err(err).Msg("failed to batch get file stats")
+		writeError(w, http.StatusInternalServerError, "internal_error", "Failed to load file stats")
+		return
+	}
+
 	// Look up the schema for category resolution.
 	sch := s.schemas["kindred-rd"]
 	var catSegment *schema.Segment
@@ -440,9 +433,10 @@ func (s *Server) HandleAuditCompleteness(w http.ResponseWriter, r *http.Request)

 		bomCount := bomCounts[item.ID]
 		hasBOM := bomCount > 0
+		hasFiles := fileStats[item.ID].Count > 0
 		projects := projectCodes[item.ID]

-		result := scoreItem(item, categoryProps, hasBOM, bomCount, categoryName, projects, false)
+		result := scoreItem(item, categoryProps, hasBOM, bomCount, hasFiles, categoryName, projects, false)
 		allResults = append(allResults, *result)
 	}

@@ -544,6 +538,15 @@ func (s *Server) HandleAuditItemDetail(w http.ResponseWriter, r *http.Request) {
 	}
 	projects := projectCodes[item.ID]

+	// Get file stats.
+	fileStats, err := s.items.BatchGetFileStats(ctx, []string{item.ID})
+	if err != nil {
+		s.logger.Error().Err(err).Str("pn", partNumber).Msg("failed to get file stats for audit")
+		writeError(w, http.StatusInternalServerError, "internal_error", "Failed to load file stats")
+		return
+	}
+	hasFiles := fileStats[item.ID].Count > 0
+
 	// Category resolution.
 	cat := extractCategory(item.PartNumber)
 	categoryName := cat
@@ -561,7 +564,7 @@ func (s *Server) HandleAuditItemDetail(w http.ResponseWriter, r *http.Request) {
 		categoryProps = sch.PropertySchemas.GetPropertiesForCategory(cat)
 	}

-	result := scoreItem(iwp, categoryProps, hasBOM, bomCount, categoryName, projects, true)
+	result := scoreItem(iwp, categoryProps, hasBOM, bomCount, hasFiles, categoryName, projects, true)

 	writeJSON(w, http.StatusOK, result)
 }
--- a/internal/api/audit_handlers_test.go
+++ b/internal/api/audit_handlers_test.go
@@ -0,0 +1,106 @@
+package api
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/go-chi/chi/v5"
+)
+
+func newAuditRouter(s *Server) http.Handler {
+	r := chi.NewRouter()
+	r.Get("/api/audit/completeness", s.HandleAuditCompleteness)
+	r.Get("/api/audit/completeness/{partNumber}", s.HandleAuditItemDetail)
+	return r
+}
+
+func TestHandleAuditCompletenessEmpty(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newAuditRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/audit/completeness", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+}
+
+func TestHandleAuditCompleteness(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newAuditRouter(s)
+
+	createItemDirect(t, s, "AUD-001", "audit item 1", nil)
+	createItemDirect(t, s, "AUD-002", "audit item 2", nil)
+
+	req := httptest.NewRequest("GET", "/api/audit/completeness", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var resp map[string]any
+	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	// Should have items array
+	items, ok := resp["items"]
+	if !ok {
+		t.Fatal("response missing 'items' key")
+	}
+	itemList, ok := items.([]any)
+	if !ok {
+		t.Fatal("'items' is not an array")
+	}
+	if len(itemList) < 2 {
+		t.Errorf("expected at least 2 audit items, got %d", len(itemList))
+	}
+}
+
+func TestHandleAuditItemDetail(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newAuditRouter(s)
+
+	cost := 50.0
+	createItemDirect(t, s, "AUDDET-001", "audit detail item", &cost)
+
+	req := httptest.NewRequest("GET", "/api/audit/completeness/AUDDET-001", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var resp map[string]any
+	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if resp["part_number"] != "AUDDET-001" {
+		t.Errorf("part_number: got %v, want %q", resp["part_number"], "AUDDET-001")
+	}
+	if _, ok := resp["score"]; !ok {
+		t.Error("response missing 'score' field")
+	}
+	if _, ok := resp["tier"]; !ok {
+		t.Error("response missing 'tier' field")
+	}
+}
+
+func TestHandleAuditItemDetailNotFound(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newAuditRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/audit/completeness/NOPE-999", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusNotFound {
+		t.Errorf("status: got %d, want %d", w.Code, http.StatusNotFound)
+	}
+}
--- a/internal/api/auth_handlers_test.go
+++ b/internal/api/auth_handlers_test.go
@@ -0,0 +1,206 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/go-chi/chi/v5"
+	"github.com/kindredsystems/silo/internal/auth"
+	"github.com/kindredsystems/silo/internal/db"
+	"github.com/kindredsystems/silo/internal/schema"
+	"github.com/kindredsystems/silo/internal/testutil"
+	"github.com/rs/zerolog"
+)
+
+// newAuthTestServer creates a Server with a real auth service (for token tests).
+func newAuthTestServer(t *testing.T) *Server {
+	t.Helper()
+	pool := testutil.MustConnectTestPool(t)
+	database := db.NewFromPool(pool)
+	users := db.NewUserRepository(database)
+	tokens := db.NewTokenRepository(database)
+	authSvc := auth.NewService(zerolog.Nop(), users, tokens)
+	broker := NewBroker(zerolog.Nop())
+	state := NewServerState(zerolog.Nop(), nil, broker)
+	return NewServer(
+		zerolog.Nop(),
+		database,
+		map[string]*schema.Schema{},
+		"",      // schemasDir
+		nil,     // storage
+		authSvc, // authService
+		nil,     // sessionManager
+		nil,     // oidcBackend
+		nil,     // authConfig
+		broker,
+		state,
+	)
+}
+
+// ensureTestUser creates a user in the DB and returns their ID.
+func ensureTestUser(t *testing.T, s *Server, username string) string {
+	t.Helper()
+	u := &db.User{
+		Username:    username,
+		DisplayName: "Test " + username,
+		Email:       username + "@test.local",
+		AuthSource:  "local",
+		Role:        "admin",
+	}
+	users := db.NewUserRepository(s.db)
+	if err := users.Upsert(context.Background(), u); err != nil {
+		t.Fatalf("upserting user: %v", err)
+	}
+	return u.ID
+}
+
+func newAuthRouter(s *Server) http.Handler {
+	r := chi.NewRouter()
+	r.Get("/api/auth/me", s.HandleGetCurrentUser)
+	r.Post("/api/auth/tokens", s.HandleCreateToken)
+	r.Get("/api/auth/tokens", s.HandleListTokens)
+	r.Delete("/api/auth/tokens/{id}", s.HandleRevokeToken)
+	r.Get("/api/auth/config", s.HandleAuthConfig)
+	return r
+}
+
+func TestHandleGetCurrentUser(t *testing.T) {
+	s := newTestServer(t)
+	router := newAuthRouter(s)
+
+	req := authRequest(httptest.NewRequest("GET", "/api/auth/me", nil))
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var resp map[string]any
+	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if resp["username"] != "testadmin" {
+		t.Errorf("username: got %v, want %q", resp["username"], "testadmin")
+	}
+	if resp["role"] != "admin" {
+		t.Errorf("role: got %v, want %q", resp["role"], "admin")
+	}
+}
+
+func TestHandleGetCurrentUserUnauth(t *testing.T) {
+	s := newTestServer(t)
+	router := newAuthRouter(s)
+
+	// No auth context
+	req := httptest.NewRequest("GET", "/api/auth/me", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusUnauthorized {
+		t.Errorf("status: got %d, want %d", w.Code, http.StatusUnauthorized)
+	}
+}
+
+func TestHandleAuthConfig(t *testing.T) {
+	s := newTestServer(t)
+	router := newAuthRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/auth/config", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var resp map[string]any
+	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	// With nil oidc and nil authConfig, both should be false
+	if resp["oidc_enabled"] != false {
+		t.Errorf("oidc_enabled: got %v, want false", resp["oidc_enabled"])
+	}
+}
+
+func TestHandleCreateAndListTokens(t *testing.T) {
+	s := newAuthTestServer(t)
+	router := newAuthRouter(s)
+
+	// Create a user in the DB so token generation can associate
+	userID := ensureTestUser(t, s, "tokenuser")
+
+	// Inject user with the DB-assigned ID
+	u := &auth.User{
+		ID:          userID,
+		Username:    "tokenuser",
+		DisplayName: "Test tokenuser",
+		Role:        auth.RoleAdmin,
+		AuthSource:  "local",
+	}
+
+	// Create token
+	body := `{"name":"test-token"}`
+	req := httptest.NewRequest("POST", "/api/auth/tokens", strings.NewReader(body))
+	req = req.WithContext(auth.ContextWithUser(req.Context(), u))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusCreated {
+		t.Fatalf("create token status: got %d, want %d; body: %s", w.Code, http.StatusCreated, w.Body.String())
+	}
+
+	var createResp map[string]any
+	if err := json.Unmarshal(w.Body.Bytes(), &createResp); err != nil {
+		t.Fatalf("decoding create response: %v", err)
+	}
+	if createResp["token"] == nil || createResp["token"] == "" {
+		t.Error("expected token in response")
+	}
+	tokenID, _ := createResp["id"].(string)
+
+	// List tokens
+	req = httptest.NewRequest("GET", "/api/auth/tokens", nil)
+	req = req.WithContext(auth.ContextWithUser(req.Context(), u))
+	w = httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("list tokens status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var tokens []map[string]any
+	if err := json.Unmarshal(w.Body.Bytes(), &tokens); err != nil {
+		t.Fatalf("decoding list response: %v", err)
+	}
+	if len(tokens) != 1 {
+		t.Errorf("expected 1 token, got %d", len(tokens))
+	}
+
+	// Revoke token
+	req = httptest.NewRequest("DELETE", "/api/auth/tokens/"+tokenID, nil)
+	req = req.WithContext(auth.ContextWithUser(req.Context(), u))
+	w = httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusNoContent {
+		t.Errorf("revoke token status: got %d, want %d; body: %s", w.Code, http.StatusNoContent, w.Body.String())
+	}
+
+	// List again — should be empty
+	req = httptest.NewRequest("GET", "/api/auth/tokens", nil)
+	req = req.WithContext(auth.ContextWithUser(req.Context(), u))
+	w = httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	json.Unmarshal(w.Body.Bytes(), &tokens)
+	if len(tokens) != 0 {
+		t.Errorf("expected 0 tokens after revoke, got %d", len(tokens))
+	}
+}
--- a/internal/api/bom_handlers.go
+++ b/internal/api/bom_handlers.go
@@ -29,6 +29,7 @@ type BOMEntryResponse struct {
 	ChildRevision        *int           `json:"child_revision,omitempty"`
 	EffectiveRevision    int            `json:"effective_revision"`
 	Depth                *int           `json:"depth,omitempty"`
+	Source               string         `json:"source"`
 	Metadata             map[string]any `json:"metadata,omitempty"`
 }

@@ -51,6 +52,7 @@ type AddBOMEntryRequest struct {
 	Unit                 *string        `json:"unit,omitempty"`
 	ReferenceDesignators []string       `json:"reference_designators,omitempty"`
 	ChildRevision        *int           `json:"child_revision,omitempty"`
+	Source               string         `json:"source,omitempty"`
 	Metadata             map[string]any `json:"metadata,omitempty"`
 }

@@ -240,6 +242,7 @@ func (s *Server) HandleAddBOMEntry(w http.ResponseWriter, r *http.Request) {
 		Unit:                 req.Unit,
 		ReferenceDesignators: req.ReferenceDesignators,
 		ChildRevision:        req.ChildRevision,
+		Source:               req.Source,
 		Metadata:             req.Metadata,
 	}
 	if user := auth.UserFromContext(ctx); user != nil {
@@ -273,6 +276,7 @@ func (s *Server) HandleAddBOMEntry(w http.ResponseWriter, r *http.Request) {
 		ReferenceDesignators: req.ReferenceDesignators,
 		ChildRevision:        req.ChildRevision,
 		EffectiveRevision:    child.CurrentRevision,
+		Source:               rel.Source,
 		Metadata:             req.Metadata,
 	}
 	if req.ChildRevision != nil {
@@ -434,6 +438,7 @@ func bomEntryToResponse(e *db.BOMEntry) BOMEntryResponse {
 		ReferenceDesignators: refDes,
 		ChildRevision:        e.ChildRevision,
 		EffectiveRevision:    e.EffectiveRevision,
+		Source:               e.Source,
 		Metadata:             e.Metadata,
 	}
 }
@@ -568,8 +573,20 @@ func (s *Server) HandleGetBOMCost(w http.ResponseWriter, r *http.Request) {
 	for i, e := range entries {
 		unitCost := 0.0
 		leaf, err := s.items.GetByID(ctx, e.ItemID)
-		if err == nil && leaf != nil && leaf.StandardCost != nil {
-			unitCost = *leaf.StandardCost
+		if err == nil && leaf != nil {
+			// Get standard_cost from revision properties
+			if revs, rerr := s.items.GetRevisions(ctx, leaf.ID); rerr == nil {
+				for _, rev := range revs {
+					if rev.RevisionNumber == leaf.CurrentRevision && rev.Properties != nil {
+						if sc, ok := rev.Properties["standard_cost"]; ok {
+							if cost, cok := sc.(float64); cok {
+								unitCost = cost
+							}
+						}
+						break
+					}
+				}
+			}
 		}
 		extCost := e.TotalQuantity * unitCost
 		totalCost += extCost
@@ -589,6 +606,56 @@ func (s *Server) HandleGetBOMCost(w http.ResponseWriter, r *http.Request) {
 	})
 }

+// BOM merge request/response types
+
+// MergeBOMRequest represents a request to merge assembly BOM entries.
+type MergeBOMRequest struct {
+	Source  string          `json:"source"`
+	Entries []MergeBOMEntry `json:"entries"`
+}
+
+// MergeBOMEntry represents a single entry in a merge request.
+type MergeBOMEntry struct {
+	ChildPartNumber string   `json:"child_part_number"`
+	Quantity        *float64 `json:"quantity"`
+}
+
+// MergeBOMResponse represents the result of a BOM merge.
+type MergeBOMResponse struct {
+	Status     string         `json:"status"`
+	Diff       MergeBOMDiff   `json:"diff"`
+	Warnings   []MergeWarning `json:"warnings"`
+	ResolveURL string         `json:"resolve_url"`
+}
+
+// MergeBOMDiff categorizes changes from a merge operation.
+type MergeBOMDiff struct {
+	Added           []MergeDiffEntry `json:"added"`
+	Removed         []MergeDiffEntry `json:"removed"`
+	QuantityChanged []MergeQtyChange `json:"quantity_changed"`
+	Unchanged       []MergeDiffEntry `json:"unchanged"`
+}
+
+// MergeDiffEntry represents an added, removed, or unchanged BOM entry.
+type MergeDiffEntry struct {
+	PartNumber string   `json:"part_number"`
+	Quantity   *float64 `json:"quantity"`
+}
+
+// MergeQtyChange represents a BOM entry whose quantity changed.
+type MergeQtyChange struct {
+	PartNumber  string   `json:"part_number"`
+	OldQuantity *float64 `json:"old_quantity"`
+	NewQuantity *float64 `json:"new_quantity"`
+}
+
+// MergeWarning represents a warning generated during merge.
+type MergeWarning struct {
+	Type       string `json:"type"`
+	PartNumber string `json:"part_number"`
+	Message    string `json:"message"`
+}
+
 // BOM CSV headers matching the user-specified format.
 var bomCSVHeaders = []string{
 	"Item", "Level", "Source", "PN", "Seller Description",
@@ -686,14 +753,14 @@ func (s *Server) HandleExportBOMCSV(w http.ResponseWriter, r *http.Request) {
 		}

 		row := []string{
-			strconv.Itoa(i + 1),                             // Item
-			strconv.Itoa(e.Depth),                           // Level
-			getMetaString(e.Metadata, "source"),             // Source
-			e.ChildPartNumber,                               // PN
+			strconv.Itoa(i + 1),   // Item
+			strconv.Itoa(e.Depth), // Level
+			e.Source,              // Source
+			e.ChildPartNumber,     // PN
 			getMetaString(e.Metadata, "seller_description"), // Seller Description
-			unitCostStr,                                     // Unit Cost
-			qtyStr,                                          // QTY
-			extCost,                                         // Ext Cost
+			unitCostStr, // Unit Cost
+			qtyStr,      // QTY
+			extCost,     // Ext Cost
 			getMetaString(e.Metadata, "sourcing_link"), // Sourcing Link
 		}
 		if err := writer.Write(row); err != nil {
@@ -853,12 +920,11 @@ func (s *Server) HandleImportBOMCSV(w http.ResponseWriter, r *http.Request) {
 		}

 		// Build metadata from CSV columns
-		metadata := make(map[string]any)
+		source := ""
 		if idx, ok := headerIdx["source"]; ok && idx < len(record) {
-			if v := strings.TrimSpace(record[idx]); v != "" {
-				metadata["source"] = v
-			}
+			source = strings.TrimSpace(record[idx])
 		}
+		metadata := make(map[string]any)
 		if idx, ok := headerIdx["seller description"]; ok && idx < len(record) {
 			if v := strings.TrimSpace(record[idx]); v != "" {
 				metadata["seller_description"] = v
@@ -942,6 +1008,7 @@ func (s *Server) HandleImportBOMCSV(w http.ResponseWriter, r *http.Request) {
 				ChildItemID:  child.ID,
 				RelType:      "component",
 				Quantity:     quantity,
+				Source:       source,
 				Metadata:     metadata,
 				CreatedBy:    importUsername,
 			}
@@ -971,3 +1038,197 @@ func (s *Server) HandleImportBOMCSV(w http.ResponseWriter, r *http.Request) {

 	writeJSON(w, http.StatusOK, result)
 }
+
+// HandleMergeBOM merges assembly-derived BOM entries into the server's BOM.
+// Added entries are created, quantity changes are applied, and entries present
+// in the server but missing from the request are flagged as warnings (not deleted).
+func (s *Server) HandleMergeBOM(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	partNumber := chi.URLParam(r, "partNumber")
+
+	parent, err := s.items.GetByPartNumber(ctx, partNumber)
+	if err != nil {
+		s.logger.Error().Err(err).Msg("failed to get parent item")
+		writeError(w, http.StatusInternalServerError, "internal_error", "Failed to get parent item")
+		return
+	}
+	if parent == nil {
+		writeError(w, http.StatusNotFound, "not_found", "Parent item not found")
+		return
+	}
+
+	var req MergeBOMRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		writeError(w, http.StatusBadRequest, "invalid_json", err.Error())
+		return
+	}
+	if len(req.Entries) == 0 {
+		writeError(w, http.StatusBadRequest, "invalid_request", "entries must not be empty")
+		return
+	}
+
+	// Fetch existing BOM (includes Source field)
+	existing, err := s.relationships.GetBOM(ctx, parent.ID)
+	if err != nil {
+		s.logger.Error().Err(err).Msg("failed to get existing BOM")
+		writeError(w, http.StatusInternalServerError, "internal_error", "Failed to get existing BOM")
+		return
+	}
+
+	// Build lookup map by child part number
+	existingMap := make(map[string]*db.BOMEntry, len(existing))
+	for _, e := range existing {
+		existingMap[e.ChildPartNumber] = e
+	}
+
+	var username *string
+	if user := auth.UserFromContext(ctx); user != nil {
+		username = &user.Username
+	}
+
+	diff := MergeBOMDiff{
+		Added:           make([]MergeDiffEntry, 0),
+		Removed:         make([]MergeDiffEntry, 0),
+		QuantityChanged: make([]MergeQtyChange, 0),
+		Unchanged:       make([]MergeDiffEntry, 0),
+	}
+	var warnings []MergeWarning
+
+	// Process incoming entries
+	for _, entry := range req.Entries {
+		if entry.ChildPartNumber == "" {
+			continue
+		}
+
+		child, err := s.items.GetByPartNumber(ctx, entry.ChildPartNumber)
+		if err != nil {
+			s.logger.Error().Err(err).Str("child", entry.ChildPartNumber).Msg("failed to look up child")
+			warnings = append(warnings, MergeWarning{
+				Type:       "error",
+				PartNumber: entry.ChildPartNumber,
+				Message:    fmt.Sprintf("Error looking up item: %s", err.Error()),
+			})
+			continue
+		}
+		if child == nil {
+			warnings = append(warnings, MergeWarning{
+				Type:       "not_found",
+				PartNumber: entry.ChildPartNumber,
+				Message:    fmt.Sprintf("Item '%s' not found in database", entry.ChildPartNumber),
+			})
+			continue
+		}
+
+		if ex, ok := existingMap[entry.ChildPartNumber]; ok {
+			// Entry already exists — check quantity
+			oldQty := ex.Quantity
+			newQty := entry.Quantity
+			if quantitiesEqual(oldQty, newQty) {
+				diff.Unchanged = append(diff.Unchanged, MergeDiffEntry{
+					PartNumber: entry.ChildPartNumber,
+					Quantity:   newQty,
+				})
+			} else {
+				// Update quantity
+				if err := s.relationships.Update(ctx, ex.RelationshipID, nil, newQty, nil, nil, nil, nil, username); err != nil {
+					s.logger.Error().Err(err).Str("child", entry.ChildPartNumber).Msg("failed to update quantity")
+					warnings = append(warnings, MergeWarning{
+						Type:       "error",
+						PartNumber: entry.ChildPartNumber,
+						Message:    fmt.Sprintf("Failed to update quantity: %s", err.Error()),
+					})
+				} else {
+					diff.QuantityChanged = append(diff.QuantityChanged, MergeQtyChange{
+						PartNumber:  entry.ChildPartNumber,
+						OldQuantity: oldQty,
+						NewQuantity: newQty,
+					})
+				}
+			}
+			delete(existingMap, entry.ChildPartNumber)
+		} else {
+			// New entry — create
+			rel := &db.Relationship{
+				ParentItemID: parent.ID,
+				ChildItemID:  child.ID,
+				RelType:      "component",
+				Quantity:     entry.Quantity,
+				Source:       "assembly",
+				CreatedBy:    username,
+			}
+			if err := s.relationships.Create(ctx, rel); err != nil {
+				if strings.Contains(err.Error(), "cycle") {
+					warnings = append(warnings, MergeWarning{
+						Type:       "cycle",
+						PartNumber: entry.ChildPartNumber,
+						Message:    fmt.Sprintf("Adding '%s' would create a cycle", entry.ChildPartNumber),
+					})
+				} else {
+					s.logger.Error().Err(err).Str("child", entry.ChildPartNumber).Msg("failed to create relationship")
+					warnings = append(warnings, MergeWarning{
+						Type:       "error",
+						PartNumber: entry.ChildPartNumber,
+						Message:    fmt.Sprintf("Failed to create: %s", err.Error()),
+					})
+				}
+				continue
+			}
+			diff.Added = append(diff.Added, MergeDiffEntry{
+				PartNumber: entry.ChildPartNumber,
+				Quantity:   entry.Quantity,
+			})
+		}
+	}
+
+	// Remaining entries in existingMap are not in the merge request
+	for pn, e := range existingMap {
+		if e.Source == "assembly" {
+			diff.Removed = append(diff.Removed, MergeDiffEntry{
+				PartNumber: pn,
+				Quantity:   e.Quantity,
+			})
+			warnings = append(warnings, MergeWarning{
+				Type:       "unreferenced",
+				PartNumber: pn,
+				Message:    "Present in server BOM but not in assembly",
+			})
+		}
+	}
+
+	resp := MergeBOMResponse{
+		Status:     "merged",
+		Diff:       diff,
+		Warnings:   warnings,
+		ResolveURL: fmt.Sprintf("/items/%s/bom", partNumber),
+	}
+
+	s.logger.Info().
+		Str("parent", partNumber).
+		Int("added", len(diff.Added)).
+		Int("updated", len(diff.QuantityChanged)).
+		Int("unchanged", len(diff.Unchanged)).
+		Int("unreferenced", len(diff.Removed)).
+		Int("warnings", len(warnings)).
+		Msg("BOM merge completed")
+
+	s.broker.Publish("bom.merged", mustMarshal(map[string]any{
+		"part_number":      partNumber,
+		"added":            len(diff.Added),
+		"quantity_changed": len(diff.QuantityChanged),
+		"unchanged":        len(diff.Unchanged),
+		"unreferenced":     len(diff.Removed),
+	}))
+
+	writeJSON(w, http.StatusOK, resp)
+}
+
+// quantitiesEqual compares two nullable float64 quantities.
+func quantitiesEqual(a, b *float64) bool {
+	if a == nil && b == nil {
+		return true
+	}
+	if a == nil || b == nil {
+		return false
+	}
+	return *a == *b
+}
--- a/internal/api/bom_handlers_test.go
+++ b/internal/api/bom_handlers_test.go
@@ -55,12 +55,15 @@ func newTestRouter(s *Server) http.Handler {
 func createItemDirect(t *testing.T, s *Server, pn, desc string, cost *float64) {
 	t.Helper()
 	item := &db.Item{
-		PartNumber:   pn,
-		ItemType:     "part",
-		Description:  desc,
-		StandardCost: cost,
+		PartNumber:  pn,
+		ItemType:    "part",
+		Description: desc,
 	}
-	if err := s.items.Create(context.Background(), item, nil); err != nil {
+	var props map[string]any
+	if cost != nil {
+		props = map[string]any{"standard_cost": *cost}
+	}
+	if err := s.items.Create(context.Background(), item, props); err != nil {
 		t.Fatalf("creating item %s: %v", pn, err)
 	}
 }
--- a/internal/api/csv.go
+++ b/internal/api/csv.go
@@ -51,9 +51,7 @@ var csvColumns = []string{
 	"category",
 	"projects", // comma-separated project codes
 	"sourcing_type",
-	"sourcing_link",
 	"long_description",
-	"standard_cost",
 }

 // HandleExportCSV exports items to CSV format.
@@ -158,14 +156,8 @@ func (s *Server) HandleExportCSV(w http.ResponseWriter, r *http.Request) {
 		row[6] = category
 		row[7] = projectCodes
 		row[8] = item.SourcingType
-		if item.SourcingLink != nil {
-			row[9] = *item.SourcingLink
-		}
 		if item.LongDescription != nil {
-			row[10] = *item.LongDescription
-		}
-		if item.StandardCost != nil {
-			row[11] = strconv.FormatFloat(*item.StandardCost, 'f', -1, 64)
+			row[9] = *item.LongDescription
 		}

 		// Property columns
@@ -366,9 +358,17 @@ func (s *Server) HandleImportCSV(w http.ResponseWriter, r *http.Request) {

 		// Parse extended fields
 		sourcingType := getCSVValue(record, colIndex, "sourcing_type")
-		sourcingLink := getCSVValue(record, colIndex, "sourcing_link")
 		longDesc := getCSVValue(record, colIndex, "long_description")
-		stdCostStr := getCSVValue(record, colIndex, "standard_cost")
+
+		// sourcing_link and standard_cost are now properties — add to properties map
+		if sl := getCSVValue(record, colIndex, "sourcing_link"); sl != "" {
+			properties["sourcing_link"] = sl
+		}
+		if sc := getCSVValue(record, colIndex, "standard_cost"); sc != "" {
+			if cost, err := strconv.ParseFloat(sc, 64); err == nil {
+				properties["standard_cost"] = cost
+			}
+		}

 		// Create item
 		item := &db.Item{
@@ -382,17 +382,9 @@ func (s *Server) HandleImportCSV(w http.ResponseWriter, r *http.Request) {
 		if sourcingType != "" {
 			item.SourcingType = sourcingType
 		}
-		if sourcingLink != "" {
-			item.SourcingLink = &sourcingLink
-		}
 		if longDesc != "" {
 			item.LongDescription = &longDesc
 		}
-		if stdCostStr != "" {
-			if cost, err := strconv.ParseFloat(stdCostStr, 64); err == nil {
-				item.StandardCost = &cost
-			}
-		}

 		if err := s.items.Create(ctx, item, properties); err != nil {
 			result.Errors = append(result.Errors, CSVImportErr{
@@ -585,9 +577,7 @@ func isStandardColumn(col string) bool {
 		"objects":          true, // FreeCAD objects data - skip on import
 		"archived_at":      true,
 		"sourcing_type":    true,
-		"sourcing_link":    true,
 		"long_description": true,
-		"standard_cost":    true,
 	}
 	return standardCols[col]
 }
--- a/internal/api/csv_handlers_test.go
+++ b/internal/api/csv_handlers_test.go
@@ -0,0 +1,254 @@
+package api
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+	"mime/multipart"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/go-chi/chi/v5"
+	"github.com/kindredsystems/silo/internal/schema"
+	"github.com/kindredsystems/silo/internal/testutil"
+	"github.com/rs/zerolog"
+
+	"github.com/kindredsystems/silo/internal/db"
+)
+
+// findSchemasDir walks upward to find the project root and returns
+// the path to the schemas/ directory.
+func findSchemasDir(t *testing.T) string {
+	t.Helper()
+	dir, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("getting working directory: %v", err)
+	}
+	for {
+		if _, err := os.Stat(filepath.Join(dir, "go.mod")); err == nil {
+			return filepath.Join(dir, "schemas")
+		}
+		parent := filepath.Dir(dir)
+		if parent == dir {
+			t.Fatal("could not find project root")
+		}
+		dir = parent
+	}
+}
+
+// newTestServerWithSchemas creates a Server backed by a real test DB with schemas loaded.
+func newTestServerWithSchemas(t *testing.T) *Server {
+	t.Helper()
+	pool := testutil.MustConnectTestPool(t)
+	database := db.NewFromPool(pool)
+	broker := NewBroker(zerolog.Nop())
+	state := NewServerState(zerolog.Nop(), nil, broker)
+	schemasDir := findSchemasDir(t)
+	schemas, err := schema.LoadAll(schemasDir)
+	if err != nil {
+		t.Fatalf("loading schemas: %v", err)
+	}
+	return NewServer(
+		zerolog.Nop(),
+		database,
+		schemas,
+		schemasDir,
+		nil, // storage
+		nil, // authService
+		nil, // sessionManager
+		nil, // oidcBackend
+		nil, // authConfig
+		broker,
+		state,
+	)
+}
+
+func newCSVRouter(s *Server) http.Handler {
+	r := chi.NewRouter()
+	r.Get("/api/items/export.csv", s.HandleExportCSV)
+	r.Get("/api/items/template.csv", s.HandleCSVTemplate)
+	r.Post("/api/items/import", s.HandleImportCSV)
+	r.Get("/api/items/{partNumber}/bom/export.csv", s.HandleExportBOMCSV)
+	return r
+}
+
+func TestHandleExportCSVEmpty(t *testing.T) {
+	s := newTestServer(t)
+	router := newCSVRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/items/export.csv", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	ct := w.Header().Get("Content-Type")
+	if !strings.Contains(ct, "text/csv") {
+		t.Errorf("content-type: got %q, want text/csv", ct)
+	}
+
+	// Should have header row only
+	lines := strings.Split(strings.TrimSpace(w.Body.String()), "\n")
+	if len(lines) != 1 {
+		t.Errorf("expected 1 line (header only), got %d", len(lines))
+	}
+}
+
+func TestHandleExportCSVWithItems(t *testing.T) {
+	s := newTestServer(t)
+	router := newCSVRouter(s)
+
+	createItemDirect(t, s, "CSV-001", "first csv item", nil)
+	createItemDirect(t, s, "CSV-002", "second csv item", nil)
+
+	req := httptest.NewRequest("GET", "/api/items/export.csv", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	lines := strings.Split(strings.TrimSpace(w.Body.String()), "\n")
+	// header + 2 data rows
+	if len(lines) != 3 {
+		t.Errorf("expected 3 lines (header + 2 rows), got %d", len(lines))
+	}
+}
+
+func TestHandleCSVTemplate(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newCSVRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/items/template.csv?schema=kindred-rd", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	ct := w.Header().Get("Content-Type")
+	if !strings.Contains(ct, "text/csv") {
+		t.Errorf("content-type: got %q, want text/csv", ct)
+	}
+
+	// Should contain at least "category" and "description" columns
+	header := strings.Split(strings.TrimSpace(w.Body.String()), "\n")[0]
+	if !strings.Contains(header, "category") {
+		t.Error("template header missing 'category' column")
+	}
+	if !strings.Contains(header, "description") {
+		t.Error("template header missing 'description' column")
+	}
+}
+
+// csvMultipartBody creates a multipart form body with a CSV file and optional form fields.
+func csvMultipartBody(t *testing.T, csvContent string, fields map[string]string) (*bytes.Buffer, string) {
+	t.Helper()
+	body := &bytes.Buffer{}
+	writer := multipart.NewWriter(body)
+
+	part, err := writer.CreateFormFile("file", "import.csv")
+	if err != nil {
+		t.Fatalf("creating form file: %v", err)
+	}
+	io.WriteString(part, csvContent)
+
+	for k, v := range fields {
+		writer.WriteField(k, v)
+	}
+	writer.Close()
+	return body, writer.FormDataContentType()
+}
+
+func TestHandleImportCSVDryRun(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newCSVRouter(s)
+
+	csv := "category,description\nF01,Dry run widget\nF01,Dry run gadget\n"
+	body, contentType := csvMultipartBody(t, csv, map[string]string{"dry_run": "true"})
+
+	req := authRequest(httptest.NewRequest("POST", "/api/items/import", body))
+	req.Header.Set("Content-Type", contentType)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var result CSVImportResult
+	if err := json.Unmarshal(w.Body.Bytes(), &result); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if result.TotalRows != 2 {
+		t.Errorf("total_rows: got %d, want 2", result.TotalRows)
+	}
+	// Dry run should not create items
+	if len(result.CreatedItems) != 0 {
+		t.Errorf("dry run should not create items, got %d", len(result.CreatedItems))
+	}
+}
+
+func TestHandleImportCSVCommit(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newCSVRouter(s)
+
+	csv := "category,description\nF01,Committed widget\n"
+	body, contentType := csvMultipartBody(t, csv, nil)
+
+	req := authRequest(httptest.NewRequest("POST", "/api/items/import", body))
+	req.Header.Set("Content-Type", contentType)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var result CSVImportResult
+	if err := json.Unmarshal(w.Body.Bytes(), &result); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if result.SuccessCount != 1 {
+		t.Errorf("success_count: got %d, want 1", result.SuccessCount)
+	}
+	if len(result.CreatedItems) != 1 {
+		t.Errorf("created_items: got %d, want 1", len(result.CreatedItems))
+	}
+}
+
+func TestHandleExportBOMCSV(t *testing.T) {
+	s := newTestServer(t)
+	router := newCSVRouter(s)
+
+	createItemDirect(t, s, "BOMCSV-P", "parent", nil)
+	createItemDirect(t, s, "BOMCSV-C", "child", nil)
+	addBOMDirect(t, s, "BOMCSV-P", "BOMCSV-C", 3)
+
+	req := httptest.NewRequest("GET", "/api/items/BOMCSV-P/bom/export.csv", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	ct := w.Header().Get("Content-Type")
+	if !strings.Contains(ct, "text/csv") {
+		t.Errorf("content-type: got %q, want text/csv", ct)
+	}
+
+	lines := strings.Split(strings.TrimSpace(w.Body.String()), "\n")
+	// header + 1 BOM entry
+	if len(lines) != 2 {
+		t.Errorf("expected 2 lines (header + 1 row), got %d", len(lines))
+	}
+}
--- a/internal/api/file_handlers_test.go
+++ b/internal/api/file_handlers_test.go
@@ -0,0 +1,186 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/go-chi/chi/v5"
+	"github.com/kindredsystems/silo/internal/db"
+)
+
+// newFileRouter creates a chi router with file-related routes for testing.
+func newFileRouter(s *Server) http.Handler {
+	r := chi.NewRouter()
+	r.Route("/api/items/{partNumber}", func(r chi.Router) {
+		r.Get("/files", s.HandleListItemFiles)
+		r.Post("/files", s.HandleAssociateItemFile)
+		r.Delete("/files/{fileId}", s.HandleDeleteItemFile)
+		r.Put("/thumbnail", s.HandleSetItemThumbnail)
+		r.Post("/file", s.HandleUploadFile)
+		r.Get("/file/{revision}", s.HandleDownloadFile)
+	})
+	r.Post("/api/uploads/presign", s.HandlePresignUpload)
+	return r
+}
+
+// createFileDirect creates a file record directly via the DB for test setup.
+func createFileDirect(t *testing.T, s *Server, itemID, filename string) *db.ItemFile {
+	t.Helper()
+	f := &db.ItemFile{
+		ItemID:      itemID,
+		Filename:    filename,
+		ContentType: "application/octet-stream",
+		Size:        1024,
+		ObjectKey:   "items/" + itemID + "/files/" + filename,
+	}
+	if err := s.itemFiles.Create(context.Background(), f); err != nil {
+		t.Fatalf("creating file %s: %v", filename, err)
+	}
+	return f
+}
+
+func TestHandleListItemFiles(t *testing.T) {
+	s := newTestServer(t)
+	router := newFileRouter(s)
+
+	createItemDirect(t, s, "FAPI-001", "file list item", nil)
+	item, _ := s.items.GetByPartNumber(context.Background(), "FAPI-001")
+
+	createFileDirect(t, s, item.ID, "drawing.pdf")
+	createFileDirect(t, s, item.ID, "model.step")
+
+	req := httptest.NewRequest("GET", "/api/items/FAPI-001/files", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var files []itemFileResponse
+	if err := json.Unmarshal(w.Body.Bytes(), &files); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if len(files) != 2 {
+		t.Errorf("expected 2 files, got %d", len(files))
+	}
+}
+
+func TestHandleListItemFilesNotFound(t *testing.T) {
+	s := newTestServer(t)
+	router := newFileRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/items/NONEXISTENT/files", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusNotFound {
+		t.Errorf("status: got %d, want %d", w.Code, http.StatusNotFound)
+	}
+}
+
+func TestHandleDeleteItemFile(t *testing.T) {
+	s := newTestServer(t)
+	router := newFileRouter(s)
+
+	createItemDirect(t, s, "FDEL-API-001", "delete file item", nil)
+	item, _ := s.items.GetByPartNumber(context.Background(), "FDEL-API-001")
+	f := createFileDirect(t, s, item.ID, "removable.bin")
+
+	req := authRequest(httptest.NewRequest("DELETE", "/api/items/FDEL-API-001/files/"+f.ID, nil))
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusNoContent {
+		t.Errorf("status: got %d, want %d; body: %s", w.Code, http.StatusNoContent, w.Body.String())
+	}
+}
+
+func TestHandleDeleteItemFileCrossItem(t *testing.T) {
+	s := newTestServer(t)
+	router := newFileRouter(s)
+
+	// Create two items, attach file to item A
+	createItemDirect(t, s, "CROSS-A", "item A", nil)
+	createItemDirect(t, s, "CROSS-B", "item B", nil)
+	itemA, _ := s.items.GetByPartNumber(context.Background(), "CROSS-A")
+	f := createFileDirect(t, s, itemA.ID, "belongs-to-a.pdf")
+
+	// Try to delete via item B — should fail
+	req := authRequest(httptest.NewRequest("DELETE", "/api/items/CROSS-B/files/"+f.ID, nil))
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusNotFound {
+		t.Errorf("status: got %d, want %d", w.Code, http.StatusNotFound)
+	}
+}
+
+func TestHandlePresignUploadNoStorage(t *testing.T) {
+	s := newTestServer(t) // storage is nil
+	router := newFileRouter(s)
+
+	body := `{"filename":"test.bin","content_type":"application/octet-stream","size":1024}`
+	req := authRequest(httptest.NewRequest("POST", "/api/uploads/presign", strings.NewReader(body)))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusServiceUnavailable {
+		t.Errorf("status: got %d, want %d; body: %s", w.Code, http.StatusServiceUnavailable, w.Body.String())
+	}
+}
+
+func TestHandleUploadFileNoStorage(t *testing.T) {
+	s := newTestServer(t) // storage is nil
+	router := newFileRouter(s)
+
+	createItemDirect(t, s, "UPNS-001", "upload no storage", nil)
+
+	req := authRequest(httptest.NewRequest("POST", "/api/items/UPNS-001/file", strings.NewReader("fake")))
+	req.Header.Set("Content-Type", "multipart/form-data")
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusServiceUnavailable {
+		t.Errorf("status: got %d, want %d; body: %s", w.Code, http.StatusServiceUnavailable, w.Body.String())
+	}
+}
+
+func TestHandleAssociateFileNoStorage(t *testing.T) {
+	s := newTestServer(t) // storage is nil
+	router := newFileRouter(s)
+
+	createItemDirect(t, s, "ASSNS-001", "associate no storage", nil)
+
+	body := `{"object_key":"uploads/tmp/abc/test.bin","filename":"test.bin"}`
+	req := authRequest(httptest.NewRequest("POST", "/api/items/ASSNS-001/files", strings.NewReader(body)))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusServiceUnavailable {
+		t.Errorf("status: got %d, want %d; body: %s", w.Code, http.StatusServiceUnavailable, w.Body.String())
+	}
+}
+
+func TestHandleSetThumbnailNoStorage(t *testing.T) {
+	s := newTestServer(t) // storage is nil
+	router := newFileRouter(s)
+
+	createItemDirect(t, s, "THNS-001", "thumbnail no storage", nil)
+
+	body := `{"object_key":"uploads/tmp/abc/thumb.png"}`
+	req := authRequest(httptest.NewRequest("PUT", "/api/items/THNS-001/thumbnail", strings.NewReader(body)))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusServiceUnavailable {
+		t.Errorf("status: got %d, want %d; body: %s", w.Code, http.StatusServiceUnavailable, w.Body.String())
+	}
+}
--- a/internal/api/handlers.go
+++ b/internal/api/handlers.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"sort"
 	"strconv"
 	"strings"

@@ -195,10 +196,35 @@ func (s *Server) HandleGetSchema(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, schemaToResponse(sch))
 }

-// HandleGetPropertySchema returns the property schema for a category.
-func (s *Server) HandleGetPropertySchema(w http.ResponseWriter, r *http.Request) {
+// FormFieldDescriptor describes a single field in the form descriptor response.
+type FormFieldDescriptor struct {
+	Name        string   `json:"name"`
+	Type        string   `json:"type"`
+	Widget      string   `json:"widget,omitempty"`
+	Label       string   `json:"label"`
+	Required    bool     `json:"required,omitempty"`
+	Default     any      `json:"default,omitempty"`
+	Unit        string   `json:"unit,omitempty"`
+	Description string   `json:"description,omitempty"`
+	Options     []string `json:"options,omitempty"`
+	Currency    string   `json:"currency,omitempty"`
+
+	// Item-field specific
+	DerivedFromCategory map[string]string `json:"derived_from_category,omitempty"`
+	SearchEndpoint      string            `json:"search_endpoint,omitempty"`
+}
+
+// FormFieldGroupDescriptor describes an ordered group of resolved fields.
+type FormFieldGroupDescriptor struct {
+	Key    string                `json:"key"`
+	Label  string                `json:"label"`
+	Order  int                   `json:"order"`
+	Fields []FormFieldDescriptor `json:"fields"`
+}
+
+// HandleGetFormDescriptor returns the full form descriptor for a schema.
+func (s *Server) HandleGetFormDescriptor(w http.ResponseWriter, r *http.Request) {
 	schemaName := chi.URLParam(r, "name")
-	category := r.URL.Query().Get("category")

 	sch, ok := s.schemas[schemaName]
 	if !ok {
@@ -206,19 +232,194 @@ func (s *Server) HandleGetPropertySchema(w http.ResponseWriter, r *http.Request)
 		return
 	}

-	if sch.PropertySchemas == nil {
-		writeJSON(w, http.StatusOK, map[string]any{
-			"version":    0,
-			"properties": map[string]any{},
-		})
-		return
+	result := map[string]any{
+		"schema_name": sch.Name,
+		"format":      sch.Format,
 	}

-	props := sch.PropertySchemas.GetPropertiesForCategory(category)
-	writeJSON(w, http.StatusOK, map[string]any{
-		"version":    sch.PropertySchemas.Version,
-		"properties": props,
+	// Category picker with auto-derived values_by_domain
+	if sch.UI != nil && sch.UI.CategoryPicker != nil {
+		picker := map[string]any{
+			"style": sch.UI.CategoryPicker.Style,
+		}
+
+		vbd := sch.ValuesByDomain()
+
+		stages := make([]map[string]any, 0, len(sch.UI.CategoryPicker.Stages)+1)
+		for _, stage := range sch.UI.CategoryPicker.Stages {
+			stg := map[string]any{
+				"name":  stage.Name,
+				"label": stage.Label,
+			}
+			if stage.Values != nil {
+				stg["values"] = stage.Values
+			}
+			stages = append(stages, stg)
+		}
+
+		// Auto-add subcategory stage from values_by_domain
+		if vbd != nil {
+			stages = append(stages, map[string]any{
+				"name":             "subcategory",
+				"label":            "Type",
+				"values_by_domain": vbd,
+			})
+		}
+
+		picker["stages"] = stages
+		result["category_picker"] = picker
+	}
+
+	// Item fields
+	if sch.UI != nil && sch.UI.ItemFields != nil {
+		result["item_fields"] = sch.UI.ItemFields
+	}
+
+	// Resolve field groups into ordered list with full field metadata
+	if sch.UI != nil && sch.UI.FieldGroups != nil {
+		groups := s.resolveFieldGroups(sch, sch.UI.FieldGroups)
+		result["field_groups"] = groups
+	}
+
+	// Category field groups
+	if sch.UI != nil && sch.UI.CategoryFieldGroups != nil {
+		catGroups := make(map[string][]FormFieldGroupDescriptor)
+		for prefix, groups := range sch.UI.CategoryFieldGroups {
+			catGroups[prefix] = s.resolveCategoryFieldGroups(sch, prefix, groups)
+		}
+		result["category_field_groups"] = catGroups
+	}
+
+	// Field overrides (pass through)
+	if sch.UI != nil && sch.UI.FieldOverrides != nil {
+		result["field_overrides"] = sch.UI.FieldOverrides
+	}
+
+	writeJSON(w, http.StatusOK, result)
+}
+
+// resolveFieldGroups converts field group definitions into fully resolved descriptors.
+func (s *Server) resolveFieldGroups(sch *schema.Schema, groups map[string]schema.FieldGroup) []FormFieldGroupDescriptor {
+	result := make([]FormFieldGroupDescriptor, 0, len(groups))
+	for key, group := range groups {
+		desc := FormFieldGroupDescriptor{
+			Key:   key,
+			Label: group.Label,
+			Order: group.Order,
+		}
+		for _, fieldName := range group.Fields {
+			fd := s.resolveField(sch, fieldName)
+			desc.Fields = append(desc.Fields, fd)
+		}
+		result = append(result, desc)
+	}
+	// Sort by order
+	sort.Slice(result, func(i, j int) bool {
+		return result[i].Order < result[j].Order
 	})
+	return result
+}
+
+// resolveCategoryFieldGroups resolves category-specific field groups.
+func (s *Server) resolveCategoryFieldGroups(sch *schema.Schema, prefix string, groups map[string]schema.FieldGroup) []FormFieldGroupDescriptor {
+	result := make([]FormFieldGroupDescriptor, 0, len(groups))
+	for key, group := range groups {
+		desc := FormFieldGroupDescriptor{
+			Key:   key,
+			Label: group.Label,
+			Order: group.Order,
+		}
+		for _, fieldName := range group.Fields {
+			fd := s.resolveCategoryField(sch, prefix, fieldName)
+			desc.Fields = append(desc.Fields, fd)
+		}
+		result = append(result, desc)
+	}
+	sort.Slice(result, func(i, j int) bool {
+		return result[i].Order < result[j].Order
+	})
+	return result
+}
+
+// resolveField builds a FormFieldDescriptor from item_fields or property_schemas.defaults.
+func (s *Server) resolveField(sch *schema.Schema, name string) FormFieldDescriptor {
+	fd := FormFieldDescriptor{Name: name}
+
+	// Check item_fields first
+	if sch.UI != nil && sch.UI.ItemFields != nil {
+		if def, ok := sch.UI.ItemFields[name]; ok {
+			fd.Type = def.Type
+			fd.Widget = def.Widget
+			fd.Label = def.Label
+			fd.Required = def.Required
+			fd.Default = def.Default
+			fd.Options = def.Options
+			fd.DerivedFromCategory = def.DerivedFromCategory
+			fd.SearchEndpoint = def.SearchEndpoint
+			s.applyOverrides(sch, name, &fd)
+			return fd
+		}
+	}
+
+	// Check property_schemas.defaults
+	if sch.PropertySchemas != nil && sch.PropertySchemas.Defaults != nil {
+		if def, ok := sch.PropertySchemas.Defaults[name]; ok {
+			fd.Type = def.Type
+			fd.Label = name // Use field name as label if not overridden
+			fd.Default = def.Default
+			fd.Unit = def.Unit
+			fd.Description = def.Description
+			fd.Required = def.Required
+			s.applyOverrides(sch, name, &fd)
+			return fd
+		}
+	}
+
+	// Fallback — field name only
+	fd.Label = name
+	fd.Type = "string"
+	s.applyOverrides(sch, name, &fd)
+	return fd
+}
+
+// resolveCategoryField builds a FormFieldDescriptor from category-specific property schema.
+func (s *Server) resolveCategoryField(sch *schema.Schema, prefix, name string) FormFieldDescriptor {
+	fd := FormFieldDescriptor{Name: name, Label: name, Type: "string"}
+
+	if sch.PropertySchemas != nil {
+		if catProps, ok := sch.PropertySchemas.Categories[prefix]; ok {
+			if def, ok := catProps[name]; ok {
+				fd.Type = def.Type
+				fd.Default = def.Default
+				fd.Unit = def.Unit
+				fd.Description = def.Description
+				fd.Required = def.Required
+			}
+		}
+	}
+
+	s.applyOverrides(sch, name, &fd)
+	return fd
+}
+
+// applyOverrides applies field_overrides to a field descriptor.
+func (s *Server) applyOverrides(sch *schema.Schema, name string, fd *FormFieldDescriptor) {
+	if sch.UI == nil || sch.UI.FieldOverrides == nil {
+		return
+	}
+	ov, ok := sch.UI.FieldOverrides[name]
+	if !ok {
+		return
+	}
+	if ov.Widget != "" {
+		fd.Widget = ov.Widget
+	}
+	if ov.Currency != "" {
+		fd.Currency = ov.Currency
+	}
+	if len(ov.Options) > 0 {
+		fd.Options = ov.Options
+	}
 }

 func schemaToResponse(sch *schema.Schema) SchemaResponse {
@@ -256,10 +457,10 @@ type ItemResponse struct {
 	CreatedAt       string         `json:"created_at"`
 	UpdatedAt       string         `json:"updated_at"`
 	SourcingType    string         `json:"sourcing_type"`
-	SourcingLink    *string        `json:"sourcing_link,omitempty"`
 	LongDescription *string        `json:"long_description,omitempty"`
-	StandardCost    *float64       `json:"standard_cost,omitempty"`
 	ThumbnailKey    *string        `json:"thumbnail_key,omitempty"`
+	FileCount       int            `json:"file_count"`
+	FilesTotalSize  int64          `json:"files_total_size"`
 	Properties      map[string]any `json:"properties,omitempty"`
 }

@@ -271,9 +472,7 @@ type CreateItemRequest struct {
 	Projects        []string       `json:"projects,omitempty"`
 	Properties      map[string]any `json:"properties,omitempty"`
 	SourcingType    string         `json:"sourcing_type,omitempty"`
-	SourcingLink    *string        `json:"sourcing_link,omitempty"`
 	LongDescription *string        `json:"long_description,omitempty"`
-	StandardCost    *float64       `json:"standard_cost,omitempty"`
 }

 // HandleListItems lists items with optional filtering.
@@ -304,9 +503,20 @@ func (s *Server) HandleListItems(w http.ResponseWriter, r *http.Request) {
 		return
 	}

+	// Batch-fetch file attachment stats
+	ids := make([]string, len(items))
+	for i, item := range items {
+		ids[i] = item.ID
+	}
+	fileStats, _ := s.items.BatchGetFileStats(ctx, ids)
+
 	response := make([]ItemResponse, len(items))
 	for i, item := range items {
 		response[i] = itemToResponse(item)
+		if fs, ok := fileStats[item.ID]; ok {
+			response[i].FileCount = fs.Count
+			response[i].FilesTotalSize = fs.TotalSize
+		}
 	}

 	writeJSON(w, http.StatusOK, response)
@@ -411,14 +621,18 @@ func (s *Server) HandleCreateItem(w http.ResponseWriter, r *http.Request) {
 			return
 		}

+		if err := s.partgen.Validate(partNumber, schemaName); err != nil {
+			s.logger.Error().Err(err).Str("part_number", partNumber).Msg("generated part number failed validation")
+			writeError(w, http.StatusInternalServerError, "validation_failed", err.Error())
+			return
+		}
+
 		item = &db.Item{
 			PartNumber:      partNumber,
 			ItemType:        itemType,
 			Description:     req.Description,
 			SourcingType:    req.SourcingType,
-			SourcingLink:    req.SourcingLink,
 			LongDescription: req.LongDescription,
-			StandardCost:    req.StandardCost,
 		}
 		if user := auth.UserFromContext(ctx); user != nil {
 			item.CreatedBy = &user.Username
@@ -465,6 +679,34 @@ func (s *Server) HandleCreateItem(w http.ResponseWriter, r *http.Request) {
 	s.broker.Publish("item.created", mustMarshal(resp))
 }

+// HandleGetItemByUUID retrieves an item by its stable UUID (the items.id column).
+// Used by silo-mod to resolve FreeCAD document SiloUUID properties to part numbers.
+func (s *Server) HandleGetItemByUUID(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	uuid := chi.URLParam(r, "uuid")
+
+	item, err := s.items.GetByID(ctx, uuid)
+	if err != nil {
+		s.logger.Error().Err(err).Msg("failed to get item by UUID")
+		writeError(w, http.StatusInternalServerError, "internal_error", "Failed to get item")
+		return
+	}
+	if item == nil || item.ArchivedAt != nil {
+		writeError(w, http.StatusNotFound, "not_found", "Item not found")
+		return
+	}
+
+	response := itemToResponse(item)
+	if fileStats, err := s.items.BatchGetFileStats(ctx, []string{item.ID}); err == nil {
+		if fs, ok := fileStats[item.ID]; ok {
+			response.FileCount = fs.Count
+			response.FilesTotalSize = fs.TotalSize
+		}
+	}
+
+	writeJSON(w, http.StatusOK, response)
+}
+
 // HandleGetItem retrieves an item by part number.
 // Supports query param: ?include=properties to include current revision properties.
 func (s *Server) HandleGetItem(w http.ResponseWriter, r *http.Request) {
@@ -484,6 +726,14 @@ func (s *Server) HandleGetItem(w http.ResponseWriter, r *http.Request) {

 	response := itemToResponse(item)

+	// File attachment stats
+	if fileStats, err := s.items.BatchGetFileStats(ctx, []string{item.ID}); err == nil {
+		if fs, ok := fileStats[item.ID]; ok {
+			response.FileCount = fs.Count
+			response.FilesTotalSize = fs.TotalSize
+		}
+	}
+
 	// Include properties from current revision if requested
 	if r.URL.Query().Get("include") == "properties" {
 		revisions, err := s.items.GetRevisions(ctx, item.ID)
@@ -508,9 +758,7 @@ type UpdateItemRequest struct {
 	Properties      map[string]any `json:"properties,omitempty"`
 	Comment         string         `json:"comment,omitempty"`
 	SourcingType    *string        `json:"sourcing_type,omitempty"`
-	SourcingLink    *string        `json:"sourcing_link,omitempty"`
 	LongDescription *string        `json:"long_description,omitempty"`
-	StandardCost    *float64       `json:"standard_cost,omitempty"`
 }

 // HandleUpdateItem updates an item's fields and/or creates a new revision.
@@ -541,9 +789,7 @@ func (s *Server) HandleUpdateItem(w http.ResponseWriter, r *http.Request) {
 		ItemType:        item.ItemType,
 		Description:     item.Description,
 		SourcingType:    req.SourcingType,
-		SourcingLink:    req.SourcingLink,
 		LongDescription: req.LongDescription,
-		StandardCost:    req.StandardCost,
 	}

 	if req.PartNumber != "" {
@@ -1155,9 +1401,7 @@ func itemToResponse(item *db.Item) ItemResponse {
 		CreatedAt:       item.CreatedAt.Format("2006-01-02T15:04:05Z07:00"),
 		UpdatedAt:       item.UpdatedAt.Format("2006-01-02T15:04:05Z07:00"),
 		SourcingType:    item.SourcingType,
-		SourcingLink:    item.SourcingLink,
 		LongDescription: item.LongDescription,
-		StandardCost:    item.StandardCost,
 		ThumbnailKey:    item.ThumbnailKey,
 	}
 }
--- a/internal/api/ods.go
+++ b/internal/api/ods.go
@@ -138,21 +138,11 @@ func (s *Server) HandleExportODS(w http.ResponseWriter, r *http.Request) {
 			ods.StringCell(item.SourcingType),
 		}

-		if item.SourcingLink != nil {
-			cells = append(cells, ods.StringCell(*item.SourcingLink))
-		} else {
-			cells = append(cells, ods.EmptyCell())
-		}
 		if item.LongDescription != nil {
 			cells = append(cells, ods.StringCell(*item.LongDescription))
 		} else {
 			cells = append(cells, ods.EmptyCell())
 		}
-		if item.StandardCost != nil {
-			cells = append(cells, ods.CurrencyCell(*item.StandardCost))
-		} else {
-			cells = append(cells, ods.EmptyCell())
-		}

 		// Property columns
 		if includeProps {
@@ -419,6 +409,16 @@ func (s *Server) HandleImportODS(w http.ResponseWriter, r *http.Request) {
 		longDesc := getCellValue("long_description")
 		stdCostStr := getCellValue("standard_cost")

+		// Put sourcing_link and standard_cost into properties
+		if sourcingLink != "" {
+			properties["sourcing_link"] = sourcingLink
+		}
+		if stdCostStr != "" {
+			if cost, err := strconv.ParseFloat(strings.TrimLeft(stdCostStr, "$"), 64); err == nil {
+				properties["standard_cost"] = cost
+			}
+		}
+
 		item := &db.Item{
 			PartNumber:  partNumber,
 			ItemType:    itemType,
@@ -430,17 +430,9 @@ func (s *Server) HandleImportODS(w http.ResponseWriter, r *http.Request) {
 		if sourcingType != "" {
 			item.SourcingType = sourcingType
 		}
-		if sourcingLink != "" {
-			item.SourcingLink = &sourcingLink
-		}
 		if longDesc != "" {
 			item.LongDescription = &longDesc
 		}
-		if stdCostStr != "" {
-			if cost, err := strconv.ParseFloat(strings.TrimLeft(stdCostStr, "$"), 64); err == nil {
-				item.StandardCost = &cost
-			}
-		}

 		if err := s.items.Create(ctx, item, properties); err != nil {
 			result.Errors = append(result.Errors, CSVImportErr{
@@ -580,9 +572,16 @@ func (s *Server) HandleExportBOMODS(w http.ResponseWriter, r *http.Request) {
 		childItem, _ := s.items.GetByPartNumber(ctx, e.ChildPartNumber)

 		unitCost, hasUnitCost := getMetaFloat(e.Metadata, "unit_cost")
-		if !hasUnitCost && childItem != nil && childItem.StandardCost != nil {
-			unitCost = *childItem.StandardCost
-			hasUnitCost = true
+		if !hasUnitCost && childItem != nil {
+			// Fall back to standard_cost from revision properties
+			if childProps := itemPropsCache[e.ChildPartNumber]; childProps != nil {
+				if sc, ok := childProps["standard_cost"]; ok {
+					if cost, cok := sc.(float64); cok {
+						unitCost = cost
+						hasUnitCost = true
+					}
+				}
+			}
 		}

 		qty := 0.0
@@ -599,7 +598,7 @@ func (s *Server) HandleExportBOMODS(w http.ResponseWriter, r *http.Request) {
 			}
 		}

-		source := getMetaString(e.Metadata, "source")
+		source := e.Source
 		if source == "" && childItem != nil {
 			st := childItem.SourcingType
 			if st == "manufactured" {
@@ -682,6 +681,21 @@ func (s *Server) HandleProjectSheetODS(w http.ResponseWriter, r *http.Request) {
 		return
 	}

+	// Build item properties cache for sourcing_link / standard_cost
+	itemPropsMap := make(map[string]map[string]any)
+	for _, item := range items {
+		revisions, err := s.items.GetRevisions(ctx, item.ID)
+		if err != nil {
+			continue
+		}
+		for _, rev := range revisions {
+			if rev.RevisionNumber == item.CurrentRevision && rev.Properties != nil {
+				itemPropsMap[item.ID] = rev.Properties
+				break
+			}
+		}
+	}
+
 	// Sheet 1: Items list
 	itemHeaders := []string{
 		"PN", "Type", "Description", "Revision", "Category",
@@ -696,6 +710,8 @@ func (s *Server) HandleProjectSheetODS(w http.ResponseWriter, r *http.Request) {
 	itemRows = append(itemRows, ods.Row{Cells: itemHeaderCells})

 	for _, item := range items {
+		props := itemPropsMap[item.ID]
+
 		cells := []ods.Cell{
 			ods.StringCell(item.PartNumber),
 			ods.StringCell(item.ItemType),
@@ -704,13 +720,17 @@ func (s *Server) HandleProjectSheetODS(w http.ResponseWriter, r *http.Request) {
 			ods.StringCell(parseCategory(item.PartNumber)),
 			ods.StringCell(item.SourcingType),
 		}
-		if item.SourcingLink != nil {
-			cells = append(cells, ods.StringCell(*item.SourcingLink))
+		if sl, ok := props["sourcing_link"]; ok {
+			cells = append(cells, ods.StringCell(formatPropertyValue(sl)))
 		} else {
 			cells = append(cells, ods.EmptyCell())
 		}
-		if item.StandardCost != nil {
-			cells = append(cells, ods.CurrencyCell(*item.StandardCost))
+		if sc, ok := props["standard_cost"]; ok {
+			if cost, cok := sc.(float64); cok {
+				cells = append(cells, ods.CurrencyCell(cost))
+			} else {
+				cells = append(cells, ods.StringCell(formatPropertyValue(sc)))
+			}
 		} else {
 			cells = append(cells, ods.EmptyCell())
 		}
@@ -746,15 +766,33 @@ func (s *Server) HandleProjectSheetODS(w http.ResponseWriter, r *http.Request) {
 			for _, e := range bomEntries {
 				childItem, _ := s.items.GetByPartNumber(ctx, e.ChildPartNumber)
 				unitCost, hasUnitCost := getMetaFloat(e.Metadata, "unit_cost")
-				if !hasUnitCost && childItem != nil && childItem.StandardCost != nil {
-					unitCost = *childItem.StandardCost
-					hasUnitCost = true
+				if !hasUnitCost && childItem != nil {
+					// Fall back to standard_cost from revision properties
+					// Ensure child item props are cached
+					if _, cached := itemPropsMap[childItem.ID]; !cached {
+						if revs, err := s.items.GetRevisions(ctx, childItem.ID); err == nil {
+							for _, rev := range revs {
+								if rev.RevisionNumber == childItem.CurrentRevision && rev.Properties != nil {
+									itemPropsMap[childItem.ID] = rev.Properties
+									break
+								}
+							}
+						}
+					}
+					if childRevProps := itemPropsMap[childItem.ID]; childRevProps != nil {
+						if sc, ok := childRevProps["standard_cost"]; ok {
+							if cost, cok := sc.(float64); cok {
+								unitCost = cost
+								hasUnitCost = true
+							}
+						}
+					}
 				}
 				qty := 0.0
 				if e.Quantity != nil {
 					qty = *e.Quantity
 				}
-				source := getMetaString(e.Metadata, "source")
+				source := e.Source
 				if source == "" && childItem != nil {
 					if childItem.SourcingType == "manufactured" {
 						source = "M"
@@ -957,7 +995,20 @@ func (s *Server) HandleSheetDiff(w http.ResponseWriter, r *http.Request) {
 		if costStr != "" {
 			costStr = strings.TrimLeft(costStr, "$")
 			if cost, err := strconv.ParseFloat(costStr, 64); err == nil {
-				if dbItem.StandardCost == nil || *dbItem.StandardCost != cost {
+				// Compare against standard_cost in revision properties
+				revisions, _ := s.items.GetRevisions(ctx, dbItem.ID)
+				var dbCost *float64
+				for _, rev := range revisions {
+					if rev.RevisionNumber == dbItem.CurrentRevision && rev.Properties != nil {
+						if sc, ok := rev.Properties["standard_cost"]; ok {
+							if c, cok := sc.(float64); cok {
+								dbCost = &c
+							}
+						}
+						break
+					}
+				}
+				if dbCost == nil || *dbCost != cost {
 					changes["standard_cost"] = cost
 				}
 			}
@@ -986,8 +1037,11 @@ func buildBOMRow(itemLabel string, depth int, source, pn string, item *db.Item,

 	if item != nil {
 		description = item.Description
-		if sourcingLink == "" && item.SourcingLink != nil {
-			sourcingLink = *item.SourcingLink
+	}
+	// Fall back to sourcing_link from revision properties
+	if sourcingLink == "" && props != nil {
+		if sl, ok := props["sourcing_link"]; ok {
+			sourcingLink = formatPropertyValue(sl)
 		}
 	}

--- a/internal/api/ods_handlers_test.go
+++ b/internal/api/ods_handlers_test.go
@@ -0,0 +1,90 @@
+package api
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/go-chi/chi/v5"
+	"github.com/kindredsystems/silo/internal/db"
+)
+
+func newODSRouter(s *Server) http.Handler {
+	r := chi.NewRouter()
+	r.Get("/api/items/export.ods", s.HandleExportODS)
+	r.Get("/api/items/template.ods", s.HandleODSTemplate)
+	r.Post("/api/items/import.ods", s.HandleImportODS)
+	r.Get("/api/projects/{code}/sheet.ods", s.HandleProjectSheetODS)
+	return r
+}
+
+func TestHandleExportODS(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newODSRouter(s)
+
+	createItemDirect(t, s, "ODS-001", "ods export item", nil)
+
+	req := httptest.NewRequest("GET", "/api/items/export.ods", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	ct := w.Header().Get("Content-Type")
+	if !strings.Contains(ct, "application/vnd.oasis.opendocument.spreadsheet") {
+		t.Errorf("content-type: got %q, want ODS type", ct)
+	}
+
+	// ODS is a ZIP file — first 2 bytes should be PK
+	body := w.Body.Bytes()
+	if len(body) < 2 || body[0] != 'P' || body[1] != 'K' {
+		t.Error("response body does not start with PK (ZIP magic)")
+	}
+}
+
+func TestHandleODSTemplate(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newODSRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/items/template.ods?schema=kindred-rd", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	ct := w.Header().Get("Content-Type")
+	if !strings.Contains(ct, "application/vnd.oasis.opendocument.spreadsheet") {
+		t.Errorf("content-type: got %q, want ODS type", ct)
+	}
+}
+
+func TestHandleProjectSheetODS(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newODSRouter(s)
+
+	// Create project and item
+	ctx := httptest.NewRequest("GET", "/", nil).Context()
+	proj := &db.Project{Code: "ODSPR", Name: "ODS Project"}
+	s.projects.Create(ctx, proj)
+	createItemDirect(t, s, "ODSPR-001", "project sheet item", nil)
+	item, _ := s.items.GetByPartNumber(ctx, "ODSPR-001")
+	s.projects.AddItemToProject(ctx, item.ID, proj.ID)
+
+	req := httptest.NewRequest("GET", "/api/projects/ODSPR/sheet.ods", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	ct := w.Header().Get("Content-Type")
+	if !strings.Contains(ct, "application/vnd.oasis.opendocument.spreadsheet") {
+		t.Errorf("content-type: got %q, want ODS type", ct)
+	}
+}
--- a/internal/api/revision_handlers_test.go
+++ b/internal/api/revision_handlers_test.go
@@ -0,0 +1,222 @@
+package api
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/go-chi/chi/v5"
+)
+
+func newRevisionRouter(s *Server) http.Handler {
+	r := chi.NewRouter()
+	r.Route("/api/items/{partNumber}", func(r chi.Router) {
+		r.Get("/revisions", s.HandleListRevisions)
+		r.Get("/revisions/compare", s.HandleCompareRevisions)
+		r.Get("/revisions/{revision}", s.HandleGetRevision)
+		r.Post("/revisions", s.HandleCreateRevision)
+		r.Patch("/revisions/{revision}", s.HandleUpdateRevision)
+		r.Post("/revisions/{revision}/rollback", s.HandleRollbackRevision)
+	})
+	return r
+}
+
+func TestHandleListRevisions(t *testing.T) {
+	s := newTestServer(t)
+	router := newRevisionRouter(s)
+
+	createItemDirect(t, s, "REV-API-001", "revision list", nil)
+
+	req := httptest.NewRequest("GET", "/api/items/REV-API-001/revisions", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var revisions []RevisionResponse
+	if err := json.Unmarshal(w.Body.Bytes(), &revisions); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if len(revisions) != 1 {
+		t.Errorf("expected 1 revision (initial), got %d", len(revisions))
+	}
+}
+
+func TestHandleListRevisionsNotFound(t *testing.T) {
+	s := newTestServer(t)
+	router := newRevisionRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/items/NOEXIST/revisions", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusNotFound {
+		t.Errorf("status: got %d, want %d", w.Code, http.StatusNotFound)
+	}
+}
+
+func TestHandleGetRevision(t *testing.T) {
+	s := newTestServer(t)
+	router := newRevisionRouter(s)
+
+	createItemDirect(t, s, "REVGET-001", "get revision", nil)
+
+	req := httptest.NewRequest("GET", "/api/items/REVGET-001/revisions/1", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var rev RevisionResponse
+	if err := json.Unmarshal(w.Body.Bytes(), &rev); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if rev.RevisionNumber != 1 {
+		t.Errorf("revision_number: got %d, want 1", rev.RevisionNumber)
+	}
+}
+
+func TestHandleGetRevisionNotFound(t *testing.T) {
+	s := newTestServer(t)
+	router := newRevisionRouter(s)
+
+	createItemDirect(t, s, "REVNF-001", "rev not found", nil)
+
+	req := httptest.NewRequest("GET", "/api/items/REVNF-001/revisions/99", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusNotFound {
+		t.Errorf("status: got %d, want %d", w.Code, http.StatusNotFound)
+	}
+}
+
+func TestHandleCreateRevision(t *testing.T) {
+	s := newTestServer(t)
+	router := newRevisionRouter(s)
+
+	createItemDirect(t, s, "REVCR-001", "create revision", nil)
+
+	body := `{"properties":{"material":"steel"},"comment":"added material"}`
+	req := authRequest(httptest.NewRequest("POST", "/api/items/REVCR-001/revisions", strings.NewReader(body)))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusCreated {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusCreated, w.Body.String())
+	}
+
+	var rev RevisionResponse
+	if err := json.Unmarshal(w.Body.Bytes(), &rev); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if rev.RevisionNumber != 2 {
+		t.Errorf("revision_number: got %d, want 2", rev.RevisionNumber)
+	}
+}
+
+func TestHandleUpdateRevision(t *testing.T) {
+	s := newTestServer(t)
+	router := newRevisionRouter(s)
+
+	createItemDirect(t, s, "REVUP-001", "update revision", nil)
+
+	body := `{"status":"released","labels":["production"]}`
+	req := authRequest(httptest.NewRequest("PATCH", "/api/items/REVUP-001/revisions/1", strings.NewReader(body)))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var rev RevisionResponse
+	if err := json.Unmarshal(w.Body.Bytes(), &rev); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if rev.Status != "released" {
+		t.Errorf("status: got %q, want %q", rev.Status, "released")
+	}
+	if len(rev.Labels) != 1 || rev.Labels[0] != "production" {
+		t.Errorf("labels: got %v, want [production]", rev.Labels)
+	}
+}
+
+func TestHandleCompareRevisions(t *testing.T) {
+	s := newTestServer(t)
+	router := newRevisionRouter(s)
+
+	// Create item with properties, then create second revision with changed properties
+	cost := 10.0
+	createItemDirect(t, s, "REVCMP-001", "compare revisions", &cost)
+
+	body := `{"properties":{"standard_cost":20,"material":"aluminum"},"comment":"updated cost"}`
+	req := authRequest(httptest.NewRequest("POST", "/api/items/REVCMP-001/revisions", strings.NewReader(body)))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+	if w.Code != http.StatusCreated {
+		t.Fatalf("create rev 2: status %d; body: %s", w.Code, w.Body.String())
+	}
+
+	// Compare rev 1 vs rev 2
+	req = httptest.NewRequest("GET", "/api/items/REVCMP-001/revisions/compare?from=1&to=2", nil)
+	w = httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var diff RevisionDiffResponse
+	if err := json.Unmarshal(w.Body.Bytes(), &diff); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if diff.FromRevision != 1 || diff.ToRevision != 2 {
+		t.Errorf("revisions: got from=%d to=%d, want from=1 to=2", diff.FromRevision, diff.ToRevision)
+	}
+}
+
+func TestHandleRollbackRevision(t *testing.T) {
+	s := newTestServer(t)
+	router := newRevisionRouter(s)
+
+	createItemDirect(t, s, "REVRB-001", "rollback test", nil)
+
+	// Create rev 2
+	body := `{"properties":{"version":"v2"},"comment":"version 2"}`
+	req := authRequest(httptest.NewRequest("POST", "/api/items/REVRB-001/revisions", strings.NewReader(body)))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+	if w.Code != http.StatusCreated {
+		t.Fatalf("create rev 2: status %d; body: %s", w.Code, w.Body.String())
+	}
+
+	// Rollback to rev 1 — should create rev 3
+	body = `{"comment":"rolling back"}`
+	req = authRequest(httptest.NewRequest("POST", "/api/items/REVRB-001/revisions/1/rollback", strings.NewReader(body)))
+	req.Header.Set("Content-Type", "application/json")
+	w = httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusCreated {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusCreated, w.Body.String())
+	}
+
+	var rev RevisionResponse
+	if err := json.Unmarshal(w.Body.Bytes(), &rev); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if rev.RevisionNumber != 3 {
+		t.Errorf("revision_number: got %d, want 3", rev.RevisionNumber)
+	}
+}
--- a/internal/api/routes.go
+++ b/internal/api/routes.go
@@ -86,7 +86,7 @@ func NewRouter(server *Server, logger zerolog.Logger) http.Handler {
 		r.Route("/schemas", func(r chi.Router) {
 			r.Get("/", server.HandleListSchemas)
 			r.Get("/{name}", server.HandleGetSchema)
-			r.Get("/{name}/properties", server.HandleGetPropertySchema)
+			r.Get("/{name}/form", server.HandleGetFormDescriptor)

 			r.Group(func(r chi.Router) {
 				r.Use(server.RequireWritable)
@@ -119,6 +119,7 @@ func NewRouter(server *Server, logger zerolog.Logger) http.Handler {
 		r.Route("/items", func(r chi.Router) {
 			r.Get("/", server.HandleListItems)
 			r.Get("/search", server.HandleFuzzySearch)
+			r.Get("/by-uuid/{uuid}", server.HandleGetItemByUUID)
 			r.Get("/export.csv", server.HandleExportCSV)
 			r.Get("/template.csv", server.HandleCSVTemplate)
 			r.Get("/export.ods", server.HandleExportODS)
@@ -165,6 +166,7 @@ func NewRouter(server *Server, logger zerolog.Logger) http.Handler {
 					r.Put("/thumbnail", server.HandleSetItemThumbnail)
 					r.Post("/bom", server.HandleAddBOMEntry)
 					r.Post("/bom/import", server.HandleImportBOMCSV)
+					r.Post("/bom/merge", server.HandleMergeBOM)
 					r.Put("/bom/{childPartNumber}", server.HandleUpdateBOMEntry)
 					r.Delete("/bom/{childPartNumber}", server.HandleDeleteBOMEntry)
 				})
--- a/internal/api/schema_handlers_test.go
+++ b/internal/api/schema_handlers_test.go
@@ -0,0 +1,100 @@
+package api
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/go-chi/chi/v5"
+)
+
+func newSchemaRouter(s *Server) http.Handler {
+	r := chi.NewRouter()
+	r.Get("/api/schemas", s.HandleListSchemas)
+	r.Get("/api/schemas/{name}", s.HandleGetSchema)
+	r.Get("/api/schemas/{name}/form", s.HandleGetFormDescriptor)
+	return r
+}
+
+func TestHandleListSchemas(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newSchemaRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/schemas", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var schemas []map[string]any
+	if err := json.Unmarshal(w.Body.Bytes(), &schemas); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if len(schemas) == 0 {
+		t.Error("expected at least 1 schema")
+	}
+}
+
+func TestHandleGetSchema(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newSchemaRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/schemas/kindred-rd", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var schema map[string]any
+	if err := json.Unmarshal(w.Body.Bytes(), &schema); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	if schema["name"] != "kindred-rd" {
+		t.Errorf("name: got %v, want %q", schema["name"], "kindred-rd")
+	}
+}
+
+func TestHandleGetSchemaNotFound(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newSchemaRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/schemas/nonexistent", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusNotFound {
+		t.Errorf("status: got %d, want %d", w.Code, http.StatusNotFound)
+	}
+}
+
+func TestHandleGetFormDescriptor(t *testing.T) {
+	s := newTestServerWithSchemas(t)
+	router := newSchemaRouter(s)
+
+	req := httptest.NewRequest("GET", "/api/schemas/kindred-rd/form", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("status: got %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
+	}
+
+	var form map[string]any
+	if err := json.Unmarshal(w.Body.Bytes(), &form); err != nil {
+		t.Fatalf("decoding response: %v", err)
+	}
+	// Form descriptor should have fields
+	if _, ok := form["fields"]; !ok {
+		// Some schemas may use "categories" or "segments" instead
+		if _, ok := form["categories"]; !ok {
+			if _, ok := form["segments"]; !ok {
+				t.Error("form descriptor missing fields/categories/segments key")
+			}
+		}
+	}
+}
--- a/internal/api/sse_handler.go
+++ b/internal/api/sse_handler.go
@@ -16,9 +16,12 @@ func (s *Server) HandleEvents(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	// Disable the write deadline for this long-lived connection.
-	// The server's WriteTimeout (15s) would otherwise kill it.
+	// Disable read and write deadlines for this long-lived connection.
+	// The server's ReadTimeout/WriteTimeout (15s) would otherwise kill it.
 	rc := http.NewResponseController(w)
+	if err := rc.SetReadDeadline(time.Time{}); err != nil {
+		s.logger.Warn().Err(err).Msg("failed to disable read deadline for SSE")
+	}
 	if err := rc.SetWriteDeadline(time.Time{}); err != nil {
 		s.logger.Warn().Err(err).Msg("failed to disable write deadline for SSE")
 	}
--- a/internal/db/audit_queries.go
+++ b/internal/db/audit_queries.go
@@ -31,7 +31,7 @@ func (r *ItemRepository) ListItemsWithProperties(ctx context.Context, opts Audit
 		query = `
 			SELECT DISTINCT i.id, i.part_number, i.schema_id, i.item_type, i.description,
 			       i.created_at, i.updated_at, i.archived_at, i.current_revision,
-			       i.sourcing_type, i.sourcing_link, i.long_description, i.standard_cost,
+			       i.sourcing_type, i.long_description,
 			       COALESCE(r.properties, '{}'::jsonb) as properties
 			FROM items i
 			LEFT JOIN revisions r ON r.item_id = i.id AND r.revision_number = i.current_revision
@@ -45,7 +45,7 @@ func (r *ItemRepository) ListItemsWithProperties(ctx context.Context, opts Audit
 		query = `
 			SELECT i.id, i.part_number, i.schema_id, i.item_type, i.description,
 			       i.created_at, i.updated_at, i.archived_at, i.current_revision,
-			       i.sourcing_type, i.sourcing_link, i.long_description, i.standard_cost,
+			       i.sourcing_type, i.long_description,
 			       COALESCE(r.properties, '{}'::jsonb) as properties
 			FROM items i
 			LEFT JOIN revisions r ON r.item_id = i.id AND r.revision_number = i.current_revision
@@ -85,7 +85,7 @@ func (r *ItemRepository) ListItemsWithProperties(ctx context.Context, opts Audit
 		err := rows.Scan(
 			&iwp.ID, &iwp.PartNumber, &iwp.SchemaID, &iwp.ItemType, &iwp.Description,
 			&iwp.CreatedAt, &iwp.UpdatedAt, &iwp.ArchivedAt, &iwp.CurrentRevision,
-			&iwp.SourcingType, &iwp.SourcingLink, &iwp.LongDescription, &iwp.StandardCost,
+			&iwp.SourcingType, &iwp.LongDescription,
 			&propsJSON,
 		)
 		if err != nil {
@@ -134,6 +134,43 @@ func (r *ItemRepository) BatchCheckBOM(ctx context.Context, itemIDs []string) (m
 	return result, nil
 }

+// FileStats holds aggregated file attachment statistics for an item.
+type FileStats struct {
+	Count     int
+	TotalSize int64
+}
+
+// BatchGetFileStats returns a map of item ID to file attachment statistics
+// for the given item IDs. Items not in the map have no files.
+func (r *ItemRepository) BatchGetFileStats(ctx context.Context, itemIDs []string) (map[string]FileStats, error) {
+	if len(itemIDs) == 0 {
+		return map[string]FileStats{}, nil
+	}
+
+	rows, err := r.db.pool.Query(ctx, `
+		SELECT item_id, COUNT(*), COALESCE(SUM(size), 0)
+		FROM item_files
+		WHERE item_id = ANY($1)
+		GROUP BY item_id
+	`, itemIDs)
+	if err != nil {
+		return nil, fmt.Errorf("batch getting file stats: %w", err)
+	}
+	defer rows.Close()
+
+	result := make(map[string]FileStats)
+	for rows.Next() {
+		var itemID string
+		var fs FileStats
+		if err := rows.Scan(&itemID, &fs.Count, &fs.TotalSize); err != nil {
+			return nil, fmt.Errorf("scanning file stats: %w", err)
+		}
+		result[itemID] = fs
+	}
+
+	return result, nil
+}
+
 // BatchGetProjectCodes returns a map of item ID to project code list for
 // the given item IDs.
 func (r *ItemRepository) BatchGetProjectCodes(ctx context.Context, itemIDs []string) (map[string][]string, error) {
--- a/internal/db/item_files_test.go
+++ b/internal/db/item_files_test.go
@@ -0,0 +1,121 @@
+package db
+
+import (
+	"context"
+	"testing"
+)
+
+func TestItemFileCreate(t *testing.T) {
+	database := mustConnectTestDB(t)
+	itemRepo := NewItemRepository(database)
+	fileRepo := NewItemFileRepository(database)
+	ctx := context.Background()
+
+	item := &Item{PartNumber: "FILE-001", ItemType: "part", Description: "file test"}
+	if err := itemRepo.Create(ctx, item, nil); err != nil {
+		t.Fatalf("Create item: %v", err)
+	}
+
+	f := &ItemFile{
+		ItemID:      item.ID,
+		Filename:    "drawing.pdf",
+		ContentType: "application/pdf",
+		Size:        12345,
+		ObjectKey:   "items/FILE-001/files/abc/drawing.pdf",
+	}
+	if err := fileRepo.Create(ctx, f); err != nil {
+		t.Fatalf("Create file: %v", err)
+	}
+	if f.ID == "" {
+		t.Error("expected file ID to be set")
+	}
+	if f.CreatedAt.IsZero() {
+		t.Error("expected created_at to be set")
+	}
+}
+
+func TestItemFileListByItem(t *testing.T) {
+	database := mustConnectTestDB(t)
+	itemRepo := NewItemRepository(database)
+	fileRepo := NewItemFileRepository(database)
+	ctx := context.Background()
+
+	item := &Item{PartNumber: "FLIST-001", ItemType: "part", Description: "file list test"}
+	itemRepo.Create(ctx, item, nil)
+
+	for i, name := range []string{"a.pdf", "b.step"} {
+		fileRepo.Create(ctx, &ItemFile{
+			ItemID:      item.ID,
+			Filename:    name,
+			ContentType: "application/octet-stream",
+			Size:        int64(i * 1000),
+			ObjectKey:   "items/FLIST-001/files/" + name,
+		})
+	}
+
+	files, err := fileRepo.ListByItem(ctx, item.ID)
+	if err != nil {
+		t.Fatalf("ListByItem: %v", err)
+	}
+	if len(files) != 2 {
+		t.Errorf("expected 2 files, got %d", len(files))
+	}
+}
+
+func TestItemFileGet(t *testing.T) {
+	database := mustConnectTestDB(t)
+	itemRepo := NewItemRepository(database)
+	fileRepo := NewItemFileRepository(database)
+	ctx := context.Background()
+
+	item := &Item{PartNumber: "FGET-001", ItemType: "part", Description: "file get test"}
+	itemRepo.Create(ctx, item, nil)
+
+	f := &ItemFile{
+		ItemID:      item.ID,
+		Filename:    "model.FCStd",
+		ContentType: "application/x-freecad",
+		Size:        99999,
+		ObjectKey:   "items/FGET-001/files/xyz/model.FCStd",
+	}
+	fileRepo.Create(ctx, f)
+
+	got, err := fileRepo.Get(ctx, f.ID)
+	if err != nil {
+		t.Fatalf("Get: %v", err)
+	}
+	if got.Filename != "model.FCStd" {
+		t.Errorf("filename: got %q, want %q", got.Filename, "model.FCStd")
+	}
+	if got.Size != 99999 {
+		t.Errorf("size: got %d, want %d", got.Size, 99999)
+	}
+}
+
+func TestItemFileDelete(t *testing.T) {
+	database := mustConnectTestDB(t)
+	itemRepo := NewItemRepository(database)
+	fileRepo := NewItemFileRepository(database)
+	ctx := context.Background()
+
+	item := &Item{PartNumber: "FDEL-001", ItemType: "part", Description: "file delete test"}
+	itemRepo.Create(ctx, item, nil)
+
+	f := &ItemFile{
+		ItemID:      item.ID,
+		Filename:    "temp.bin",
+		ContentType: "application/octet-stream",
+		Size:        100,
+		ObjectKey:   "items/FDEL-001/files/tmp/temp.bin",
+	}
+	fileRepo.Create(ctx, f)
+
+	if err := fileRepo.Delete(ctx, f.ID); err != nil {
+		t.Fatalf("Delete: %v", err)
+	}
+
+	_, err := fileRepo.Get(ctx, f.ID)
+	if err == nil {
+		t.Error("expected error after delete, got nil")
+	}
+}
--- a/internal/db/items.go
+++ b/internal/db/items.go
@@ -24,11 +24,9 @@ type Item struct {
 	CADFilePath     *string
 	CreatedBy       *string
 	UpdatedBy       *string
-	SourcingType    string   // "manufactured" or "purchased"
-	SourcingLink    *string  // URL to supplier/datasheet
-	LongDescription *string  // extended description
-	StandardCost    *float64 // baseline unit cost
-	ThumbnailKey    *string  // MinIO key for item thumbnail
+	SourcingType    string  // "manufactured" or "purchased"
+	LongDescription *string // extended description
+	ThumbnailKey    *string // MinIO key for item thumbnail
 }

 // Revision represents a revision record.
@@ -96,11 +94,11 @@ func (r *ItemRepository) Create(ctx context.Context, item *Item, properties map[
 		}
 		err := tx.QueryRow(ctx, `
 			INSERT INTO items (part_number, schema_id, item_type, description, created_by,
-			                   sourcing_type, sourcing_link, long_description, standard_cost)
-			VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+			                   sourcing_type, long_description)
+			VALUES ($1, $2, $3, $4, $5, $6, $7)
 			RETURNING id, created_at, updated_at, current_revision
 		`, item.PartNumber, item.SchemaID, item.ItemType, item.Description, item.CreatedBy,
-			sourcingType, item.SourcingLink, item.LongDescription, item.StandardCost,
+			sourcingType, item.LongDescription,
 		).Scan(
 			&item.ID, &item.CreatedAt, &item.UpdatedAt, &item.CurrentRevision,
 		)
@@ -133,7 +131,7 @@ func (r *ItemRepository) GetByPartNumber(ctx context.Context, partNumber string)
 		SELECT id, part_number, schema_id, item_type, description,
 		       created_at, updated_at, archived_at, current_revision,
 		       cad_synced_at, cad_file_path,
-		       sourcing_type, sourcing_link, long_description, standard_cost,
+		       sourcing_type, long_description,
 		       thumbnail_key
 		FROM items
 		WHERE part_number = $1 AND archived_at IS NULL
@@ -141,7 +139,7 @@ func (r *ItemRepository) GetByPartNumber(ctx context.Context, partNumber string)
 		&item.ID, &item.PartNumber, &item.SchemaID, &item.ItemType, &item.Description,
 		&item.CreatedAt, &item.UpdatedAt, &item.ArchivedAt, &item.CurrentRevision,
 		&item.CADSyncedAt, &item.CADFilePath,
-		&item.SourcingType, &item.SourcingLink, &item.LongDescription, &item.StandardCost,
+		&item.SourcingType, &item.LongDescription,
 		&item.ThumbnailKey,
 	)
 	if err == pgx.ErrNoRows {
@@ -160,7 +158,7 @@ func (r *ItemRepository) GetByID(ctx context.Context, id string) (*Item, error)
 		SELECT id, part_number, schema_id, item_type, description,
 		       created_at, updated_at, archived_at, current_revision,
 		       cad_synced_at, cad_file_path,
-		       sourcing_type, sourcing_link, long_description, standard_cost,
+		       sourcing_type, long_description,
 		       thumbnail_key
 		FROM items
 		WHERE id = $1
@@ -168,7 +166,7 @@ func (r *ItemRepository) GetByID(ctx context.Context, id string) (*Item, error)
 		&item.ID, &item.PartNumber, &item.SchemaID, &item.ItemType, &item.Description,
 		&item.CreatedAt, &item.UpdatedAt, &item.ArchivedAt, &item.CurrentRevision,
 		&item.CADSyncedAt, &item.CADFilePath,
-		&item.SourcingType, &item.SourcingLink, &item.LongDescription, &item.StandardCost,
+		&item.SourcingType, &item.LongDescription,
 		&item.ThumbnailKey,
 	)
 	if err == pgx.ErrNoRows {
@@ -192,7 +190,7 @@ func (r *ItemRepository) List(ctx context.Context, opts ListOptions) ([]*Item, e
 		query = `
 			SELECT DISTINCT i.id, i.part_number, i.schema_id, i.item_type, i.description,
 			       i.created_at, i.updated_at, i.archived_at, i.current_revision,
-			       i.sourcing_type, i.sourcing_link, i.long_description, i.standard_cost,
+			       i.sourcing_type, i.long_description,
 			       i.thumbnail_key
 			FROM items i
 			JOIN item_projects ip ON ip.item_id = i.id
@@ -205,7 +203,7 @@ func (r *ItemRepository) List(ctx context.Context, opts ListOptions) ([]*Item, e
 		query = `
 			SELECT id, part_number, schema_id, item_type, description,
 			       created_at, updated_at, archived_at, current_revision,
-			       sourcing_type, sourcing_link, long_description, standard_cost,
+			       sourcing_type, long_description,
 			       thumbnail_key
 			FROM items
 			WHERE archived_at IS NULL
@@ -257,7 +255,7 @@ func (r *ItemRepository) List(ctx context.Context, opts ListOptions) ([]*Item, e
 		err := rows.Scan(
 			&item.ID, &item.PartNumber, &item.SchemaID, &item.ItemType, &item.Description,
 			&item.CreatedAt, &item.UpdatedAt, &item.ArchivedAt, &item.CurrentRevision,
-			&item.SourcingType, &item.SourcingLink, &item.LongDescription, &item.StandardCost,
+			&item.SourcingType, &item.LongDescription,
 			&item.ThumbnailKey,
 		)
 		if err != nil {
@@ -659,9 +657,7 @@ type UpdateItemFields struct {
 	Description     string
 	UpdatedBy       *string
 	SourcingType    *string
-	SourcingLink    *string
 	LongDescription *string
-	StandardCost    *float64
 }

 // Update modifies an item's fields. The UUID remains stable.
@@ -670,16 +666,12 @@ func (r *ItemRepository) Update(ctx context.Context, id string, fields UpdateIte
 		UPDATE items
 		SET part_number = $2, item_type = $3, description = $4, updated_by = $5,
 		    sourcing_type = COALESCE($6, sourcing_type),
-		    sourcing_link = CASE WHEN $7::boolean THEN $8 ELSE sourcing_link END,
-		    long_description = CASE WHEN $9::boolean THEN $10 ELSE long_description END,
-		    standard_cost = CASE WHEN $11::boolean THEN $12 ELSE standard_cost END,
+		    long_description = CASE WHEN $7::boolean THEN $8 ELSE long_description END,
 		    updated_at = now()
 		WHERE id = $1 AND archived_at IS NULL
 	`, id, fields.PartNumber, fields.ItemType, fields.Description, fields.UpdatedBy,
 		fields.SourcingType,
-		fields.SourcingLink != nil, fields.SourcingLink,
 		fields.LongDescription != nil, fields.LongDescription,
-		fields.StandardCost != nil, fields.StandardCost,
 	)
 	if err != nil {
 		return fmt.Errorf("updating item: %w", err)
--- a/internal/db/items_edge_test.go
+++ b/internal/db/items_edge_test.go
@@ -0,0 +1,281 @@
+package db
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"testing"
+)
+
+func TestItemCreateDuplicatePartNumber(t *testing.T) {
+	database := mustConnectTestDB(t)
+	repo := NewItemRepository(database)
+	ctx := context.Background()
+
+	item := &Item{PartNumber: "DUP-001", ItemType: "part", Description: "first"}
+	if err := repo.Create(ctx, item, nil); err != nil {
+		t.Fatalf("Create: %v", err)
+	}
+
+	dup := &Item{PartNumber: "DUP-001", ItemType: "part", Description: "duplicate"}
+	err := repo.Create(ctx, dup, nil)
+	if err == nil {
+		t.Fatal("expected error for duplicate part number, got nil")
+	}
+	if !strings.Contains(err.Error(), "23505") && !strings.Contains(err.Error(), "duplicate") {
+		t.Errorf("expected duplicate key error, got: %v", err)
+	}
+}
+
+func TestItemDelete(t *testing.T) {
+	database := mustConnectTestDB(t)
+	repo := NewItemRepository(database)
+	ctx := context.Background()
+
+	item := &Item{PartNumber: "HDEL-001", ItemType: "part", Description: "hard delete"}
+	if err := repo.Create(ctx, item, nil); err != nil {
+		t.Fatalf("Create: %v", err)
+	}
+
+	if err := repo.Delete(ctx, item.ID); err != nil {
+		t.Fatalf("Delete: %v", err)
+	}
+
+	got, err := repo.GetByID(ctx, item.ID)
+	if err != nil {
+		t.Fatalf("GetByID after delete: %v", err)
+	}
+	if got != nil {
+		t.Error("expected nil after hard delete")
+	}
+}
+
+func TestItemListPagination(t *testing.T) {
+	database := mustConnectTestDB(t)
+	repo := NewItemRepository(database)
+	ctx := context.Background()
+
+	for i := 0; i < 5; i++ {
+		item := &Item{
+			PartNumber:  fmt.Sprintf("PAGE-%04d", i),
+			ItemType:    "part",
+			Description: fmt.Sprintf("page item %d", i),
+		}
+		if err := repo.Create(ctx, item, nil); err != nil {
+			t.Fatalf("Create #%d: %v", i, err)
+		}
+	}
+
+	// Fetch page of 2 with offset 2
+	items, err := repo.List(ctx, ListOptions{Limit: 2, Offset: 2})
+	if err != nil {
+		t.Fatalf("List: %v", err)
+	}
+	if len(items) != 2 {
+		t.Errorf("expected 2 items, got %d", len(items))
+	}
+}
+
+func TestItemListSearch(t *testing.T) {
+	database := mustConnectTestDB(t)
+	repo := NewItemRepository(database)
+	ctx := context.Background()
+
+	repo.Create(ctx, &Item{PartNumber: "SRCH-001", ItemType: "part", Description: "alpha widget"}, nil)
+	repo.Create(ctx, &Item{PartNumber: "SRCH-002", ItemType: "part", Description: "beta gadget"}, nil)
+	repo.Create(ctx, &Item{PartNumber: "SRCH-003", ItemType: "part", Description: "alpha gizmo"}, nil)
+
+	items, err := repo.List(ctx, ListOptions{Search: "alpha"})
+	if err != nil {
+		t.Fatalf("List: %v", err)
+	}
+	if len(items) != 2 {
+		t.Errorf("expected 2 items matching 'alpha', got %d", len(items))
+	}
+}
+
+func TestRevisionStatusUpdate(t *testing.T) {
+	database := mustConnectTestDB(t)
+	repo := NewItemRepository(database)
+	ctx := context.Background()
+
+	item := &Item{PartNumber: "STAT-001", ItemType: "part", Description: "status test"}
+	if err := repo.Create(ctx, item, map[string]any{"v": 1}); err != nil {
+		t.Fatalf("Create: %v", err)
+	}
+
+	status := "released"
+	if err := repo.UpdateRevisionStatus(ctx, item.ID, 1, &status, nil); err != nil {
+		t.Fatalf("UpdateRevisionStatus: %v", err)
+	}
+
+	rev, err := repo.GetRevision(ctx, item.ID, 1)
+	if err != nil {
+		t.Fatalf("GetRevision: %v", err)
+	}
+	if rev.Status != "released" {
+		t.Errorf("status: got %q, want %q", rev.Status, "released")
+	}
+}
+
+func TestRevisionLabelsUpdate(t *testing.T) {
+	database := mustConnectTestDB(t)
+	repo := NewItemRepository(database)
+	ctx := context.Background()
+
+	item := &Item{PartNumber: "LBL-001", ItemType: "part", Description: "label test"}
+	if err := repo.Create(ctx, item, nil); err != nil {
+		t.Fatalf("Create: %v", err)
+	}
+
+	labels := []string{"prototype", "urgent"}
+	if err := repo.UpdateRevisionStatus(ctx, item.ID, 1, nil, labels); err != nil {
+		t.Fatalf("UpdateRevisionStatus: %v", err)
+	}
+
+	rev, err := repo.GetRevision(ctx, item.ID, 1)
+	if err != nil {
+		t.Fatalf("GetRevision: %v", err)
+	}
+	if len(rev.Labels) != 2 {
+		t.Errorf("labels count: got %d, want 2", len(rev.Labels))
+	}
+}
+
+func TestRevisionCompare(t *testing.T) {
+	database := mustConnectTestDB(t)
+	repo := NewItemRepository(database)
+	ctx := context.Background()
+
+	item := &Item{PartNumber: "CMP-001", ItemType: "part", Description: "compare test"}
+	if err := repo.Create(ctx, item, map[string]any{"color": "red", "weight": 10}); err != nil {
+		t.Fatalf("Create: %v", err)
+	}
+
+	// Rev 2: change color, remove weight, add size
+	repo.CreateRevision(ctx, &Revision{
+		ItemID:     item.ID,
+		Properties: map[string]any{"color": "blue", "size": "large"},
+	})
+
+	diff, err := repo.CompareRevisions(ctx, item.ID, 1, 2)
+	if err != nil {
+		t.Fatalf("CompareRevisions: %v", err)
+	}
+
+	if len(diff.Added) == 0 {
+		t.Error("expected added fields (size)")
+	}
+	if len(diff.Removed) == 0 {
+		t.Error("expected removed fields (weight)")
+	}
+	if len(diff.Changed) == 0 {
+		t.Error("expected changed fields (color)")
+	}
+}
+
+func TestRevisionRollback(t *testing.T) {
+	database := mustConnectTestDB(t)
+	repo := NewItemRepository(database)
+	ctx := context.Background()
+
+	item := &Item{PartNumber: "RBK-001", ItemType: "part", Description: "rollback test"}
+	if err := repo.Create(ctx, item, map[string]any{"version": "original"}); err != nil {
+		t.Fatalf("Create: %v", err)
+	}
+
+	// Rev 2: change property
+	repo.CreateRevision(ctx, &Revision{
+		ItemID:     item.ID,
+		Properties: map[string]any{"version": "modified"},
+	})
+
+	// Rollback to rev 1 — should create rev 3
+	comment := "rollback to rev 1"
+	rev3, err := repo.CreateRevisionFromExisting(ctx, item.ID, 1, comment, nil)
+	if err != nil {
+		t.Fatalf("CreateRevisionFromExisting: %v", err)
+	}
+	if rev3.RevisionNumber != 3 {
+		t.Errorf("revision number: got %d, want 3", rev3.RevisionNumber)
+	}
+
+	// Rev 3 should have rev 1's properties
+	got, err := repo.GetRevision(ctx, item.ID, 3)
+	if err != nil {
+		t.Fatalf("GetRevision: %v", err)
+	}
+	if got.Properties["version"] != "original" {
+		t.Errorf("rolled back version: got %v, want %q", got.Properties["version"], "original")
+	}
+}
+
+func TestProjectItemAssociationsByCode(t *testing.T) {
+	database := mustConnectTestDB(t)
+	projRepo := NewProjectRepository(database)
+	itemRepo := NewItemRepository(database)
+	ctx := context.Background()
+
+	proj := &Project{Code: "BYTAG", Name: "Tag Project"}
+	projRepo.Create(ctx, proj)
+
+	item := &Item{PartNumber: "TAG-001", ItemType: "part", Description: "taggable"}
+	itemRepo.Create(ctx, item, nil)
+
+	// Tag by code
+	if err := projRepo.AddItemToProjectByCode(ctx, item.ID, "BYTAG"); err != nil {
+		t.Fatalf("AddItemToProjectByCode: %v", err)
+	}
+
+	projects, err := projRepo.GetProjectsForItem(ctx, item.ID)
+	if err != nil {
+		t.Fatalf("GetProjectsForItem: %v", err)
+	}
+	if len(projects) != 1 {
+		t.Fatalf("expected 1 project, got %d", len(projects))
+	}
+	if projects[0].Code != "BYTAG" {
+		t.Errorf("project code: got %q, want %q", projects[0].Code, "BYTAG")
+	}
+
+	// Untag by code
+	if err := projRepo.RemoveItemFromProjectByCode(ctx, item.ID, "BYTAG"); err != nil {
+		t.Fatalf("RemoveItemFromProjectByCode: %v", err)
+	}
+
+	projects, _ = projRepo.GetProjectsForItem(ctx, item.ID)
+	if len(projects) != 0 {
+		t.Errorf("expected 0 projects after removal, got %d", len(projects))
+	}
+}
+
+func TestListByProject(t *testing.T) {
+	database := mustConnectTestDB(t)
+	projRepo := NewProjectRepository(database)
+	itemRepo := NewItemRepository(database)
+	ctx := context.Background()
+
+	proj := &Project{Code: "FILT", Name: "Filter Project"}
+	projRepo.Create(ctx, proj)
+
+	// Create 3 items, tag only 2
+	for i := 0; i < 3; i++ {
+		item := &Item{
+			PartNumber:  fmt.Sprintf("FILT-%04d", i),
+			ItemType:    "part",
+			Description: fmt.Sprintf("filter item %d", i),
+		}
+		itemRepo.Create(ctx, item, nil)
+		if i < 2 {
+			projRepo.AddItemToProjectByCode(ctx, item.ID, "FILT")
+		}
+	}
+
+	items, err := itemRepo.List(ctx, ListOptions{Project: "FILT"})
+	if err != nil {
+		t.Fatalf("List with project filter: %v", err)
+	}
+	if len(items) != 2 {
+		t.Errorf("expected 2 items in project FILT, got %d", len(items))
+	}
+}
--- a/internal/db/items_test.go
+++ b/internal/db/items_test.go
@@ -134,12 +134,10 @@ func TestItemUpdate(t *testing.T) {
 		t.Fatalf("Create: %v", err)
 	}

-	cost := 42.50
 	err := repo.Update(ctx, item.ID, UpdateItemFields{
-		PartNumber:   "UPD-001",
-		ItemType:     "part",
-		Description:  "updated",
-		StandardCost: &cost,
+		PartNumber:  "UPD-001",
+		ItemType:    "part",
+		Description: "updated",
 	})
 	if err != nil {
 		t.Fatalf("Update: %v", err)
@@ -149,9 +147,6 @@ func TestItemUpdate(t *testing.T) {
 	if got.Description != "updated" {
 		t.Errorf("description: got %q, want %q", got.Description, "updated")
 	}
-	if got.StandardCost == nil || *got.StandardCost != 42.50 {
-		t.Errorf("standard_cost: got %v, want 42.50", got.StandardCost)
-	}
 }

 func TestItemArchiveUnarchive(t *testing.T) {
--- a/internal/db/projects.go
+++ b/internal/db/projects.go
@@ -240,7 +240,7 @@ func (r *ProjectRepository) GetItemsForProject(ctx context.Context, projectID st
 		SELECT i.id, i.part_number, i.schema_id, i.item_type, i.description,
 		       i.created_at, i.updated_at, i.archived_at, i.current_revision,
 		       i.cad_synced_at, i.cad_file_path,
-		       i.sourcing_type, i.sourcing_link, i.long_description, i.standard_cost,
+		       i.sourcing_type, i.long_description,
 		       i.thumbnail_key
 		FROM items i
 		JOIN item_projects ip ON ip.item_id = i.id
@@ -259,7 +259,7 @@ func (r *ProjectRepository) GetItemsForProject(ctx context.Context, projectID st
 			&item.ID, &item.PartNumber, &item.SchemaID, &item.ItemType, &item.Description,
 			&item.CreatedAt, &item.UpdatedAt, &item.ArchivedAt, &item.CurrentRevision,
 			&item.CADSyncedAt, &item.CADFilePath,
-			&item.SourcingType, &item.SourcingLink, &item.LongDescription, &item.StandardCost,
+			&item.SourcingType, &item.LongDescription,
 			&item.ThumbnailKey,
 		); err != nil {
 			return nil, err
--- a/internal/db/relationships.go
+++ b/internal/db/relationships.go
@@ -23,6 +23,7 @@ type Relationship struct {
 	ChildRevision        *int
 	Metadata             map[string]any
 	ParentRevisionID     *string
+	Source               string // "manual" or "assembly"
 	CreatedAt            time.Time
 	UpdatedAt            time.Time
 	CreatedBy            *string
@@ -46,6 +47,7 @@ type BOMEntry struct {
 	ChildRevision        *int
 	EffectiveRevision    int
 	Metadata             map[string]any
+	Source               string
 }

 // BOMTreeEntry extends BOMEntry with depth for multi-level BOM expansion.
@@ -84,16 +86,21 @@ func (r *RelationshipRepository) Create(ctx context.Context, rel *Relationship)
 		}
 	}

+	source := rel.Source
+	if source == "" {
+		source = "manual"
+	}
+
 	err = r.db.pool.QueryRow(ctx, `
 		INSERT INTO relationships (
 			parent_item_id, child_item_id, rel_type, quantity, unit,
-			reference_designators, child_revision, metadata, parent_revision_id, created_by
+			reference_designators, child_revision, metadata, parent_revision_id, created_by, source
 		)
-		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
 		RETURNING id, created_at, updated_at
 	`, rel.ParentItemID, rel.ChildItemID, rel.RelType, rel.Quantity, rel.Unit,
 		rel.ReferenceDesignators, rel.ChildRevision, metadataJSON, rel.ParentRevisionID,
-		rel.CreatedBy,
+		rel.CreatedBy, source,
 	).Scan(&rel.ID, &rel.CreatedAt, &rel.UpdatedAt)
 	if err != nil {
 		return fmt.Errorf("inserting relationship: %w", err)
@@ -256,7 +263,7 @@ func (r *RelationshipRepository) GetBOM(ctx context.Context, parentItemID string
 		       rel.rel_type, rel.quantity, rel.unit,
 		       rel.reference_designators, rel.child_revision,
 		       COALESCE(rel.child_revision, child.current_revision) AS effective_revision,
-		       rel.metadata
+		       rel.metadata, rel.source
 		FROM relationships rel
 		JOIN items parent ON parent.id = rel.parent_item_id
 		JOIN items child ON child.id = rel.child_item_id
@@ -281,7 +288,7 @@ func (r *RelationshipRepository) GetWhereUsed(ctx context.Context, childItemID s
 		       rel.rel_type, rel.quantity, rel.unit,
 		       rel.reference_designators, rel.child_revision,
 		       COALESCE(rel.child_revision, child.current_revision) AS effective_revision,
-		       rel.metadata
+		       rel.metadata, rel.source
 		FROM relationships rel
 		JOIN items parent ON parent.id = rel.parent_item_id
 		JOIN items child ON child.id = rel.child_item_id
@@ -315,7 +322,7 @@ func (r *RelationshipRepository) GetExpandedBOM(ctx context.Context, parentItemI
 			       rel.rel_type, rel.quantity, rel.unit,
 			       rel.reference_designators, rel.child_revision,
 			       COALESCE(rel.child_revision, child.current_revision) AS effective_revision,
-			       rel.metadata,
+			       rel.metadata, rel.source,
 			       1 AS depth
 			FROM relationships rel
 			JOIN items parent ON parent.id = rel.parent_item_id
@@ -334,7 +341,7 @@ func (r *RelationshipRepository) GetExpandedBOM(ctx context.Context, parentItemI
 			       rel.rel_type, rel.quantity, rel.unit,
 			       rel.reference_designators, rel.child_revision,
 			       COALESCE(rel.child_revision, child.current_revision),
-			       rel.metadata,
+			       rel.metadata, rel.source,
 			       bt.depth + 1
 			FROM relationships rel
 			JOIN items parent ON parent.id = rel.parent_item_id
@@ -347,7 +354,7 @@ func (r *RelationshipRepository) GetExpandedBOM(ctx context.Context, parentItemI
 		SELECT id, parent_item_id, parent_part_number, parent_description,
 		       child_item_id, child_part_number, child_description,
 		       rel_type, quantity, unit, reference_designators,
-		       child_revision, effective_revision, metadata, depth
+		       child_revision, effective_revision, metadata, source, depth
 		FROM bom_tree
 		ORDER BY depth, child_part_number
 	`, parentItemID, maxDepth)
@@ -366,7 +373,7 @@ func (r *RelationshipRepository) GetExpandedBOM(ctx context.Context, parentItemI
 			&e.ChildItemID, &e.ChildPartNumber, &childDesc,
 			&e.RelType, &e.Quantity, &e.Unit,
 			&e.ReferenceDesignators, &e.ChildRevision,
-			&e.EffectiveRevision, &metadataJSON, &e.Depth,
+			&e.EffectiveRevision, &metadataJSON, &e.Source, &e.Depth,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("scanning BOM tree entry: %w", err)
@@ -553,7 +560,7 @@ func scanBOMEntries(rows pgx.Rows) ([]*BOMEntry, error) {
 			&e.RelType, &e.Quantity, &e.Unit,
 			&e.ReferenceDesignators, &e.ChildRevision,
 			&e.EffectiveRevision,
-			&metadataJSON,
+			&metadataJSON, &e.Source,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("scanning BOM entry: %w", err)
--- a/internal/partnum/generator.go
+++ b/internal/partnum/generator.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"regexp"
 	"strings"
+	"time"

 	"github.com/kindredsystems/silo/internal/schema"
 )
@@ -99,8 +100,11 @@ func (g *Generator) resolveSegment(
 		return g.formatSerial(seg, next), nil

 	case "date":
-		// TODO: implement date formatting
-		return "", fmt.Errorf("date segments not yet implemented")
+		layout := seg.Value
+		if layout == "" {
+			layout = "20060102"
+		}
+		return time.Now().UTC().Format(layout), nil

 	default:
 		return "", fmt.Errorf("unknown segment type: %s", seg.Type)
@@ -174,7 +178,84 @@ func (g *Generator) Validate(partNumber string, schemaName string) error {
 		return fmt.Errorf("unknown schema: %s", schemaName)
 	}

-	// TODO: parse part number and validate each segment
-	_ = s
+	parts := strings.Split(partNumber, s.Separator)
+	if len(parts) != len(s.Segments) {
+		return fmt.Errorf("expected %d segments, got %d", len(s.Segments), len(parts))
+	}
+
+	for i, seg := range s.Segments {
+		val := parts[i]
+		if err := g.validateSegment(&seg, val); err != nil {
+			return fmt.Errorf("segment %s: %w", seg.Name, err)
+		}
+	}
+
+	return nil
+}
+
+// validateSegment checks that a single segment value is valid.
+func (g *Generator) validateSegment(seg *schema.Segment, val string) error {
+	switch seg.Type {
+	case "constant":
+		if val != seg.Value {
+			return fmt.Errorf("expected %q, got %q", seg.Value, val)
+		}
+
+	case "enum":
+		if _, ok := seg.Values[val]; !ok {
+			return fmt.Errorf("invalid enum value: %s", val)
+		}
+
+	case "string":
+		if seg.Length > 0 && len(val) != seg.Length {
+			return fmt.Errorf("value must be exactly %d characters", seg.Length)
+		}
+		if seg.MinLength > 0 && len(val) < seg.MinLength {
+			return fmt.Errorf("value must be at least %d characters", seg.MinLength)
+		}
+		if seg.MaxLength > 0 && len(val) > seg.MaxLength {
+			return fmt.Errorf("value must be at most %d characters", seg.MaxLength)
+		}
+		if seg.Case == "upper" && val != strings.ToUpper(val) {
+			return fmt.Errorf("value must be uppercase")
+		}
+		if seg.Case == "lower" && val != strings.ToLower(val) {
+			return fmt.Errorf("value must be lowercase")
+		}
+		if seg.Validation.Pattern != "" {
+			re := regexp.MustCompile(seg.Validation.Pattern)
+			if !re.MatchString(val) {
+				msg := seg.Validation.Message
+				if msg == "" {
+					msg = fmt.Sprintf("value does not match pattern %s", seg.Validation.Pattern)
+				}
+				return fmt.Errorf("%s", msg)
+			}
+		}
+
+	case "serial":
+		if seg.Length > 0 && len(val) != seg.Length {
+			return fmt.Errorf("value must be exactly %d characters", seg.Length)
+		}
+		for _, ch := range val {
+			if ch < '0' || ch > '9' {
+				return fmt.Errorf("serial must be numeric")
+			}
+		}
+
+	case "date":
+		layout := seg.Value
+		if layout == "" {
+			layout = "20060102"
+		}
+		expected := time.Now().UTC().Format(layout)
+		if len(val) != len(expected) {
+			return fmt.Errorf("date segment length mismatch: expected %d, got %d", len(expected), len(val))
+		}
+
+	default:
+		return fmt.Errorf("unknown segment type: %s", seg.Type)
+	}
+
 	return nil
 }
--- a/internal/partnum/generator_test.go
+++ b/internal/partnum/generator_test.go
@@ -3,7 +3,9 @@ package partnum
 import (
 	"context"
 	"fmt"
+	"regexp"
 	"testing"
+	"time"

 	"github.com/kindredsystems/silo/internal/schema"
 )
@@ -165,3 +167,199 @@ func TestGenerateConstantSegment(t *testing.T) {
 		t.Errorf("got %q, want %q", pn, "KS-0001")
 	}
 }
+
+func TestGenerateDateSegmentDefault(t *testing.T) {
+	s := &schema.Schema{
+		Name:      "date-test",
+		Version:   1,
+		Separator: "-",
+		Segments: []schema.Segment{
+			{Name: "date", Type: "date"},
+			{Name: "serial", Type: "serial", Length: 3},
+		},
+	}
+	gen := NewGenerator(map[string]*schema.Schema{"date-test": s}, &mockSeqStore{})
+
+	pn, err := gen.Generate(context.Background(), Input{
+		SchemaName: "date-test",
+		Values:     map[string]string{},
+	})
+	if err != nil {
+		t.Fatalf("Generate returned error: %v", err)
+	}
+
+	// Default format: YYYYMMDD-NNN
+	want := time.Now().UTC().Format("20060102") + "-001"
+	if pn != want {
+		t.Errorf("got %q, want %q", pn, want)
+	}
+}
+
+func TestGenerateDateSegmentCustomFormat(t *testing.T) {
+	s := &schema.Schema{
+		Name:      "date-custom",
+		Version:   1,
+		Separator: "-",
+		Segments: []schema.Segment{
+			{Name: "date", Type: "date", Value: "0601"},
+			{Name: "serial", Type: "serial", Length: 4},
+		},
+	}
+	gen := NewGenerator(map[string]*schema.Schema{"date-custom": s}, &mockSeqStore{})
+
+	pn, err := gen.Generate(context.Background(), Input{
+		SchemaName: "date-custom",
+		Values:     map[string]string{},
+	})
+	if err != nil {
+		t.Fatalf("Generate returned error: %v", err)
+	}
+
+	// Format "0601" produces YYMM
+	if matched, _ := regexp.MatchString(`^\d{4}-\d{4}$`, pn); !matched {
+		t.Errorf("got %q, want pattern YYMM-NNNN", pn)
+	}
+
+	want := time.Now().UTC().Format("0601") + "-0001"
+	if pn != want {
+		t.Errorf("got %q, want %q", pn, want)
+	}
+}
+
+// --- Validation tests ---
+
+func TestValidateBasic(t *testing.T) {
+	s := testSchema()
+	gen := NewGenerator(map[string]*schema.Schema{"test": s}, &mockSeqStore{})
+
+	if err := gen.Validate("F01-0001", "test"); err != nil {
+		t.Fatalf("expected valid, got error: %v", err)
+	}
+}
+
+func TestValidateWrongSegmentCount(t *testing.T) {
+	s := testSchema()
+	gen := NewGenerator(map[string]*schema.Schema{"test": s}, &mockSeqStore{})
+
+	if err := gen.Validate("F01-0001-EXTRA", "test"); err == nil {
+		t.Fatal("expected error for wrong segment count")
+	}
+}
+
+func TestValidateInvalidEnum(t *testing.T) {
+	s := testSchema()
+	gen := NewGenerator(map[string]*schema.Schema{"test": s}, &mockSeqStore{})
+
+	if err := gen.Validate("ZZZ-0001", "test"); err == nil {
+		t.Fatal("expected error for invalid enum value")
+	}
+}
+
+func TestValidateNonNumericSerial(t *testing.T) {
+	s := testSchema()
+	gen := NewGenerator(map[string]*schema.Schema{"test": s}, &mockSeqStore{})
+
+	if err := gen.Validate("F01-ABCD", "test"); err == nil {
+		t.Fatal("expected error for non-numeric serial")
+	}
+}
+
+func TestValidateSerialWrongLength(t *testing.T) {
+	s := testSchema()
+	gen := NewGenerator(map[string]*schema.Schema{"test": s}, &mockSeqStore{})
+
+	if err := gen.Validate("F01-01", "test"); err == nil {
+		t.Fatal("expected error for wrong serial length")
+	}
+}
+
+func TestValidateConstantSegment(t *testing.T) {
+	s := &schema.Schema{
+		Name:      "const-val",
+		Version:   1,
+		Separator: "-",
+		Segments: []schema.Segment{
+			{Name: "prefix", Type: "constant", Value: "KS"},
+			{Name: "serial", Type: "serial", Length: 4},
+		},
+	}
+	gen := NewGenerator(map[string]*schema.Schema{"const-val": s}, &mockSeqStore{})
+
+	if err := gen.Validate("KS-0001", "const-val"); err != nil {
+		t.Fatalf("expected valid, got error: %v", err)
+	}
+	if err := gen.Validate("XX-0001", "const-val"); err == nil {
+		t.Fatal("expected error for wrong constant value")
+	}
+}
+
+func TestValidateUnknownSchema(t *testing.T) {
+	gen := NewGenerator(map[string]*schema.Schema{}, &mockSeqStore{})
+
+	if err := gen.Validate("F01-0001", "nonexistent"); err == nil {
+		t.Fatal("expected error for unknown schema")
+	}
+}
+
+func TestValidateDateSegment(t *testing.T) {
+	s := &schema.Schema{
+		Name:      "date-val",
+		Version:   1,
+		Separator: "-",
+		Segments: []schema.Segment{
+			{Name: "date", Type: "date"},
+			{Name: "serial", Type: "serial", Length: 3},
+		},
+	}
+	gen := NewGenerator(map[string]*schema.Schema{"date-val": s}, &mockSeqStore{})
+
+	today := time.Now().UTC().Format("20060102")
+	if err := gen.Validate(today+"-001", "date-val"); err != nil {
+		t.Fatalf("expected valid, got error: %v", err)
+	}
+	if err := gen.Validate("20-001", "date-val"); err == nil {
+		t.Fatal("expected error for wrong date length")
+	}
+}
+
+func TestValidateGeneratedOutput(t *testing.T) {
+	s := testSchema()
+	gen := NewGenerator(map[string]*schema.Schema{"test": s}, &mockSeqStore{})
+
+	pn, err := gen.Generate(context.Background(), Input{
+		SchemaName: "test",
+		Values:     map[string]string{"category": "F01"},
+	})
+	if err != nil {
+		t.Fatalf("Generate error: %v", err)
+	}
+	if err := gen.Validate(pn, "test"); err != nil {
+		t.Fatalf("generated part number %q failed validation: %v", pn, err)
+	}
+}
+
+func TestGenerateDateSegmentYearOnly(t *testing.T) {
+	s := &schema.Schema{
+		Name:      "date-year",
+		Version:   1,
+		Separator: "-",
+		Segments: []schema.Segment{
+			{Name: "year", Type: "date", Value: "2006"},
+			{Name: "serial", Type: "serial", Length: 4},
+		},
+	}
+	gen := NewGenerator(map[string]*schema.Schema{"date-year": s}, &mockSeqStore{})
+
+	pn, err := gen.Generate(context.Background(), Input{
+		SchemaName: "date-year",
+		Values:     map[string]string{},
+	})
+	if err != nil {
+		t.Fatalf("Generate returned error: %v", err)
+	}
+
+	want := time.Now().UTC().Format("2006") + "-0001"
+	if pn != want {
+		t.Errorf("got %q, want %q", pn, want)
+	}
+}
--- a/internal/schema/schema.go
+++ b/internal/schema/schema.go
@@ -22,6 +22,55 @@ type Schema struct {
 	Format          string           `yaml:"format"`
 	Examples        []string         `yaml:"examples"`
 	PropertySchemas *PropertySchemas `yaml:"property_schemas,omitempty"`
+	UI              *UIConfig        `yaml:"ui,omitempty" json:"ui,omitempty"`
+}
+
+// UIConfig defines form layout for all clients.
+type UIConfig struct {
+	CategoryPicker      *CategoryPickerConfig            `yaml:"category_picker,omitempty" json:"category_picker,omitempty"`
+	ItemFields          map[string]ItemFieldDef           `yaml:"item_fields,omitempty" json:"item_fields,omitempty"`
+	FieldGroups         map[string]FieldGroup             `yaml:"field_groups,omitempty" json:"field_groups"`
+	CategoryFieldGroups map[string]map[string]FieldGroup  `yaml:"category_field_groups,omitempty" json:"category_field_groups,omitempty"`
+	FieldOverrides      map[string]FieldOverride          `yaml:"field_overrides,omitempty" json:"field_overrides,omitempty"`
+}
+
+// CategoryPickerConfig defines how the category picker is rendered.
+type CategoryPickerConfig struct {
+	Style  string                `yaml:"style" json:"style"`
+	Stages []CategoryPickerStage `yaml:"stages" json:"stages"`
+}
+
+// CategoryPickerStage defines one stage of a multi-stage category picker.
+type CategoryPickerStage struct {
+	Name   string            `yaml:"name" json:"name"`
+	Label  string            `yaml:"label" json:"label"`
+	Values map[string]string `yaml:"values,omitempty" json:"values,omitempty"`
+}
+
+// ItemFieldDef defines a field stored on the items table (not in revision properties).
+type ItemFieldDef struct {
+	Type                string            `yaml:"type" json:"type"`
+	Widget              string            `yaml:"widget" json:"widget"`
+	Label               string            `yaml:"label" json:"label"`
+	Required            bool              `yaml:"required,omitempty" json:"required,omitempty"`
+	Default             any               `yaml:"default,omitempty" json:"default,omitempty"`
+	Options             []string          `yaml:"options,omitempty" json:"options,omitempty"`
+	DerivedFromCategory map[string]string `yaml:"derived_from_category,omitempty" json:"derived_from_category,omitempty"`
+	SearchEndpoint      string            `yaml:"search_endpoint,omitempty" json:"search_endpoint,omitempty"`
+}
+
+// FieldGroup defines an ordered group of fields for form layout.
+type FieldGroup struct {
+	Label  string   `yaml:"label" json:"label"`
+	Order  int      `yaml:"order" json:"order"`
+	Fields []string `yaml:"fields" json:"fields"`
+}
+
+// FieldOverride overrides display hints for a field.
+type FieldOverride struct {
+	Widget   string   `yaml:"widget,omitempty" json:"widget,omitempty"`
+	Currency string   `yaml:"currency,omitempty" json:"currency,omitempty"`
+	Options  []string `yaml:"options,omitempty" json:"options,omitempty"`
 }

 // PropertySchemas defines property schemas per category.
@@ -180,6 +229,10 @@ func (s *Schema) Validate() error {
 		}
 	}

+	if err := s.ValidateUI(); err != nil {
+		return err
+	}
+
 	return nil
 }

@@ -224,6 +277,112 @@ func (seg *Segment) Validate() error {
 	return nil
 }

+// ValuesByDomain groups category enum values by their first character (domain prefix).
+func (s *Schema) ValuesByDomain() map[string]map[string]string {
+	catSeg := s.GetSegment("category")
+	if catSeg == nil {
+		return nil
+	}
+	result := make(map[string]map[string]string)
+	for code, desc := range catSeg.Values {
+		if len(code) == 0 {
+			continue
+		}
+		domain := string(code[0])
+		if result[domain] == nil {
+			result[domain] = make(map[string]string)
+		}
+		result[domain][code] = desc
+	}
+	return result
+}
+
+// ValidateUI validates the UI configuration against property schemas and segments.
+func (s *Schema) ValidateUI() error {
+	if s.UI == nil {
+		return nil
+	}
+
+	// Build a set of all known fields (item_fields + property defaults)
+	knownGlobal := make(map[string]bool)
+	if s.UI.ItemFields != nil {
+		for k := range s.UI.ItemFields {
+			knownGlobal[k] = true
+		}
+	}
+	if s.PropertySchemas != nil {
+		for k := range s.PropertySchemas.Defaults {
+			knownGlobal[k] = true
+		}
+	}
+
+	// Validate field_groups: every field must be a known global field
+	for groupKey, group := range s.UI.FieldGroups {
+		for _, field := range group.Fields {
+			if !knownGlobal[field] {
+				return fmt.Errorf("ui.field_groups.%s: field %q not found in item_fields or property_schemas.defaults", groupKey, field)
+			}
+		}
+	}
+
+	// Validate category_field_groups: every field must exist in the category's property schema
+	if s.PropertySchemas != nil {
+		for prefix, groups := range s.UI.CategoryFieldGroups {
+			catProps := s.PropertySchemas.Categories[prefix]
+			for groupKey, group := range groups {
+				for _, field := range group.Fields {
+					if catProps == nil {
+						return fmt.Errorf("ui.category_field_groups.%s.%s: category prefix %q has no property schema", prefix, groupKey, prefix)
+					}
+					if _, ok := catProps[field]; !ok {
+						return fmt.Errorf("ui.category_field_groups.%s.%s: field %q not found in property_schemas.categories.%s", prefix, groupKey, field, prefix)
+					}
+				}
+			}
+		}
+	}
+
+	// Validate field_overrides: keys must be known fields
+	for key := range s.UI.FieldOverrides {
+		if !knownGlobal[key] {
+			// Also check category-level properties
+			found := false
+			if s.PropertySchemas != nil {
+				for _, catProps := range s.PropertySchemas.Categories {
+					if _, ok := catProps[key]; ok {
+						found = true
+						break
+					}
+				}
+			}
+			if !found {
+				return fmt.Errorf("ui.field_overrides: field %q not found in any property schema", key)
+			}
+		}
+	}
+
+	// Validate category_picker stages: first stage values must be valid domain prefixes
+	if s.UI.CategoryPicker != nil && len(s.UI.CategoryPicker.Stages) > 0 {
+		catSeg := s.GetSegment("category")
+		if catSeg != nil {
+			validPrefixes := make(map[string]bool)
+			for code := range catSeg.Values {
+				if len(code) > 0 {
+					validPrefixes[string(code[0])] = true
+				}
+			}
+			firstStage := s.UI.CategoryPicker.Stages[0]
+			for key := range firstStage.Values {
+				if !validPrefixes[key] {
+					return fmt.Errorf("ui.category_picker.stages[0]: value %q is not a valid category prefix", key)
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
 // GetSegment returns a segment by name.
 func (s *Schema) GetSegment(name string) *Segment {
 	for i := range s.Segments {
--- a/migrations/012_bom_source.sql
+++ b/migrations/012_bom_source.sql
@@ -0,0 +1,16 @@
+-- Add source column to relationships table to distinguish assembly-derived
+-- BOM entries from manually-added ones.
+ALTER TABLE relationships
+    ADD COLUMN source VARCHAR(20) NOT NULL DEFAULT 'manual'
+    CHECK (source IN ('manual', 'assembly'));
+
+-- Migrate existing metadata.source values where they exist.
+-- The metadata field stores source as a free-form string; promote to column.
+UPDATE relationships
+SET source = 'manual'
+WHERE metadata->>'source' IS NOT NULL;
+
+-- Remove the source key from metadata since it's now a dedicated column.
+UPDATE relationships
+SET metadata = metadata - 'source'
+WHERE metadata ? 'source';
--- a/migrations/013_move_cost_sourcing_to_props.sql
+++ b/migrations/013_move_cost_sourcing_to_props.sql
@@ -0,0 +1,25 @@
+-- Migration 013: Move sourcing_link and standard_cost to revision properties
+--
+-- These fields are being deduplicated from the items table into revision
+-- properties (JSONB). The YAML property_schemas.defaults already defines
+-- them, so they belong in the properties system rather than as standalone
+-- columns.
+
+-- Step 1: Copy sourcing_link and standard_cost from items into the current
+-- revision's properties JSONB for every item that has non-null values.
+UPDATE revisions r
+SET properties = r.properties
+    || CASE WHEN i.sourcing_link IS NOT NULL
+            THEN jsonb_build_object('sourcing_link', i.sourcing_link)
+            ELSE '{}'::jsonb END
+    || CASE WHEN i.standard_cost IS NOT NULL
+            THEN jsonb_build_object('standard_cost', i.standard_cost)
+            ELSE '{}'::jsonb END
+FROM items i
+WHERE r.item_id = i.id
+  AND r.revision_number = i.current_revision
+  AND (i.sourcing_link IS NOT NULL OR i.standard_cost IS NOT NULL);
+
+-- Step 2: Drop the columns from the items table.
+ALTER TABLE items DROP COLUMN sourcing_link;
+ALTER TABLE items DROP COLUMN standard_cost;
--- a/schemas/kindred-rd.yaml
+++ b/schemas/kindred-rd.yaml
@@ -846,3 +846,255 @@ schema:
          type: string
          default: ""
          description: "Inspection/QC requirements"
+
+  # UI configuration — drives form rendering for all clients.
+  ui:
+    category_picker:
+      style: multi_stage
+      stages:
+        - name: domain
+          label: "Domain"
+          values:
+            F: "Fasteners"
+            C: "Fluid Fittings"
+            R: "Motion"
+            S: "Structural"
+            E: "Electrical"
+            M: "Mechanical"
+            T: "Tooling"
+            A: "Assemblies"
+            P: "Purchased"
+            X: "Custom Fabricated"
+
+    # Item-level fields (stored on items table, not in revision properties)
+    item_fields:
+      description:
+        type: string
+        widget: text
+        label: "Description"
+      item_type:
+        type: string
+        widget: select
+        label: "Type"
+        options: [part, assembly, consumable, tool]
+        derived_from_category:
+          A: assembly
+          T: tool
+          default: part
+      sourcing_type:
+        type: string
+        widget: select
+        label: "Sourcing Type"
+        options: [manufactured, purchased]
+        default: manufactured
+      long_description:
+        type: string
+        widget: textarea
+        label: "Long Description"
+      projects:
+        type: string_array
+        widget: tag_input
+        label: "Projects"
+        search_endpoint: "/api/projects"
+
+    field_groups:
+      identity:
+        label: "Identity"
+        order: 1
+        fields: [item_type, description]
+      sourcing:
+        label: "Sourcing"
+        order: 2
+        fields:
+          [
+            sourcing_type,
+            manufacturer,
+            manufacturer_pn,
+            supplier,
+            supplier_pn,
+            sourcing_link,
+          ]
+      cost:
+        label: "Cost & Lead Time"
+        order: 3
+        fields: [standard_cost, lead_time_days, minimum_order_qty]
+      status:
+        label: "Status"
+        order: 4
+        fields: [lifecycle_status, rohs_compliant, country_of_origin]
+      details:
+        label: "Details"
+        order: 5
+        fields: [long_description, projects, notes]
+
+    # Per-category-prefix field groups (rendered after global groups)
+    category_field_groups:
+      F:
+        fastener_specs:
+          label: "Fastener Specifications"
+          order: 10
+          fields:
+            [
+              material,
+              finish,
+              thread_size,
+              thread_pitch,
+              length,
+              head_type,
+              drive_type,
+              strength_grade,
+              torque_spec,
+            ]
+      C:
+        fitting_specs:
+          label: "Fitting Specifications"
+          order: 10
+          fields:
+            [
+              material,
+              connection_type,
+              size_1,
+              size_2,
+              pressure_rating,
+              temperature_min,
+              temperature_max,
+              media_compatibility,
+              seal_material,
+            ]
+      R:
+        motion_specs:
+          label: "Motion Specifications"
+          order: 10
+          fields:
+            [
+              load_capacity,
+              speed_rating,
+              power_rating,
+              voltage_nominal,
+              current_nominal,
+              torque_continuous,
+              bore_diameter,
+              travel,
+              stroke,
+              operating_pressure,
+            ]
+      S:
+        structural_specs:
+          label: "Structural Specifications"
+          order: 10
+          fields:
+            [
+              material,
+              material_spec,
+              profile,
+              dimension_a,
+              dimension_b,
+              wall_thickness,
+              length,
+              weight_per_length,
+              finish,
+              temper,
+            ]
+      E:
+        electrical_specs:
+          label: "Electrical Specifications"
+          order: 10
+          fields:
+            [
+              voltage_rating,
+              current_rating,
+              power_rating,
+              value,
+              tolerance,
+              package,
+              mounting,
+              pin_count,
+              wire_gauge,
+              connector_type,
+            ]
+      M:
+        mechanical_specs:
+          label: "Mechanical Specifications"
+          order: 10
+          fields:
+            [
+              material,
+              spring_rate,
+              free_length,
+              max_load,
+              travel,
+              inner_diameter,
+              outer_diameter,
+              hardness,
+              temperature_range,
+            ]
+      T:
+        tooling_specs:
+          label: "Tooling Specifications"
+          order: 10
+          fields:
+            [
+              material,
+              tolerance,
+              surface_finish,
+              hardness,
+              associated_part,
+              machine,
+              cycle_life,
+            ]
+      A:
+        assembly_specs:
+          label: "Assembly Specifications"
+          order: 10
+          fields:
+            [
+              weight,
+              dimensions,
+              component_count,
+              assembly_time,
+              test_procedure,
+              voltage_rating,
+              current_rating,
+              ip_rating,
+            ]
+      P:
+        purchased_specs:
+          label: "Purchased Item Specifications"
+          order: 10
+          fields:
+            [
+              material,
+              form,
+              grade,
+              quantity_per_unit,
+              unit_of_measure,
+              shelf_life,
+            ]
+      X:
+        fabrication_specs:
+          label: "Fabrication Specifications"
+          order: 10
+          fields:
+            [
+              material,
+              material_spec,
+              finish,
+              critical_dimensions,
+              weight,
+              process,
+              secondary_operations,
+              drawing_rev,
+              inspection_requirements,
+            ]
+
+    field_overrides:
+      standard_cost:
+        widget: currency
+        currency: USD
+      sourcing_link:
+        widget: url
+      lifecycle_status:
+        widget: select
+        options: [active, deprecated, obsolete, prototype]
+      rohs_compliant:
+        widget: checkbox
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -1,18 +1,23 @@
 #!/bin/bash
-# Deploy Silo to silo.kindred.internal
+# Deploy Silo to a target host
 #
 # Usage: ./scripts/deploy.sh [host]
-#   host defaults to silo.kindred.internal
+#   host defaults to SILO_DEPLOY_TARGET env var, or silo.example.internal
 #
 # Prerequisites:
 #   - SSH access to the target host
 #   - /etc/silo/silod.env must exist on target with credentials filled in
-#   - PostgreSQL reachable from target at psql.kindred.internal
-#   - MinIO reachable from target at minio.kindred.internal
+#   - PostgreSQL reachable from target (set SILO_DB_HOST to override)
+#   - MinIO reachable from target (set SILO_MINIO_HOST to override)
+#
+# Environment variables:
+#   SILO_DEPLOY_TARGET  - target host (default: silo.example.internal)
+#   SILO_DB_HOST        - PostgreSQL host (default: psql.example.internal)

 set -euo pipefail

-TARGET="${1:-silo.kindred.internal}"
+TARGET="${1:-${SILO_DEPLOY_TARGET:-silo.example.internal}}"
+DB_HOST="${SILO_DB_HOST:-psql.example.internal}"
 DEPLOY_DIR="/opt/silo"
 CONFIG_DIR="/etc/silo"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -104,7 +109,7 @@ echo "  Files installed to $DEPLOY_DIR"
 REMOTE

 echo "[6/6] Running migrations and starting service..."
-ssh "$TARGET" bash -s <<'REMOTE'
+ssh "$TARGET" DB_HOST="$DB_HOST" bash -s <<'REMOTE'
 set -euo pipefail

 DEPLOY_DIR="/opt/silo"
@@ -123,14 +128,14 @@ if command -v psql &>/dev/null && [ -n "${SILO_DB_PASSWORD:-}" ]; then
    for f in "$DEPLOY_DIR/migrations/"*.sql; do
        echo "    $(basename "$f")"
        PGPASSWORD="$SILO_DB_PASSWORD" psql \
-            -h psql.kindred.internal -p 5432 \
+            -h "$DB_HOST" -p 5432 \
            -U silo -d silo \
            -f "$f" -q 2>&1 | grep -v "already exists" || true
    done
    echo "  Migrations complete."
 else
    echo "  WARNING: psql not available or SILO_DB_PASSWORD not set, skipping migrations."
-    echo "  Run migrations manually: PGPASSWORD=... psql -h psql.kindred.internal -U silo -d silo -f /opt/silo/migrations/NNN_name.sql"
+    echo "  Run migrations manually: PGPASSWORD=... psql -h $DB_HOST -U silo -d silo -f /opt/silo/migrations/NNN_name.sql"
 fi

 # Start service
--- a/scripts/setup-docker.sh
+++ b/scripts/setup-docker.sh
@@ -0,0 +1,344 @@
+#!/usr/bin/env bash
+#
+# Silo Docker Setup Script
+# Generates .env and config.docker.yaml for the all-in-one Docker Compose stack.
+#
+# Usage:
+#   ./scripts/setup-docker.sh                  # interactive
+#   ./scripts/setup-docker.sh --non-interactive # use defaults / env vars
+#   ./scripts/setup-docker.sh --domain silo.example.com
+#   ./scripts/setup-docker.sh --with-nginx
+#
+# Output:
+#   deployments/.env              - Docker Compose environment variables
+#   deployments/config.docker.yaml - Silo server configuration
+
+set -euo pipefail
+
+# Colors (disabled if not a terminal)
+if [[ -t 1 ]]; then
+    RED='\033[0;31m'
+    GREEN='\033[0;32m'
+    YELLOW='\033[1;33m'
+    BLUE='\033[0;34m'
+    BOLD='\033[1m'
+    NC='\033[0m'
+else
+    RED='' GREEN='' YELLOW='' BLUE='' BOLD='' NC=''
+fi
+
+log_info()    { echo -e "${BLUE}[INFO]${NC} $*"; }
+log_success() { echo -e "${GREEN}[OK]${NC} $*"; }
+log_warn()    { echo -e "${YELLOW}[WARN]${NC} $*"; }
+log_error()   { echo -e "${RED}[ERROR]${NC} $*" >&2; }
+
+# ---------------------------------------------------------------------------
+# Defaults
+# ---------------------------------------------------------------------------
+DOMAIN="localhost"
+NON_INTERACTIVE=false
+WITH_NGINX=false
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_DIR="${SCRIPT_DIR}/.."
+OUTPUT_DIR="${PROJECT_DIR}/deployments"
+
+# ---------------------------------------------------------------------------
+# Parse arguments
+# ---------------------------------------------------------------------------
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --non-interactive) NON_INTERACTIVE=true; shift ;;
+        --domain)          DOMAIN="$2"; shift 2 ;;
+        --with-nginx)      WITH_NGINX=true; shift ;;
+        --output-dir)      OUTPUT_DIR="$2"; shift 2 ;;
+        -h|--help)
+            echo "Usage: $0 [OPTIONS]"
+            echo ""
+            echo "Options:"
+            echo "  --non-interactive    Use defaults and env vars, no prompts"
+            echo "  --domain DOMAIN      Server hostname (default: localhost)"
+            echo "  --with-nginx         Print instructions for the nginx profile"
+            echo "  --output-dir DIR     Output directory (default: ./deployments)"
+            echo "  -h, --help           Show this help"
+            exit 0
+            ;;
+        *) log_error "Unknown option: $1"; exit 1 ;;
+    esac
+done
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+generate_secret() {
+    local len="${1:-32}"
+    openssl rand -hex "$len" 2>/dev/null \
+        || head -c "$len" /dev/urandom | od -An -tx1 | tr -d ' \n'
+}
+
+prompt() {
+    local var_name="$1" prompt_text="$2" default="$3"
+    if [[ "$NON_INTERACTIVE" == "true" ]]; then
+        eval "$var_name=\"$default\""
+        return
+    fi
+    local input
+    read -r -p "$(echo -e "${BOLD}${prompt_text}${NC} [${default}]: ")" input
+    eval "$var_name=\"${input:-$default}\""
+}
+
+prompt_secret() {
+    local var_name="$1" prompt_text="$2" default="$3"
+    if [[ "$NON_INTERACTIVE" == "true" ]]; then
+        eval "$var_name=\"$default\""
+        return
+    fi
+    local input
+    read -r -p "$(echo -e "${BOLD}${prompt_text}${NC} [auto-generated]: ")" input
+    eval "$var_name=\"${input:-$default}\""
+}
+
+# ---------------------------------------------------------------------------
+# Banner
+# ---------------------------------------------------------------------------
+echo ""
+echo -e "${BOLD}Silo Docker Setup${NC}"
+echo "Generates configuration for the all-in-one Docker Compose stack."
+echo ""
+
+# Check for existing files
+if [[ -f "${OUTPUT_DIR}/.env" ]]; then
+    log_warn "deployments/.env already exists."
+    if [[ "$NON_INTERACTIVE" == "false" ]]; then
+        read -r -p "Overwrite? [y/N]: " overwrite
+        if [[ "${overwrite,,}" != "y" ]]; then
+            log_info "Aborted."
+            exit 0
+        fi
+    fi
+fi
+
+# ---------------------------------------------------------------------------
+# Gather configuration
+# ---------------------------------------------------------------------------
+log_info "Gathering configuration..."
+echo ""
+
+# Domain / base URL
+prompt DOMAIN "Server domain" "$DOMAIN"
+
+if [[ "$WITH_NGINX" == "true" ]]; then
+    BASE_URL="http://${DOMAIN}"
+elif [[ "$DOMAIN" == "localhost" ]]; then
+    BASE_URL="http://localhost:8080"
+else
+    BASE_URL="http://${DOMAIN}:8080"
+fi
+
+# PostgreSQL
+PG_PASSWORD_DEFAULT="$(generate_secret 16)"
+prompt_secret POSTGRES_PASSWORD "PostgreSQL password" "$PG_PASSWORD_DEFAULT"
+
+# MinIO
+MINIO_AK_DEFAULT="$(generate_secret 10)"
+MINIO_SK_DEFAULT="$(generate_secret 16)"
+prompt_secret MINIO_ACCESS_KEY "MinIO access key" "$MINIO_AK_DEFAULT"
+prompt_secret MINIO_SECRET_KEY "MinIO secret key" "$MINIO_SK_DEFAULT"
+
+# OpenLDAP
+LDAP_ADMIN_PW_DEFAULT="$(generate_secret 16)"
+prompt_secret LDAP_ADMIN_PASSWORD "LDAP admin password" "$LDAP_ADMIN_PW_DEFAULT"
+prompt LDAP_USERS "LDAP initial username" "siloadmin"
+LDAP_USER_PW_DEFAULT="$(generate_secret 12)"
+prompt_secret LDAP_PASSWORDS "LDAP initial user password" "$LDAP_USER_PW_DEFAULT"
+
+# Session secret
+SESSION_SECRET="$(generate_secret 32)"
+
+# Silo local admin (fallback when LDAP is unavailable)
+prompt SILO_ADMIN_USERNAME "Silo local admin username" "admin"
+ADMIN_PW_DEFAULT="$(generate_secret 12)"
+prompt_secret SILO_ADMIN_PASSWORD "Silo local admin password" "$ADMIN_PW_DEFAULT"
+
+echo ""
+
+# ---------------------------------------------------------------------------
+# Write .env
+# ---------------------------------------------------------------------------
+log_info "Writing ${OUTPUT_DIR}/.env ..."
+
+cat > "${OUTPUT_DIR}/.env" << EOF
+# Generated by setup-docker.sh on $(date +%Y-%m-%d)
+# Used by: docker compose -f deployments/docker-compose.allinone.yaml
+
+# PostgreSQL
+POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+
+# MinIO
+MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY}
+MINIO_SECRET_KEY=${MINIO_SECRET_KEY}
+
+# OpenLDAP
+LDAP_ADMIN_PASSWORD=${LDAP_ADMIN_PASSWORD}
+LDAP_USERS=${LDAP_USERS}
+LDAP_PASSWORDS=${LDAP_PASSWORDS}
+
+# Silo
+SILO_SESSION_SECRET=${SESSION_SECRET}
+SILO_ADMIN_USERNAME=${SILO_ADMIN_USERNAME}
+SILO_ADMIN_PASSWORD=${SILO_ADMIN_PASSWORD}
+SILO_BASE_URL=${BASE_URL}
+
+# Uncomment if using OIDC (Keycloak)
+# SILO_OIDC_CLIENT_SECRET=
+EOF
+
+chmod 600 "${OUTPUT_DIR}/.env"
+log_success "deployments/.env written"
+
+# ---------------------------------------------------------------------------
+# Write config.docker.yaml
+# ---------------------------------------------------------------------------
+log_info "Writing ${OUTPUT_DIR}/config.docker.yaml ..."
+
+# Note: Values wrapped in ${VAR} (inside the single-quoted YAMLEOF blocks)
+# are NOT expanded by bash — they are written literally into the YAML file
+# and expanded at runtime by the Go config loader via os.ExpandEnv().
+# The base_url and cors origin use the bash variable directly since
+# SILO_SERVER_BASE_URL is not a supported direct override in the Go loader.
+{
+cat << 'YAMLEOF'
+# Silo Configuration — Docker Compose (all-in-one)
+# Generated by scripts/setup-docker.sh
+#
+# Values using ${VAR} syntax are expanded from environment variables at
+# startup. Direct env var overrides (SILO_DB_PASSWORD, etc.) take precedence
+# over YAML values — see docs/CONFIGURATION.md for the full reference.
+
+server:
+  host: "0.0.0.0"
+  port: 8080
+YAMLEOF
+
+cat << EOF
+  base_url: "${BASE_URL}"
+EOF
+
+cat << 'YAMLEOF'
+
+database:
+  host: "postgres"
+  port: 5432
+  name: "silo"
+  user: "silo"
+  password: "${SILO_DB_PASSWORD}"
+  sslmode: "disable"
+  max_connections: 10
+
+storage:
+  endpoint: "minio:9000"
+  access_key: "${SILO_MINIO_ACCESS_KEY}"
+  secret_key: "${SILO_MINIO_SECRET_KEY}"
+  bucket: "silo-files"
+  use_ssl: false
+  region: "us-east-1"
+
+schemas:
+  directory: "/etc/silo/schemas"
+  default: "kindred-rd"
+
+freecad:
+  uri_scheme: "silo"
+
+auth:
+  enabled: true
+  session_secret: "${SILO_SESSION_SECRET}"
+
+  # Local accounts (fallback when LDAP is unavailable)
+  local:
+    enabled: true
+    default_admin_username: "${SILO_ADMIN_USERNAME}"
+    default_admin_password: "${SILO_ADMIN_PASSWORD}"
+
+  # OpenLDAP (provided by the Docker Compose stack)
+  ldap:
+    enabled: true
+    url: "ldap://openldap:1389"
+    base_dn: "dc=silo,dc=local"
+    user_search_dn: "ou=users,dc=silo,dc=local"
+    user_attr: "cn"
+    email_attr: "mail"
+    display_attr: "cn"
+    group_attr: "memberOf"
+    role_mapping:
+      admin:
+        - "cn=silo-admins,ou=groups,dc=silo,dc=local"
+      editor:
+        - "cn=silo-users,ou=groups,dc=silo,dc=local"
+      viewer:
+        - "cn=silo-viewers,ou=groups,dc=silo,dc=local"
+    tls_skip_verify: false
+
+  oidc:
+    enabled: false
+
+  cors:
+    allowed_origins:
+YAMLEOF
+
+cat << EOF
+      - "${BASE_URL}"
+EOF
+} > "${OUTPUT_DIR}/config.docker.yaml"
+
+log_success "deployments/config.docker.yaml written"
+
+# ---------------------------------------------------------------------------
+# Summary
+# ---------------------------------------------------------------------------
+echo ""
+echo -e "${BOLD}============================================${NC}"
+echo -e "${BOLD}Setup complete!${NC}"
+echo -e "${BOLD}============================================${NC}"
+echo ""
+echo "Generated files:"
+echo "  deployments/.env              - secrets and credentials"
+echo "  deployments/config.docker.yaml - server configuration"
+echo ""
+echo -e "${BOLD}Credentials:${NC}"
+echo "  PostgreSQL:    silo / ${POSTGRES_PASSWORD}"
+echo "  MinIO:         ${MINIO_ACCESS_KEY} / ${MINIO_SECRET_KEY}"
+echo "  MinIO Console: http://localhost:9001"
+echo "  LDAP Admin:    cn=admin,dc=silo,dc=local / ${LDAP_ADMIN_PASSWORD}"
+echo "  LDAP User:     ${LDAP_USERS} / ${LDAP_PASSWORDS}"
+echo "  Silo Admin:    ${SILO_ADMIN_USERNAME} / ${SILO_ADMIN_PASSWORD} (local fallback)"
+echo "  Base URL:      ${BASE_URL}"
+echo ""
+echo -e "${BOLD}Next steps:${NC}"
+echo ""
+echo "  # Start the stack"
+if [[ "$WITH_NGINX" == "true" ]]; then
+    echo "  docker compose -f deployments/docker-compose.allinone.yaml --profile nginx up -d"
+else
+    echo "  docker compose -f deployments/docker-compose.allinone.yaml up -d"
+fi
+echo ""
+echo "  # Check status"
+echo "  docker compose -f deployments/docker-compose.allinone.yaml ps"
+echo ""
+echo "  # View logs"
+echo "  docker compose -f deployments/docker-compose.allinone.yaml logs -f silo"
+echo ""
+echo "  # Open in browser"
+echo "  ${BASE_URL}"
+echo ""
+echo "  # Log in with LDAP: ${LDAP_USERS} / <password above>"
+echo "  # Or local admin:   ${SILO_ADMIN_USERNAME} / <password above>"
+echo ""
+if [[ "$WITH_NGINX" != "true" ]]; then
+    echo "  To add nginx later:"
+    echo "  docker compose -f deployments/docker-compose.allinone.yaml --profile nginx up -d"
+    echo ""
+fi
+echo "Save these credentials somewhere safe. The passwords in deployments/.env"
+echo "are the source of truth for the running stack."
+echo ""
--- a/scripts/setup-host.sh
+++ b/scripts/setup-host.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
 # Silo Host Setup Script
-# Run this once on silo.kindred.internal to prepare for deployment
+# Run this once on silo.example.internal to prepare for deployment
 #
 # Usage:
 #   sudo ./setup-host.sh
@@ -24,11 +24,13 @@ BLUE='\033[0;34m'
 NC='\033[0m'

 # Configuration
-REPO_URL="${SILO_REPO_URL:-https://gitea.kindred.internal/kindred/silo-0062.git}"
+REPO_URL="${SILO_REPO_URL:-https://git.kindred-systems.com/kindred/silo.git}"
 REPO_BRANCH="${SILO_BRANCH:-main}"
 INSTALL_DIR="/opt/silo"
 CONFIG_DIR="/etc/silo"
-GO_VERSION="1.23.0"
+GO_VERSION="1.24.0"
+DB_HOST="${SILO_DB_HOST:-psql.example.internal}"
+MINIO_HOST="${SILO_MINIO_HOST:-minio.example.internal}"

 log_info() { echo -e "${BLUE}[INFO]${NC} $*"; }
 log_success() { echo -e "${GREEN}[OK]${NC} $*"; }
@@ -155,21 +157,28 @@ log_success "Directories created"
 ENV_FILE="${CONFIG_DIR}/silod.env"
 if [[ ! -f "${ENV_FILE}" ]]; then
    log_info "Creating environment file..."
-    cat > "${ENV_FILE}" << 'EOF'
+    cat > "${ENV_FILE}" << EOF
 # Silo daemon environment variables
 # Fill in the values below

-# Database credentials (psql.kindred.internal)
+# Database credentials (${DB_HOST})
 # Database: silo, User: silo
 SILO_DB_PASSWORD=

-# MinIO credentials (minio.kindred.internal)
+# MinIO credentials (${MINIO_HOST})
 # User: silouser
 SILO_MINIO_ACCESS_KEY=silouser
 SILO_MINIO_SECRET_KEY=

+# Authentication
+# Session secret (required when auth is enabled)
+SILO_SESSION_SECRET=
+# Default admin account (created on first startup if both are set)
+SILO_ADMIN_USERNAME=admin
+SILO_ADMIN_PASSWORD=
+
 # Optional overrides
-# SILO_SERVER_BASE_URL=http://silo.kindred.internal:8080
+# SILO_SERVER_BASE_URL=http://\$(hostname -f):8080
 EOF
    chmod 600 "${ENV_FILE}"
    chown root:silo "${ENV_FILE}"
@@ -214,10 +223,10 @@ echo "1. Edit ${ENV_FILE} and fill in credentials:"
 echo "   sudo nano ${ENV_FILE}"
 echo ""
 echo "2. Verify database connectivity:"
-echo "   psql -h psql.kindred.internal -U silo -d silo -c 'SELECT 1'"
+echo "   psql -h ${DB_HOST} -U silo -d silo -c 'SELECT 1'"
 echo ""
 echo "3. Verify MinIO connectivity:"
-echo "   curl -I http://minio.kindred.internal:9000/minio/health/live"
+echo "   curl -I http://${MINIO_HOST}:9000/minio/health/live"
 echo ""
 echo "4. Run the deployment:"
 echo "   sudo ${INSTALL_DIR}/src/scripts/deploy.sh"
--- a/scripts/setup-ipa-nginx.sh
+++ b/scripts/setup-ipa-nginx.sh
@@ -7,8 +7,8 @@
 #   sudo ./scripts/setup-ipa-nginx.sh
 #
 # Prerequisites:
-#   - FreeIPA server at ipa.kindred.internal
-#   - DNS configured for silo.kindred.internal
+#   - FreeIPA server at ipa.example.internal
+#   - DNS configured for the silo host (set SILO_HOSTNAME to override default)
 #   - Admin credentials for IPA enrollment

 set -euo pipefail
@@ -21,12 +21,12 @@ BLUE='\033[0;34m'
 NC='\033[0m'

 # Configuration
-IPA_SERVER="${IPA_SERVER:-ipa.kindred.internal}"
-IPA_DOMAIN="${IPA_DOMAIN:-kindred.internal}"
+IPA_SERVER="${IPA_SERVER:-ipa.example.internal}"
+IPA_DOMAIN="${IPA_DOMAIN:-example.internal}"
 IPA_REALM="${IPA_REALM:-KINDRED.INTERNAL}"
-HOSTNAME="silo.kindred.internal"
+SILO_HOSTNAME="${SILO_HOSTNAME:-silo.example.internal}"
 CERT_DIR="/etc/ssl/silo"
-SILO_PORT=8080
+SILO_PORT="${SILO_PORT:-8080}"

 log_info() { echo -e "${BLUE}[INFO]${NC} $*"; }
 log_success() { echo -e "${GREEN}[OK]${NC} $*"; }
@@ -77,8 +77,8 @@ log_success "Packages installed"
 #
 # Step 2: Set hostname
 #
-log_info "Setting hostname to ${HOSTNAME}..."
-hostnamectl set-hostname "${HOSTNAME}"
+log_info "Setting hostname to ${SILO_HOSTNAME}..."
+hostnamectl set-hostname "${SILO_HOSTNAME}"
 log_success "Hostname set"

 #
@@ -95,7 +95,7 @@ else
        --server="${IPA_SERVER}" \
        --domain="${IPA_DOMAIN}" \
        --realm="${IPA_REALM}" \
-        --hostname="${HOSTNAME}" \
+        --hostname="${SILO_HOSTNAME}" \
        --mkhomedir \
        --enable-dns-updates \
        --unattended \
@@ -105,7 +105,7 @@ else
                --server="${IPA_SERVER}" \
                --domain="${IPA_DOMAIN}" \
                --realm="${IPA_REALM}" \
-                --hostname="${HOSTNAME}" \
+                --hostname="${SILO_HOSTNAME}" \
                --mkhomedir \
                --enable-dns-updates
        }
@@ -135,9 +135,9 @@ else
    ipa-getcert request \
        -f "${CERT_DIR}/silo.crt" \
        -k "${CERT_DIR}/silo.key" \
-        -K "HTTP/${HOSTNAME}" \
-        -D "${HOSTNAME}" \
-        -N "CN=${HOSTNAME}" \
+        -K "HTTP/${SILO_HOSTNAME}" \
+        -D "${SILO_HOSTNAME}" \
+        -N "CN=${SILO_HOSTNAME}" \
        -C "systemctl reload nginx"

    log_info "Waiting for certificate to be issued..."
@@ -186,14 +186,14 @@ if [[ -f /etc/nginx/sites-enabled/default ]]; then
 fi

 # Create silo nginx config
-cat > /etc/nginx/sites-available/silo << 'NGINX_EOF'
+cat > /etc/nginx/sites-available/silo << NGINX_EOF
 # Silo API Server - Nginx Reverse Proxy Configuration

 # Redirect HTTP to HTTPS
 server {
    listen 80;
    listen [::]:80;
-    server_name silo.kindred.internal;
+    server_name ${SILO_HOSTNAME};

    # Allow certmonger/ACME challenges
    location /.well-known/ {
@@ -201,7 +201,7 @@ server {
    }

    location / {
-        return 301 https://$server_name$request_uri;
+        return 301 https://\\$server_name\\$request_uri;
    }
 }

@@ -209,11 +209,11 @@ server {
 server {
    listen 443 ssl http2;
    listen [::]:443 ssl http2;
-    server_name silo.kindred.internal;
+    server_name ${SILO_HOSTNAME};

    # SSL certificates (managed by certmonger/IPA)
-    ssl_certificate /etc/ssl/silo/silo.crt;
-    ssl_certificate_key /etc/ssl/silo/silo.key;
+    ssl_certificate ${CERT_DIR}/silo.crt;
+    ssl_certificate_key ${CERT_DIR}/silo.key;

    # SSL configuration
    ssl_protocols TLSv1.2 TLSv1.3;
@@ -226,7 +226,7 @@ server {
    # OCSP stapling
    ssl_stapling on;
    ssl_stapling_verify on;
-    ssl_trusted_certificate /etc/ssl/silo/ca.crt;
+    ssl_trusted_certificate ${CERT_DIR}/ca.crt;

    # Security headers
    add_header X-Frame-Options "SAMEORIGIN" always;
@@ -240,19 +240,19 @@ server {

    # Proxy settings
    location / {
-        proxy_pass http://127.0.0.1:8080;
+        proxy_pass http://127.0.0.1:${SILO_PORT};
        proxy_http_version 1.1;

        # Headers
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header X-Forwarded-Port $server_port;
+        proxy_set_header Host \\$host;
+        proxy_set_header X-Real-IP \\$remote_addr;
+        proxy_set_header X-Forwarded-For \\$proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto \\$scheme;
+        proxy_set_header X-Forwarded-Host \\$host;
+        proxy_set_header X-Forwarded-Port \\$server_port;

        # WebSocket support (for future use)
-        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Upgrade \\$http_upgrade;
        proxy_set_header Connection "upgrade";

        # Timeouts
@@ -343,14 +343,14 @@ echo "   getcert list"
 echo ""
 echo "2. Update silo config to use correct base URL:"
 echo "   sudo nano /etc/silo/config.yaml"
-echo "   # Change base_url to: https://silo.kindred.internal"
+echo "   # Change base_url to: https://${SILO_HOSTNAME}"
 echo ""
 echo "3. Restart silo service:"
 echo "   sudo systemctl restart silod"
 echo ""
 echo "4. Test the setup:"
-echo "   curl -k https://silo.kindred.internal/health"
-echo "   curl https://silo.kindred.internal/health  # after trusting IPA CA"
+echo "   curl -k https://${SILO_HOSTNAME}/health"
+echo "   curl https://${SILO_HOSTNAME}/health  # after trusting IPA CA"
 echo ""
 echo "5. Trust IPA CA on client machines:"
 echo "   # The CA cert is at: ${CERT_DIR}/ca.crt"
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -8,6 +8,7 @@
      "name": "silo-web",
      "version": "0.0.0",
      "dependencies": {
+        "lucide-react": "^0.564.0",
        "react": "^19.0.0",
        "react-dom": "^19.0.0",
        "react-router-dom": "^7.0.0"
@@ -1499,6 +1500,15 @@
        "yallist": "^3.0.2"
      }
    },
+    "node_modules/lucide-react": {
+      "version": "0.564.0",
+      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.564.0.tgz",
+      "integrity": "sha512-JJ8GVTQqFwuliifD48U6+h7DXEHdkhJ/E87kksGByII3qHxtPciVb8T8woQONHBQgHVOl7rSMrrip3SeVNy7Fg==",
+      "license": "ISC",
+      "peerDependencies": {
+        "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
    "node_modules/ms": {
      "version": "2.1.3",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
--- a/web/package.json
+++ b/web/package.json
@@ -9,6 +9,7 @@
    "preview": "vite preview"
  },
  "dependencies": {
+    "lucide-react": "^0.564.0",
    "react": "^19.0.0",
    "react-dom": "^19.0.0",
    "react-router-dom": "^7.0.0"
--- a/web/src/api/types.ts
+++ b/web/src/api/types.ts
@@ -16,9 +16,9 @@ export interface Item {
  created_at: string;
  updated_at: string;
  sourcing_type: string;
-  sourcing_link?: string;
  long_description?: string;
-  standard_cost?: number;
+  file_count: number;
+  files_total_size: number;
  properties?: Record<string, unknown>;
 }

@@ -75,6 +75,7 @@ export interface BOMEntry {
  child_revision?: number;
  effective_revision: number;
  depth?: number;
+  source: string;
  metadata?: Record<string, unknown>;
 }

@@ -167,9 +168,7 @@ export interface CreateItemRequest {
  projects?: string[];
  properties?: Record<string, unknown>;
  sourcing_type?: string;
-  sourcing_link?: string;
  long_description?: string;
-  standard_cost?: number;
 }

 export interface UpdateItemRequest {
@@ -179,9 +178,7 @@ export interface UpdateItemRequest {
  properties?: Record<string, unknown>;
  comment?: string;
  sourcing_type?: string;
-  sourcing_link?: string;
  long_description?: string;
-  standard_cost?: number;
 }

 export interface CreateRevisionRequest {
@@ -196,6 +193,7 @@ export interface AddBOMEntryRequest {
  unit?: string;
  reference_designators?: string[];
  child_revision?: number;
+  source?: string;
  metadata?: Record<string, unknown>;
 }

@@ -208,6 +206,38 @@ export interface UpdateBOMEntryRequest {
  metadata?: Record<string, unknown>;
 }

+// BOM Merge
+export interface MergeBOMResponse {
+  status: string;
+  diff: MergeBOMDiff;
+  warnings: MergeWarning[];
+  resolve_url: string;
+}
+
+export interface MergeBOMDiff {
+  added: MergeDiffEntry[];
+  removed: MergeDiffEntry[];
+  quantity_changed: MergeQtyChange[];
+  unchanged: MergeDiffEntry[];
+}
+
+export interface MergeDiffEntry {
+  part_number: string;
+  quantity: number | null;
+}
+
+export interface MergeQtyChange {
+  part_number: string;
+  old_quantity: number | null;
+  new_quantity: number | null;
+}
+
+export interface MergeWarning {
+  type: string;
+  part_number: string;
+  message: string;
+}
+
 // Schema properties
 export interface PropertyDef {
  type: string;
@@ -218,6 +248,68 @@ export interface PropertyDef {

 export type PropertySchema = Record<string, PropertyDef>;

+// Form Descriptor (from GET /api/schemas/{name}/form)
+export interface FormFieldDescriptor {
+  name: string;
+  type: string;
+  widget?: string;
+  label: string;
+  required?: boolean;
+  default?: unknown;
+  unit?: string;
+  description?: string;
+  options?: string[];
+  currency?: string;
+  derived_from_category?: Record<string, string>;
+  search_endpoint?: string;
+}
+
+export interface FormFieldGroup {
+  key: string;
+  label: string;
+  order: number;
+  fields: FormFieldDescriptor[];
+}
+
+export interface CategoryPickerStage {
+  name: string;
+  label: string;
+  values?: Record<string, string>;
+  values_by_domain?: Record<string, Record<string, string>>;
+}
+
+export interface CategoryPickerDescriptor {
+  style: string;
+  stages: CategoryPickerStage[];
+}
+
+export interface ItemFieldDef {
+  type: string;
+  widget: string;
+  label: string;
+  required?: boolean;
+  default?: unknown;
+  options?: string[];
+  derived_from_category?: Record<string, string>;
+  search_endpoint?: string;
+}
+
+export interface FieldOverride {
+  widget?: string;
+  currency?: string;
+  options?: string[];
+}
+
+export interface FormDescriptor {
+  schema_name: string;
+  format: string;
+  category_picker?: CategoryPickerDescriptor;
+  item_fields?: Record<string, ItemFieldDef>;
+  field_groups?: FormFieldGroup[];
+  category_field_groups?: Record<string, FormFieldGroup[]>;
+  field_overrides?: Record<string, FieldOverride>;
+}
+
 // API Token
 export interface ApiToken {
  id: string;
--- a/web/src/components/AppShell.tsx
+++ b/web/src/components/AppShell.tsx
@@ -73,7 +73,7 @@ export function AppShell() {
                padding: "var(--d-nav-py) var(--d-nav-px)",
                borderRadius: "var(--d-nav-radius)",
                textDecoration: "none",
-                transition: "all 0.2s",
+                transition: "all 0.15s ease",
              })}
            >
              {link.label}
@@ -113,9 +113,9 @@ export function AppShell() {
              onClick={toggleDensity}
              title={`Switch to ${density === "comfortable" ? "compact" : "comfortable"} view`}
              style={{
-                padding: "0.2rem 0.5rem",
-                fontSize: "0.7rem",
-                borderRadius: "0.3rem",
+                padding: "0.25rem 0.5rem",
+                fontSize: "var(--font-sm)",
+                borderRadius: "0.375rem",
                cursor: "pointer",
                border: "1px solid var(--ctp-surface1)",
                background: "var(--ctp-surface0)",
@@ -130,7 +130,7 @@ export function AppShell() {
              onClick={logout}
              style={{
                padding: "0.35rem 0.75rem",
-                fontSize: "0.8rem",
+                fontSize: "var(--font-table)",
                borderRadius: "0.4rem",
                cursor: "pointer",
                border: "none",
--- a/web/src/components/ContextMenu.tsx
+++ b/web/src/components/ContextMenu.tsx
@@ -1,4 +1,5 @@
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef } from "react";
+import { Check } from "lucide-react";

 export interface ContextMenuItem {
  label: string;
@@ -24,76 +25,95 @@ export function ContextMenu({ x, y, items, onClose }: ContextMenuProps) {
      if (ref.current && !ref.current.contains(e.target as Node)) onClose();
    };
    const handleKey = (e: KeyboardEvent) => {
-      if (e.key === 'Escape') onClose();
+      if (e.key === "Escape") onClose();
    };
    const handleScroll = () => onClose();

-    document.addEventListener('mousedown', handleClick);
-    document.addEventListener('keydown', handleKey);
-    window.addEventListener('scroll', handleScroll, true);
+    document.addEventListener("mousedown", handleClick);
+    document.addEventListener("keydown", handleKey);
+    window.addEventListener("scroll", handleScroll, true);
    return () => {
-      document.removeEventListener('mousedown', handleClick);
-      document.removeEventListener('keydown', handleKey);
-      window.removeEventListener('scroll', handleScroll, true);
+      document.removeEventListener("mousedown", handleClick);
+      document.removeEventListener("keydown", handleKey);
+      window.removeEventListener("scroll", handleScroll, true);
    };
  }, [onClose]);

  // Clamp position to viewport
  const style: React.CSSProperties = {
-    position: 'fixed',
+    position: "fixed",
    left: Math.min(x, window.innerWidth - 220),
    top: Math.min(y, window.innerHeight - items.length * 32 - 16),
    zIndex: 9999,
-    backgroundColor: 'var(--ctp-surface0)',
-    border: '1px solid var(--ctp-surface1)',
-    borderRadius: '0.5rem',
-    padding: '0.25rem 0',
+    backgroundColor: "var(--ctp-surface0)",
+    border: "1px solid var(--ctp-surface1)",
+    borderRadius: "0.5rem",
+    padding: "0.25rem 0",
    minWidth: 200,
-    boxShadow: '0 4px 12px rgba(0,0,0,0.4)',
+    boxShadow: "0 4px 12px rgba(0,0,0,0.4)",
  };

  return (
    <div ref={ref} style={style}>
      {items.map((item, i) =>
        item.divider ? (
-          <div key={i} style={{ borderTop: '1px solid var(--ctp-surface1)', margin: '0.25rem 0' }} />
+          <div
+            key={i}
+            style={{
+              borderTop: "1px solid var(--ctp-surface1)",
+              margin: "0.25rem 0",
+            }}
+          />
        ) : (
          <button
            key={i}
            onClick={() => {
              if (item.onToggle) item.onToggle();
-              else if (item.onClick) { item.onClick(); onClose(); }
+              else if (item.onClick) {
+                item.onClick();
+                onClose();
+              }
            }}
            disabled={item.disabled}
            style={{
-              display: 'flex',
-              alignItems: 'center',
-              gap: '0.5rem',
-              width: '100%',
-              padding: '0.35rem 0.75rem',
-              background: 'none',
-              border: 'none',
-              color: item.disabled ? 'var(--ctp-overlay0)' : 'var(--ctp-text)',
-              fontSize: '0.85rem',
-              cursor: item.disabled ? 'default' : 'pointer',
-              textAlign: 'left',
+              display: "flex",
+              alignItems: "center",
+              gap: "0.5rem",
+              width: "100%",
+              padding: "0.35rem 0.75rem",
+              background: "none",
+              border: "none",
+              color: item.disabled ? "var(--ctp-overlay0)" : "var(--ctp-text)",
+              fontSize: "var(--font-body)",
+              cursor: item.disabled ? "default" : "pointer",
+              textAlign: "left",
            }}
            onMouseEnter={(e) => {
-              if (!item.disabled) e.currentTarget.style.backgroundColor = 'var(--ctp-surface1)';
+              if (!item.disabled)
+                e.currentTarget.style.backgroundColor = "var(--ctp-surface1)";
            }}
            onMouseLeave={(e) => {
-              e.currentTarget.style.backgroundColor = 'transparent';
+              e.currentTarget.style.backgroundColor = "transparent";
            }}
          >
            {item.checked !== undefined && (
-              <span style={{
-                width: 16, height: 16, display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
-                border: '1px solid var(--ctp-overlay0)', borderRadius: 3,
-                backgroundColor: item.checked ? 'var(--ctp-mauve)' : 'transparent',
-                color: item.checked ? 'var(--ctp-crust)' : 'transparent',
-                fontSize: '0.7rem', fontWeight: 700, flexShrink: 0,
-              }}>
-                {item.checked ? '✓' : ''}
+              <span
+                style={{
+                  width: 16,
+                  height: 16,
+                  display: "inline-flex",
+                  alignItems: "center",
+                  justifyContent: "center",
+                  border: "1px solid var(--ctp-overlay0)",
+                  borderRadius: 3,
+                  backgroundColor: item.checked
+                    ? "var(--ctp-mauve)"
+                    : "transparent",
+                  color: item.checked ? "var(--ctp-crust)" : "transparent",
+                  flexShrink: 0,
+                }}
+              >
+                {item.checked ? <Check size={14} /> : ""}
              </span>
            )}
            {item.label}
--- a/web/src/components/TagInput.tsx
+++ b/web/src/components/TagInput.tsx
@@ -1,4 +1,5 @@
-import { useState, useRef, useEffect, useCallback } from 'react';
+import { useState, useRef, useEffect, useCallback } from "react";
+import { X } from "lucide-react";

 export interface TagOption {
  id: string;
@@ -12,34 +13,45 @@ interface TagInputProps {
  searchFn: (query: string) => Promise<TagOption[]>;
 }

-export function TagInput({ value, onChange, placeholder, searchFn }: TagInputProps) {
-  const [query, setQuery] = useState('');
+export function TagInput({
+  value,
+  onChange,
+  placeholder,
+  searchFn,
+}: TagInputProps) {
+  const [query, setQuery] = useState("");
  const [results, setResults] = useState<TagOption[]>([]);
  const [open, setOpen] = useState(false);
  const [highlighted, setHighlighted] = useState(0);
  const inputRef = useRef<HTMLInputElement>(null);
  const containerRef = useRef<HTMLDivElement>(null);
-  const debounceRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
+  const debounceRef = useRef<ReturnType<typeof setTimeout> | undefined>(
+    undefined,
+  );

  // Debounced search
  const search = useCallback(
    (q: string) => {
      if (debounceRef.current) clearTimeout(debounceRef.current);
-      if (q.trim() === '') {
+      if (q.trim() === "") {
        // Show all results when input is empty but focused
        debounceRef.current = setTimeout(() => {
-          searchFn('').then((opts) => {
-            setResults(opts.filter((o) => !value.includes(o.id)));
-            setHighlighted(0);
-          }).catch(() => setResults([]));
+          searchFn("")
+            .then((opts) => {
+              setResults(opts.filter((o) => !value.includes(o.id)));
+              setHighlighted(0);
+            })
+            .catch(() => setResults([]));
        }, 100);
        return;
      }
      debounceRef.current = setTimeout(() => {
-        searchFn(q).then((opts) => {
-          setResults(opts.filter((o) => !value.includes(o.id)));
-          setHighlighted(0);
-        }).catch(() => setResults([]));
+        searchFn(q)
+          .then((opts) => {
+            setResults(opts.filter((o) => !value.includes(o.id)));
+            setHighlighted(0);
+          })
+          .catch(() => setResults([]));
      }, 200);
    },
    [searchFn, value],
@@ -53,17 +65,20 @@ export function TagInput({ value, onChange, placeholder, searchFn }: TagInputPro
  // Close on click outside
  useEffect(() => {
    const handler = (e: MouseEvent) => {
-      if (containerRef.current && !containerRef.current.contains(e.target as Node)) {
+      if (
+        containerRef.current &&
+        !containerRef.current.contains(e.target as Node)
+      ) {
        setOpen(false);
      }
    };
-    document.addEventListener('mousedown', handler);
-    return () => document.removeEventListener('mousedown', handler);
+    document.addEventListener("mousedown", handler);
+    return () => document.removeEventListener("mousedown", handler);
  }, []);

  const select = (id: string) => {
    onChange([...value, id]);
-    setQuery('');
+    setQuery("");
    setOpen(false);
    inputRef.current?.focus();
  };
@@ -73,22 +88,22 @@ export function TagInput({ value, onChange, placeholder, searchFn }: TagInputPro
  };

  const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === 'Backspace' && query === '' && value.length > 0) {
+    if (e.key === "Backspace" && query === "" && value.length > 0) {
      onChange(value.slice(0, -1));
      return;
    }
-    if (e.key === 'Escape') {
+    if (e.key === "Escape") {
      setOpen(false);
      return;
    }
    if (!open || results.length === 0) return;
-    if (e.key === 'ArrowDown') {
+    if (e.key === "ArrowDown") {
      e.preventDefault();
      setHighlighted((h) => (h + 1) % results.length);
-    } else if (e.key === 'ArrowUp') {
+    } else if (e.key === "ArrowUp") {
      e.preventDefault();
      setHighlighted((h) => (h - 1 + results.length) % results.length);
-    } else if (e.key === 'Enter') {
+    } else if (e.key === "Enter") {
      e.preventDefault();
      if (results[highlighted]) select(results[highlighted].id);
    }
@@ -99,19 +114,19 @@ export function TagInput({ value, onChange, placeholder, searchFn }: TagInputPro
  for (const r of results) labelMap.current.set(r.id, r.label);

  return (
-    <div ref={containerRef} style={{ position: 'relative' }}>
+    <div ref={containerRef} style={{ position: "relative" }}>
      <div
        style={{
-          display: 'flex',
-          flexWrap: 'wrap',
-          alignItems: 'center',
-          gap: '0.25rem',
-          padding: '0.25rem 0.5rem',
-          backgroundColor: 'var(--ctp-base)',
-          border: '1px solid var(--ctp-surface1)',
-          borderRadius: '0.3rem',
-          cursor: 'text',
-          minHeight: '1.8rem',
+          display: "flex",
+          flexWrap: "wrap",
+          alignItems: "center",
+          gap: "0.25rem",
+          padding: "0.25rem 0.5rem",
+          backgroundColor: "var(--ctp-base)",
+          border: "1px solid var(--ctp-surface1)",
+          borderRadius: "0.375rem",
+          cursor: "text",
+          minHeight: "1.8rem",
        }}
        onClick={() => inputRef.current?.focus()}
      >
@@ -119,14 +134,14 @@ export function TagInput({ value, onChange, placeholder, searchFn }: TagInputPro
          <span
            key={id}
            style={{
-              display: 'inline-flex',
-              alignItems: 'center',
-              gap: '0.25rem',
-              padding: '0.1rem 0.5rem',
-              borderRadius: '1rem',
-              backgroundColor: 'rgba(203,166,247,0.15)',
-              color: 'var(--ctp-mauve)',
-              fontSize: '0.75rem',
+              display: "inline-flex",
+              alignItems: "center",
+              gap: "0.25rem",
+              padding: "0.15rem 0.5rem",
+              borderRadius: "1rem",
+              backgroundColor: "rgba(203,166,247,0.15)",
+              color: "var(--ctp-mauve)",
+              fontSize: "0.75rem",
            }}
          >
            {labelMap.current.get(id) ?? id}
@@ -137,16 +152,16 @@ export function TagInput({ value, onChange, placeholder, searchFn }: TagInputPro
                remove(id);
              }}
              style={{
-                background: 'none',
-                border: 'none',
-                cursor: 'pointer',
-                color: 'var(--ctp-mauve)',
+                background: "none",
+                border: "none",
+                cursor: "pointer",
+                color: "var(--ctp-mauve)",
                padding: 0,
-                fontSize: '0.8rem',
                lineHeight: 1,
+                display: "inline-flex",
              }}
            >
-              ×
+              <X size={14} />
            </button>
          </span>
        ))}
@@ -166,30 +181,30 @@ export function TagInput({ value, onChange, placeholder, searchFn }: TagInputPro
          placeholder={value.length === 0 ? placeholder : undefined}
          style={{
            flex: 1,
-            minWidth: '4rem',
-            border: 'none',
-            outline: 'none',
-            background: 'transparent',
-            color: 'var(--ctp-text)',
-            fontSize: '0.85rem',
-            padding: '0.1rem 0',
+            minWidth: "4rem",
+            border: "none",
+            outline: "none",
+            background: "transparent",
+            color: "var(--ctp-text)",
+            fontSize: "var(--font-body)",
+            padding: "0.15rem 0",
          }}
        />
      </div>
      {open && results.length > 0 && (
        <div
          style={{
-            position: 'absolute',
-            top: '100%',
+            position: "absolute",
+            top: "100%",
            left: 0,
            right: 0,
            zIndex: 10,
-            marginTop: '0.2rem',
-            backgroundColor: 'var(--ctp-surface0)',
-            border: '1px solid var(--ctp-surface1)',
-            borderRadius: '0.3rem',
-            maxHeight: '160px',
-            overflowY: 'auto',
+            marginTop: "0.25rem",
+            backgroundColor: "var(--ctp-surface0)",
+            border: "1px solid var(--ctp-surface1)",
+            borderRadius: "0.375rem",
+            maxHeight: "160px",
+            overflowY: "auto",
          }}
        >
          {results.map((opt, i) => (
@@ -201,15 +216,15 @@ export function TagInput({ value, onChange, placeholder, searchFn }: TagInputPro
              }}
              onMouseEnter={() => setHighlighted(i)}
              style={{
-                padding: '0.25rem 0.5rem',
-                height: '28px',
-                display: 'flex',
-                alignItems: 'center',
-                fontSize: '0.8rem',
-                cursor: 'pointer',
-                color: 'var(--ctp-text)',
+                padding: "0.25rem 0.5rem",
+                height: "28px",
+                display: "flex",
+                alignItems: "center",
+                fontSize: "var(--font-table)",
+                cursor: "pointer",
+                color: "var(--ctp-text)",
                backgroundColor:
-                  i === highlighted ? 'var(--ctp-surface1)' : 'transparent',
+                  i === highlighted ? "var(--ctp-surface1)" : "transparent",
              }}
            >
              {opt.label}
--- a/web/src/components/audit/AuditDetailPanel.tsx
+++ b/web/src/components/audit/AuditDetailPanel.tsx
@@ -1,10 +1,6 @@
 import { useEffect, useState, useCallback, useRef } from "react";
 import { get, put } from "../../api/client";
-import type {
-  AuditItemResult,
-  AuditFieldResult,
-  Item,
-} from "../../api/types";
+import type { AuditItemResult, AuditFieldResult, Item } from "../../api/types";

 const tierColors: Record<string, string> = {
  critical: "var(--ctp-red)",
@@ -18,8 +14,6 @@ const tierColors: Record<string, string> = {
 const itemFields = new Set([
  "description",
  "sourcing_type",
-  "sourcing_link",
-  "standard_cost",
  "long_description",
 ]);

@@ -83,12 +77,9 @@ export function AuditDetailPanel({
    void fetchData();
  }, [fetchData]);

-  const handleFieldChange = useCallback(
-    (key: string, value: string) => {
-      setEdits((prev) => ({ ...prev, [key]: value }));
-    },
-    [],
-  );
+  const handleFieldChange = useCallback((key: string, value: string) => {
+    setEdits((prev) => ({ ...prev, [key]: value }));
+  }, []);

  const saveChanges = useCallback(async () => {
    if (!item || Object.keys(edits).length === 0) return;
@@ -102,18 +93,14 @@ export function AuditDetailPanel({

      for (const [key, value] of Object.entries(edits)) {
        if (itemFields.has(key)) {
-          if (key === "standard_cost") {
-            const num = parseFloat(value);
-            itemUpdate[key] = isNaN(num) ? undefined : num;
-          } else {
-            itemUpdate[key] = value || undefined;
-          }
+          itemUpdate[key] = value || undefined;
        } else {
          // Attempt number coercion for property fields.
          const num = parseFloat(value);
-          propUpdate[key] = !isNaN(num) && String(num) === value.trim()
-            ? num
-            : value || undefined;
+          propUpdate[key] =
+            !isNaN(num) && String(num) === value.trim()
+              ? num
+              : value || undefined;
        }
      }

@@ -123,7 +110,10 @@ export function AuditDetailPanel({
      const payload: Record<string, unknown> = {
        ...itemUpdate,
        ...(hasProps
-          ? { properties: { ...currentProps, ...propUpdate }, comment: "Audit field update" }
+          ? {
+              properties: { ...currentProps, ...propUpdate },
+              comment: "Audit field update",
+            }
          : {}),
      };

@@ -220,7 +210,7 @@ export function AuditDetailPanel({
            fontFamily: "'JetBrains Mono', monospace",
            color: "var(--ctp-peach)",
            fontWeight: 600,
-            fontSize: "1rem",
+            fontSize: "var(--font-body)",
          }}
        >
          {audit.part_number}
@@ -262,7 +252,7 @@ export function AuditDetailPanel({
            height: "100%",
            width: `${Math.min(audit.score * 100, 100)}%`,
            backgroundColor: color,
-            transition: "width 0.3s, background-color 0.3s",
+            transition: "all 0.15s ease",
            borderRadius: "0 3px 3px 0",
          }}
        />
@@ -273,7 +263,7 @@ export function AuditDetailPanel({
          style={{
            padding: "0.5rem 1rem",
            color: "var(--ctp-red)",
-            fontSize: "0.8rem",
+            fontSize: "var(--font-table)",
          }}
        >
          {error}
@@ -284,7 +274,7 @@ export function AuditDetailPanel({
      <div
        style={{
          padding: "0.5rem 1rem",
-          fontSize: "0.85rem",
+          fontSize: "var(--font-body)",
          color: "var(--ctp-subtext1)",
          borderBottom: "1px solid var(--ctp-surface0)",
          flexShrink: 0,
@@ -371,8 +361,8 @@ function FieldGroup({
    <div style={{ marginBottom: "0.75rem" }}>
      <div
        style={{
-          padding: "0.3rem 1rem",
-          fontSize: "0.7rem",
+          padding: "0.25rem 1rem",
+          fontSize: "var(--font-sm)",
          fontWeight: 600,
          textTransform: "uppercase",
          letterSpacing: "0.05em",
@@ -423,9 +413,7 @@ function FieldRow({
        ? String(field.value)
        : "";

-  const borderColor = field.filled
-    ? "var(--ctp-green)"
-    : "var(--ctp-red)";
+  const borderColor = field.filled ? "var(--ctp-green)" : "var(--ctp-red)";

  const label = field.key
    .replace(/_/g, " ")
@@ -436,7 +424,7 @@ function FieldRow({
      style={{
        display: "flex",
        alignItems: "center",
-        padding: "0.3rem 1rem",
+        padding: "0.25rem 1rem",
        borderLeft: `3px solid ${borderColor}`,
        marginLeft: "0.5rem",
        gap: "0.5rem",
@@ -446,7 +434,7 @@ function FieldRow({
        style={{
          width: 140,
          flexShrink: 0,
-          fontSize: "0.78rem",
+          fontSize: "var(--font-table)",
          color: "var(--ctp-subtext1)",
        }}
        title={`Weight: ${field.weight}`}
@@ -457,7 +445,7 @@ function FieldRow({
            style={{
              marginLeft: 4,
              color: "var(--ctp-red)",
-              fontSize: "0.65rem",
+              fontSize: "var(--font-xs)",
            }}
          >
            *
@@ -468,10 +456,8 @@ function FieldRow({
        <div
          style={{
            flex: 1,
-            fontSize: "0.8rem",
-            color: field.filled
-              ? "var(--ctp-text)"
-              : "var(--ctp-subtext0)",
+            fontSize: "var(--font-table)",
+            color: field.filled ? "var(--ctp-text)" : "var(--ctp-subtext0)",
            fontStyle: field.filled ? "normal" : "italic",
          }}
        >
@@ -491,10 +477,10 @@ function FieldRow({
          placeholder="---"
          style={{
            flex: 1,
-            padding: "0.2rem 0.4rem",
-            fontSize: "0.8rem",
+            padding: "0.25rem 0.4rem",
+            fontSize: "var(--font-table)",
            border: "1px solid var(--ctp-surface1)",
-            borderRadius: "0.3rem",
+            borderRadius: "0.375rem",
            backgroundColor: "var(--ctp-surface0)",
            color: "var(--ctp-text)",
            outline: "none",
@@ -506,10 +492,10 @@ function FieldRow({
 }

 const closeBtnStyle: React.CSSProperties = {
-  padding: "0.2rem 0.5rem",
-  fontSize: "0.8rem",
+  padding: "0.25rem 0.5rem",
+  fontSize: "var(--font-table)",
  border: "none",
-  borderRadius: "0.3rem",
+  borderRadius: "0.375rem",
  backgroundColor: "var(--ctp-surface1)",
  color: "var(--ctp-subtext1)",
  cursor: "pointer",
--- a/web/src/components/audit/AuditSummaryBar.tsx
+++ b/web/src/components/audit/AuditSummaryBar.tsx
@@ -51,10 +51,10 @@ export function AuditSummaryBar({
                display: "flex",
                alignItems: "center",
                justifyContent: "center",
-                fontSize: "0.7rem",
+                fontSize: "var(--font-sm)",
                fontWeight: 600,
                color: "var(--ctp-crust)",
-                transition: "opacity 0.2s",
+                transition: "all 0.15s ease",
                outline: isActive ? "2px solid var(--ctp-text)" : "none",
                outlineOffset: -2,
              }}
@@ -71,16 +71,12 @@ export function AuditSummaryBar({
          display: "flex",
          gap: "1.5rem",
          marginTop: "0.4rem",
-          fontSize: "0.8rem",
+          fontSize: "var(--font-table)",
          color: "var(--ctp-subtext0)",
        }}
      >
-        <span>
-          {summary.total_items} items
-        </span>
-        <span>
-          Avg score: {(summary.avg_score * 100).toFixed(1)}%
-        </span>
+        <span>{summary.total_items} items</span>
+        <span>Avg score: {(summary.avg_score * 100).toFixed(1)}%</span>
        {summary.manufactured_without_bom > 0 && (
          <span style={{ color: "var(--ctp-red)" }}>
            {summary.manufactured_without_bom} manufactured without BOM
--- a/web/src/components/audit/AuditTable.tsx
+++ b/web/src/components/audit/AuditTable.tsx
@@ -55,7 +55,7 @@ export function AuditTable({
        style={{
          width: "100%",
          borderCollapse: "collapse",
-          fontSize: "0.8rem",
+          fontSize: "var(--font-table)",
        }}
      >
        <thead>
@@ -85,9 +85,9 @@ export function AuditTable({
                style={{
                  cursor: "pointer",
                  backgroundColor: isSelected
-                    ? "var(--ctp-surface1)"
+                    ? "rgba(203, 166, 247, 0.08)"
                    : "transparent",
-                  transition: "background-color 0.15s",
+                  transition: "all 0.15s ease",
                }}
                onMouseEnter={(e) => {
                  if (!isSelected)
@@ -154,7 +154,7 @@ const thStyle: React.CSSProperties = {
  padding: "var(--d-th-py) var(--d-th-px)",
  fontSize: "var(--d-th-font)",
  borderBottom: "1px solid var(--ctp-surface1)",
-  color: "var(--ctp-subtext0)",
+  color: "var(--ctp-overlay1)",
  fontWeight: 500,
  position: "sticky",
  top: 0,
--- a/web/src/components/items/BOMTab.tsx
+++ b/web/src/components/items/BOMTab.tsx
@@ -1,6 +1,7 @@
-import { useState, useEffect, useCallback } from 'react';
-import { get, post, put, del } from '../../api/client';
-import type { BOMEntry } from '../../api/types';
+import { useState, useEffect, useCallback } from "react";
+import { Plus, Download } from "lucide-react";
+import { get, post, put, del } from "../../api/client";
+import type { BOMEntry } from "../../api/types";

 interface BOMTabProps {
  partNumber: string;
@@ -16,7 +17,14 @@ interface BOMFormData {
  sourcing_link: string;
 }

-const emptyForm: BOMFormData = { child_part_number: '', quantity: '1', source: '', seller_description: '', unit_cost: '', sourcing_link: '' };
+const emptyForm: BOMFormData = {
+  child_part_number: "",
+  quantity: "1",
+  source: "",
+  seller_description: "",
+  unit_cost: "",
+  sourcing_link: "",
+};

 export function BOMTab({ partNumber, isEditor }: BOMTabProps) {
  const [entries, setEntries] = useState<BOMEntry[]>([]);
@@ -39,13 +47,14 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) {
  const unitCost = (e: BOMEntry) => Number(meta(e).unit_cost) || 0;
  const extCost = (e: BOMEntry) => unitCost(e) * (e.quantity ?? 0);
  const totalCost = entries.reduce((sum, e) => sum + extCost(e), 0);
+  const assemblyCount = entries.filter((e) => e.source === "assembly").length;

  const formToRequest = () => ({
    child_part_number: form.child_part_number,
-    rel_type: 'component' as const,
+    rel_type: "component" as const,
    quantity: Number(form.quantity) || 1,
+    source: form.source,
    metadata: {
-      source: form.source,
      seller_description: form.seller_description,
      unit_cost: form.unit_cost,
      sourcing_link: form.sourcing_link,
@@ -54,34 +63,42 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) {

  const handleAdd = async () => {
    try {
-      await post(`/api/items/${encodeURIComponent(partNumber)}/bom`, formToRequest());
+      await post(
+        `/api/items/${encodeURIComponent(partNumber)}/bom`,
+        formToRequest(),
+      );
      setShowAdd(false);
      setForm(emptyForm);
      load();
    } catch (e) {
-      alert(e instanceof Error ? e.message : 'Failed to add BOM entry');
+      alert(e instanceof Error ? e.message : "Failed to add BOM entry");
    }
  };

  const handleEdit = async (childPN: string) => {
    try {
      const { child_part_number: _, ...req } = formToRequest();
-      await put(`/api/items/${encodeURIComponent(partNumber)}/bom/${encodeURIComponent(childPN)}`, req);
+      await put(
+        `/api/items/${encodeURIComponent(partNumber)}/bom/${encodeURIComponent(childPN)}`,
+        req,
+      );
      setEditIdx(null);
      setForm(emptyForm);
      load();
    } catch (e) {
-      alert(e instanceof Error ? e.message : 'Failed to update BOM entry');
+      alert(e instanceof Error ? e.message : "Failed to update BOM entry");
    }
  };

  const handleDelete = async (childPN: string) => {
    if (!confirm(`Remove ${childPN} from BOM?`)) return;
    try {
-      await del(`/api/items/${encodeURIComponent(partNumber)}/bom/${encodeURIComponent(childPN)}`);
+      await del(
+        `/api/items/${encodeURIComponent(partNumber)}/bom/${encodeURIComponent(childPN)}`,
+      );
      load();
    } catch (e) {
-      alert(e instanceof Error ? e.message : 'Failed to delete BOM entry');
+      alert(e instanceof Error ? e.message : "Failed to delete BOM entry");
    }
  };

@@ -91,71 +108,188 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) {
    setForm({
      child_part_number: e.child_part_number,
      quantity: String(e.quantity ?? 1),
-      source: m.source ?? '',
-      seller_description: m.seller_description ?? '',
-      unit_cost: m.unit_cost ?? '',
-      sourcing_link: m.sourcing_link ?? '',
+      source: e.source ?? "",
+      seller_description: m.seller_description ?? "",
+      unit_cost: m.unit_cost ?? "",
+      sourcing_link: m.sourcing_link ?? "",
    });
    setEditIdx(idx);
    setShowAdd(false);
  };

  const inputStyle: React.CSSProperties = {
-    padding: '0.2rem 0.4rem', fontSize: '0.8rem',
-    backgroundColor: 'var(--ctp-base)', border: '1px solid var(--ctp-surface1)',
-    borderRadius: '0.3rem', color: 'var(--ctp-text)', width: '100%',
+    padding: "0.25rem 0.4rem",
+    fontSize: "var(--font-table)",
+    backgroundColor: "var(--ctp-base)",
+    border: "1px solid var(--ctp-surface1)",
+    borderRadius: "0.375rem",
+    color: "var(--ctp-text)",
+    width: "100%",
  };

  const formRow = (isEditing: boolean, childPN?: string) => (
-    <tr style={{ backgroundColor: 'var(--ctp-surface0)' }}>
+    <tr style={{ backgroundColor: "var(--ctp-surface0)" }}>
      <td style={tdStyle}>
-        <input value={form.child_part_number} onChange={(e) => setForm({ ...form, child_part_number: e.target.value })}
-          disabled={isEditing} placeholder="Part number" style={inputStyle} />
+        <input
+          value={form.child_part_number}
+          onChange={(e) =>
+            setForm({ ...form, child_part_number: e.target.value })
+          }
+          disabled={isEditing}
+          placeholder="Part number"
+          style={inputStyle}
+        />
      </td>
      <td style={tdStyle}>
-        <input value={form.source} onChange={(e) => setForm({ ...form, source: e.target.value })} placeholder="Source" style={inputStyle} />
+        <select
+          value={form.source}
+          onChange={(e) => setForm({ ...form, source: e.target.value })}
+          style={inputStyle}
+        >
+          <option value="">—</option>
+          <option value="manual">manual</option>
+          <option value="assembly">assembly</option>
+        </select>
      </td>
      <td style={tdStyle}>
-        <input value={form.seller_description} onChange={(e) => setForm({ ...form, seller_description: e.target.value })} placeholder="Description" style={inputStyle} />
+        <input
+          value={form.seller_description}
+          onChange={(e) =>
+            setForm({ ...form, seller_description: e.target.value })
+          }
+          placeholder="Description"
+          style={inputStyle}
+        />
      </td>
      <td style={tdStyle}>
-        <input value={form.unit_cost} onChange={(e) => setForm({ ...form, unit_cost: e.target.value })} type="number" step="0.01" placeholder="0.00" style={inputStyle} />
+        <input
+          value={form.unit_cost}
+          onChange={(e) => setForm({ ...form, unit_cost: e.target.value })}
+          type="number"
+          step="0.01"
+          placeholder="0.00"
+          style={inputStyle}
+        />
      </td>
      <td style={tdStyle}>
-        <input value={form.quantity} onChange={(e) => setForm({ ...form, quantity: e.target.value })} type="number" step="1" placeholder="1" style={{ ...inputStyle, width: 50 }} />
+        <input
+          value={form.quantity}
+          onChange={(e) => setForm({ ...form, quantity: e.target.value })}
+          type="number"
+          step="1"
+          placeholder="1"
+          style={{ ...inputStyle, width: 50 }}
+        />
      </td>
      <td style={tdStyle}>—</td>
      <td style={tdStyle}>
-        <input value={form.sourcing_link} onChange={(e) => setForm({ ...form, sourcing_link: e.target.value })} placeholder="URL" style={inputStyle} />
+        <input
+          value={form.sourcing_link}
+          onChange={(e) => setForm({ ...form, sourcing_link: e.target.value })}
+          placeholder="URL"
+          style={inputStyle}
+        />
      </td>
      <td style={tdStyle}>
-        <button onClick={() => isEditing ? void handleEdit(childPN!) : void handleAdd()} style={saveBtnStyle}>Save</button>
-        <button onClick={() => { isEditing ? setEditIdx(null) : setShowAdd(false); setForm(emptyForm); }} style={cancelBtnStyle}>Cancel</button>
+        <button
+          onClick={() =>
+            isEditing ? void handleEdit(childPN!) : void handleAdd()
+          }
+          style={saveBtnStyle}
+        >
+          Save
+        </button>
+        <button
+          onClick={() => {
+            isEditing ? setEditIdx(null) : setShowAdd(false);
+            setForm(emptyForm);
+          }}
+          style={cancelBtnStyle}
+        >
+          Cancel
+        </button>
      </td>
    </tr>
  );

-  if (loading) return <div style={{ color: 'var(--ctp-subtext0)' }}>Loading BOM...</div>;
+  if (loading)
+    return <div style={{ color: "var(--ctp-subtext0)" }}>Loading BOM...</div>;

  return (
    <div>
      {/* Toolbar */}
-      <div style={{ display: 'flex', gap: '0.5rem', alignItems: 'center', marginBottom: '0.5rem' }}>
-        <span style={{ fontSize: '0.85rem', color: 'var(--ctp-subtext1)' }}>{entries.length} entries</span>
+      <div
+        style={{
+          display: "flex",
+          gap: "0.5rem",
+          alignItems: "center",
+          marginBottom: "0.5rem",
+        }}
+      >
+        <span
+          style={{ fontSize: "var(--font-body)", color: "var(--ctp-subtext1)" }}
+        >
+          {entries.length} entries
+        </span>
        <span style={{ flex: 1 }} />
        <button
-          onClick={() => { window.location.href = `/api/items/${encodeURIComponent(partNumber)}/bom/export.csv`; }}
-          style={toolBtnStyle}
+          onClick={() => {
+            window.location.href = `/api/items/${encodeURIComponent(partNumber)}/bom/export.csv`;
+          }}
+          style={{
+            ...toolBtnStyle,
+            display: "inline-flex",
+            alignItems: "center",
+            gap: "0.35rem",
+          }}
        >
-          Export CSV
+          <Download size={14} /> Export CSV
        </button>
        {isEditor && (
-          <button onClick={() => { setShowAdd(true); setEditIdx(null); setForm(emptyForm); }} style={toolBtnStyle}>+ Add</button>
+          <button
+            onClick={() => {
+              setShowAdd(true);
+              setEditIdx(null);
+              setForm(emptyForm);
+            }}
+            style={{
+              ...toolBtnStyle,
+              display: "inline-flex",
+              alignItems: "center",
+              gap: "0.35rem",
+            }}
+          >
+            <Plus size={14} /> Add
+          </button>
        )}
      </div>

-      <div style={{ overflow: 'auto' }}>
-        <table style={{ width: '100%', borderCollapse: 'collapse', fontSize: '0.8rem' }}>
+      {isEditor && assemblyCount > 0 && (
+        <div
+          style={{
+            padding: "0.35rem 0.5rem",
+            marginBottom: "0.5rem",
+            borderRadius: "0.375rem",
+            backgroundColor: "rgba(148,226,213,0.1)",
+            border: "1px solid rgba(148,226,213,0.3)",
+            fontSize: "0.75rem",
+            color: "var(--ctp-subtext1)",
+          }}
+        >
+          {assemblyCount} assembly-sourced{" "}
+          {assemblyCount === 1 ? "entry" : "entries"}. Entries removed from the
+          FreeCAD assembly will remain here until manually deleted.
+        </div>
+      )}
+
+      <div style={{ overflow: "auto" }}>
+        <table
+          style={{
+            width: "100%",
+            borderCollapse: "collapse",
+            fontSize: "var(--font-table)",
+          }}
+        >
          <thead>
            <tr>
              <th style={thStyle}>PN</th>
@@ -174,20 +308,79 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) {
              if (editIdx === idx) return formRow(true, e.child_part_number);
              const m = meta(e);
              return (
-                <tr key={e.id} style={{ backgroundColor: idx % 2 === 0 ? 'var(--ctp-base)' : 'var(--ctp-surface0)' }}>
-                  <td style={{ ...tdStyle, fontFamily: "'JetBrains Mono', monospace", color: 'var(--ctp-peach)' }}>{e.child_part_number}</td>
-                  <td style={tdStyle}>{m.source ?? ''}</td>
-                  <td style={{ ...tdStyle, maxWidth: 150, overflow: 'hidden', textOverflow: 'ellipsis' }}>{e.child_description || m.seller_description || ''}</td>
-                  <td style={{ ...tdStyle, fontFamily: 'monospace' }}>{unitCost(e) ? `$${unitCost(e).toFixed(2)}` : '—'}</td>
-                  <td style={tdStyle}>{e.quantity ?? '—'}</td>
-                  <td style={{ ...tdStyle, fontFamily: 'monospace' }}>{extCost(e) ? `$${extCost(e).toFixed(2)}` : '—'}</td>
+                <tr
+                  key={e.id}
+                  style={{
+                    backgroundColor:
+                      idx % 2 === 0 ? "var(--ctp-base)" : "var(--ctp-surface0)",
+                  }}
+                >
+                  <td
+                    style={{
+                      ...tdStyle,
+                      fontFamily: "'JetBrains Mono', monospace",
+                      color: "var(--ctp-peach)",
+                    }}
+                  >
+                    {e.child_part_number}
+                  </td>
                  <td style={tdStyle}>
-                    {m.sourcing_link ? <a href={m.sourcing_link} target="_blank" rel="noreferrer" style={{ color: 'var(--ctp-sapphire)', fontSize: '0.75rem' }}>Link</a> : '—'}
+                    {e.source === "assembly" ? (
+                      <span style={assemblyBadge}>assembly</span>
+                    ) : e.source === "manual" ? (
+                      <span style={manualBadge}>manual</span>
+                    ) : (
+                      "—"
+                    )}
+                  </td>
+                  <td
+                    style={{
+                      ...tdStyle,
+                      maxWidth: 150,
+                      overflow: "hidden",
+                      textOverflow: "ellipsis",
+                    }}
+                  >
+                    {e.child_description || m.seller_description || ""}
+                  </td>
+                  <td style={{ ...tdStyle, fontFamily: "monospace" }}>
+                    {unitCost(e) ? `$${unitCost(e).toFixed(2)}` : "—"}
+                  </td>
+                  <td style={tdStyle}>{e.quantity ?? "—"}</td>
+                  <td style={{ ...tdStyle, fontFamily: "monospace" }}>
+                    {extCost(e) ? `$${extCost(e).toFixed(2)}` : "—"}
+                  </td>
+                  <td style={tdStyle}>
+                    {m.sourcing_link ? (
+                      <a
+                        href={m.sourcing_link}
+                        target="_blank"
+                        rel="noreferrer"
+                        style={{
+                          color: "var(--ctp-sapphire)",
+                          fontSize: "0.75rem",
+                        }}
+                      >
+                        Link
+                      </a>
+                    ) : (
+                      "—"
+                    )}
                  </td>
                  {isEditor && (
                    <td style={tdStyle}>
-                      <button onClick={() => startEdit(idx)} style={actionBtnStyle}>Edit</button>
-                      <button onClick={() => void handleDelete(e.child_part_number)} style={{ ...actionBtnStyle, color: 'var(--ctp-red)' }}>Del</button>
+                      <button
+                        onClick={() => startEdit(idx)}
+                        style={actionBtnStyle}
+                      >
+                        Edit
+                      </button>
+                      <button
+                        onClick={() => void handleDelete(e.child_part_number)}
+                        style={{ ...actionBtnStyle, color: "var(--ctp-red)" }}
+                      >
+                        Del
+                      </button>
                    </td>
                  )}
                </tr>
@@ -196,9 +389,22 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) {
          </tbody>
          {totalCost > 0 && (
            <tfoot>
-              <tr style={{ borderTop: '2px solid var(--ctp-surface1)' }}>
-                <td colSpan={5} style={{ ...tdStyle, textAlign: 'right', fontWeight: 600 }}>Total:</td>
-                <td style={{ ...tdStyle, fontFamily: 'monospace', fontWeight: 600 }}>${totalCost.toFixed(2)}</td>
+              <tr style={{ borderTop: "2px solid var(--ctp-surface1)" }}>
+                <td
+                  colSpan={5}
+                  style={{ ...tdStyle, textAlign: "right", fontWeight: 600 }}
+                >
+                  Total:
+                </td>
+                <td
+                  style={{
+                    ...tdStyle,
+                    fontFamily: "monospace",
+                    fontWeight: 600,
+                  }}
+                >
+                  ${totalCost.toFixed(2)}
+                </td>
                <td colSpan={isEditor ? 2 : 1} style={tdStyle} />
              </tr>
            </tfoot>
@@ -210,29 +416,83 @@ export function BOMTab({ partNumber, isEditor }: BOMTabProps) {
 }

 const thStyle: React.CSSProperties = {
-  padding: '0.3rem 0.5rem', textAlign: 'left', borderBottom: '1px solid var(--ctp-surface1)',
-  color: 'var(--ctp-subtext1)', fontWeight: 600, fontSize: '0.7rem', textTransform: 'uppercase', letterSpacing: '0.05em', whiteSpace: 'nowrap',
+  padding: "0.25rem 0.5rem",
+  textAlign: "left",
+  borderBottom: "1px solid var(--ctp-surface1)",
+  color: "var(--ctp-overlay1)",
+  fontWeight: 600,
+  fontSize: "var(--font-sm)",
+  textTransform: "uppercase",
+  letterSpacing: "0.05em",
+  whiteSpace: "nowrap",
 };

 const tdStyle: React.CSSProperties = {
-  padding: '0.25rem 0.5rem', borderBottom: '1px solid var(--ctp-surface0)', whiteSpace: 'nowrap',
+  padding: "0.25rem 0.5rem",
+  borderBottom: "1px solid var(--ctp-surface0)",
+  whiteSpace: "nowrap",
 };

 const toolBtnStyle: React.CSSProperties = {
-  padding: '0.25rem 0.5rem', fontSize: '0.8rem', border: 'none', borderRadius: '0.3rem',
-  backgroundColor: 'var(--ctp-surface1)', color: 'var(--ctp-text)', cursor: 'pointer',
+  padding: "0.25rem 0.5rem",
+  fontSize: "0.75rem",
+  fontWeight: 500,
+  border: "none",
+  borderRadius: "0.375rem",
+  backgroundColor: "var(--ctp-surface1)",
+  color: "var(--ctp-text)",
+  cursor: "pointer",
 };

 const actionBtnStyle: React.CSSProperties = {
-  background: 'none', border: 'none', color: 'var(--ctp-subtext1)', cursor: 'pointer', fontSize: '0.75rem', padding: '0.1rem 0.3rem',
+  background: "none",
+  border: "none",
+  color: "var(--ctp-subtext1)",
+  cursor: "pointer",
+  fontSize: "0.75rem",
+  fontWeight: 500,
+  padding: "0.15rem 0.25rem",
+  borderRadius: "0.375rem",
 };

 const saveBtnStyle: React.CSSProperties = {
-  padding: '0.2rem 0.4rem', fontSize: '0.75rem', border: 'none', borderRadius: '0.25rem',
-  backgroundColor: 'var(--ctp-green)', color: 'var(--ctp-crust)', cursor: 'pointer', marginRight: '0.25rem',
+  padding: "0.25rem 0.4rem",
+  fontSize: "0.75rem",
+  fontWeight: 500,
+  border: "none",
+  borderRadius: "0.375rem",
+  backgroundColor: "var(--ctp-green)",
+  color: "var(--ctp-crust)",
+  cursor: "pointer",
+  marginRight: "0.25rem",
+};
+
+const sourceBadgeBase: React.CSSProperties = {
+  padding: "0.15rem 0.4rem",
+  borderRadius: "1rem",
+  fontSize: "var(--font-sm)",
+  fontWeight: 500,
+};
+
+const assemblyBadge: React.CSSProperties = {
+  ...sourceBadgeBase,
+  backgroundColor: "rgba(148,226,213,0.2)",
+  color: "var(--ctp-teal)",
+};
+
+const manualBadge: React.CSSProperties = {
+  ...sourceBadgeBase,
+  backgroundColor: "rgba(137,180,250,0.2)",
+  color: "var(--ctp-blue)",
 };

 const cancelBtnStyle: React.CSSProperties = {
-  padding: '0.2rem 0.4rem', fontSize: '0.75rem', border: 'none', borderRadius: '0.25rem',
-  backgroundColor: 'var(--ctp-surface1)', color: 'var(--ctp-subtext1)', cursor: 'pointer',
+  padding: "0.25rem 0.4rem",
+  fontSize: "0.75rem",
+  fontWeight: 500,
+  border: "none",
+  borderRadius: "0.375rem",
+  backgroundColor: "var(--ctp-surface1)",
+  color: "var(--ctp-subtext1)",
+  cursor: "pointer",
 };
--- a/web/src/components/items/CategoryPicker.tsx
+++ b/web/src/components/items/CategoryPicker.tsx
@@ -1,21 +1,48 @@
 import { useState, useMemo, useRef, useEffect } from "react";
+import type { CategoryPickerStage } from "../../api/types";

 interface CategoryPickerProps {
  value: string;
  onChange: (code: string) => void;
  categories: Record<string, string>;
+  stages?: CategoryPickerStage[];
 }

 export function CategoryPicker({
  value,
  onChange,
  categories,
+  stages,
 }: CategoryPickerProps) {
+  const [selectedDomain, setSelectedDomain] = useState<string>("");
  const [search, setSearch] = useState("");
  const selectedRef = useRef<HTMLDivElement>(null);

+  // Derive domain from current value
+  useEffect(() => {
+    if (value && value.length > 0) {
+      setSelectedDomain(value[0]!);
+    }
+  }, [value]);
+
+  const isMultiStage = stages && stages.length >= 2;
+
+  // Domain stage (first stage)
+  const domainStage = isMultiStage ? stages[0] : undefined;
+  const subcatStage = isMultiStage
+    ? stages.find((s) => s.values_by_domain)
+    : undefined;
+
+  // Filtered categories for current domain in multi-stage mode
+  const filteredCategories = useMemo(() => {
+    if (!isMultiStage || !selectedDomain || !subcatStage?.values_by_domain) {
+      return categories;
+    }
+    return subcatStage.values_by_domain[selectedDomain] ?? {};
+  }, [isMultiStage, selectedDomain, subcatStage, categories]);
+
  const entries = useMemo(() => {
-    const all = Object.entries(categories).sort(([a], [b]) =>
+    const all = Object.entries(filteredCategories).sort(([a], [b]) =>
      a.localeCompare(b),
    );
    if (!search) return all;
@@ -24,7 +51,7 @@ export function CategoryPicker({
      ([code, desc]) =>
        code.toLowerCase().includes(q) || desc.toLowerCase().includes(q),
    );
-  }, [categories, search]);
+  }, [filteredCategories, search]);

  // Scroll selected into view on mount.
  useEffect(() => {
@@ -40,16 +67,74 @@ export function CategoryPicker({
        overflow: "hidden",
      }}
    >
+      {/* Multi-stage domain picker */}
+      {isMultiStage && domainStage?.values && (
+        <div
+          style={{
+            display: "flex",
+            flexWrap: "wrap",
+            gap: "0.25rem",
+            padding: "0.4rem 0.5rem",
+            borderBottom: "1px solid var(--ctp-surface1)",
+            backgroundColor: "var(--ctp-mantle)",
+          }}
+        >
+          {Object.entries(domainStage.values)
+            .sort(([a], [b]) => a.localeCompare(b))
+            .map(([code, label]) => {
+              const isActive = code === selectedDomain;
+              return (
+                <button
+                  key={code}
+                  onClick={() => {
+                    setSelectedDomain(code);
+                    setSearch("");
+                    // Clear selection if switching domain
+                    if (value && value[0] !== code) {
+                      onChange("");
+                    }
+                  }}
+                  style={{
+                    padding: "0.25rem 0.5rem",
+                    fontSize: "0.75rem",
+                    fontWeight: 500,
+                    border: "none",
+                    borderRadius: "0.375rem",
+                    cursor: "pointer",
+                    backgroundColor: isActive
+                      ? "rgba(203,166,247,0.2)"
+                      : "transparent",
+                    color: isActive
+                      ? "var(--ctp-mauve)"
+                      : "var(--ctp-subtext0)",
+                    transition: "all 0.15s ease",
+                  }}
+                >
+                  <span style={{ fontFamily: "'JetBrains Mono', monospace" }}>
+                    {code}
+                  </span>{" "}
+                  {label}
+                </button>
+              );
+            })}
+        </div>
+      )}
+
      {/* Search */}
      <input
        type="text"
        value={search}
        onChange={(e) => setSearch(e.target.value)}
-        placeholder="Search categories..."
+        placeholder={
+          isMultiStage && !selectedDomain
+            ? "Select a domain above..."
+            : "Search categories..."
+        }
+        disabled={isMultiStage && !selectedDomain}
        style={{
          width: "100%",
          padding: "0.4rem 0.5rem",
-          fontSize: "0.8rem",
+          fontSize: "var(--font-table)",
          border: "none",
          borderBottom: "1px solid var(--ctp-surface1)",
          backgroundColor: "var(--ctp-mantle)",
@@ -61,13 +146,24 @@ export function CategoryPicker({

      {/* Scrollable list */}
      <div style={{ maxHeight: 200, overflowY: "auto" }}>
-        {entries.length === 0 ? (
+        {isMultiStage && !selectedDomain ? (
          <div
            style={{
              padding: "0.75rem",
              textAlign: "center",
              color: "var(--ctp-subtext0)",
-              fontSize: "0.8rem",
+              fontSize: "var(--font-table)",
+            }}
+          >
+            Select a domain to see categories
+          </div>
+        ) : entries.length === 0 ? (
+          <div
+            style={{
+              padding: "0.75rem",
+              textAlign: "center",
+              color: "var(--ctp-subtext0)",
+              fontSize: "var(--font-table)",
            }}
          >
            No categories found
@@ -84,17 +180,15 @@ export function CategoryPicker({
                  display: "flex",
                  alignItems: "center",
                  gap: "0.5rem",
-                  padding: "0.3rem 0.5rem",
+                  padding: "0.25rem 0.5rem",
                  cursor: "pointer",
-                  fontSize: "0.8rem",
+                  fontSize: "var(--font-table)",
                  backgroundColor: isSelected
                    ? "rgba(203,166,247,0.12)"
                    : "transparent",
-                  color: isSelected
-                    ? "var(--ctp-mauve)"
-                    : "var(--ctp-text)",
+                  color: isSelected ? "var(--ctp-mauve)" : "var(--ctp-text)",
                  fontWeight: isSelected ? 600 : 400,
-                  transition: "background-color 0.1s",
+                  transition: "all 0.15s ease",
                }}
                onMouseEnter={(e) => {
                  if (!isSelected)
@@ -134,7 +228,7 @@ export function CategoryPicker({
      {value && categories[value] && (
        <div
          style={{
-            padding: "0.3rem 0.5rem",
+            padding: "0.25rem 0.5rem",
            fontSize: "0.75rem",
            color: "var(--ctp-subtext0)",
            borderTop: "1px solid var(--ctp-surface0)",
--- a/web/src/components/items/CreateItemPane.tsx
+++ b/web/src/components/items/CreateItemPane.tsx
@@ -1,16 +1,29 @@
-import { useState, useEffect, useCallback } from "react";
+import { useState, useCallback } from "react";
 import { get, post, put } from "../../api/client";
-import type { Project } from "../../api/types";
+import type {
+  Project,
+  FormFieldDescriptor,
+  FormFieldGroup,
+} from "../../api/types";
 import { TagInput, type TagOption } from "../TagInput";
 import { CategoryPicker } from "./CategoryPicker";
 import { FileDropZone } from "./FileDropZone";
-import { useCategories } from "../../hooks/useCategories";
+import { useFormDescriptor } from "../../hooks/useFormDescriptor";
 import {
  useFileUpload,
  type PendingAttachment,
 } from "../../hooks/useFileUpload";
 import { useAuth } from "../../hooks/useAuth";

+// Item-level field names that are sent as top-level API fields, not properties.
+const ITEM_LEVEL_FIELDS = new Set([
+  "item_type",
+  "description",
+  "sourcing_type",
+  "long_description",
+  "projects",
+]);
+
 interface CreateItemPaneProps {
  onCreated: (partNumber: string) => void;
  onCancel: () => void;
@@ -18,22 +31,13 @@ interface CreateItemPaneProps {

 export function CreateItemPane({ onCreated, onCancel }: CreateItemPaneProps) {
  const { user } = useAuth();
-  const { categories } = useCategories();
+  const { descriptor, categories } = useFormDescriptor();
  const { upload } = useFileUpload();

-  // Form state.
-  const [itemType, setItemType] = useState("part");
+  // Single form state for all fields (item-level + properties).
  const [category, setCategory] = useState("");
-  const [description, setDescription] = useState("");
-  const [sourcingType, setSourcingType] = useState("manufactured");
-  const [sourcingLink, setSourcingLink] = useState("");
-  const [longDescription, setLongDescription] = useState("");
-  const [standardCost, setStandardCost] = useState("");
+  const [fields, setFields] = useState<Record<string, string>>({});
  const [selectedProjects, setSelectedProjects] = useState<string[]>([]);
-  const [catProps, setCatProps] = useState<Record<string, string>>({});
-  const [catPropDefs, setCatPropDefs] = useState<
-    Record<string, { type: string }>
-  >({});

  // Attachments.
  const [attachments, setAttachments] = useState<PendingAttachment[]>([]);
@@ -44,27 +48,33 @@ export function CreateItemPane({ onCreated, onCancel }: CreateItemPaneProps) {
  const [saving, setSaving] = useState(false);
  const [error, setError] = useState<string | null>(null);

-  // Load category-specific properties.
-  useEffect(() => {
-    if (!category) {
-      setCatPropDefs({});
-      setCatProps({});
-      return;
+  const setField = (name: string, value: string) =>
+    setFields((prev) => ({ ...prev, [name]: value }));
+
+  const getField = (name: string) => fields[name] ?? "";
+
+  // Derive item_type from category using derived_from_category mapping
+  const deriveItemType = (cat: string): string => {
+    if (!cat || !descriptor?.item_fields?.item_type?.derived_from_category) {
+      return getField("item_type") || "part";
    }
-    get<Record<string, { type: string }>>(
-      `/api/schemas/kindred-rd/properties?category=${encodeURIComponent(category)}`,
-    )
-      .then((defs) => {
-        setCatPropDefs(defs);
-        const defaults: Record<string, string> = {};
-        for (const key of Object.keys(defs)) defaults[key] = "";
-        setCatProps(defaults);
-      })
-      .catch(() => {
-        setCatPropDefs({});
-        setCatProps({});
-      });
-  }, [category]);
+    const mapping = descriptor.item_fields.item_type.derived_from_category;
+    const prefix = cat[0]!;
+    return mapping[prefix] ?? mapping["default"] ?? "part";
+  };
+
+  const handleCategoryChange = (cat: string) => {
+    setCategory(cat);
+    // Auto-derive item_type when category changes
+    if (descriptor?.item_fields?.item_type?.derived_from_category) {
+      const derived = cat
+        ? (descriptor.item_fields.item_type.derived_from_category[cat[0]!] ??
+          descriptor.item_fields.item_type.derived_from_category["default"] ??
+          "part")
+        : "part";
+      setField("item_type", derived);
+    }
+  };

  const searchProjects = useCallback(
    async (query: string): Promise<TagOption[]> => {
@@ -90,10 +100,8 @@ export function CreateItemPane({ onCreated, onCancel }: CreateItemPaneProps) {
      const startIdx = attachments.length;
      setAttachments((prev) => [...prev, ...files]);

-      // Upload each file.
      files.forEach((f, i) => {
        const idx = startIdx + i;
-        // Mark uploading.
        setAttachments((prev) =>
          prev.map((a, j) =>
            j === idx ? { ...a, uploadStatus: "uploading" } : a,
@@ -155,12 +163,15 @@ export function CreateItemPane({ onCreated, onCancel }: CreateItemPaneProps) {
    setSaving(true);
    setError(null);

+    // Split fields into item-level and properties
    const properties: Record<string, unknown> = {};
-    for (const [k, v] of Object.entries(catProps)) {
+    for (const [k, v] of Object.entries(fields)) {
      if (!v) continue;
-      const def = catPropDefs[k];
-      if (def?.type === "number") properties[k] = Number(v);
-      else if (def?.type === "boolean") properties[k] = v === "true";
+      if (ITEM_LEVEL_FIELDS.has(k)) continue; // handled separately
+      // Coerce type from descriptor
+      const fieldDef = findFieldDef(k);
+      if (fieldDef?.type === "number") properties[k] = Number(v);
+      else if (fieldDef?.type === "boolean") properties[k] = v === "true";
      else properties[k] = v;
    }

@@ -168,14 +179,12 @@ export function CreateItemPane({ onCreated, onCancel }: CreateItemPaneProps) {
      const result = await post<{ part_number: string }>("/api/items", {
        schema: "kindred-rd",
        category,
-        description,
-        item_type: itemType,
+        description: getField("description") || undefined,
+        item_type: deriveItemType(category),
        projects: selectedProjects.length > 0 ? selectedProjects : undefined,
        properties: Object.keys(properties).length > 0 ? properties : undefined,
-        sourcing_type: sourcingType || undefined,
-        sourcing_link: sourcingLink || undefined,
-        long_description: longDescription || undefined,
-        standard_cost: standardCost ? Number(standardCost) : undefined,
+        sourcing_type: getField("sourcing_type") || undefined,
+        long_description: getField("long_description") || undefined,
      });

      const pn = result.part_number;
@@ -219,6 +228,33 @@ export function CreateItemPane({ onCreated, onCancel }: CreateItemPaneProps) {
    }
  };

+  // Find field definition from descriptor (global groups + category groups).
+  function findFieldDef(name: string): FormFieldDescriptor | undefined {
+    if (descriptor?.field_groups) {
+      for (const group of descriptor.field_groups) {
+        const f = group.fields.find((fd) => fd.name === name);
+        if (f) return f;
+      }
+    }
+    if (descriptor?.category_field_groups && category) {
+      const prefix = category[0]!;
+      const catGroups = descriptor.category_field_groups[prefix];
+      if (catGroups) {
+        for (const group of catGroups) {
+          const f = group.fields.find((fd) => fd.name === name);
+          if (f) return f;
+        }
+      }
+    }
+    return undefined;
+  }
+
+  // Get category-specific field groups for the selected category.
+  const catFieldGroups: FormFieldGroup[] =
+    category && descriptor?.category_field_groups
+      ? (descriptor.category_field_groups[category[0]!] ?? [])
+      : [];
+
  return (
    <div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
      {/* Header */}
@@ -227,7 +263,7 @@ export function CreateItemPane({ onCreated, onCancel }: CreateItemPaneProps) {
          style={{
            color: "var(--ctp-green)",
            fontWeight: 600,
-            fontSize: "0.9rem",
+            fontSize: "var(--font-body)",
          }}
        >
          New Item
@@ -262,130 +298,52 @@ export function CreateItemPane({ onCreated, onCancel }: CreateItemPaneProps) {
        <div style={{ overflow: "auto", padding: "0.75rem" }}>
          {error && <div style={errorStyle}>{error}</div>}

-          {/* Identity section */}
-          <SectionHeader>Identity</SectionHeader>
-          <div style={fieldGridStyle}>
-            <FormGroup label="Type *">
-              <select
-                value={itemType}
-                onChange={(e) => setItemType(e.target.value)}
-                style={inputStyle}
-              >
-                <option value="part">Part</option>
-                <option value="assembly">Assembly</option>
-                <option value="consumable">Consumable</option>
-                <option value="tool">Tool</option>
-              </select>
-            </FormGroup>
-            <FormGroup label="Description">
-              <input
-                value={description}
-                onChange={(e) => setDescription(e.target.value)}
-                style={inputStyle}
-                placeholder="Item description"
-              />
-            </FormGroup>
-            <div style={{ gridColumn: "1 / -1" }}>
-              <FormGroup label="Category *">
-                <CategoryPicker
-                  value={category}
-                  onChange={setCategory}
-                  categories={categories}
-                />
-              </FormGroup>
-            </div>
-          </div>
+          {/* Category picker */}
+          <SectionHeader>Category *</SectionHeader>
+          <CategoryPicker
+            value={category}
+            onChange={handleCategoryChange}
+            categories={categories}
+            stages={descriptor?.category_picker?.stages}
+          />

-          {/* Sourcing section */}
-          <SectionHeader>Sourcing</SectionHeader>
-          <div style={fieldGridStyle}>
-            <FormGroup label="Sourcing Type">
-              <select
-                value={sourcingType}
-                onChange={(e) => setSourcingType(e.target.value)}
-                style={inputStyle}
-              >
-                <option value="manufactured">Manufactured</option>
-                <option value="purchased">Purchased</option>
-              </select>
-            </FormGroup>
-            <FormGroup label="Standard Cost">
-              <input
-                type="number"
-                step="0.01"
-                value={standardCost}
-                onChange={(e) => setStandardCost(e.target.value)}
-                style={inputStyle}
-                placeholder="0.00"
-              />
-            </FormGroup>
-            <div style={{ gridColumn: "1 / -1" }}>
-              <FormGroup label="Sourcing Link">
-                <input
-                  value={sourcingLink}
-                  onChange={(e) => setSourcingLink(e.target.value)}
-                  style={inputStyle}
-                  placeholder="https://..."
-                />
-              </FormGroup>
-            </div>
-          </div>
-
-          {/* Details section */}
-          <SectionHeader>Details</SectionHeader>
-          <FormGroup label="Long Description">
-            <textarea
-              value={longDescription}
-              onChange={(e) => setLongDescription(e.target.value)}
-              style={{ ...inputStyle, minHeight: 60, resize: "vertical" }}
-              placeholder="Detailed description..."
-            />
-          </FormGroup>
-          <FormGroup label="Projects">
-            <TagInput
-              value={selectedProjects}
-              onChange={setSelectedProjects}
-              placeholder="Search projects\u2026"
-              searchFn={searchProjects}
-            />
-          </FormGroup>
-
-          {/* Category properties */}
-          {Object.keys(catPropDefs).length > 0 && (
-            <>
-              <SectionHeader>
-                {categories[category] ?? category} Properties
-              </SectionHeader>
+          {/* Dynamic field groups from descriptor */}
+          {descriptor?.field_groups?.map((group) => (
+            <div key={group.key}>
+              <SectionHeader>{group.label}</SectionHeader>
              <div style={fieldGridStyle}>
-                {Object.entries(catPropDefs).map(([key, def]) => (
-                  <FormGroup key={key} label={key}>
-                    {def.type === "boolean" ? (
-                      <select
-                        value={catProps[key] ?? ""}
-                        onChange={(e) =>
-                          setCatProps({ ...catProps, [key]: e.target.value })
-                        }
-                        style={inputStyle}
-                      >
-                        <option value="">---</option>
-                        <option value="true">true</option>
-                        <option value="false">false</option>
-                      </select>
-                    ) : (
-                      <input
-                        type={def.type === "number" ? "number" : "text"}
-                        value={catProps[key] ?? ""}
-                        onChange={(e) =>
-                          setCatProps({ ...catProps, [key]: e.target.value })
-                        }
-                        style={inputStyle}
-                      />
-                    )}
-                  </FormGroup>
-                ))}
+                {group.fields.map((field) =>
+                  renderField(
+                    field,
+                    getField(field.name),
+                    (v) => setField(field.name, v),
+                    selectedProjects,
+                    setSelectedProjects,
+                    searchProjects,
+                  ),
+                )}
              </div>
-            </>
-          )}
+            </div>
+          ))}
+
+          {/* Category-specific field groups */}
+          {catFieldGroups.map((group) => (
+            <div key={group.key}>
+              <SectionHeader>{group.label}</SectionHeader>
+              <div style={fieldGridStyle}>
+                {group.fields.map((field) =>
+                  renderField(
+                    field,
+                    getField(field.name),
+                    (v) => setField(field.name, v),
+                    selectedProjects,
+                    setSelectedProjects,
+                    searchProjects,
+                  ),
+                )}
+              </div>
+            </div>
+          ))}
        </div>

        {/* Right: sidebar */}
@@ -442,13 +400,19 @@ export function CreateItemPane({ onCreated, onCancel }: CreateItemPaneProps) {
                />
              ) : thumbnailFile?.uploadStatus === "uploading" ? (
                <span
-                  style={{ fontSize: "0.8rem", color: "var(--ctp-subtext0)" }}
+                  style={{
+                    fontSize: "var(--font-table)",
+                    color: "var(--ctp-subtext0)",
+                  }}
                >
                  Uploading... {thumbnailFile.uploadProgress}%
                </span>
              ) : (
                <span
-                  style={{ fontSize: "0.8rem", color: "var(--ctp-subtext0)" }}
+                  style={{
+                    fontSize: "var(--font-table)",
+                    color: "var(--ctp-subtext0)",
+                  }}
                >
                  Click to upload
                </span>
@@ -461,6 +425,144 @@ export function CreateItemPane({ onCreated, onCancel }: CreateItemPaneProps) {
  );
 }

+// --- Field renderer ---
+
+function renderField(
+  field: FormFieldDescriptor,
+  value: string,
+  onChange: (v: string) => void,
+  selectedProjects: string[],
+  setSelectedProjects: (v: string[]) => void,
+  searchProjects: (q: string) => Promise<{ id: string; label: string }[]>,
+) {
+  const widget =
+    field.widget ?? (field.type === "boolean" ? "checkbox" : "text");
+
+  // Projects field gets special tag_input treatment
+  if (widget === "tag_input") {
+    return (
+      <div key={field.name} style={{ gridColumn: "1 / -1" }}>
+        <FormGroup label={field.label}>
+          <TagInput
+            value={selectedProjects}
+            onChange={setSelectedProjects}
+            placeholder="Search projects\u2026"
+            searchFn={searchProjects}
+          />
+        </FormGroup>
+      </div>
+    );
+  }
+
+  if (widget === "textarea") {
+    return (
+      <div key={field.name} style={{ gridColumn: "1 / -1" }}>
+        <FormGroup label={field.label}>
+          <textarea
+            className="silo-input"
+            value={value}
+            onChange={(e) => onChange(e.target.value)}
+            style={{ ...inputStyle, minHeight: 60, resize: "vertical" }}
+            placeholder={field.description ?? ""}
+          />
+        </FormGroup>
+      </div>
+    );
+  }
+
+  if (widget === "select" && field.options) {
+    return (
+      <FormGroup key={field.name} label={field.label}>
+        <select
+          className="silo-input"
+          value={value || (field.default != null ? String(field.default) : "")}
+          onChange={(e) => onChange(e.target.value)}
+          style={inputStyle}
+        >
+          {!field.required && <option value="">---</option>}
+          {field.options.map((opt) => (
+            <option key={opt} value={opt}>
+              {opt}
+            </option>
+          ))}
+        </select>
+      </FormGroup>
+    );
+  }
+
+  if (widget === "checkbox") {
+    return (
+      <FormGroup key={field.name} label={field.label}>
+        <select
+          className="silo-input"
+          value={value}
+          onChange={(e) => onChange(e.target.value)}
+          style={inputStyle}
+        >
+          <option value="">---</option>
+          <option value="true">Yes</option>
+          <option value="false">No</option>
+        </select>
+      </FormGroup>
+    );
+  }
+
+  if (widget === "currency") {
+    return (
+      <FormGroup
+        key={field.name}
+        label={`${field.label}${field.currency ? ` (${field.currency})` : ""}`}
+      >
+        <input
+          className="silo-input"
+          type="number"
+          step="0.01"
+          value={value}
+          onChange={(e) => onChange(e.target.value)}
+          style={inputStyle}
+          placeholder="0.00"
+        />
+      </FormGroup>
+    );
+  }
+
+  if (widget === "url") {
+    return (
+      <div key={field.name} style={{ gridColumn: "1 / -1" }}>
+        <FormGroup label={field.label}>
+          <input
+            className="silo-input"
+            type="url"
+            value={value}
+            onChange={(e) => onChange(e.target.value)}
+            style={inputStyle}
+            placeholder="https://..."
+          />
+        </FormGroup>
+      </div>
+    );
+  }
+
+  // Default: text or number input
+  const inputType = field.type === "number" ? "number" : "text";
+  const placeholder = field.unit
+    ? `${field.description ?? ""} (${field.unit})`
+    : (field.description ?? "");
+
+  return (
+    <FormGroup key={field.name} label={field.label}>
+      <input
+        className="silo-input"
+        type={inputType}
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+        style={inputStyle}
+        placeholder={placeholder}
+      />
+    </FormGroup>
+  );
+}
+
 // --- Sub-components ---

 function SectionHeader({ children }: { children: React.ReactNode }) {
@@ -475,7 +577,7 @@ function SectionHeader({ children }: { children: React.ReactNode }) {
    >
      <span
        style={{
-          fontSize: "0.7rem",
+          fontSize: "var(--font-sm)",
          fontWeight: 600,
          textTransform: "uppercase",
          letterSpacing: "0.05em",
@@ -512,7 +614,7 @@ function SidebarSection({
    >
      <div
        style={{
-          fontSize: "0.7rem",
+          fontSize: "var(--font-sm)",
          fontWeight: 600,
          textTransform: "uppercase",
          letterSpacing: "0.05em",
@@ -533,7 +635,7 @@ function MetaRow({ label, value }: { label: string; value: string }) {
      style={{
        display: "flex",
        justifyContent: "space-between",
-        fontSize: "0.8rem",
+        fontSize: "var(--font-table)",
        padding: "0.15rem 0",
      }}
    >
@@ -551,13 +653,13 @@ function FormGroup({
  children: React.ReactNode;
 }) {
  return (
-    <div style={{ marginBottom: "0.6rem" }}>
+    <div style={{ marginBottom: "0.5rem" }}>
      <label
        style={{
          display: "block",
          fontSize: "0.75rem",
          color: "var(--ctp-subtext0)",
-          marginBottom: "0.2rem",
+          marginBottom: "0.25rem",
        }}
      >
        {label}
@@ -580,10 +682,11 @@ const headerStyle: React.CSSProperties = {
 };

 const actionBtnStyle: React.CSSProperties = {
-  padding: "0.3rem 0.75rem",
-  fontSize: "0.8rem",
+  padding: "0.25rem 0.75rem",
+  fontSize: "0.75rem",
+  fontWeight: 500,
  border: "none",
-  borderRadius: "0.3rem",
+  borderRadius: "0.375rem",
  color: "var(--ctp-crust)",
  cursor: "pointer",
 };
@@ -593,17 +696,19 @@ const cancelBtnStyle: React.CSSProperties = {
  border: "none",
  cursor: "pointer",
  color: "var(--ctp-subtext1)",
-  fontSize: "0.8rem",
-  padding: "0.2rem 0.4rem",
+  fontSize: "0.75rem",
+  fontWeight: 500,
+  padding: "0.25rem 0.4rem",
+  borderRadius: "0.375rem",
 };

 const inputStyle: React.CSSProperties = {
  width: "100%",
  padding: "0.35rem 0.5rem",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
  backgroundColor: "var(--ctp-base)",
  border: "1px solid var(--ctp-surface1)",
-  borderRadius: "0.3rem",
+  borderRadius: "0.375rem",
  color: "var(--ctp-text)",
  boxSizing: "border-box",
 };
@@ -618,7 +723,7 @@ const errorStyle: React.CSSProperties = {
  color: "var(--ctp-red)",
  backgroundColor: "rgba(243,139,168,0.1)",
  padding: "0.5rem",
-  borderRadius: "0.3rem",
+  borderRadius: "0.375rem",
  marginBottom: "0.5rem",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
 };
--- a/web/src/components/items/DeleteItemPane.tsx
+++ b/web/src/components/items/DeleteItemPane.tsx
@@ -1,5 +1,5 @@
-import { useState } from 'react';
-import { del } from '../../api/client';
+import { useState } from "react";
+import { del } from "../../api/client";

 interface DeleteItemPaneProps {
  partNumber: string;
@@ -7,7 +7,11 @@ interface DeleteItemPaneProps {
  onCancel: () => void;
 }

-export function DeleteItemPane({ partNumber, onDeleted, onCancel }: DeleteItemPaneProps) {
+export function DeleteItemPane({
+  partNumber,
+  onDeleted,
+  onCancel,
+}: DeleteItemPaneProps) {
  const [deleting, setDeleting] = useState(false);
  const [error, setError] = useState<string | null>(null);

@@ -18,59 +22,133 @@ export function DeleteItemPane({ partNumber, onDeleted, onCancel }: DeleteItemPa
      await del(`/api/items/${encodeURIComponent(partNumber)}`);
      onDeleted();
    } catch (e) {
-      setError(e instanceof Error ? e.message : 'Failed to delete item');
+      setError(e instanceof Error ? e.message : "Failed to delete item");
    } finally {
      setDeleting(false);
    }
  };

  return (
-    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
-      <div style={{
-        display: 'flex', alignItems: 'center', gap: '0.75rem',
-        padding: '0.5rem 0.75rem',
-        borderBottom: '1px solid var(--ctp-surface1)',
-        backgroundColor: 'var(--ctp-mantle)',
-        flexShrink: 0,
-      }}>
-        <span style={{ color: 'var(--ctp-red)', fontWeight: 600, fontSize: '0.9rem' }}>Delete Item</span>
+    <div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
+      <div
+        style={{
+          display: "flex",
+          alignItems: "center",
+          gap: "0.75rem",
+          padding: "0.5rem 0.75rem",
+          borderBottom: "1px solid var(--ctp-surface1)",
+          backgroundColor: "var(--ctp-mantle)",
+          flexShrink: 0,
+        }}
+      >
+        <span
+          style={{
+            color: "var(--ctp-red)",
+            fontWeight: 600,
+            fontSize: "var(--font-body)",
+          }}
+        >
+          Delete Item
+        </span>
        <span style={{ flex: 1 }} />
-        <button onClick={onCancel} style={headerBtnStyle}>Cancel</button>
+        <button onClick={onCancel} style={headerBtnStyle}>
+          Cancel
+        </button>
      </div>

-      <div style={{ flex: 1, display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', padding: '2rem', gap: '1rem' }}>
+      <div
+        style={{
+          flex: 1,
+          display: "flex",
+          flexDirection: "column",
+          alignItems: "center",
+          justifyContent: "center",
+          padding: "2rem",
+          gap: "1rem",
+        }}
+      >
        {error && (
-          <div style={{ color: 'var(--ctp-red)', backgroundColor: 'rgba(243,139,168,0.1)', padding: '0.5rem 1rem', borderRadius: '0.3rem', fontSize: '0.85rem', width: '100%', textAlign: 'center' }}>
+          <div
+            style={{
+              color: "var(--ctp-red)",
+              backgroundColor: "rgba(243,139,168,0.1)",
+              padding: "0.5rem 1rem",
+              borderRadius: "0.375rem",
+              fontSize: "var(--font-body)",
+              width: "100%",
+              textAlign: "center",
+            }}
+          >
            {error}
          </div>
        )}

-        <div style={{ textAlign: 'center' }}>
-          <p style={{ fontSize: '0.9rem', color: 'var(--ctp-text)', marginBottom: '0.5rem' }}>
+        <div style={{ textAlign: "center" }}>
+          <p
+            style={{
+              fontSize: "var(--font-body)",
+              color: "var(--ctp-text)",
+              marginBottom: "0.5rem",
+            }}
+          >
            Permanently delete item
          </p>
-          <p style={{ fontFamily: "'JetBrains Mono', monospace", color: 'var(--ctp-peach)', fontSize: '1.1rem', fontWeight: 600 }}>
+          <p
+            style={{
+              fontFamily: "'JetBrains Mono', monospace",
+              color: "var(--ctp-peach)",
+              fontSize: "var(--font-title)",
+              fontWeight: 600,
+            }}
+          >
            {partNumber}
          </p>
        </div>

-        <p style={{ color: 'var(--ctp-subtext0)', fontSize: '0.85rem', textAlign: 'center', maxWidth: 300 }}>
-          This will permanently remove this item, all its revisions, BOM entries, and file attachments. This action cannot be undone.
+        <p
+          style={{
+            color: "var(--ctp-subtext0)",
+            fontSize: "var(--font-body)",
+            textAlign: "center",
+            maxWidth: 300,
+          }}
+        >
+          This will permanently remove this item, all its revisions, BOM
+          entries, and file attachments. This action cannot be undone.
        </p>

-        <div style={{ display: 'flex', gap: '0.75rem', marginTop: '0.5rem' }}>
-          <button onClick={onCancel} style={{
-            padding: '0.5rem 1.25rem', fontSize: '0.85rem', border: 'none', borderRadius: '0.4rem',
-            backgroundColor: 'var(--ctp-surface1)', color: 'var(--ctp-text)', cursor: 'pointer',
-          }}>
+        <div style={{ display: "flex", gap: "0.75rem", marginTop: "0.5rem" }}>
+          <button
+            onClick={onCancel}
+            style={{
+              padding: "0.5rem 1.25rem",
+              fontSize: "0.75rem",
+              fontWeight: 500,
+              border: "none",
+              borderRadius: "0.375rem",
+              backgroundColor: "var(--ctp-surface1)",
+              color: "var(--ctp-text)",
+              cursor: "pointer",
+            }}
+          >
            Cancel
          </button>
-          <button onClick={() => void handleDelete()} disabled={deleting} style={{
-            padding: '0.5rem 1.25rem', fontSize: '0.85rem', border: 'none', borderRadius: '0.4rem',
-            backgroundColor: 'var(--ctp-red)', color: 'var(--ctp-crust)', cursor: 'pointer',
-            opacity: deleting ? 0.6 : 1,
-          }}>
-            {deleting ? 'Deleting...' : 'Delete Permanently'}
+          <button
+            onClick={() => void handleDelete()}
+            disabled={deleting}
+            style={{
+              padding: "0.5rem 1.25rem",
+              fontSize: "0.75rem",
+              fontWeight: 500,
+              border: "none",
+              borderRadius: "0.375rem",
+              backgroundColor: "var(--ctp-red)",
+              color: "var(--ctp-crust)",
+              cursor: "pointer",
+              opacity: deleting ? 0.6 : 1,
+            }}
+          >
+            {deleting ? "Deleting..." : "Delete Permanently"}
          </button>
        </div>
      </div>
@@ -79,6 +157,12 @@ export function DeleteItemPane({ partNumber, onDeleted, onCancel }: DeleteItemPa
 }

 const headerBtnStyle: React.CSSProperties = {
-  background: 'none', border: 'none', cursor: 'pointer',
-  color: 'var(--ctp-subtext1)', fontSize: '0.8rem', padding: '0.2rem 0.4rem',
+  background: "none",
+  border: "none",
+  cursor: "pointer",
+  color: "var(--ctp-subtext1)",
+  fontSize: "0.75rem",
+  fontWeight: 500,
+  padding: "0.25rem 0.4rem",
+  borderRadius: "0.375rem",
 };
--- a/web/src/components/items/EditItemPane.tsx
+++ b/web/src/components/items/EditItemPane.tsx
@@ -1,6 +1,6 @@
-import { useState, useEffect } from 'react';
-import { get, put } from '../../api/client';
-import type { Item } from '../../api/types';
+import { useState, useEffect } from "react";
+import { get, put } from "../../api/client";
+import type { Item } from "../../api/types";

 interface EditItemPaneProps {
  partNumber: string;
@@ -8,17 +8,19 @@ interface EditItemPaneProps {
  onCancel: () => void;
 }

-export function EditItemPane({ partNumber, onSaved, onCancel }: EditItemPaneProps) {
+export function EditItemPane({
+  partNumber,
+  onSaved,
+  onCancel,
+}: EditItemPaneProps) {
  const [loading, setLoading] = useState(true);
  const [saving, setSaving] = useState(false);
  const [error, setError] = useState<string | null>(null);
-  const [pn, setPN] = useState('');
-  const [itemType, setItemType] = useState('');
-  const [description, setDescription] = useState('');
-  const [sourcingType, setSourcingType] = useState('');
-  const [sourcingLink, setSourcingLink] = useState('');
-  const [longDescription, setLongDescription] = useState('');
-  const [standardCost, setStandardCost] = useState('');
+  const [pn, setPN] = useState("");
+  const [itemType, setItemType] = useState("");
+  const [description, setDescription] = useState("");
+  const [sourcingType, setSourcingType] = useState("");
+  const [longDescription, setLongDescription] = useState("");

  useEffect(() => {
    setLoading(true);
@@ -27,12 +29,10 @@ export function EditItemPane({ partNumber, onSaved, onCancel }: EditItemPaneProp
        setPN(item.part_number);
        setItemType(item.item_type);
        setDescription(item.description);
-        setSourcingType(item.sourcing_type ?? '');
-        setSourcingLink(item.sourcing_link ?? '');
-        setLongDescription(item.long_description ?? '');
-        setStandardCost(item.standard_cost != null ? String(item.standard_cost) : '');
+        setSourcingType(item.sourcing_type ?? "");
+        setLongDescription(item.long_description ?? "");
      })
-      .catch(() => setError('Failed to load item'))
+      .catch(() => setError("Failed to load item"))
      .finally(() => setLoading(false));
  }, [partNumber]);

@@ -45,54 +45,100 @@ export function EditItemPane({ partNumber, onSaved, onCancel }: EditItemPaneProp
        item_type: itemType || undefined,
        description: description || undefined,
        sourcing_type: sourcingType || undefined,
-        sourcing_link: sourcingLink || undefined,
        long_description: longDescription || undefined,
-        standard_cost: standardCost ? Number(standardCost) : undefined,
      });
      onSaved();
    } catch (e) {
-      setError(e instanceof Error ? e.message : 'Failed to save item');
+      setError(e instanceof Error ? e.message : "Failed to save item");
    } finally {
      setSaving(false);
    }
  };

-  if (loading) return <div style={{ padding: '1rem', color: 'var(--ctp-subtext0)' }}>Loading...</div>;
+  if (loading)
+    return (
+      <div style={{ padding: "1rem", color: "var(--ctp-subtext0)" }}>
+        Loading...
+      </div>
+    );

  return (
-    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
-      <div style={{
-        display: 'flex', alignItems: 'center', gap: '0.75rem',
-        padding: '0.5rem 0.75rem',
-        borderBottom: '1px solid var(--ctp-surface1)',
-        backgroundColor: 'var(--ctp-mantle)',
-        flexShrink: 0,
-      }}>
-        <span style={{ color: 'var(--ctp-blue)', fontWeight: 600, fontSize: '0.9rem' }}>Edit {partNumber}</span>
+    <div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
+      <div
+        style={{
+          display: "flex",
+          alignItems: "center",
+          gap: "0.75rem",
+          padding: "0.5rem 0.75rem",
+          borderBottom: "1px solid var(--ctp-surface1)",
+          backgroundColor: "var(--ctp-mantle)",
+          flexShrink: 0,
+        }}
+      >
+        <span
+          style={{
+            color: "var(--ctp-blue)",
+            fontWeight: 600,
+            fontSize: "var(--font-body)",
+          }}
+        >
+          Edit {partNumber}
+        </span>
        <span style={{ flex: 1 }} />
-        <button onClick={() => void handleSave()} disabled={saving} style={{
-          padding: '0.3rem 0.75rem', fontSize: '0.8rem', border: 'none', borderRadius: '0.3rem',
-          backgroundColor: 'var(--ctp-blue)', color: 'var(--ctp-crust)', cursor: 'pointer',
-          opacity: saving ? 0.6 : 1,
-        }}>
-          {saving ? 'Saving...' : 'Save'}
+        <button
+          onClick={() => void handleSave()}
+          disabled={saving}
+          style={{
+            padding: "0.25rem 0.75rem",
+            fontSize: "0.75rem",
+            fontWeight: 500,
+            border: "none",
+            borderRadius: "0.375rem",
+            backgroundColor: "var(--ctp-blue)",
+            color: "var(--ctp-crust)",
+            cursor: "pointer",
+            opacity: saving ? 0.6 : 1,
+          }}
+        >
+          {saving ? "Saving..." : "Save"}
+        </button>
+        <button onClick={onCancel} style={headerBtnStyle}>
+          Cancel
        </button>
-        <button onClick={onCancel} style={headerBtnStyle}>Cancel</button>
      </div>

-      <div style={{ flex: 1, overflow: 'auto', padding: '0.75rem' }}>
+      <div style={{ flex: 1, overflow: "auto", padding: "0.75rem" }}>
        {error && (
-          <div style={{ color: 'var(--ctp-red)', backgroundColor: 'rgba(243,139,168,0.1)', padding: '0.5rem', borderRadius: '0.3rem', marginBottom: '0.5rem', fontSize: '0.85rem' }}>
+          <div
+            style={{
+              color: "var(--ctp-red)",
+              backgroundColor: "rgba(243,139,168,0.1)",
+              padding: "0.5rem",
+              borderRadius: "0.375rem",
+              marginBottom: "0.5rem",
+              fontSize: "var(--font-body)",
+            }}
+          >
            {error}
          </div>
        )}

        <FormGroup label="Part Number">
-          <input value={pn} onChange={(e) => setPN(e.target.value)} style={inputStyle} />
+          <input
+            className="silo-input"
+            value={pn}
+            onChange={(e) => setPN(e.target.value)}
+            style={inputStyle}
+          />
        </FormGroup>

        <FormGroup label="Type">
-          <select value={itemType} onChange={(e) => setItemType(e.target.value)} style={inputStyle}>
+          <select
+            className="silo-input"
+            value={itemType}
+            onChange={(e) => setItemType(e.target.value)}
+            style={inputStyle}
+          >
            <option value="part">Part</option>
            <option value="assembly">Assembly</option>
            <option value="document">Document</option>
@@ -101,11 +147,21 @@ export function EditItemPane({ partNumber, onSaved, onCancel }: EditItemPaneProp
        </FormGroup>

        <FormGroup label="Description">
-          <input value={description} onChange={(e) => setDescription(e.target.value)} style={inputStyle} />
+          <input
+            className="silo-input"
+            value={description}
+            onChange={(e) => setDescription(e.target.value)}
+            style={inputStyle}
+          />
        </FormGroup>

        <FormGroup label="Sourcing Type">
-          <select value={sourcingType} onChange={(e) => setSourcingType(e.target.value)} style={inputStyle}>
+          <select
+            className="silo-input"
+            value={sourcingType}
+            onChange={(e) => setSourcingType(e.target.value)}
+            style={inputStyle}
+          >
            <option value="">—</option>
            <option value="manufactured">Manufactured</option>
            <option value="purchased">Purchased</option>
@@ -113,38 +169,60 @@ export function EditItemPane({ partNumber, onSaved, onCancel }: EditItemPaneProp
          </select>
        </FormGroup>

-        <FormGroup label="Sourcing Link">
-          <input value={sourcingLink} onChange={(e) => setSourcingLink(e.target.value)} style={inputStyle} placeholder="URL" />
-        </FormGroup>
-
-        <FormGroup label="Standard Cost">
-          <input type="number" step="0.01" value={standardCost} onChange={(e) => setStandardCost(e.target.value)} style={inputStyle} placeholder="0.00" />
-        </FormGroup>
-
        <FormGroup label="Long Description">
-          <textarea value={longDescription} onChange={(e) => setLongDescription(e.target.value)} style={{ ...inputStyle, minHeight: 80, resize: 'vertical' }} />
+          <textarea
+            className="silo-input"
+            value={longDescription}
+            onChange={(e) => setLongDescription(e.target.value)}
+            style={{ ...inputStyle, minHeight: 80, resize: "vertical" }}
+          />
        </FormGroup>
      </div>
    </div>
  );
 }

-function FormGroup({ label, children }: { label: string; children: React.ReactNode }) {
+function FormGroup({
+  label,
+  children,
+}: {
+  label: string;
+  children: React.ReactNode;
+}) {
  return (
-    <div style={{ marginBottom: '0.6rem' }}>
-      <label style={{ display: 'block', fontSize: '0.75rem', color: 'var(--ctp-subtext0)', marginBottom: '0.2rem' }}>{label}</label>
+    <div style={{ marginBottom: "0.5rem" }}>
+      <label
+        style={{
+          display: "block",
+          fontSize: "0.75rem",
+          color: "var(--ctp-subtext0)",
+          marginBottom: "0.25rem",
+        }}
+      >
+        {label}
+      </label>
      {children}
    </div>
  );
 }

 const inputStyle: React.CSSProperties = {
-  width: '100%', padding: '0.35rem 0.5rem', fontSize: '0.85rem',
-  backgroundColor: 'var(--ctp-base)', border: '1px solid var(--ctp-surface1)',
-  borderRadius: '0.3rem', color: 'var(--ctp-text)',
+  width: "100%",
+  padding: "0.35rem 0.5rem",
+  fontSize: "var(--font-body)",
+  backgroundColor: "var(--ctp-base)",
+  border: "1px solid var(--ctp-surface1)",
+  borderRadius: "0.375rem",
+  color: "var(--ctp-text)",
 };

 const headerBtnStyle: React.CSSProperties = {
-  background: 'none', border: 'none', cursor: 'pointer',
-  color: 'var(--ctp-subtext1)', fontSize: '0.8rem', padding: '0.2rem 0.4rem',
+  background: "none",
+  border: "none",
+  cursor: "pointer",
+  color: "var(--ctp-subtext1)",
+  fontSize: "0.75rem",
+  fontWeight: 500,
+  padding: "0.25rem 0.4rem",
+  borderRadius: "0.375rem",
 };
--- a/web/src/components/items/FileDropZone.tsx
+++ b/web/src/components/items/FileDropZone.tsx
@@ -72,13 +72,13 @@ export function FileDropZone({
          padding: "1.25rem",
          textAlign: "center",
          cursor: "pointer",
-          backgroundColor: dragOver
-            ? "rgba(203,166,247,0.05)"
-            : "transparent",
-          transition: "border-color 0.15s, background-color 0.15s",
+          backgroundColor: dragOver ? "rgba(203,166,247,0.05)" : "transparent",
+          transition: "all 0.15s ease",
        }}
      >
-        <div style={{ fontSize: "0.85rem", color: "var(--ctp-subtext1)" }}>
+        <div
+          style={{ fontSize: "var(--font-body)", color: "var(--ctp-subtext1)" }}
+        >
          Drop files here or{" "}
          <span style={{ color: "var(--ctp-mauve)", fontWeight: 600 }}>
            browse
@@ -87,7 +87,7 @@ export function FileDropZone({
        {accept && (
          <div
            style={{
-              fontSize: "0.7rem",
+              fontSize: "var(--font-sm)",
              color: "var(--ctp-overlay0)",
              marginTop: "0.25rem",
            }}
@@ -113,7 +113,11 @@ export function FileDropZone({
      {files.length > 0 && (
        <div style={{ marginTop: "0.5rem" }}>
          {files.map((att, i) => (
-            <FileRow key={i} attachment={att} onRemove={() => onFileRemoved(i)} />
+            <FileRow
+              key={i}
+              attachment={att}
+              onRemove={() => onFileRemoved(i)}
+            />
          ))}
        </div>
      )}
@@ -139,8 +143,8 @@ function FileRow({
        display: "flex",
        alignItems: "center",
        gap: "0.5rem",
-        padding: "0.3rem 0.4rem",
-        borderRadius: "0.3rem",
+        padding: "0.25rem 0.4rem",
+        borderRadius: "0.375rem",
        position: "relative",
      }}
    >
@@ -149,13 +153,13 @@ function FileRow({
        style={{
          width: 28,
          height: 28,
-          borderRadius: "0.3rem",
+          borderRadius: "0.375rem",
          backgroundColor: color,
          opacity: 0.8,
          display: "flex",
          alignItems: "center",
          justifyContent: "center",
-          fontSize: "0.6rem",
+          fontSize: "var(--font-xs)",
          fontWeight: 700,
          color: "var(--ctp-crust)",
          flexShrink: 0,
@@ -168,7 +172,7 @@ function FileRow({
      <div style={{ flex: 1, minWidth: 0 }}>
        <div
          style={{
-            fontSize: "0.8rem",
+            fontSize: "var(--font-table)",
            color: "var(--ctp-text)",
            overflow: "hidden",
            textOverflow: "ellipsis",
@@ -177,7 +181,9 @@ function FileRow({
        >
          {attachment.file.name}
        </div>
-        <div style={{ fontSize: "0.7rem", color: "var(--ctp-overlay0)" }}>
+        <div
+          style={{ fontSize: "var(--font-sm)", color: "var(--ctp-overlay0)" }}
+        >
          {formatSize(attachment.file.size)}
          {attachment.uploadStatus === "error" && (
            <span style={{ color: "var(--ctp-red)", marginLeft: "0.5rem" }}>
@@ -202,7 +208,7 @@ function FileRow({
                width: `${attachment.uploadProgress}%`,
                backgroundColor: "var(--ctp-mauve)",
                borderRadius: 1,
-                transition: "width 0.15s",
+                transition: "all 0.15s ease",
              }}
            />
          </div>
@@ -213,7 +219,7 @@ function FileRow({
      {attachment.uploadStatus === "complete" ? (
        <span
          style={{
-            fontSize: "0.7rem",
+            fontSize: "var(--font-sm)",
            color: "var(--ctp-green)",
            flexShrink: 0,
          }}
@@ -231,11 +237,11 @@ function FileRow({
          background: "none",
          border: "none",
          cursor: "pointer",
-          fontSize: "0.8rem",
+          fontSize: "var(--font-table)",
          color: hovered ? "var(--ctp-red)" : "var(--ctp-overlay0)",
          padding: "0 0.2rem",
          flexShrink: 0,
-          transition: "color 0.15s",
+          transition: "all 0.15s ease",
        }}
        title="Remove"
      >
--- a/web/src/components/items/ImportItemsPane.tsx
+++ b/web/src/components/items/ImportItemsPane.tsx
@@ -1,12 +1,15 @@
-import { useState, useRef } from 'react';
-import type { CSVImportResult } from '../../api/types';
+import { useState, useRef } from "react";
+import type { CSVImportResult } from "../../api/types";

 interface ImportItemsPaneProps {
  onImported: () => void;
  onCancel: () => void;
 }

-export function ImportItemsPane({ onImported, onCancel }: ImportItemsPaneProps) {
+export function ImportItemsPane({
+  onImported,
+  onCancel,
+}: ImportItemsPaneProps) {
  const [file, setFile] = useState<File | null>(null);
  const [skipExisting, setSkipExisting] = useState(false);
  const [importing, setImporting] = useState(false);
@@ -21,19 +24,22 @@ export function ImportItemsPane({ onImported, onCancel }: ImportItemsPaneProps)
    setError(null);

    const formData = new FormData();
-    formData.append('file', file);
-    if (dryRun) formData.append('dry_run', 'true');
-    if (skipExisting) formData.append('skip_existing', 'true');
+    formData.append("file", file);
+    if (dryRun) formData.append("dry_run", "true");
+    if (skipExisting) formData.append("skip_existing", "true");

    try {
-      const res = await fetch('/api/items/import', {
-        method: 'POST',
-        credentials: 'include',
+      const res = await fetch("/api/items/import", {
+        method: "POST",
+        credentials: "include",
        body: formData,
      });
-      const data = await res.json() as CSVImportResult;
+      const data = (await res.json()) as CSVImportResult;
      if (!res.ok) {
-        setError((data as unknown as { message?: string }).message ?? `HTTP ${res.status}`);
+        setError(
+          (data as unknown as { message?: string }).message ??
+            `HTTP ${res.status}`,
+        );
      } else {
        setResult(data);
        if (dryRun) {
@@ -43,48 +49,88 @@ export function ImportItemsPane({ onImported, onCancel }: ImportItemsPaneProps)
        }
      }
    } catch (e) {
-      setError(e instanceof Error ? e.message : 'Import failed');
+      setError(e instanceof Error ? e.message : "Import failed");
    } finally {
      setImporting(false);
    }
  };

  return (
-    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
-      <div style={{
-        display: 'flex', alignItems: 'center', gap: '0.75rem',
-        padding: '0.5rem 0.75rem',
-        borderBottom: '1px solid var(--ctp-surface1)',
-        backgroundColor: 'var(--ctp-mantle)',
-        flexShrink: 0,
-      }}>
-        <span style={{ color: 'var(--ctp-yellow)', fontWeight: 600, fontSize: '0.9rem' }}>Import Items (CSV)</span>
+    <div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
+      <div
+        style={{
+          display: "flex",
+          alignItems: "center",
+          gap: "0.75rem",
+          padding: "0.5rem 0.75rem",
+          borderBottom: "1px solid var(--ctp-surface1)",
+          backgroundColor: "var(--ctp-mantle)",
+          flexShrink: 0,
+        }}
+      >
+        <span
+          style={{
+            color: "var(--ctp-yellow)",
+            fontWeight: 600,
+            fontSize: "var(--font-body)",
+          }}
+        >
+          Import Items (CSV)
+        </span>
        <span style={{ flex: 1 }} />
-        <button onClick={onCancel} style={headerBtnStyle}>Cancel</button>
+        <button onClick={onCancel} style={headerBtnStyle}>
+          Cancel
+        </button>
      </div>

-      <div style={{ flex: 1, overflow: 'auto', padding: '0.75rem' }}>
+      <div style={{ flex: 1, overflow: "auto", padding: "0.75rem" }}>
        {error && (
-          <div style={{ color: 'var(--ctp-red)', backgroundColor: 'rgba(243,139,168,0.1)', padding: '0.5rem', borderRadius: '0.3rem', marginBottom: '0.5rem', fontSize: '0.85rem' }}>
+          <div
+            style={{
+              color: "var(--ctp-red)",
+              backgroundColor: "rgba(243,139,168,0.1)",
+              padding: "0.5rem",
+              borderRadius: "0.375rem",
+              marginBottom: "0.5rem",
+              fontSize: "var(--font-body)",
+            }}
+          >
            {error}
          </div>
        )}

        {/* Instructions */}
-        <div style={{ fontSize: '0.8rem', color: 'var(--ctp-subtext0)', marginBottom: '0.75rem' }}>
-          <p style={{ marginBottom: '0.25rem' }}>Upload a CSV file with items to import.</p>
-          <p>Required column: <strong style={{ color: 'var(--ctp-text)' }}>category</strong></p>
-          <p>Optional: description, projects, sourcing_type, sourcing_link, long_description, standard_cost, + property columns</p>
+        <div
+          style={{
+            fontSize: "var(--font-table)",
+            color: "var(--ctp-subtext0)",
+            marginBottom: "0.75rem",
+          }}
+        >
+          <p style={{ marginBottom: "0.25rem" }}>
+            Upload a CSV file with items to import.
+          </p>
+          <p>
+            Required column:{" "}
+            <strong style={{ color: "var(--ctp-text)" }}>category</strong>
+          </p>
+          <p>
+            Optional: description, projects, sourcing_type, long_description, +
+            property columns (including sourcing_link, standard_cost)
+          </p>
          <a
            href="/api/items/template.csv"
-            style={{ color: 'var(--ctp-sapphire)', fontSize: '0.8rem' }}
+            style={{
+              color: "var(--ctp-sapphire)",
+              fontSize: "var(--font-table)",
+            }}
          >
            Download CSV template
          </a>
        </div>

        {/* File input */}
-        <div style={{ marginBottom: '0.75rem' }}>
+        <div style={{ marginBottom: "0.75rem" }}>
          <input
            ref={fileRef}
            type="file"
@@ -94,76 +140,146 @@ export function ImportItemsPane({ onImported, onCancel }: ImportItemsPaneProps)
              setResult(null);
              setValidated(false);
            }}
-            style={{ display: 'none' }}
+            style={{ display: "none" }}
          />
          <button
            onClick={() => fileRef.current?.click()}
            style={{
-              padding: '0.75rem 1.5rem', border: '2px dashed var(--ctp-surface2)',
-              borderRadius: '0.5rem', backgroundColor: 'var(--ctp-surface0)',
-              color: 'var(--ctp-subtext1)', cursor: 'pointer', width: '100%',
-              fontSize: '0.85rem',
+              padding: "0.75rem 1.5rem",
+              border: "2px dashed var(--ctp-surface2)",
+              borderRadius: "0.5rem",
+              backgroundColor: "var(--ctp-surface0)",
+              color: "var(--ctp-subtext1)",
+              cursor: "pointer",
+              width: "100%",
+              fontSize: "var(--font-body)",
            }}
          >
-            {file ? file.name : 'Choose CSV file...'}
+            {file ? file.name : "Choose CSV file..."}
          </button>
        </div>

        {/* Options */}
-        <label style={{ display: 'flex', alignItems: 'center', gap: '0.4rem', fontSize: '0.85rem', color: 'var(--ctp-subtext1)', marginBottom: '0.75rem' }}>
-          <input type="checkbox" checked={skipExisting} onChange={(e) => setSkipExisting(e.target.checked)} />
+        <label
+          style={{
+            display: "flex",
+            alignItems: "center",
+            gap: "0.4rem",
+            fontSize: "var(--font-body)",
+            color: "var(--ctp-subtext1)",
+            marginBottom: "0.75rem",
+          }}
+        >
+          <input
+            type="checkbox"
+            checked={skipExisting}
+            onChange={(e) => setSkipExisting(e.target.checked)}
+          />
          Skip existing items
        </label>

        {/* Actions */}
-        <div style={{ display: 'flex', gap: '0.5rem', marginBottom: '0.75rem' }}>
+        <div
+          style={{ display: "flex", gap: "0.5rem", marginBottom: "0.75rem" }}
+        >
          {!validated ? (
            <button
              onClick={() => void doImport(true)}
              disabled={!file || importing}
              style={{
-                padding: '0.4rem 0.75rem', fontSize: '0.85rem', border: 'none', borderRadius: '0.3rem',
-                backgroundColor: 'var(--ctp-yellow)', color: 'var(--ctp-crust)', cursor: 'pointer',
-                opacity: (!file || importing) ? 0.5 : 1,
+                padding: "0.4rem 0.75rem",
+                fontSize: "0.75rem",
+                fontWeight: 500,
+                border: "none",
+                borderRadius: "0.375rem",
+                backgroundColor: "var(--ctp-yellow)",
+                color: "var(--ctp-crust)",
+                cursor: "pointer",
+                opacity: !file || importing ? 0.5 : 1,
              }}
            >
-              {importing ? 'Validating...' : 'Validate (Dry Run)'}
+              {importing ? "Validating..." : "Validate (Dry Run)"}
            </button>
          ) : (
            <button
              onClick={() => void doImport(false)}
              disabled={importing || (result?.error_count ?? 0) > 0}
              style={{
-                padding: '0.4rem 0.75rem', fontSize: '0.85rem', border: 'none', borderRadius: '0.3rem',
-                backgroundColor: 'var(--ctp-green)', color: 'var(--ctp-crust)', cursor: 'pointer',
-                opacity: (importing || (result?.error_count ?? 0) > 0) ? 0.5 : 1,
+                padding: "0.4rem 0.75rem",
+                fontSize: "0.75rem",
+                fontWeight: 500,
+                border: "none",
+                borderRadius: "0.375rem",
+                backgroundColor: "var(--ctp-green)",
+                color: "var(--ctp-crust)",
+                cursor: "pointer",
+                opacity: importing || (result?.error_count ?? 0) > 0 ? 0.5 : 1,
              }}
            >
-              {importing ? 'Importing...' : 'Import Now'}
+              {importing ? "Importing..." : "Import Now"}
            </button>
          )}
        </div>

        {/* Results */}
        {result && (
-          <div style={{ padding: '0.5rem', backgroundColor: 'var(--ctp-surface0)', borderRadius: '0.4rem', fontSize: '0.8rem' }}>
-            <p>Total rows: <strong>{result.total_rows}</strong></p>
-            <p>Success: <strong style={{ color: 'var(--ctp-green)' }}>{result.success_count}</strong></p>
+          <div
+            style={{
+              padding: "0.5rem",
+              backgroundColor: "var(--ctp-surface0)",
+              borderRadius: "0.4rem",
+              fontSize: "var(--font-table)",
+            }}
+          >
+            <p>
+              Total rows: <strong>{result.total_rows}</strong>
+            </p>
+            <p>
+              Success:{" "}
+              <strong style={{ color: "var(--ctp-green)" }}>
+                {result.success_count}
+              </strong>
+            </p>
            {result.error_count > 0 && (
-              <p>Errors: <strong style={{ color: 'var(--ctp-red)' }}>{result.error_count}</strong></p>
+              <p>
+                Errors:{" "}
+                <strong style={{ color: "var(--ctp-red)" }}>
+                  {result.error_count}
+                </strong>
+              </p>
            )}
            {result.errors && result.errors.length > 0 && (
-              <div style={{ marginTop: '0.5rem', maxHeight: 200, overflow: 'auto' }}>
+              <div
+                style={{
+                  marginTop: "0.5rem",
+                  maxHeight: 200,
+                  overflow: "auto",
+                }}
+              >
                {result.errors.map((err, i) => (
-                  <div key={i} style={{ color: 'var(--ctp-red)', fontSize: '0.75rem', padding: '0.1rem 0' }}>
-                    Row {err.row}{err.field ? ` [${err.field}]` : ''}: {err.message}
+                  <div
+                    key={i}
+                    style={{
+                      color: "var(--ctp-red)",
+                      fontSize: "0.75rem",
+                      padding: "0.15rem 0",
+                    }}
+                  >
+                    Row {err.row}
+                    {err.field ? ` [${err.field}]` : ""}: {err.message}
                  </div>
                ))}
              </div>
            )}
            {result.created_items && result.created_items.length > 0 && (
-              <div style={{ marginTop: '0.5rem', color: 'var(--ctp-green)', fontSize: '0.75rem' }}>
-                Created: {result.created_items.join(', ')}
+              <div
+                style={{
+                  marginTop: "0.5rem",
+                  color: "var(--ctp-green)",
+                  fontSize: "0.75rem",
+                }}
+              >
+                Created: {result.created_items.join(", ")}
              </div>
            )}
          </div>
@@ -174,6 +290,12 @@ export function ImportItemsPane({ onImported, onCancel }: ImportItemsPaneProps)
 }

 const headerBtnStyle: React.CSSProperties = {
-  background: 'none', border: 'none', cursor: 'pointer',
-  color: 'var(--ctp-subtext1)', fontSize: '0.8rem', padding: '0.2rem 0.4rem',
+  background: "none",
+  border: "none",
+  cursor: "pointer",
+  color: "var(--ctp-subtext1)",
+  fontSize: "0.75rem",
+  fontWeight: 500,
+  padding: "0.25rem 0.4rem",
+  borderRadius: "0.375rem",
 };
--- a/web/src/components/items/ItemDetail.tsx
+++ b/web/src/components/items/ItemDetail.tsx
@@ -1,4 +1,5 @@
 import { useState, useEffect } from "react";
+import { X } from "lucide-react";
 import { get } from "../../api/client";
 import type { Item } from "../../api/types";
 import { MainTab } from "./MainTab";
@@ -64,9 +65,11 @@ export function ItemDetail({
  }

  const typeColors: Record<string, { bg: string; color: string }> = {
-    part: { bg: "rgba(137,180,250,0.2)", color: "var(--ctp-blue)" },
-    assembly: { bg: "rgba(166,227,161,0.2)", color: "var(--ctp-green)" },
-    document: { bg: "rgba(249,226,175,0.2)", color: "var(--ctp-yellow)" },
+    part: { bg: "rgba(166,227,161,0.2)", color: "var(--ctp-green)" },
+    assembly: { bg: "rgba(203,166,247,0.2)", color: "var(--ctp-mauve)" },
+    document: { bg: "rgba(137,180,250,0.2)", color: "var(--ctp-blue)" },
+    purchased: { bg: "rgba(250,179,135,0.2)", color: "var(--ctp-peach)" },
+    phantom: { bg: "rgba(127,132,156,0.2)", color: "var(--ctp-overlay1)" },
    tooling: { bg: "rgba(243,139,168,0.2)", color: "var(--ctp-red)" },
  };
  const tc = typeColors[item.item_type] ?? {
@@ -93,16 +96,16 @@ export function ItemDetail({
            fontFamily: "'JetBrains Mono', monospace",
            color: "var(--ctp-peach)",
            fontWeight: 600,
-            fontSize: "0.9rem",
+            fontSize: "var(--font-body)",
          }}
        >
          {item.part_number}
        </span>
        <span
          style={{
-            padding: "0.1rem 0.5rem",
+            padding: "0.15rem 0.5rem",
            borderRadius: "1rem",
-            fontSize: "0.7rem",
+            fontSize: "var(--font-sm)",
            fontWeight: 500,
            backgroundColor: tc.bg,
            color: tc.color,
@@ -129,9 +132,13 @@ export function ItemDetail({
        )}
        <button
          onClick={onClose}
-          style={{ ...headerBtnStyle, fontSize: "1rem" }}
+          style={{
+            ...headerBtnStyle,
+            display: "inline-flex",
+            alignItems: "center",
+          }}
        >
-          ×
+          <X size={14} />
        </button>
      </div>

@@ -151,7 +158,7 @@ export function ItemDetail({
            onClick={() => setActiveTab(tab.key)}
            style={{
              padding: "0.4rem 0.75rem",
-              fontSize: "0.8rem",
+              fontSize: "var(--font-table)",
              border: "none",
              borderBottom:
                activeTab === tab.key
@@ -197,6 +204,6 @@ const headerBtnStyle: React.CSSProperties = {
  border: "none",
  cursor: "pointer",
  color: "var(--ctp-subtext1)",
-  fontSize: "0.8rem",
-  padding: "0.2rem 0.4rem",
+  fontSize: "var(--font-table)",
+  padding: "0.25rem 0.4rem",
 };
--- a/web/src/components/items/ItemTable.tsx
+++ b/web/src/components/items/ItemTable.tsx
@@ -1,4 +1,5 @@
 import { useState, useCallback } from "react";
+import { ChevronUp, ChevronDown } from "lucide-react";
 import type { Item } from "../../api/types";
 import { ContextMenu, type ContextMenuItem } from "../ContextMenu";

@@ -12,6 +13,7 @@ export const ALL_COLUMNS: ColumnDef[] = [
  { key: "item_type", label: "Type" },
  { key: "description", label: "Description" },
  { key: "revision", label: "Rev" },
+  { key: "files", label: "Files" },
  { key: "projects", label: "Projects" },
  { key: "created", label: "Created" },
  { key: "actions", label: "Actions" },
@@ -28,6 +30,7 @@ export const DEFAULT_COLUMNS_V = [
  "item_type",
  "description",
  "revision",
+  "files",
  "created",
  "actions",
 ];
@@ -47,9 +50,11 @@ interface ItemTableProps {
 }

 const typeColors: Record<string, { bg: string; color: string }> = {
-  part: { bg: "rgba(137,180,250,0.2)", color: "var(--ctp-blue)" },
-  assembly: { bg: "rgba(166,227,161,0.2)", color: "var(--ctp-green)" },
-  document: { bg: "rgba(249,226,175,0.2)", color: "var(--ctp-yellow)" },
+  part: { bg: "rgba(166,227,161,0.2)", color: "var(--ctp-green)" },
+  assembly: { bg: "rgba(203,166,247,0.2)", color: "var(--ctp-mauve)" },
+  document: { bg: "rgba(137,180,250,0.2)", color: "var(--ctp-blue)" },
+  purchased: { bg: "rgba(250,179,135,0.2)", color: "var(--ctp-peach)" },
+  phantom: { bg: "rgba(127,132,156,0.2)", color: "var(--ctp-overlay1)" },
  tooling: { bg: "rgba(243,139,168,0.2)", color: "var(--ctp-red)" },
 };

@@ -67,6 +72,12 @@ function copyPN(pn: string) {
  void navigator.clipboard.writeText(pn);
 }

+function formatSize(bytes: number): string {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
+
 export function ItemTable({
  items,
  loading,
@@ -120,6 +131,10 @@ export function ItemTable({
        av = a.current_revision;
        bv = b.current_revision;
        break;
+      case "files":
+        av = a.file_count;
+        bv = b.file_count;
+        break;
      case "created":
        av = a.created_at;
        bv = b.created_at;
@@ -136,7 +151,7 @@ export function ItemTable({
    padding: "var(--d-th-py) var(--d-th-px)",
    textAlign: "left",
    borderBottom: "1px solid var(--ctp-surface1)",
-    color: "var(--ctp-subtext1)",
+    color: "var(--ctp-overlay1)",
    fontWeight: 600,
    fontSize: "var(--d-th-font)",
    textTransform: "uppercase",
@@ -177,8 +192,18 @@ export function ItemTable({
                >
                  {col.label}
                  {sortKey === col.key && (
-                    <span style={{ marginLeft: 4 }}>
-                      {sortDir === "asc" ? "▲" : "▼"}
+                    <span
+                      style={{
+                        marginLeft: 4,
+                        display: "inline-flex",
+                        verticalAlign: "middle",
+                      }}
+                    >
+                      {sortDir === "asc" ? (
+                        <ChevronUp size={14} />
+                      ) : (
+                        <ChevronDown size={14} />
+                      )}
                    </span>
                  )}
                </th>
@@ -189,7 +214,7 @@ export function ItemTable({
            {sortedItems.map((item, idx) => {
              const isSelected = item.part_number === selectedPN;
              const rowBg = isSelected
-                ? "var(--ctp-surface1)"
+                ? "rgba(203, 166, 247, 0.08)"
                : idx % 2 === 0
                  ? "var(--ctp-base)"
                  : "var(--ctp-surface0)";
@@ -243,7 +268,7 @@ export function ItemTable({
                          <td key={col.key} style={tdStyle}>
                            <span
                              style={{
-                                padding: "0.1rem 0.5rem",
+                                padding: "0.15rem 0.5rem",
                                borderRadius: "1rem",
                                fontSize: "0.75rem",
                                fontWeight: 500,
@@ -271,6 +296,20 @@ export function ItemTable({
                            Rev {item.current_revision}
                          </td>
                        );
+                      case "files":
+                        return (
+                          <td
+                            key={col.key}
+                            style={{ ...tdStyle, textAlign: "center" }}
+                            title={
+                              item.file_count > 0
+                                ? `${item.file_count} file${item.file_count !== 1 ? "s" : ""}, ${formatSize(item.files_total_size)}`
+                                : "No files"
+                            }
+                          >
+                            {item.file_count > 0 ? item.file_count : "—"}
+                          </td>
+                        );
                      case "projects":
                        return (
                          <td key={col.key} style={tdStyle}>
@@ -357,7 +396,8 @@ const actionBtnStyle: React.CSSProperties = {
  border: "none",
  color: "var(--ctp-subtext1)",
  cursor: "pointer",
-  fontSize: "0.8rem",
+  fontSize: "0.75rem",
+  fontWeight: 500,
  padding: "0.15rem 0.4rem",
-  borderRadius: "0.25rem",
+  borderRadius: "0.375rem",
 };
--- a/web/src/components/items/ItemsToolbar.tsx
+++ b/web/src/components/items/ItemsToolbar.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useState } from "react";
+import { Columns2, Rows2, Plus, Download, Upload } from "lucide-react";
 import { get } from "../../api/client";
 import type { Project } from "../../api/types";
 import type { ItemFilters } from "../../hooks/useItems";
@@ -37,9 +38,10 @@ export function ItemsToolbar({
      onClick={() => onFilterChange({ searchScope: scope })}
      style={{
        padding: "var(--d-input-py) var(--d-input-px)",
-        fontSize: "var(--d-input-font)",
+        fontSize: "0.75rem",
+        fontWeight: 500,
        border: "none",
-        borderRadius: "0.3rem",
+        borderRadius: "0.375rem",
        cursor: "pointer",
        backgroundColor:
          filters.searchScope === scope
@@ -126,20 +128,42 @@ export function ItemsToolbar({
          onLayoutChange(layout === "horizontal" ? "vertical" : "horizontal")
        }
        title={`Switch to ${layout === "horizontal" ? "vertical" : "horizontal"} layout`}
-        style={toolBtnStyle}
+        style={{
+          ...toolBtnStyle,
+          display: "inline-flex",
+          alignItems: "center",
+        }}
      >
-        {layout === "horizontal" ? "⬌" : "⬍"}
+        {layout === "horizontal" ? <Columns2 size={14} /> : <Rows2 size={14} />}
      </button>

      {/* Export */}
-      <button onClick={onExport} style={toolBtnStyle} title="Export CSV">
-        Export
+      <button
+        onClick={onExport}
+        style={{
+          ...toolBtnStyle,
+          display: "inline-flex",
+          alignItems: "center",
+          gap: "0.35rem",
+        }}
+        title="Export CSV"
+      >
+        <Download size={14} /> Export
      </button>

      {/* Import (editor only) */}
      {isEditor && (
-        <button onClick={onImport} style={toolBtnStyle} title="Import CSV">
-          Import
+        <button
+          onClick={onImport}
+          style={{
+            ...toolBtnStyle,
+            display: "inline-flex",
+            alignItems: "center",
+            gap: "0.35rem",
+          }}
+          title="Import CSV"
+        >
+          <Upload size={14} /> Import
        </button>
      )}

@@ -151,9 +175,12 @@ export function ItemsToolbar({
            ...toolBtnStyle,
            backgroundColor: "var(--ctp-mauve)",
            color: "var(--ctp-crust)",
+            display: "inline-flex",
+            alignItems: "center",
+            gap: "0.35rem",
          }}
        >
-          + New
+          <Plus size={14} /> New
        </button>
      )}
    </div>
@@ -173,8 +200,9 @@ const toolBtnStyle: React.CSSProperties = {
  padding: "var(--d-input-py) var(--d-input-px)",
  backgroundColor: "var(--ctp-surface1)",
  border: "none",
-  borderRadius: "0.4rem",
+  borderRadius: "0.375rem",
  color: "var(--ctp-text)",
-  fontSize: "var(--d-input-font)",
+  fontSize: "0.75rem",
+  fontWeight: 500,
  cursor: "pointer",
 };
--- a/web/src/components/items/MainTab.tsx
+++ b/web/src/components/items/MainTab.tsx
@@ -1,4 +1,5 @@
 import { useState, useEffect } from "react";
+import { X } from "lucide-react";
 import { get, post, del } from "../../api/client";
 import type { Item, Project, Revision } from "../../api/types";

@@ -83,8 +84,8 @@ export function MainTab({ item, onReload, isEditor }: MainTabProps) {
      style={{
        display: "flex",
        gap: "1rem",
-        padding: "0.3rem 0",
-        fontSize: "0.85rem",
+        padding: "0.25rem 0",
+        fontSize: "var(--font-body)",
      }}
    >
      <span style={{ width: 120, flexShrink: 0, color: "var(--ctp-subtext0)" }}>
@@ -110,15 +111,19 @@ export function MainTab({ item, onReload, isEditor }: MainTabProps) {
      {row("Description", item.description)}
      {row("Type", item.item_type)}
      {row("Sourcing", item.sourcing_type || "—")}
-      {item.sourcing_link &&
+      {item.properties?.sourcing_link != null &&
        row(
          "Source Link",
-          <a href={item.sourcing_link} target="_blank" rel="noreferrer">
-            {item.sourcing_link}
+          <a
+            href={String(item.properties.sourcing_link)}
+            target="_blank"
+            rel="noreferrer"
+          >
+            {String(item.properties.sourcing_link)}
          </a>,
        )}
-      {item.standard_cost != null &&
-        row("Std Cost", `$${item.standard_cost.toFixed(2)}`)}
+      {item.properties?.standard_cost != null &&
+        row("Std Cost", `$${Number(item.properties.standard_cost).toFixed(2)}`)}
      {row("Revision", `Rev ${item.current_revision}`)}
      {row("Created", formatDate(item.created_at))}
      {row("Updated", formatDate(item.updated_at))}
@@ -130,7 +135,7 @@ export function MainTab({ item, onReload, isEditor }: MainTabProps) {
            padding: "0.5rem",
            backgroundColor: "var(--ctp-surface0)",
            borderRadius: "0.4rem",
-            fontSize: "0.85rem",
+            fontSize: "var(--font-body)",
          }}
        >
          <div
@@ -172,7 +177,7 @@ export function MainTab({ item, onReload, isEditor }: MainTabProps) {
                display: "inline-flex",
                alignItems: "center",
                gap: "0.25rem",
-                padding: "0.1rem 0.5rem",
+                padding: "0.15rem 0.5rem",
                borderRadius: "1rem",
                backgroundColor: "rgba(203,166,247,0.15)",
                color: "var(--ctp-mauve)",
@@ -188,11 +193,11 @@ export function MainTab({ item, onReload, isEditor }: MainTabProps) {
                    border: "none",
                    color: "var(--ctp-overlay0)",
                    cursor: "pointer",
-                    fontSize: "0.8rem",
                    padding: 0,
+                    display: "inline-flex",
                  }}
                >
-                  ×
+                  <X size={14} />
                </button>
              )}
            </span>
@@ -203,11 +208,11 @@ export function MainTab({ item, onReload, isEditor }: MainTabProps) {
                value={addProject}
                onChange={(e) => setAddProject(e.target.value)}
                style={{
-                  padding: "0.1rem 0.3rem",
+                  padding: "0.15rem 0.25rem",
                  fontSize: "0.75rem",
                  backgroundColor: "var(--ctp-surface0)",
                  border: "1px solid var(--ctp-surface1)",
-                  borderRadius: "0.3rem",
+                  borderRadius: "0.375rem",
                  color: "var(--ctp-text)",
                }}
              >
@@ -224,12 +229,12 @@ export function MainTab({ item, onReload, isEditor }: MainTabProps) {
                <button
                  onClick={() => void handleAddProject()}
                  style={{
-                    padding: "0.1rem 0.4rem",
-                    fontSize: "0.7rem",
+                    padding: "0.15rem 0.4rem",
+                    fontSize: "var(--font-sm)",
                    border: "none",
                    backgroundColor: "var(--ctp-mauve)",
                    color: "var(--ctp-crust)",
-                    borderRadius: "0.3rem",
+                    borderRadius: "0.375rem",
                    cursor: "pointer",
                  }}
                >
@@ -265,7 +270,7 @@ export function MainTab({ item, onReload, isEditor }: MainTabProps) {
              display: "flex",
              alignItems: "center",
              gap: "0.75rem",
-              fontSize: "0.85rem",
+              fontSize: "var(--font-body)",
            }}
          >
            {latestRev.file_size != null && (
@@ -288,12 +293,12 @@ export function MainTab({ item, onReload, isEditor }: MainTabProps) {
                window.location.href = `/api/items/${encodeURIComponent(item.part_number)}/file/${latestRev.revision_number}`;
              }}
              style={{
-                padding: "0.2rem 0.5rem",
-                fontSize: "0.8rem",
+                padding: "0.25rem 0.5rem",
+                fontSize: "var(--font-table)",
                border: "none",
                backgroundColor: "var(--ctp-surface1)",
                color: "var(--ctp-text)",
-                borderRadius: "0.3rem",
+                borderRadius: "0.375rem",
                cursor: "pointer",
              }}
            >
--- a/web/src/components/items/PropertiesTab.tsx
+++ b/web/src/components/items/PropertiesTab.tsx
@@ -1,6 +1,7 @@
-import { useState } from 'react';
-import { post } from '../../api/client';
-import type { Item } from '../../api/types';
+import { useState } from "react";
+import { X, Plus } from "lucide-react";
+import { post } from "../../api/client";
+import type { Item } from "../../api/types";

 interface PropertiesTabProps {
  item: Item;
@@ -8,24 +9,24 @@ interface PropertiesTabProps {
  isEditor: boolean;
 }

-type Mode = 'form' | 'json';
+type Mode = "form" | "json";

 interface PropRow {
  key: string;
  value: string;
-  type: 'string' | 'number' | 'boolean';
+  type: "string" | "number" | "boolean";
 }

-function detectType(v: unknown): PropRow['type'] {
-  if (typeof v === 'number') return 'number';
-  if (typeof v === 'boolean') return 'boolean';
-  return 'string';
+function detectType(v: unknown): PropRow["type"] {
+  if (typeof v === "number") return "number";
+  if (typeof v === "boolean") return "boolean";
+  return "string";
 }

 function toRows(props: Record<string, unknown>): PropRow[] {
  return Object.entries(props).map(([key, value]) => ({
    key,
-    value: String(value ?? ''),
+    value: String(value ?? ""),
    type: detectType(value),
  }));
 }
@@ -35,17 +36,26 @@ function fromRows(rows: PropRow[]): Record<string, unknown> {
  for (const row of rows) {
    if (!row.key.trim()) continue;
    switch (row.type) {
-      case 'number': obj[row.key] = Number(row.value) || 0; break;
-      case 'boolean': obj[row.key] = row.value === 'true'; break;
-      default: obj[row.key] = row.value;
+      case "number":
+        obj[row.key] = Number(row.value) || 0;
+        break;
+      case "boolean":
+        obj[row.key] = row.value === "true";
+        break;
+      default:
+        obj[row.key] = row.value;
    }
  }
  return obj;
 }

-export function PropertiesTab({ item, onReload, isEditor }: PropertiesTabProps) {
+export function PropertiesTab({
+  item,
+  onReload,
+  isEditor,
+}: PropertiesTabProps) {
  const props = item.properties ?? {};
-  const [mode, setMode] = useState<Mode>('form');
+  const [mode, setMode] = useState<Mode>("form");
  const [rows, setRows] = useState<PropRow[]>(toRows(props));
  const [jsonText, setJsonText] = useState(JSON.stringify(props, null, 2));
  const [jsonError, setJsonError] = useState<string | null>(null);
@@ -62,18 +72,20 @@ export function PropertiesTab({ item, onReload, isEditor }: PropertiesTabProps)
      setRows(toRows(parsed));
      setJsonError(null);
    } catch (e) {
-      setJsonError(e instanceof Error ? e.message : 'Invalid JSON');
+      setJsonError(e instanceof Error ? e.message : "Invalid JSON");
    }
  };

  const switchMode = (m: Mode) => {
-    if (m === 'json') syncFormToJson();
+    if (m === "json") syncFormToJson();
    else syncJsonToForm();
    setMode(m);
  };

  const updateRow = (idx: number, field: keyof PropRow, value: string) => {
-    setRows((prev) => prev.map((r, i) => i === idx ? { ...r, [field]: value } : r));
+    setRows((prev) =>
+      prev.map((r, i) => (i === idx ? { ...r, [field]: value } : r)),
+    );
  };

  const removeRow = (idx: number) => {
@@ -81,72 +93,112 @@ export function PropertiesTab({ item, onReload, isEditor }: PropertiesTabProps)
  };

  const addRow = () => {
-    setRows((prev) => [...prev, { key: '', value: '', type: 'string' }]);
+    setRows((prev) => [...prev, { key: "", value: "", type: "string" }]);
  };

  const handleSave = async () => {
    let properties: Record<string, unknown>;
-    if (mode === 'json') {
+    if (mode === "json") {
      try {
        properties = JSON.parse(jsonText) as Record<string, unknown>;
      } catch {
-        setJsonError('Invalid JSON');
+        setJsonError("Invalid JSON");
        return;
      }
    } else {
      properties = fromRows(rows);
    }

-    const comment = prompt('Revision comment (optional):') ?? '';
+    const comment = prompt("Revision comment (optional):") ?? "";
    setSaving(true);
    try {
-      await post(`/api/items/${encodeURIComponent(item.part_number)}/revisions`, { properties, comment });
+      await post(
+        `/api/items/${encodeURIComponent(item.part_number)}/revisions`,
+        { properties, comment },
+      );
      onReload();
    } catch (e) {
-      alert(e instanceof Error ? e.message : 'Failed to save properties');
+      alert(e instanceof Error ? e.message : "Failed to save properties");
    } finally {
      setSaving(false);
    }
  };

  const inputStyle: React.CSSProperties = {
-    padding: '0.25rem 0.4rem', fontSize: '0.8rem',
-    backgroundColor: 'var(--ctp-base)', border: '1px solid var(--ctp-surface1)',
-    borderRadius: '0.3rem', color: 'var(--ctp-text)',
+    padding: "0.25rem 0.4rem",
+    fontSize: "var(--font-table)",
+    backgroundColor: "var(--ctp-base)",
+    border: "1px solid var(--ctp-surface1)",
+    borderRadius: "0.375rem",
+    color: "var(--ctp-text)",
  };

  return (
    <div>
      {/* Mode toggle */}
-      <div style={{ display: 'flex', gap: '0.5rem', marginBottom: '0.5rem', alignItems: 'center' }}>
-        <button onClick={() => switchMode('form')} style={mode === 'form' ? activeTabBtn : tabBtn}>Form</button>
-        <button onClick={() => switchMode('json')} style={mode === 'json' ? activeTabBtn : tabBtn}>JSON</button>
+      <div
+        style={{
+          display: "flex",
+          gap: "0.5rem",
+          marginBottom: "0.5rem",
+          alignItems: "center",
+        }}
+      >
+        <button
+          onClick={() => switchMode("form")}
+          style={mode === "form" ? activeTabBtn : tabBtn}
+        >
+          Form
+        </button>
+        <button
+          onClick={() => switchMode("json")}
+          style={mode === "json" ? activeTabBtn : tabBtn}
+        >
+          JSON
+        </button>
        <span style={{ flex: 1 }} />
        {isEditor && (
-          <button onClick={() => void handleSave()} disabled={saving} style={{
-            padding: '0.3rem 0.75rem', fontSize: '0.8rem', border: 'none', borderRadius: '0.3rem',
-            backgroundColor: 'var(--ctp-mauve)', color: 'var(--ctp-crust)', cursor: 'pointer',
-            opacity: saving ? 0.6 : 1,
-          }}>
-            {saving ? 'Saving...' : 'Save (New Revision)'}
+          <button
+            onClick={() => void handleSave()}
+            disabled={saving}
+            style={{
+              padding: "0.25rem 0.75rem",
+              fontSize: "var(--font-table)",
+              border: "none",
+              borderRadius: "0.375rem",
+              backgroundColor: "var(--ctp-mauve)",
+              color: "var(--ctp-crust)",
+              cursor: "pointer",
+              opacity: saving ? 0.6 : 1,
+            }}
+          >
+            {saving ? "Saving..." : "Save (New Revision)"}
          </button>
        )}
      </div>

-      {mode === 'form' ? (
+      {mode === "form" ? (
        <div>
          {rows.map((row, idx) => (
-            <div key={idx} style={{ display: 'flex', gap: '0.3rem', marginBottom: '0.25rem', alignItems: 'center' }}>
+            <div
+              key={idx}
+              style={{
+                display: "flex",
+                gap: "0.25rem",
+                marginBottom: "0.25rem",
+                alignItems: "center",
+              }}
+            >
              <input
                value={row.key}
-                onChange={(e) => updateRow(idx, 'key', e.target.value)}
+                onChange={(e) => updateRow(idx, "key", e.target.value)}
                placeholder="Key"
                style={{ ...inputStyle, width: 140 }}
                disabled={!isEditor}
              />
              <select
                value={row.type}
-                onChange={(e) => updateRow(idx, 'type', e.target.value)}
+                onChange={(e) => updateRow(idx, "type", e.target.value)}
                style={{ ...inputStyle, width: 80 }}
                disabled={!isEditor}
              >
@@ -154,44 +206,90 @@ export function PropertiesTab({ item, onReload, isEditor }: PropertiesTabProps)
                <option value="number">num</option>
                <option value="boolean">bool</option>
              </select>
-              {row.type === 'boolean' ? (
-                <select value={row.value} onChange={(e) => updateRow(idx, 'value', e.target.value)} style={{ ...inputStyle, flex: 1 }} disabled={!isEditor}>
+              {row.type === "boolean" ? (
+                <select
+                  value={row.value}
+                  onChange={(e) => updateRow(idx, "value", e.target.value)}
+                  style={{ ...inputStyle, flex: 1 }}
+                  disabled={!isEditor}
+                >
                  <option value="true">true</option>
                  <option value="false">false</option>
                </select>
              ) : (
                <input
-                  type={row.type === 'number' ? 'number' : 'text'}
+                  type={row.type === "number" ? "number" : "text"}
                  value={row.value}
-                  onChange={(e) => updateRow(idx, 'value', e.target.value)}
+                  onChange={(e) => updateRow(idx, "value", e.target.value)}
                  placeholder="Value"
                  style={{ ...inputStyle, flex: 1 }}
                  disabled={!isEditor}
                />
              )}
              {isEditor && (
-                <button onClick={() => removeRow(idx)} style={{ background: 'none', border: 'none', color: 'var(--ctp-red)', cursor: 'pointer', fontSize: '0.9rem' }}>×</button>
+                <button
+                  onClick={() => removeRow(idx)}
+                  style={{
+                    background: "none",
+                    border: "none",
+                    color: "var(--ctp-red)",
+                    cursor: "pointer",
+                    display: "inline-flex",
+                  }}
+                >
+                  <X size={14} />
+                </button>
              )}
            </div>
          ))}
          {isEditor && (
-            <button onClick={addRow} style={{ ...tabBtn, marginTop: '0.25rem' }}>+ Add Property</button>
+            <button
+              onClick={addRow}
+              style={{
+                ...tabBtn,
+                marginTop: "0.25rem",
+                display: "inline-flex",
+                alignItems: "center",
+                gap: "0.35rem",
+              }}
+            >
+              <Plus size={14} /> Add Property
+            </button>
          )}
        </div>
      ) : (
        <div>
          <textarea
            value={jsonText}
-            onChange={(e) => { setJsonText(e.target.value); setJsonError(null); }}
+            onChange={(e) => {
+              setJsonText(e.target.value);
+              setJsonError(null);
+            }}
            disabled={!isEditor}
            style={{
-              width: '100%', minHeight: 200, padding: '0.5rem',
-              fontFamily: "'JetBrains Mono', monospace", fontSize: '0.8rem',
-              backgroundColor: 'var(--ctp-base)', border: '1px solid var(--ctp-surface1)',
-              borderRadius: '0.4rem', color: 'var(--ctp-text)', resize: 'vertical',
+              width: "100%",
+              minHeight: 200,
+              padding: "0.5rem",
+              fontFamily: "'JetBrains Mono', monospace",
+              fontSize: "var(--font-table)",
+              backgroundColor: "var(--ctp-base)",
+              border: "1px solid var(--ctp-surface1)",
+              borderRadius: "0.4rem",
+              color: "var(--ctp-text)",
+              resize: "vertical",
            }}
          />
-          {jsonError && <div style={{ color: 'var(--ctp-red)', fontSize: '0.8rem', marginTop: '0.25rem' }}>{jsonError}</div>}
+          {jsonError && (
+            <div
+              style={{
+                color: "var(--ctp-red)",
+                fontSize: "var(--font-table)",
+                marginTop: "0.25rem",
+              }}
+            >
+              {jsonError}
+            </div>
+          )}
        </div>
      )}
    </div>
@@ -199,11 +297,17 @@ export function PropertiesTab({ item, onReload, isEditor }: PropertiesTabProps)
 }

 const tabBtn: React.CSSProperties = {
-  padding: '0.25rem 0.5rem', fontSize: '0.8rem', border: 'none', borderRadius: '0.3rem',
-  backgroundColor: 'var(--ctp-surface0)', color: 'var(--ctp-subtext1)', cursor: 'pointer',
+  padding: "0.25rem 0.5rem",
+  fontSize: "var(--font-table)",
+  border: "none",
+  borderRadius: "0.375rem",
+  backgroundColor: "var(--ctp-surface0)",
+  color: "var(--ctp-subtext1)",
+  cursor: "pointer",
 };

 const activeTabBtn: React.CSSProperties = {
  ...tabBtn,
-  backgroundColor: 'var(--ctp-surface1)', color: 'var(--ctp-mauve)',
+  backgroundColor: "var(--ctp-surface1)",
+  color: "var(--ctp-mauve)",
 };
--- a/web/src/components/items/RevisionsTab.tsx
+++ b/web/src/components/items/RevisionsTab.tsx
@@ -1,6 +1,7 @@
-import { useState, useEffect } from 'react';
-import { get, post } from '../../api/client';
-import type { Revision, RevisionComparison } from '../../api/types';
+import { useState, useEffect } from "react";
+import { Download } from "lucide-react";
+import { get, post } from "../../api/client";
+import type { Revision, RevisionComparison } from "../../api/types";

 interface RevisionsTabProps {
  partNumber: string;
@@ -8,28 +9,35 @@ interface RevisionsTabProps {
 }

 const statusColors: Record<string, string> = {
-  draft: 'var(--ctp-overlay1)',
-  review: 'var(--ctp-yellow)',
-  released: 'var(--ctp-green)',
-  obsolete: 'var(--ctp-red)',
+  draft: "var(--ctp-overlay1)",
+  review: "var(--ctp-yellow)",
+  released: "var(--ctp-green)",
+  obsolete: "var(--ctp-red)",
 };

 function formatDate(s: string) {
-  if (!s) return '';
-  return new Date(s).toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric' });
+  if (!s) return "";
+  return new Date(s).toLocaleDateString("en-US", {
+    year: "numeric",
+    month: "short",
+    day: "numeric",
+  });
 }

 export function RevisionsTab({ partNumber, isEditor }: RevisionsTabProps) {
  const [revisions, setRevisions] = useState<Revision[]>([]);
  const [loading, setLoading] = useState(true);
-  const [compareFrom, setCompareFrom] = useState('');
-  const [compareTo, setCompareTo] = useState('');
+  const [compareFrom, setCompareFrom] = useState("");
+  const [compareTo, setCompareTo] = useState("");
  const [comparison, setComparison] = useState<RevisionComparison | null>(null);

  const load = () => {
    setLoading(true);
    get<Revision[]>(`/api/items/${encodeURIComponent(partNumber)}/revisions`)
-      .then((r) => { setRevisions(r); setLoading(false); })
+      .then((r) => {
+        setRevisions(r);
+        setLoading(false);
+      })
      .catch(() => setLoading(false));
  };

@@ -39,97 +47,177 @@ export function RevisionsTab({ partNumber, isEditor }: RevisionsTabProps) {
    if (!compareFrom || !compareTo) return;
    try {
      const result = await get<RevisionComparison>(
-        `/api/items/${encodeURIComponent(partNumber)}/revisions/compare?from=${compareFrom}&to=${compareTo}`
+        `/api/items/${encodeURIComponent(partNumber)}/revisions/compare?from=${compareFrom}&to=${compareTo}`,
      );
      setComparison(result);
    } catch (e) {
-      alert(e instanceof Error ? e.message : 'Compare failed');
+      alert(e instanceof Error ? e.message : "Compare failed");
    }
  };

  const handleStatusChange = async (rev: number, status: string) => {
    try {
-      await fetch(`/api/items/${encodeURIComponent(partNumber)}/revisions/${rev}`, {
-        method: 'PATCH',
-        headers: { 'Content-Type': 'application/json' },
-        credentials: 'include',
-        body: JSON.stringify({ status }),
-      });
+      await fetch(
+        `/api/items/${encodeURIComponent(partNumber)}/revisions/${rev}`,
+        {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          credentials: "include",
+          body: JSON.stringify({ status }),
+        },
+      );
      load();
    } catch (e) {
-      alert(e instanceof Error ? e.message : 'Status update failed');
+      alert(e instanceof Error ? e.message : "Status update failed");
    }
  };

  const handleRollback = async (rev: number) => {
-    if (!confirm(`Rollback to revision ${rev}? This creates a new revision with data from rev ${rev}.`)) return;
-    const comment = prompt('Rollback comment:') ?? `Rollback to rev ${rev}`;
+    if (
+      !confirm(
+        `Rollback to revision ${rev}? This creates a new revision with data from rev ${rev}.`,
+      )
+    )
+      return;
+    const comment = prompt("Rollback comment:") ?? `Rollback to rev ${rev}`;
    try {
-      await post(`/api/items/${encodeURIComponent(partNumber)}/revisions/${rev}/rollback`, { comment });
+      await post(
+        `/api/items/${encodeURIComponent(partNumber)}/revisions/${rev}/rollback`,
+        { comment },
+      );
      load();
    } catch (e) {
-      alert(e instanceof Error ? e.message : 'Rollback failed');
+      alert(e instanceof Error ? e.message : "Rollback failed");
    }
  };

-  if (loading) return <div style={{ color: 'var(--ctp-subtext0)' }}>Loading revisions...</div>;
+  if (loading)
+    return (
+      <div style={{ color: "var(--ctp-subtext0)" }}>Loading revisions...</div>
+    );

  const selectStyle: React.CSSProperties = {
-    padding: '0.25rem 0.4rem', fontSize: '0.8rem',
-    backgroundColor: 'var(--ctp-surface0)', border: '1px solid var(--ctp-surface1)',
-    borderRadius: '0.3rem', color: 'var(--ctp-text)',
+    padding: "0.25rem 0.4rem",
+    fontSize: "var(--font-table)",
+    backgroundColor: "var(--ctp-surface0)",
+    border: "1px solid var(--ctp-surface1)",
+    borderRadius: "0.375rem",
+    color: "var(--ctp-text)",
  };

  return (
    <div>
      {/* Compare controls */}
-      <div style={{ display: 'flex', gap: '0.5rem', alignItems: 'center', marginBottom: '0.75rem' }}>
-        <select value={compareFrom} onChange={(e) => setCompareFrom(e.target.value)} style={selectStyle}>
+      <div
+        style={{
+          display: "flex",
+          gap: "0.5rem",
+          alignItems: "center",
+          marginBottom: "0.75rem",
+        }}
+      >
+        <select
+          value={compareFrom}
+          onChange={(e) => setCompareFrom(e.target.value)}
+          style={selectStyle}
+        >
          <option value="">From rev...</option>
-          {revisions.map((r) => <option key={r.id} value={r.revision_number}>Rev {r.revision_number}</option>)}
+          {revisions.map((r) => (
+            <option key={r.id} value={r.revision_number}>
+              Rev {r.revision_number}
+            </option>
+          ))}
        </select>
-        <select value={compareTo} onChange={(e) => setCompareTo(e.target.value)} style={selectStyle}>
+        <select
+          value={compareTo}
+          onChange={(e) => setCompareTo(e.target.value)}
+          style={selectStyle}
+        >
          <option value="">To rev...</option>
-          {revisions.map((r) => <option key={r.id} value={r.revision_number}>Rev {r.revision_number}</option>)}
+          {revisions.map((r) => (
+            <option key={r.id} value={r.revision_number}>
+              Rev {r.revision_number}
+            </option>
+          ))}
        </select>
-        <button onClick={() => void handleCompare()} disabled={!compareFrom || !compareTo} style={{
-          padding: '0.25rem 0.5rem', fontSize: '0.8rem', border: 'none', borderRadius: '0.3rem',
-          backgroundColor: 'var(--ctp-mauve)', color: 'var(--ctp-crust)', cursor: 'pointer',
-          opacity: (!compareFrom || !compareTo) ? 0.5 : 1,
-        }}>
+        <button
+          onClick={() => void handleCompare()}
+          disabled={!compareFrom || !compareTo}
+          style={{
+            padding: "0.25rem 0.5rem",
+            fontSize: "var(--font-table)",
+            border: "none",
+            borderRadius: "0.375rem",
+            backgroundColor: "var(--ctp-mauve)",
+            color: "var(--ctp-crust)",
+            cursor: "pointer",
+            opacity: !compareFrom || !compareTo ? 0.5 : 1,
+          }}
+        >
          Compare
        </button>
      </div>

      {/* Compare results */}
      {comparison && (
-        <div style={{
-          padding: '0.5rem', backgroundColor: 'var(--ctp-surface0)', borderRadius: '0.4rem',
-          fontSize: '0.8rem', marginBottom: '0.75rem', fontFamily: "'JetBrains Mono', monospace",
-        }}>
+        <div
+          style={{
+            padding: "0.5rem",
+            backgroundColor: "var(--ctp-surface0)",
+            borderRadius: "0.4rem",
+            fontSize: "var(--font-table)",
+            marginBottom: "0.75rem",
+            fontFamily: "'JetBrains Mono', monospace",
+          }}
+        >
          {comparison.status_changed && (
-            <div>Status: <span style={{ color: 'var(--ctp-red)' }}>{comparison.status_changed.from}</span> → <span style={{ color: 'var(--ctp-green)' }}>{comparison.status_changed.to}</span></div>
+            <div>
+              Status:{" "}
+              <span style={{ color: "var(--ctp-red)" }}>
+                {comparison.status_changed.from}
+              </span>{" "}
+              →{" "}
+              <span style={{ color: "var(--ctp-green)" }}>
+                {comparison.status_changed.to}
+              </span>
+            </div>
+          )}
+          {comparison.file_changed && (
+            <div style={{ color: "var(--ctp-yellow)" }}>File changed</div>
          )}
-          {comparison.file_changed && <div style={{ color: 'var(--ctp-yellow)' }}>File changed</div>}
          {Object.entries(comparison.added).map(([k, v]) => (
-            <div key={k} style={{ color: 'var(--ctp-green)' }}>+ {k}: {String(v)}</div>
+            <div key={k} style={{ color: "var(--ctp-green)" }}>
+              + {k}: {String(v)}
+            </div>
          ))}
          {Object.entries(comparison.removed).map(([k, v]) => (
-            <div key={k} style={{ color: 'var(--ctp-red)' }}>- {k}: {String(v)}</div>
+            <div key={k} style={{ color: "var(--ctp-red)" }}>
+              - {k}: {String(v)}
+            </div>
          ))}
          {Object.entries(comparison.changed).map(([k, c]) => (
-            <div key={k} style={{ color: 'var(--ctp-yellow)' }}>~ {k}: {String(c.from)} → {String(c.to)}</div>
+            <div key={k} style={{ color: "var(--ctp-yellow)" }}>
+              ~ {k}: {String(c.from)} → {String(c.to)}
+            </div>
          ))}
-          {!comparison.status_changed && !comparison.file_changed &&
-           Object.keys(comparison.added).length === 0 && Object.keys(comparison.removed).length === 0 &&
-           Object.keys(comparison.changed).length === 0 && (
-            <div style={{ color: 'var(--ctp-subtext0)' }}>No differences</div>
-          )}
+          {!comparison.status_changed &&
+            !comparison.file_changed &&
+            Object.keys(comparison.added).length === 0 &&
+            Object.keys(comparison.removed).length === 0 &&
+            Object.keys(comparison.changed).length === 0 && (
+              <div style={{ color: "var(--ctp-subtext0)" }}>No differences</div>
+            )}
        </div>
      )}

      {/* Revisions table */}
-      <table style={{ width: '100%', borderCollapse: 'collapse', fontSize: '0.8rem' }}>
+      <table
+        style={{
+          width: "100%",
+          borderCollapse: "collapse",
+          fontSize: "var(--font-table)",
+        }}
+      >
        <thead>
          <tr>
            <th style={thStyle}>Rev</th>
@@ -143,17 +231,32 @@ export function RevisionsTab({ partNumber, isEditor }: RevisionsTabProps) {
        </thead>
        <tbody>
          {revisions.map((rev, idx) => (
-            <tr key={rev.id} style={{ backgroundColor: idx % 2 === 0 ? 'var(--ctp-base)' : 'var(--ctp-surface0)' }}>
+            <tr
+              key={rev.id}
+              style={{
+                backgroundColor:
+                  idx % 2 === 0 ? "var(--ctp-base)" : "var(--ctp-surface0)",
+              }}
+            >
              <td style={tdStyle}>{rev.revision_number}</td>
              <td style={tdStyle}>
                {isEditor ? (
                  <select
                    value={rev.status}
-                    onChange={(e) => void handleStatusChange(rev.revision_number, e.target.value)}
+                    onChange={(e) =>
+                      void handleStatusChange(
+                        rev.revision_number,
+                        e.target.value,
+                      )
+                    }
                    style={{
-                      padding: '0.1rem 0.3rem', fontSize: '0.75rem', border: 'none', borderRadius: '0.3rem',
-                      backgroundColor: 'transparent', color: statusColors[rev.status] ?? 'var(--ctp-text)',
-                      cursor: 'pointer',
+                      padding: "0.15rem 0.25rem",
+                      fontSize: "0.75rem",
+                      border: "none",
+                      borderRadius: "0.375rem",
+                      backgroundColor: "transparent",
+                      color: statusColors[rev.status] ?? "var(--ctp-text)",
+                      cursor: "pointer",
                    }}
                  >
                    <option value="draft">draft</option>
@@ -162,27 +265,58 @@ export function RevisionsTab({ partNumber, isEditor }: RevisionsTabProps) {
                    <option value="obsolete">obsolete</option>
                  </select>
                ) : (
-                  <span style={{ color: statusColors[rev.status] ?? 'var(--ctp-text)' }}>{rev.status}</span>
+                  <span
+                    style={{
+                      color: statusColors[rev.status] ?? "var(--ctp-text)",
+                    }}
+                  >
+                    {rev.status}
+                  </span>
                )}
              </td>
              <td style={tdStyle}>{formatDate(rev.created_at)}</td>
-              <td style={tdStyle}>{rev.created_by ?? '—'}</td>
-              <td style={{ ...tdStyle, maxWidth: 150, overflow: 'hidden', textOverflow: 'ellipsis' }}>{rev.comment ?? ''}</td>
+              <td style={tdStyle}>{rev.created_by ?? "—"}</td>
+              <td
+                style={{
+                  ...tdStyle,
+                  maxWidth: 150,
+                  overflow: "hidden",
+                  textOverflow: "ellipsis",
+                }}
+              >
+                {rev.comment ?? ""}
+              </td>
              <td style={tdStyle}>
                {rev.file_key ? (
                  <button
-                    onClick={() => { window.location.href = `/api/items/${encodeURIComponent(partNumber)}/file/${rev.revision_number}`; }}
-                    style={{ background: 'none', border: 'none', color: 'var(--ctp-sapphire)', cursor: 'pointer', fontSize: '0.8rem' }}
+                    onClick={() => {
+                      window.location.href = `/api/items/${encodeURIComponent(partNumber)}/file/${rev.revision_number}`;
+                    }}
+                    style={{
+                      background: "none",
+                      border: "none",
+                      color: "var(--ctp-sapphire)",
+                      cursor: "pointer",
+                      display: "inline-flex",
+                    }}
                  >
-                    ↓
+                    <Download size={14} />
                  </button>
-                ) : '—'}
+                ) : (
+                  "—"
+                )}
              </td>
              {isEditor && (
                <td style={tdStyle}>
                  <button
                    onClick={() => void handleRollback(rev.revision_number)}
-                    style={{ background: 'none', border: 'none', color: 'var(--ctp-peach)', cursor: 'pointer', fontSize: '0.75rem' }}
+                    style={{
+                      background: "none",
+                      border: "none",
+                      color: "var(--ctp-peach)",
+                      cursor: "pointer",
+                      fontSize: "0.75rem",
+                    }}
                    title="Rollback to this revision"
                  >
                    Rollback
@@ -198,10 +332,18 @@ export function RevisionsTab({ partNumber, isEditor }: RevisionsTabProps) {
 }

 const thStyle: React.CSSProperties = {
-  padding: '0.3rem 0.5rem', textAlign: 'left', borderBottom: '1px solid var(--ctp-surface1)',
-  color: 'var(--ctp-subtext1)', fontWeight: 600, fontSize: '0.7rem', textTransform: 'uppercase', letterSpacing: '0.05em',
+  padding: "0.25rem 0.5rem",
+  textAlign: "left",
+  borderBottom: "1px solid var(--ctp-surface1)",
+  color: "var(--ctp-subtext1)",
+  fontWeight: 600,
+  fontSize: "var(--font-sm)",
+  textTransform: "uppercase",
+  letterSpacing: "0.05em",
 };

 const tdStyle: React.CSSProperties = {
-  padding: '0.25rem 0.5rem', borderBottom: '1px solid var(--ctp-surface0)', whiteSpace: 'nowrap',
+  padding: "0.25rem 0.5rem",
+  borderBottom: "1px solid var(--ctp-surface0)",
+  whiteSpace: "nowrap",
 };
--- a/web/src/components/items/WhereUsedTab.tsx
+++ b/web/src/components/items/WhereUsedTab.tsx
@@ -1,6 +1,6 @@
-import { useState, useEffect } from 'react';
-import { get } from '../../api/client';
-import type { WhereUsedEntry } from '../../api/types';
+import { useState, useEffect } from "react";
+import { get } from "../../api/client";
+import type { WhereUsedEntry } from "../../api/types";

 interface WhereUsedTabProps {
  partNumber: string;
@@ -12,20 +12,35 @@ export function WhereUsedTab({ partNumber }: WhereUsedTabProps) {

  useEffect(() => {
    setLoading(true);
-    get<WhereUsedEntry[]>(`/api/items/${encodeURIComponent(partNumber)}/bom/where-used`)
+    get<WhereUsedEntry[]>(
+      `/api/items/${encodeURIComponent(partNumber)}/bom/where-used`,
+    )
      .then(setEntries)
      .catch(() => setEntries([]))
      .finally(() => setLoading(false));
  }, [partNumber]);

-  if (loading) return <div style={{ color: 'var(--ctp-subtext0)' }}>Loading where-used...</div>;
+  if (loading)
+    return (
+      <div style={{ color: "var(--ctp-subtext0)" }}>Loading where-used...</div>
+    );

  if (entries.length === 0) {
-    return <div style={{ color: 'var(--ctp-subtext0)', padding: '1rem' }}>Not used in any assemblies.</div>;
+    return (
+      <div style={{ color: "var(--ctp-subtext0)", padding: "1rem" }}>
+        Not used in any assemblies.
+      </div>
+    );
  }

  return (
-    <table style={{ width: '100%', borderCollapse: 'collapse', fontSize: '0.8rem' }}>
+    <table
+      style={{
+        width: "100%",
+        borderCollapse: "collapse",
+        fontSize: "var(--font-table)",
+      }}
+    >
      <thead>
        <tr>
          <th style={thStyle}>Parent PN</th>
@@ -36,13 +51,25 @@ export function WhereUsedTab({ partNumber }: WhereUsedTabProps) {
      </thead>
      <tbody>
        {entries.map((e, idx) => (
-          <tr key={e.id} style={{ backgroundColor: idx % 2 === 0 ? 'var(--ctp-base)' : 'var(--ctp-surface0)' }}>
-            <td style={{ ...tdStyle, fontFamily: "'JetBrains Mono', monospace", color: 'var(--ctp-peach)' }}>
+          <tr
+            key={e.id}
+            style={{
+              backgroundColor:
+                idx % 2 === 0 ? "var(--ctp-base)" : "var(--ctp-surface0)",
+            }}
+          >
+            <td
+              style={{
+                ...tdStyle,
+                fontFamily: "'JetBrains Mono', monospace",
+                color: "var(--ctp-peach)",
+              }}
+            >
              {e.parent_part_number}
            </td>
            <td style={tdStyle}>{e.parent_description}</td>
            <td style={tdStyle}>{e.rel_type}</td>
-            <td style={tdStyle}>{e.quantity ?? '—'}</td>
+            <td style={tdStyle}>{e.quantity ?? "—"}</td>
          </tr>
        ))}
      </tbody>
@@ -51,10 +78,18 @@ export function WhereUsedTab({ partNumber }: WhereUsedTabProps) {
 }

 const thStyle: React.CSSProperties = {
-  padding: '0.3rem 0.5rem', textAlign: 'left', borderBottom: '1px solid var(--ctp-surface1)',
-  color: 'var(--ctp-subtext1)', fontWeight: 600, fontSize: '0.7rem', textTransform: 'uppercase', letterSpacing: '0.05em',
+  padding: "0.25rem 0.5rem",
+  textAlign: "left",
+  borderBottom: "1px solid var(--ctp-surface1)",
+  color: "var(--ctp-subtext1)",
+  fontWeight: 600,
+  fontSize: "var(--font-sm)",
+  textTransform: "uppercase",
+  letterSpacing: "0.05em",
 };

 const tdStyle: React.CSSProperties = {
-  padding: '0.25rem 0.5rem', borderBottom: '1px solid var(--ctp-surface0)', whiteSpace: 'nowrap',
+  padding: "0.25rem 0.5rem",
+  borderBottom: "1px solid var(--ctp-surface0)",
+  whiteSpace: "nowrap",
 };
--- a/web/src/hooks/useCategories.ts
+++ b/web/src/hooks/useCategories.ts
@@ -1,28 +0,0 @@
-import { useState, useEffect } from "react";
-import { get } from "../api/client";
-import type { Schema } from "../api/types";
-
-// Module-level cache to avoid refetching across mounts.
-let cached: Record<string, string> | null = null;
-
-export function useCategories() {
-  const [categories, setCategories] = useState<Record<string, string>>(
-    cached ?? {},
-  );
-  const [loading, setLoading] = useState(cached === null);
-
-  useEffect(() => {
-    if (cached) return;
-    get<Schema>("/api/schemas/kindred-rd")
-      .then((schema) => {
-        const seg = schema.segments.find((s) => s.name === "category");
-        const vals = seg?.values ?? {};
-        cached = vals;
-        setCategories(vals);
-      })
-      .catch(() => {})
-      .finally(() => setLoading(false));
-  }, []);
-
-  return { categories, loading };
-}
--- a/web/src/hooks/useFormDescriptor.ts
+++ b/web/src/hooks/useFormDescriptor.ts
@@ -0,0 +1,37 @@
+import { useState, useEffect } from "react";
+import { get } from "../api/client";
+import type { FormDescriptor } from "../api/types";
+
+// Module-level cache to avoid refetching across mounts.
+let cached: FormDescriptor | null = null;
+
+export function useFormDescriptor(schemaName = "kindred-rd") {
+  const [descriptor, setDescriptor] = useState<FormDescriptor | null>(cached);
+  const [loading, setLoading] = useState(cached === null);
+
+  useEffect(() => {
+    if (cached) return;
+    get<FormDescriptor>(`/api/schemas/${encodeURIComponent(schemaName)}/form`)
+      .then((desc) => {
+        cached = desc;
+        setDescriptor(desc);
+      })
+      .catch(() => {})
+      .finally(() => setLoading(false));
+  }, [schemaName]);
+
+  // Derive flat categories map from the category_picker stages
+  const categories: Record<string, string> = {};
+  if (descriptor?.category_picker) {
+    const subcatStage = descriptor.category_picker.stages.find(
+      (s) => s.values_by_domain,
+    );
+    if (subcatStage?.values_by_domain) {
+      for (const domainVals of Object.values(subcatStage.values_by_domain)) {
+        Object.assign(categories, domainVals);
+      }
+    }
+  }
+
+  return { descriptor, categories, loading };
+}
--- a/web/src/pages/AuditPage.tsx
+++ b/web/src/pages/AuditPage.tsx
@@ -57,7 +57,7 @@ export function AuditPage() {
          style={{
            color: "var(--ctp-red)",
            padding: "0.5rem",
-            fontSize: "0.85rem",
+            fontSize: "var(--font-body)",
          }}
        >
          Error: {error}
--- a/web/src/pages/ItemsPage.tsx
+++ b/web/src/pages/ItemsPage.tsx
@@ -179,7 +179,7 @@ export function ItemsPage() {
          style={{
            color: "var(--ctp-red)",
            padding: "0.5rem",
-            fontSize: "0.85rem",
+            fontSize: "var(--font-body)",
          }}
        >
          Error: {error}
--- a/web/src/pages/LoginPage.tsx
+++ b/web/src/pages/LoginPage.tsx
@@ -43,6 +43,7 @@ export function LoginPage() {
          <div style={formGroupStyle}>
            <label style={labelStyle}>Username</label>
            <input
+              className="silo-input"
              type="text"
              value={username}
              onChange={(e) => setUsername(e.target.value)}
@@ -55,6 +56,7 @@ export function LoginPage() {
          <div style={formGroupStyle}>
            <label style={labelStyle}>Password</label>
            <input
+              className="silo-input"
              type="password"
              value={password}
              onChange={(e) => setPassword(e.target.value)}
@@ -76,7 +78,7 @@ export function LoginPage() {
                style={{
                  padding: "0 1rem",
                  color: "var(--ctp-overlay0)",
-                  fontSize: "0.85rem",
+                  fontSize: "var(--font-body)",
                }}
              >
                or
@@ -121,7 +123,7 @@ const titleStyle: React.CSSProperties = {
 const subtitleStyle: React.CSSProperties = {
  color: "var(--ctp-subtext0)",
  textAlign: "center",
-  fontSize: "0.9rem",
+  fontSize: "var(--font-body)",
  marginBottom: "2rem",
 };

@@ -132,7 +134,7 @@ const errorStyle: React.CSSProperties = {
  padding: "0.75rem 1rem",
  borderRadius: "0.5rem",
  marginBottom: "1rem",
-  fontSize: "0.9rem",
+  fontSize: "var(--font-body)",
 };

 const formGroupStyle: React.CSSProperties = {
@@ -144,7 +146,7 @@ const labelStyle: React.CSSProperties = {
  marginBottom: "0.5rem",
  fontWeight: 500,
  color: "var(--ctp-subtext1)",
-  fontSize: "0.9rem",
+  fontSize: "var(--font-body)",
 };

 const inputStyle: React.CSSProperties = {
@@ -154,7 +156,7 @@ const inputStyle: React.CSSProperties = {
  border: "1px solid var(--ctp-surface1)",
  borderRadius: "0.5rem",
  color: "var(--ctp-text)",
-  fontSize: "1rem",
+  fontSize: "var(--font-body)",
  boxSizing: "border-box",
 };

@@ -162,9 +164,9 @@ const btnPrimaryStyle: React.CSSProperties = {
  display: "block",
  width: "100%",
  padding: "0.75rem 1.5rem",
-  borderRadius: "0.5rem",
-  fontWeight: 600,
-  fontSize: "1rem",
+  borderRadius: "0.375rem",
+  fontWeight: 500,
+  fontSize: "0.75rem",
  cursor: "pointer",
  border: "none",
  backgroundColor: "var(--ctp-mauve)",
@@ -187,9 +189,9 @@ const btnOidcStyle: React.CSSProperties = {
  display: "block",
  width: "100%",
  padding: "0.75rem 1.5rem",
-  borderRadius: "0.5rem",
-  fontWeight: 600,
-  fontSize: "1rem",
+  borderRadius: "0.375rem",
+  fontWeight: 500,
+  fontSize: "0.75rem",
  cursor: "pointer",
  border: "none",
  backgroundColor: "var(--ctp-blue)",
--- a/web/src/pages/ProjectsPage.tsx
+++ b/web/src/pages/ProjectsPage.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useState, useCallback, type FormEvent } from "react";
 import { useNavigate } from "react-router-dom";
+import { Plus, ChevronUp, ChevronDown } from "lucide-react";
 import { get, post, put, del } from "../api/client";
 import { useAuth } from "../hooks/useAuth";
 import type {
@@ -180,7 +181,17 @@ export function ProjectsPage() {
  };

  const sortArrow = (key: typeof sortKey) =>
-    sortKey === key ? (sortAsc ? " \u25B2" : " \u25BC") : "";
+    sortKey === key ? (
+      <span
+        style={{
+          marginLeft: 4,
+          display: "inline-flex",
+          verticalAlign: "middle",
+        }}
+      >
+        {sortAsc ? <ChevronUp size={14} /> : <ChevronDown size={14} />}
+      </span>
+    ) : null;

  if (loading)
    return <p style={{ color: "var(--ctp-subtext0)" }}>Loading projects...</p>;
@@ -199,8 +210,16 @@ export function ProjectsPage() {
      >
        <h2>Projects ({projects.length})</h2>
        {isEditor && mode === "list" && (
-          <button onClick={openCreate} style={btnPrimaryStyle}>
-            + New Project
+          <button
+            onClick={openCreate}
+            style={{
+              ...btnPrimaryStyle,
+              display: "inline-flex",
+              alignItems: "center",
+              gap: "0.35rem",
+            }}
+          >
+            <Plus size={14} /> New Project
          </button>
        )}
      </div>
@@ -235,6 +254,7 @@ export function ProjectsPage() {
                  Code (2-10 characters, uppercase)
                </label>
                <input
+                  className="silo-input"
                  type="text"
                  value={formCode}
                  onChange={(e) => setFormCode(e.target.value)}
@@ -249,6 +269,7 @@ export function ProjectsPage() {
            <div style={fieldStyle}>
              <label style={labelStyle}>Name</label>
              <input
+                className="silo-input"
                type="text"
                value={formName}
                onChange={(e) => setFormName(e.target.value)}
@@ -259,6 +280,7 @@ export function ProjectsPage() {
            <div style={fieldStyle}>
              <label style={labelStyle}>Description</label>
              <input
+                className="silo-input"
                type="text"
                value={formDesc}
                onChange={(e) => setFormDesc(e.target.value)}
@@ -316,7 +338,7 @@ export function ProjectsPage() {
              style={{
                color: "var(--ctp-red)",
                marginTop: "0.5rem",
-                fontSize: "0.85rem",
+                fontSize: "var(--font-body)",
              }}
            >
              This action cannot be undone.
@@ -443,43 +465,45 @@ export function ProjectsPage() {
 // Styles
 const btnPrimaryStyle: React.CSSProperties = {
  padding: "0.5rem 1rem",
-  borderRadius: "0.4rem",
+  borderRadius: "0.375rem",
  border: "none",
  backgroundColor: "var(--ctp-mauve)",
  color: "var(--ctp-crust)",
-  fontWeight: 600,
-  fontSize: "0.85rem",
+  fontWeight: 500,
+  fontSize: "0.75rem",
  cursor: "pointer",
 };

 const btnSecondaryStyle: React.CSSProperties = {
  padding: "0.5rem 1rem",
-  borderRadius: "0.4rem",
+  borderRadius: "0.375rem",
  border: "none",
  backgroundColor: "var(--ctp-surface1)",
  color: "var(--ctp-text)",
-  fontSize: "0.85rem",
+  fontWeight: 500,
+  fontSize: "0.75rem",
  cursor: "pointer",
 };

 const btnDangerStyle: React.CSSProperties = {
  padding: "0.5rem 1rem",
-  borderRadius: "0.4rem",
+  borderRadius: "0.375rem",
  border: "none",
  backgroundColor: "var(--ctp-red)",
  color: "var(--ctp-crust)",
-  fontWeight: 600,
-  fontSize: "0.85rem",
+  fontWeight: 500,
+  fontSize: "0.75rem",
  cursor: "pointer",
 };

 const btnSmallStyle: React.CSSProperties = {
-  padding: "0.3rem 0.6rem",
-  borderRadius: "0.3rem",
+  padding: "0.25rem 0.5rem",
+  borderRadius: "0.375rem",
  border: "none",
  backgroundColor: "var(--ctp-surface1)",
  color: "var(--ctp-text)",
-  fontSize: "0.8rem",
+  fontWeight: 500,
+  fontSize: "0.75rem",
  cursor: "pointer",
 };

@@ -496,7 +520,7 @@ const formHeaderStyle: React.CSSProperties = {
  alignItems: "center",
  padding: "0.5rem 1rem",
  color: "var(--ctp-crust)",
-  fontSize: "0.9rem",
+  fontSize: "var(--font-body)",
 };

 const formCloseStyle: React.CSSProperties = {
@@ -504,8 +528,9 @@ const formCloseStyle: React.CSSProperties = {
  border: "none",
  color: "inherit",
  cursor: "pointer",
-  fontSize: "0.85rem",
-  fontWeight: 600,
+  fontSize: "0.75rem",
+  fontWeight: 500,
+  borderRadius: "0.375rem",
 };

 const errorBannerStyle: React.CSSProperties = {
@@ -515,7 +540,7 @@ const errorBannerStyle: React.CSSProperties = {
  padding: "0.5rem 0.75rem",
  borderRadius: "0.4rem",
  marginBottom: "0.75rem",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
 };

 const fieldStyle: React.CSSProperties = {
@@ -527,7 +552,7 @@ const labelStyle: React.CSSProperties = {
  marginBottom: "0.35rem",
  fontWeight: 500,
  color: "var(--ctp-subtext1)",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
 };

 const inputStyle: React.CSSProperties = {
@@ -537,7 +562,7 @@ const inputStyle: React.CSSProperties = {
  border: "1px solid var(--ctp-surface1)",
  borderRadius: "0.4rem",
  color: "var(--ctp-text)",
-  fontSize: "0.9rem",
+  fontSize: "var(--font-body)",
  boxSizing: "border-box",
 };

@@ -552,9 +577,9 @@ const thStyle: React.CSSProperties = {
  padding: "0.5rem 0.75rem",
  textAlign: "left",
  borderBottom: "1px solid var(--ctp-surface1)",
-  color: "var(--ctp-subtext1)",
+  color: "var(--ctp-overlay1)",
  fontWeight: 600,
-  fontSize: "0.8rem",
+  fontSize: "var(--font-table)",
  textTransform: "uppercase",
  letterSpacing: "0.05em",
  cursor: "pointer",
@@ -564,5 +589,5 @@ const thStyle: React.CSSProperties = {
 const tdStyle: React.CSSProperties = {
  padding: "0.35rem 0.75rem",
  borderBottom: "1px solid var(--ctp-surface1)",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
 };
--- a/web/src/pages/SchemasPage.tsx
+++ b/web/src/pages/SchemasPage.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useState, type FormEvent } from "react";
+import { ChevronRight, ChevronDown, Plus } from "lucide-react";
 import { get, post, put, del } from "../api/client";
 import { useAuth } from "../hooks/useAuth";
 import type { Schema, SchemaSegment } from "../api/types";
@@ -282,10 +283,13 @@ function SchemaCard({
          color: "var(--ctp-sapphire)",
          userSelect: "none",
          marginTop: "1rem",
+          display: "flex",
+          alignItems: "center",
+          gap: "0.25rem",
        }}
      >
-        {isExpanded ? "\u25BC" : "\u25B6"} View Segments (
-        {schema.segments.length})
+        {isExpanded ? <ChevronDown size={14} /> : <ChevronRight size={14} />}{" "}
+        View Segments ({schema.segments.length})
      </div>

      {isExpanded &&
@@ -381,7 +385,7 @@ function SegmentBlock({
          style={{
            color: "var(--ctp-subtext0)",
            marginBottom: "0.5rem",
-            fontSize: "0.85rem",
+            fontSize: "var(--font-body)",
          }}
        >
          {segment.description}
@@ -415,7 +419,9 @@ function SegmentBlock({
                  return (
                    <tr key={code}>
                      <td style={tdStyle}>
-                        <code style={{ fontSize: "0.85rem" }}>{code}</code>
+                        <code style={{ fontSize: "var(--font-body)" }}>
+                          {code}
+                        </code>
                      </td>
                      <td style={tdStyle}>
                        <form
@@ -436,6 +442,7 @@ function SegmentBlock({
                              })
                            }
                            required
+                            className="silo-input"
                            style={inlineInputStyle}
                            autoFocus
                          />
@@ -478,13 +485,15 @@ function SegmentBlock({
                      style={{ backgroundColor: "rgba(243, 139, 168, 0.1)" }}
                    >
                      <td style={tdStyle}>
-                        <code style={{ fontSize: "0.85rem" }}>{code}</code>
+                        <code style={{ fontSize: "var(--font-body)" }}>
+                          {code}
+                        </code>
                      </td>
                      <td style={tdStyle}>
                        <span
                          style={{
                            color: "var(--ctp-red)",
-                            fontSize: "0.85rem",
+                            fontSize: "var(--font-body)",
                          }}
                        >
                          Delete this value?
@@ -526,7 +535,9 @@ function SegmentBlock({
                return (
                  <tr key={code}>
                    <td style={tdStyle}>
-                      <code style={{ fontSize: "0.85rem" }}>{code}</code>
+                      <code style={{ fontSize: "var(--font-body)" }}>
+                        {code}
+                      </code>
                    </td>
                    <td style={tdStyle}>{desc}</td>
                    {isEditor && (
@@ -573,6 +584,7 @@ function SegmentBlock({
                      }
                      placeholder="Code"
                      required
+                      className="silo-input"
                      style={inlineInputStyle}
                      autoFocus
                    />
@@ -597,6 +609,7 @@ function SegmentBlock({
                        }
                        placeholder="Description"
                        required
+                        className="silo-input"
                        style={inlineInputStyle}
                      />
                      <button
@@ -639,9 +652,15 @@ function SegmentBlock({
        !(isThisSegment(editState) && editState!.mode === "add") && (
          <button
            onClick={() => onStartAdd(schemaName, segment.name)}
-            style={{ ...btnTinyPrimaryStyle, marginTop: "0.5rem" }}
+            style={{
+              ...btnTinyPrimaryStyle,
+              marginTop: "0.5rem",
+              display: "inline-flex",
+              alignItems: "center",
+              gap: "0.35rem",
+            }}
          >
-            + Add Value
+            <Plus size={14} /> Add Value
          </button>
        )}
    </div>
@@ -661,7 +680,7 @@ const codeStyle: React.CSSProperties = {
  background: "var(--ctp-surface1)",
  padding: "0.25rem 0.5rem",
  borderRadius: "0.25rem",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
 };

 const segmentStyle: React.CSSProperties = {
@@ -691,37 +710,38 @@ const thStyle: React.CSSProperties = {
  padding: "0.4rem 0.75rem",
  textAlign: "left",
  borderBottom: "1px solid var(--ctp-surface1)",
-  color: "var(--ctp-subtext1)",
+  color: "var(--ctp-overlay1)",
  fontWeight: 600,
-  fontSize: "0.8rem",
+  fontSize: "var(--font-table)",
  textTransform: "uppercase",
  letterSpacing: "0.05em",
 };

 const tdStyle: React.CSSProperties = {
-  padding: "0.3rem 0.75rem",
+  padding: "0.25rem 0.75rem",
  borderBottom: "1px solid var(--ctp-surface1)",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
 };

 const btnTinyStyle: React.CSSProperties = {
-  padding: "0.2rem 0.5rem",
-  borderRadius: "0.25rem",
+  padding: "0.25rem 0.5rem",
+  borderRadius: "0.375rem",
  border: "none",
  backgroundColor: "var(--ctp-surface1)",
  color: "var(--ctp-text)",
  fontSize: "0.75rem",
+  fontWeight: 500,
  cursor: "pointer",
 };

 const btnTinyPrimaryStyle: React.CSSProperties = {
-  padding: "0.2rem 0.5rem",
-  borderRadius: "0.25rem",
+  padding: "0.25rem 0.5rem",
+  borderRadius: "0.375rem",
  border: "none",
  backgroundColor: "var(--ctp-mauve)",
  color: "var(--ctp-crust)",
  fontSize: "0.75rem",
-  fontWeight: 600,
+  fontWeight: 500,
  cursor: "pointer",
 };

@@ -731,7 +751,7 @@ const inlineInputStyle: React.CSSProperties = {
  border: "1px solid var(--ctp-surface1)",
  borderRadius: "0.25rem",
  color: "var(--ctp-text)",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
  width: "100%",
  boxSizing: "border-box",
 };
--- a/web/src/pages/SettingsPage.tsx
+++ b/web/src/pages/SettingsPage.tsx
@@ -116,7 +116,7 @@ export function SettingsPage() {
                  display: "inline-block",
                  padding: "0.15rem 0.5rem",
                  borderRadius: "1rem",
-                  fontSize: "0.8rem",
+                  fontSize: "var(--font-table)",
                  fontWeight: 600,
                  ...roleBadgeStyles[user.role],
                }}
@@ -137,7 +137,7 @@ export function SettingsPage() {
          style={{
            color: "var(--ctp-subtext0)",
            marginBottom: "1.25rem",
-            fontSize: "0.9rem",
+            fontSize: "var(--font-body)",
          }}
        >
          API tokens allow the FreeCAD plugin and scripts to authenticate with
@@ -175,7 +175,7 @@ export function SettingsPage() {
            <p
              style={{
                color: "var(--ctp-subtext0)",
-                fontSize: "0.85rem",
+                fontSize: "var(--font-body)",
                marginTop: "0.5rem",
              }}
            >
@@ -194,6 +194,7 @@ export function SettingsPage() {
              onChange={(e) => setTokenName(e.target.value)}
              placeholder="e.g., FreeCAD workstation"
              required
+              className="silo-input"
              style={inputStyle}
            />
          </div>
@@ -211,7 +212,7 @@ export function SettingsPage() {
        {tokensLoading ? (
          <p style={mutedStyle}>Loading tokens...</p>
        ) : tokensError ? (
-          <p style={{ color: "var(--ctp-red)", fontSize: "0.85rem" }}>
+          <p style={{ color: "var(--ctp-red)", fontSize: "var(--font-body)" }}>
            {tokensError}
          </p>
        ) : (
@@ -331,7 +332,7 @@ const cardStyle: React.CSSProperties = {

 const cardTitleStyle: React.CSSProperties = {
  marginBottom: "1rem",
-  fontSize: "1.1rem",
+  fontSize: "var(--font-title)",
 };

 const dlStyle: React.CSSProperties = {
@@ -343,12 +344,12 @@ const dlStyle: React.CSSProperties = {
 const dtStyle: React.CSSProperties = {
  color: "var(--ctp-subtext0)",
  fontWeight: 500,
-  fontSize: "0.9rem",
+  fontSize: "var(--font-body)",
 };

 const ddStyle: React.CSSProperties = {
  margin: 0,
-  fontSize: "0.9rem",
+  fontSize: "var(--font-body)",
 };

 const mutedStyle: React.CSSProperties = {
@@ -370,7 +371,7 @@ const tokenDisplayStyle: React.CSSProperties = {
  border: "1px solid var(--ctp-surface1)",
  borderRadius: "0.5rem",
  fontFamily: "'JetBrains Mono', 'Fira Code', monospace",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
  color: "var(--ctp-peach)",
  wordBreak: "break-all",
 };
@@ -388,7 +389,7 @@ const labelStyle: React.CSSProperties = {
  marginBottom: "0.35rem",
  fontWeight: 500,
  color: "var(--ctp-subtext1)",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
 };

 const inputStyle: React.CSSProperties = {
@@ -398,18 +399,18 @@ const inputStyle: React.CSSProperties = {
  border: "1px solid var(--ctp-surface1)",
  borderRadius: "0.4rem",
  color: "var(--ctp-text)",
-  fontSize: "0.9rem",
+  fontSize: "var(--font-body)",
  boxSizing: "border-box",
 };

 const btnPrimaryStyle: React.CSSProperties = {
  padding: "0.5rem 1rem",
-  borderRadius: "0.4rem",
+  borderRadius: "0.375rem",
  border: "none",
  backgroundColor: "var(--ctp-mauve)",
  color: "var(--ctp-crust)",
-  fontWeight: 600,
-  fontSize: "0.85rem",
+  fontWeight: 500,
+  fontSize: "0.75rem",
  cursor: "pointer",
  whiteSpace: "nowrap",
 };
@@ -418,55 +419,60 @@ const btnCopyStyle: React.CSSProperties = {
  padding: "0.4rem 0.75rem",
  background: "var(--ctp-surface1)",
  border: "none",
-  borderRadius: "0.4rem",
+  borderRadius: "0.375rem",
  color: "var(--ctp-text)",
  cursor: "pointer",
-  fontSize: "0.85rem",
+  fontSize: "0.75rem",
+  fontWeight: 500,
 };

 const btnDismissStyle: React.CSSProperties = {
  padding: "0.4rem 0.75rem",
  background: "none",
  border: "none",
+  borderRadius: "0.375rem",
  color: "var(--ctp-subtext0)",
  cursor: "pointer",
-  fontSize: "0.85rem",
+  fontSize: "0.75rem",
+  fontWeight: 500,
 };

 const btnDangerStyle: React.CSSProperties = {
  background: "rgba(243, 139, 168, 0.15)",
  color: "var(--ctp-red)",
  border: "none",
-  padding: "0.3rem 0.6rem",
-  borderRadius: "0.3rem",
+  padding: "0.25rem 0.5rem",
+  borderRadius: "0.375rem",
  cursor: "pointer",
-  fontSize: "0.8rem",
+  fontSize: "0.75rem",
+  fontWeight: 500,
 };

 const btnRevokeConfirmStyle: React.CSSProperties = {
  background: "var(--ctp-red)",
  color: "var(--ctp-crust)",
  border: "none",
-  padding: "0.2rem 0.5rem",
-  borderRadius: "0.25rem",
+  padding: "0.25rem 0.5rem",
+  borderRadius: "0.375rem",
  cursor: "pointer",
  fontSize: "0.75rem",
-  fontWeight: 600,
+  fontWeight: 500,
 };

 const btnTinyStyle: React.CSSProperties = {
-  padding: "0.2rem 0.5rem",
-  borderRadius: "0.25rem",
+  padding: "0.25rem 0.5rem",
+  borderRadius: "0.375rem",
  border: "none",
  backgroundColor: "var(--ctp-surface1)",
  color: "var(--ctp-text)",
  fontSize: "0.75rem",
+  fontWeight: 500,
  cursor: "pointer",
 };

 const errorStyle: React.CSSProperties = {
  color: "var(--ctp-red)",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
  marginTop: "0.25rem",
 };

@@ -474,9 +480,9 @@ const thStyle: React.CSSProperties = {
  padding: "0.5rem 0.75rem",
  textAlign: "left",
  borderBottom: "1px solid var(--ctp-surface1)",
-  color: "var(--ctp-subtext1)",
+  color: "var(--ctp-overlay1)",
  fontWeight: 600,
-  fontSize: "0.8rem",
+  fontSize: "var(--font-table)",
  textTransform: "uppercase",
  letterSpacing: "0.05em",
 };
@@ -484,5 +490,5 @@ const thStyle: React.CSSProperties = {
 const tdStyle: React.CSSProperties = {
  padding: "0.4rem 0.75rem",
  borderBottom: "1px solid var(--ctp-surface1)",
-  fontSize: "0.85rem",
+  fontSize: "var(--font-body)",
 };
--- a/web/src/styles/global.css
+++ b/web/src/styles/global.css
@@ -1,51 +1,55 @@
-@import './theme.css';
+@import "./theme.css";
+@import "./silo-base.css";

 *,
 *::before,
 *::after {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
 }

 body {
-  font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-  background-color: var(--ctp-base);
-  color: var(--ctp-text);
-  line-height: 1.6;
-  min-height: 100vh;
+    font-family:
+        -apple-system, BlinkMacSystemFont, "Segoe UI", system-ui, sans-serif;
+    background-color: var(--ctp-base);
+    color: var(--ctp-text);
+    line-height: 1.6;
+    min-height: 100vh;
 }

 a {
-  color: var(--ctp-sapphire);
-  text-decoration: none;
+    color: var(--ctp-sapphire);
+    text-decoration: none;
 }

 a:hover {
-  color: var(--ctp-sky);
-  text-decoration: underline;
+    color: var(--ctp-sky);
+    text-decoration: underline;
 }

 /* Scrollbar */
 ::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
+    width: 8px;
+    height: 8px;
 }

 ::-webkit-scrollbar-track {
-  background: var(--ctp-mantle);
+    background: var(--ctp-mantle);
 }

 ::-webkit-scrollbar-thumb {
-  background: var(--ctp-surface1);
-  border-radius: 4px;
+    background: var(--ctp-surface1);
+    border-radius: 4px;
 }

 ::-webkit-scrollbar-thumb:hover {
-  background: var(--ctp-surface2);
+    background: var(--ctp-surface2);
 }

 /* Monospace */
-code, pre, .mono {
-  font-family: 'JetBrains Mono', 'Fira Code', monospace;
+code,
+pre,
+.mono {
+    font-family: "JetBrains Mono", "Fira Code", monospace;
 }
--- a/web/src/styles/silo-base.css
+++ b/web/src/styles/silo-base.css
@@ -0,0 +1,14 @@
+/* Focus and hover states for form inputs */
+.silo-input {
+    transition: border-color 0.15s ease, box-shadow 0.15s ease;
+}
+
+.silo-input:hover {
+    border-color: var(--ctp-overlay0);
+}
+
+.silo-input:focus {
+    border-color: var(--ctp-mauve);
+    box-shadow: 0 0 0 0.2rem rgba(203, 166, 247, 0.25);
+    outline: none;
+}
--- a/web/src/styles/theme.css
+++ b/web/src/styles/theme.css
@@ -28,6 +28,15 @@
    --ctp-crust: #11111b;
 }

+/* ── Font scale ── */
+:root {
+    --font-title: 1.1rem; /* page titles */
+    --font-body: 0.8125rem; /* 13px — body text, breadcrumbs */
+    --font-table: 0.75rem; /* 12px — table cells, inputs, buttons */
+    --font-sm: 0.6875rem; /* 11px — section headers, labels, captions */
+    --font-xs: 0.625rem; /* 10px — badges (minimum) */
+}
+
 /* ── Density: comfortable (default) ── */
 [data-density="comfortable"],
 :root {
@@ -39,24 +48,24 @@
    --d-nav-px: 0.75rem;
    --d-nav-radius: 0.4rem;
    --d-user-gap: 0.6rem;
-    --d-user-font: 0.85rem;
+    --d-user-font: var(--font-body);

    --d-th-py: 0.35rem;
    --d-th-px: 0.75rem;
-    --d-th-font: 0.75rem;
+    --d-th-font: var(--font-table);
    --d-td-py: 0.25rem;
    --d-td-px: 0.75rem;
-    --d-td-font: 0.85rem;
+    --d-td-font: var(--font-body);

    --d-toolbar-gap: 0.5rem;
    --d-toolbar-py: 0.5rem;
    --d-toolbar-mb: 0.35rem;
    --d-input-py: 0.35rem;
    --d-input-px: 0.6rem;
-    --d-input-font: 0.85rem;
+    --d-input-font: var(--font-body);

    --d-footer-h: 28px;
-    --d-footer-font: 0.75rem;
+    --d-footer-font: var(--font-table);
    --d-footer-px: 2rem;
 }

@@ -70,23 +79,23 @@
    --d-nav-px: 0.5rem;
    --d-nav-radius: 0.3rem;
    --d-user-gap: 0.35rem;
-    --d-user-font: 0.8rem;
+    --d-user-font: var(--font-table);

    --d-th-py: 0.2rem;
    --d-th-px: 0.5rem;
-    --d-th-font: 0.7rem;
+    --d-th-font: var(--font-sm);
    --d-td-py: 0.125rem;
    --d-td-px: 0.5rem;
-    --d-td-font: 0.8rem;
+    --d-td-font: var(--font-table);

    --d-toolbar-gap: 0.35rem;
    --d-toolbar-py: 0.25rem;
    --d-toolbar-mb: 0.15rem;
    --d-input-py: 0.2rem;
    --d-input-px: 0.4rem;
-    --d-input-font: 0.8rem;
+    --d-input-font: var(--font-table);

    --d-footer-h: 24px;
-    --d-footer-font: 0.7rem;
+    --d-footer-font: var(--font-sm);
    --d-footer-px: 1.25rem;
 }
Author	SHA1	Message	Date
Forbes	414a5cf3d6	docs: update roadmap status for completed Tier 0 items - Unit test suite: complete (137 tests across 20 files) - Date segment type: complete (#79) - Part number validation: complete (#80) - Link remaining tasks to issue numbers (#81-#91) - Update Appendix B checklists and Partially Implemented table	2026-02-14 08:54:14 -06:00
Forbes	257e3d99ac	test(api): add revision, schema, audit, and auth handler tests (#78 ) Revision tests (8): - List, get, create, update status/labels, compare, rollback - Not-found paths for missing items and revisions Schema tests (4): - List schemas, get by name, form descriptor, not-found Audit tests (4): - Completeness summary (empty + with items), item detail, not-found Auth tests (4): - Get current user (authenticated + unauthenticated) - Auth config response - Token lifecycle: create, list, revoke	2026-02-13 15:22:28 -06:00
Forbes	384b137148	test(api): add CSV and ODS import/export handler tests (#77 ) CSV tests: - Export empty/with items, template generation - Import dry-run (preview without creating), commit (items created) - BOM CSV export with parent/child relationships ODS tests: - Export with items (verify ODS content type and ZIP magic bytes) - Template generation per schema - Project sheet export with item associations	2026-02-13 15:20:20 -06:00
Forbes	7c838bdf5e	test(api): add file handler tests and fix createItemDirect helper (#76 ) - Test ListItemFiles, DeleteItemFile with real DB - Test cross-item file deletion guard (404) - Test storage-unavailable paths: presign, upload, associate, thumbnail (503) - Fix createItemDirect: StandardCost moved to revision properties	2026-02-13 15:18:46 -06:00
Forbes	c9b081b8f8	test(db): add edge-case tests for items, revisions, projects, and files (#75 ) - Duplicate part number constraint (PG 23505) - Hard delete, pagination, search filtering - Revision status/labels update, compare, rollback - Project-item association by code, list by project filter - Item file CRUD: create, list, get, delete	2026-02-13 15:17:38 -06:00
forbes	bc1149d4ba	Merge pull request 'fix(web): style guide batch 3 — icons, font scale, spacing' (#85 ) from fix-style-guide-batch-3 into main Reviewed-on: #85	2026-02-13 20:59:59 +00:00
Forbes	07c4aa1c28	fix(web): align spacing values to style guide grid (#71 ) - Replace 0.3rem padding/margin/gap with 0.25rem (xs) - Replace 0.2rem margins with 0.25rem (xs) - Replace 0.1rem padding with 0.15rem (badge spec) - Replace 0.6rem margins/padding with 0.5rem (sm) - Fix borderRadius 0.3rem to 0.375rem (6px per style guide) - Preserve style-guide-specified values: 0.35rem button gap, 0.4rem cell padding, 0.45rem input padding	2026-02-13 14:37:40 -06:00
Forbes	679b730e74	fix(web): standardize font sizes to style guide scale (#70 )	2026-02-13 14:33:11 -06:00
Forbes	b53ce94274	feat(web): install lucide-react and replace unicode icons (#67 )	2026-02-13 13:44:48 -06:00
forbes	8316ac085c	Merge pull request 'fix: style guide batch 2 — buttons, tables, transitions, inputs, validation' (#84 ) from fix-style-guide-batch-2 into main Reviewed-on: #84	2026-02-13 19:27:56 +00:00
Forbes	d5f1b4e587	feat(partnum): implement part number validation (#80 ) Implement Generator.Validate() to check part numbers against schemas: - Split by separator, verify segment count - Constant: must equal expected value - Enum: must be in allowed values map - String: length, case, pattern constraints - Serial: length + numeric-only check - Date: length matches expected format output Add belt-and-suspenders call in HandleCreateItem after Generate(). Add 9 validation tests (all pass alongside 10 existing tests). Closes #80	2026-02-13 13:26:13 -06:00
Forbes	f4a1c8004b	feat(web): add input focus states via silo-base.css (#72 ) Create silo-base.css with .silo-input hover/focus pseudo-classes: - hover: border-color overlay0 - focus: border-color mauve + 0.2rem mauve box-shadow Applied className='silo-input' to form inputs in: CreateItemPane, EditItemPane, ProjectsPage, SchemasPage, SettingsPage, LoginPage Closes #72	2026-02-13 13:24:39 -06:00
Forbes	a9614e704e	fix(web): standardize transition durations to 0.15s ease (#73 ) All inline transition properties now use 'all 0.15s ease'. Files: AppShell, CategoryPicker, AuditDetailPanel, AuditSummaryBar, AuditTable, FileDropZone Closes #73	2026-02-13 13:23:08 -06:00
Forbes	289d488469	fix(web): table header color overlay1 + selected row mauve tint (#69 ) - All thStyle objects: color subtext1/subtext0 → overlay1 - Selected row bg: surface1 → rgba(mauve, 0.08) Files: ItemTable, BOMTab, ProjectsPage, SchemasPage, SettingsPage, AuditTable Closes #69	2026-02-13 13:22:30 -06:00
Forbes	2585305590	fix(web): standardize button borderRadius, fontSize, fontWeight (#68 ) All button style objects now use: - borderRadius: 0.375rem - fontSize: 0.75rem - fontWeight: 500 Files: CreateItemPane, EditItemPane, DeleteItemPane, BOMTab, CategoryPicker, ProjectsPage, SchemasPage, LoginPage, ItemsToolbar, SettingsPage, ImportItemsPane, ItemTable Closes #68	2026-02-13 13:21:54 -06:00
forbes	65063c9ee7	Merge pull request 'fix: style guide compliance batch 1 + date segment type' (#83 ) from fix-style-guide-batch-1 into main Reviewed-on: #83	2026-02-13 19:13:35 +00:00
Forbes	1f7960db50	feat: implement date segment type for part number generation Fixes #79 Implement the date segment type in the part number generator. Uses Go's time.Format with the segment's Value field as the layout string. - Default format: 20060102 (YYYYMMDD) when no Value is specified - Custom formats via Value field: "0601" (YYMM), "2006" (YYYY), etc. - Always uses UTC time - Add 3 tests: default format, custom YYMM format, year-only format	2026-02-13 13:10:57 -06:00
Forbes	648c659e2b	fix(web): use system font stack per style guide Fixes #66 Remove Inter and Roboto from font-family. The style guide specifies system fonts only: -apple-system, BlinkMacSystemFont, Segoe UI, system-ui, sans-serif.	2026-02-13 13:09:56 -06:00
Forbes	d4ea6d2739	fix(web): align item type badge colors with style guide Fixes #65 - Part: blue → green (--ctp-green) - Assembly: green → mauve (--ctp-mauve) - Document: yellow → blue (--ctp-blue) - Add purchased (--ctp-peach) and phantom (--ctp-overlay1) - Keep tooling as red (--ctp-red)	2026-02-13 13:09:41 -06:00
forbes	e20da25405	Merge pull request 'docs: integrate root ROADMAP.md into docs/ROADMAP.md' (#64 ) from docs-integrate-roadmap into main Reviewed-on: #64	2026-02-13 18:45:04 +00:00
Forbes	30bb3ee56e	docs: integrate root ROADMAP.md into docs/ROADMAP.md Merge the tactical root ROADMAP.md (SOLIDWORKS PDM gap analysis, Phase 1-6 timelines, project inventory) with the visionary docs/ROADMAP.md (modular platform architecture, .kc format, dependency tiers) into a single unified document at docs/ROADMAP.md. - Adopt dependency tier structure (Tier 0-6) as the organizing spine - Add Status column to each tier table from project inventory - Replace Phase 1-6 calendar timelines with Near-Term Priorities section - Migrate 9 SOLIDWORKS PDM comparison tables to docs/GAP_ANALYSIS.md - Migrate Feature Comparison Matrix to docs/GAP_ANALYSIS.md - Preserve Phase 1 task checklists and success metrics as appendices - Update README.md link from ROADMAP.md to docs/ROADMAP.md - Delete root ROADMAP.md	2026-02-13 12:44:25 -06:00
forbes	a517a95912	Merge branch 'production' into main	2026-02-12 15:28:43 +00:00
forbes	6f1504021c	Merge pull request 'docs: add consolidated installation guide and helper scripts' (#62 ) from install-guide-and-scripts into main Reviewed-on: #62	2026-02-12 15:02:25 +00:00
forbes	d93770c551	Merge branch 'main' into install-guide-and-scripts	2026-02-12 15:02:13 +00:00
forbes-0023	606316204d	docs: add consolidated installation guide Add docs/INSTALL.md with two installation paths: - Option A: Docker Compose (all-in-one with PostgreSQL, MinIO, OpenLDAP, and optional nginx) - Option B: Daemon install (systemd with external services, links to setup instructions for PostgreSQL, MinIO, FreeIPA, nginx) Includes LDAP user/group management instructions, verification steps, and upgrade procedures for both paths. Update README.md Quick Start to point to INSTALL.md, add to docs table. Add redirect banner to DEPLOYMENT.md for first-time users. Add comments to docker-compose.prod.yaml noting unsupported env vars.	2026-02-12 08:59:10 -06:00
forbes-0023	3d9ef9e99e	refactor(scripts): parameterize hostnames in deployment scripts - setup-host.sh: add SILO_DB_HOST and SILO_MINIO_HOST env var overrides, update Go version from 1.23 to 1.24, expand generated silod.env template with session secret and admin password fields - deploy.sh: add SILO_DEPLOY_TARGET and SILO_DB_HOST env var overrides for target host and database host - setup-ipa-nginx.sh: replace hardcoded hostname with SILO_HOSTNAME env var (default: silo.example.internal), parameterize SILO_PORT, use variable substitution in nginx config template All scripts retain backward-compatible defaults.	2026-02-12 08:59:01 -06:00
forbes-0023	fb13795ef7	feat(deployments): add all-in-one Docker Compose stack with OpenLDAP Add docker-compose.allinone.yaml with five services: - PostgreSQL 16 with auto-applied migrations - MinIO for S3-compatible file storage - OpenLDAP (bitnami/openldap:2.6) with memberOf overlay and preconfigured silo-admins/silo-users/silo-viewers groups - Silo API server built from Dockerfile - Nginx reverse proxy (optional, via --profile nginx) Add scripts/setup-docker.sh interactive helper that generates deployments/.env and deployments/config.docker.yaml with random credentials. Supports --non-interactive for CI. Add deployments/ldap/ LDIF init scripts for memberOf overlay and Silo role groups. Add deployments/nginx/ reverse proxy configs.	2026-02-12 08:58:55 -06:00
forbes-0023	1c1cd144dc	fix(deployments): fix broken config mount and expand env example - Fix docker-compose.yaml: mount config.dev.yaml instead of nonexistent configs/config.yaml - Add deployments/config.dev.yaml with Docker service names and dev defaults for zero-setup make docker-up - Expand .env.example with all SILO_* and LDAP_* variables - Update config.example.yaml hostnames to localhost with Docker comments - Add deployments/config.docker.yaml to .gitignore (generated file)	2026-02-12 08:58:39 -06:00
forbes	460b0f37fd	Merge pull request 'docs: replace kindred.internal with example.internal in all docs and config' (#61 ) from docs-remove-internal-hostnames into main Reviewed-on: #61	2026-02-11 17:49:40 +00:00
forbes-0023	73195be6a1	docs: fix stale migration and endpoint counts, add missing endpoints - Update migration count from 11 to 13 across all docs (012_bom_source, 013_move_cost_sourcing_to_props) - Update endpoint count from 75 to 78 across all docs - Add 3 missing endpoints to SPECIFICATION.md section 11.1: GET /api/events (SSE), GET /api/items/by-uuid/{uuid}, POST /api/items/{pn}/bom/merge - Add migrations 012 and 013 to STATUS.md table - Fix migration 010 description (sourcing_link and standard_cost moved to revision properties in 013)	2026-02-11 11:37:53 -06:00
forbes-0023	127836f7ce	docs: replace kindred.internal with example.internal in all docs and config Replace all references to internal hostnames (silo.kindred.internal, psql.kindred.internal, minio.kindred.internal, ipa.kindred.internal, keycloak.kindred.internal) with example.internal equivalents. Replace gitea.kindred.internal and git.kindred.internal with the public git.kindred-systems.com instance. Also fix stale silo-0062 repo name in setup-host.sh and DEPLOYMENT.md.	2026-02-11 11:20:45 -06:00
forbes	a258152175	Merge pull request 'docs: update specs for schema-driven form descriptor API' (#60 ) from issue-docs-form-descriptor into main Reviewed-on: #60	2026-02-11 16:41:16 +00:00
forbes	efb3ccdfb5	Merge branch 'main' into issue-docs-form-descriptor	2026-02-11 16:41:07 +00:00
forbes-0023	a80e99e500	docs: update specs for schema-driven form descriptor API - frontend-spec.md: rewrite CreateItemPane spec for dynamic form rendering from form descriptor, replace CategoryPicker three-column spec with multi-stage domain/subcategory picker, replace useCategories hook with useFormDescriptor, update form sections to dynamic field groups, mark hierarchical categories as implemented, remove sourcing_link/standard_cost from item-level DB columns, update types and implementation order - SPECIFICATION.md: rename /api/schemas/{name}/properties endpoint to /api/schemas/{name}/form	2026-02-11 10:40:09 -06:00
forbes	485675b020	Merge pull request 'issue-dedup-sourcing-cost' (#59 ) from issue-dedup-sourcing-cost into main Reviewed-on: #59	2026-02-11 16:28:50 +00:00
forbes	beaf091d62	Merge branch 'main' into issue-dedup-sourcing-cost	2026-02-11 16:28:42 +00:00
forbes-0023	4edaa35c49	feat: schema-driven form descriptor API and dynamic form rendering - Add ui section to kindred-rd.yaml with category_picker (multi-stage), item_fields, field_groups, category_field_groups, and field_overrides - Add UIConfig structs to Go schema parser with full YAML/JSON tags - Add ValidateUI() to validate field references against property schemas - Add ValuesByDomain() helper to auto-derive subcategory picker stages - Implement GET /api/schemas/{name}/form endpoint that returns resolved form descriptor with field metadata, widget hints, and category picker - Replace GET /api/schemas/{name}/properties route with /form - Add FormDescriptor TypeScript types - Create useFormDescriptor hook (replaces useCategories) - Rewrite CreateItemPane to render all sections dynamically from descriptor - Update CategoryPicker with multi-stage domain/subcategory selection - Delete useCategories.ts (superseded by useFormDescriptor)	2026-02-11 10:14:00 -06:00
forbes-0023	b3c748ef10	refactor: move sourcing_link and standard_cost from item columns to revision properties - Add migration 013 to copy sourcing_link/standard_cost values into current revision properties JSONB and drop the columns from items table - Remove SourcingLink/StandardCost from Go Item struct and all DB queries (items.go, audit_queries.go, projects.go) - Remove from API request/response structs and handlers - Update CSV/ODS/BOM export/import to read these from revision properties - Update audit handlers to score as regular property fields - Remove from frontend Item type and hardcoded form fields - MainTab now reads sourcing_link/standard_cost from item.properties - CreateItemPane/EditItemPane no longer have dedicated fields for these; they will be rendered as schema-driven property fields	2026-02-11 09:50:31 -06:00
forbes	a49680b274	Merge pull request 'main' (#58 ) from main into production Reviewed-on: #58	2026-02-10 00:45:44 +00:00
forbes	701a5c21ce	Merge pull request 'fix(sse): disable read deadline for long-lived connections' (#56 ) from fix-sse-read-deadline into main Reviewed-on: #56	2026-02-09 17:39:09 +00:00
Forbes	f7aa673d2c	fix(sse): disable read deadline for long-lived SSE connections The server's ReadTimeout (15s) was closing SSE connections shortly after they were established, causing a rapid connect/disconnect loop. The handler already disabled WriteTimeout but not ReadTimeout.	2026-02-08 22:52:42 -06:00
forbes	2157b40d06	Merge pull request 'feat(web): BOM merge resolution UI (#47 )' (#55 ) from issue-47-bom-merge-ui into main Reviewed-on: #55	2026-02-09 02:09:02 +00:00
Forbes	25c42bd70b	feat(web): add BOM merge resolution UI with source badges and dropdown - Add source badges (assembly=teal, manual=blue) to BOM display rows - Add info banner when assembly-sourced entries exist - Change source input from text field to select dropdown - Add merge response types to types.ts Closes #47	2026-02-08 19:56:33 -06:00
forbes	8d88f77ff6	Merge pull request 'feat: expose file attachment stats as item properties' (#54 ) from issue-37-file-stats into main Reviewed-on: #54	2026-02-09 01:26:17 +00:00
Forbes	50985ed805	feat: expose file attachment stats as item properties (#37 ) Add file_count and files_total_size to item API responses, computed via batch query on item_files table (no migration needed). - Add BatchGetFileStats() to audit_queries.go (follows BatchCheckBOM pattern) - Add file stats to ItemResponse, HandleListItems, HandleGetItem, HandleGetItemByUUID - Add 'Files' column to ItemTable (default visible in vertical mode) - Add has_files computed field to audit completeness scoring (weight 1 for manufactured)	2026-02-08 19:25:46 -06:00
forbes	32bc00caef	Merge pull request 'main' (#53 ) from main into production Reviewed-on: #53	2026-02-09 01:23:28 +00:00
forbes	9be6f45f09	Merge pull request 'chore(docs): delete stale documentation files' (#52 ) from issue-31-delete-dead-docs into main Reviewed-on: #52	2026-02-09 01:22:02 +00:00
forbes	ef05aec619	Merge branch 'main' into issue-31-delete-dead-docs	2026-02-09 01:21:52 +00:00
forbes	64075d88b5	Merge pull request 'feat(api): add POST /api/items/{partNumber}/bom/merge endpoint' (#51 ) from issue-45-bom-merge into main Reviewed-on: #51	2026-02-09 01:21:44 +00:00
forbes	eac64f863b	Merge branch 'main' into issue-45-bom-merge	2026-02-09 01:21:38 +00:00
forbes	aa414adc43	Merge pull request 'feat(db): add source column to relationships table' (#50 ) from issue-44-bom-source into main Reviewed-on: #50	2026-02-09 01:21:30 +00:00
forbes	9ce9468474	Merge branch 'main' into issue-44-bom-source	2026-02-09 01:21:13 +00:00
forbes	2dad658e91	Merge pull request 'feat(api): add GET /api/items/by-uuid/{uuid} endpoint' (#49 ) from issue-43-uuid-lookup into main Reviewed-on: #49	2026-02-09 01:21:07 +00:00
forbes	ce37fdd169	Merge branch 'main' into issue-43-uuid-lookup	2026-02-09 01:20:59 +00:00
forbes	c557ca736c	Merge pull request 'feat(web): user-selectable density mode (compact/comfortable)' (#48 ) from ui-density-mode into main Reviewed-on: #48	2026-02-09 01:20:51 +00:00
Forbes	08e84703d5	chore(docs): delete stale REPOSITORY_STATUS.md (#31 ) Generated 2026-01-31, references HTML templates and 8 migrations that are now outdated. Superseded by STATUS.md and SPECIFICATION.md. API.md and silo-spec.md were already deleted in earlier commits.	2026-02-08 19:17:53 -06:00
Forbes	fbe4f3a36c	feat(api): add POST /api/items/{partNumber}/bom/merge endpoint (#45 ) Add BOM merge endpoint for syncing assembly-derived BOM entries from FreeCAD's silo-mod plugin. Merge rules: - Added: entries in request but not in server BOM are auto-created with source='assembly' - Quantity changed: existing entries with different quantity are auto-updated - Unchanged: same part and quantity are skipped - Unreferenced: assembly-sourced entries in server BOM but not in request are flagged as warnings (never auto-deleted) - Manual entries are silently ignored in unreferenced detection Also emits SSE 'bom.merged' event on successful merge (#46).	2026-02-08 19:15:27 -06:00
Forbes	163dc9f0f0	feat(db): add source column to relationships table (#44 ) Promote BOM source from metadata JSONB to a dedicated VARCHAR(20) column with CHECK constraint ('manual' or 'assembly'). - Add migration 012_bom_source.sql (column, data migration, cleanup) - Add Source field to Relationship and BOMEntry structs - Update all SQL queries (GetBOM, GetWhereUsed, GetExpandedBOM, Create) - Update API response/request types with source field - Update CSV/ODS export to read e.Source instead of metadata - Update CSV import to set source on relationship directly - Update frontend types and BOMTab to use top-level source field	2026-02-08 18:45:41 -06:00
Forbes	e5ddb30a4a	feat(api): add GET /api/items/by-uuid/{uuid} endpoint Closes #43 Adds a new read-only endpoint to resolve a Silo item UUID to its full ItemResponse. Used by silo-mod to resolve FreeCAD document SiloUUID properties to part numbers during BOM sync. - Reuses existing ItemRepository.GetByID() (items.id is the stable UUID) - Returns 404 for archived items - Registered in viewer-accessible route group (no editor role required)	2026-02-08 18:37:33 -06:00
forbes	2b7a9ae73a	Merge pull request 'main' (#41 ) from main into production Reviewed-on: #41	2026-02-08 22:02:18 +00:00