main was 16 days and 259 commits behind the line the product is actually built on, at contract 0.30.0 against 0.35.0, with no per-PC credential code at all. It was neither current nor curated - just stale. This brings it forward and, at the same time, makes it mean something: main is what a receiving site installs, and nothing else. WHAT IT CARRIES. Twelve plugins - backups, computers, endpoints, guides, knowledgebase, machines, network, notifications, printers, slides, tools, warranty - plus applications, which is manifest-less core and always ships. The only manifest dependency inside that set is endpoints on computers, and both are in it, so the closure is self-contained. WHAT IT DOES NOT. employees, geenforce, measuringtools, printedparts and usb stay on the site line. So do the Windows installer tree, the VM rehearsal helpers, the agent tooling config, one site's data loader, the internal audit and findings records, and the planner spreadsheet. 1,135 tracked files against 1,438. A REMOVAL THAT BREAKS THE APP IS NOT A REMOVAL, and two nearly shipped: deploy/site-profile-universal.json still named all seventeen plugins. It is the file docs/DEPLOY.md tells a site to provision from, so a fresh install would have failed at `flask plugin apply-profile` with PluginError - the first thing a receiving site does, broken by the branch meant to serve them. It now names the twelve that exist, and its comment says the two must agree. agent/ was never refreshed. Whoever populated this branch copied shopdb/, plugins/, frontend/ and tests/ from the site line and left the agent tree at its September state: 22 C# and PowerShell sources missing, including AgentCredentials, EnrollmentService, AgentHttpFactory and the fleet-alert client, plus one file the site line had deleted still present. The old tree is internally consistent, so it compiles, and nothing in CI builds it - every gate was green over a server that speaks enrollment and per-PC credentials to a bundled agent source that cannot. Resynced whole. DECISIONS THIS ENCODES, rather than defers: - The plugin-authoring lab builds printedparts, whose manifest depends on employees, so it could not stay. The lab remains on the site line and main ships no build-along tutorial. That is a real loss for an adopting developer and is recorded here rather than discovered later. - Recognition, Training and Recertification notifications are no longer seeded. Each splits one notification into a card per employee and renders a photo, which needs a plugin this branch does not bundle. Seeding them would offer an author a type that cannot resolve anybody. A site that installs employees gets them from that plugin's own seed. - Windows/IIS is documented as the legacy path throughout, and the README leads with Docker, because that is what a receiving site gets. The API description is regenerated for THIS branch - 347 paths and 483 operations, down from 415 and 573 - so the published contract describes what is here rather than what the site line serves. docs/CONFIG.md lost the two measuring-tool label keys the code no longer declares, which two lanes had decided opposite ways. Suite: 3124 passed, 6 skipped. Naming and style gates pass. The docs gates run rather than skip, and every index line count is derived from the file it names.
7.5 KiB
ADR-005: Equipment plugin scope vs measuringtools plugin
- Status: SUPERSEDED by ADR-018
- Date: 2026-05-08
- Deciders: ShopDB maintainers
- Supersedes: none
Do not build against this. ADR-018 (2026-09-04) retired the
measuringtoolsplugin and made metrology instruments machines. The split below was sound for the population it described, and that population never arrived: the plugin held zero rows. Kept as the record of why the split was made and why it was undone.
Context
ADR-001 narrowed the migration to physical manufacturing equipment with a machinenumber. In practice, the legacy category='Equipment' rows contain two distinct asset classes:
- Manufacturing machinery (5-axis mills, lathes, broachers, heat treatment ovens). These produce parts.
- Metrology and inspection instruments (CMMs, Keyence vision systems, wax-and-trace surface profilometers, GenSpec instruments). These measure parts.
Both share Asset properties (vendor, model, location, controller). They differ in domain fields (axes vs measurement accuracy, cycle time vs calibration interval, controller protocol vs measurement software).
Mixing them under one plugin pollutes the schema and confuses cross-plugin queries ("show me all measuring tools" requires an enumeration of measuring-instrument equipmenttype values, which scales badly).
Decision
Two plugins, separate concerns, shared platform contract.
equipment plugin
Tracks manufacturing machinery. Bundled, in-tree.
Schema (per ADR-001 contract):
equipment
- assetid FK to assets, PK
- equipmenttypeid FK to equipmenttypes (5-axis mill, lathe, broacher, heat treat, ...)
- vendorid FK to vendors (platform)
- modelid FK to models (platform)
- controllertypeid FK to controllertypes (equipment plugin)
- controllerosid FK to controlleros (equipment plugin)
- (other shared fields: spindle count, axes, max workpiece size, ...)
equipmenttypes (lookup, equipment plugin)
- equipmenttypeid, name (5-axis mill, lathe, broacher, heat treat, ...)
controllertypes (lookup, equipment plugin)
- controllertypeid, name (Fanuc 31i, Siemens 840D, Mitsubishi M70, Heidenhain TNC640, ...)
- vendorid (FK to vendors)
controlleros (lookup, equipment plugin - separate from PC OS)
- controllerosid, name (FAPT, VxWorks, embedded Windows, Linux RT, ...)
equipmentfocas (subtype, optional, present only when FOCAS-equipped)
- assetid PK, FK to equipment
- focasipaddress text
- focasport integer
- focasversion text
- focasmachinenumber text
equipmentclm (subtype, optional, present only when CLM-equipped)
- assetid PK, FK to equipment
- (CLM-specific: address, port, station ID - finalize when plugin is built)
equipmentmtconnect (subtype, optional, present only when MTConnect-equipped)
- assetid PK, FK to equipment
- mtconnectagenturl text
- mtconnectdevicename text
The equipment.protocol enum field is deliberately not included. Presence or absence of a subtype row indicates which protocol applies. Avoids a denormalized field that can drift out of sync.
measuringtools plugin
Tracks metrology and inspection instruments. Bundled, in-tree (built in Phase 3-4 of the refactor as the first new plugin built using the framework scaffold).
Schema (initial draft, refined when plugin is built):
measuringtools
- assetid FK to assets, PK
- measuringtooltypeid FK to measuringtooltypes (CMM, vision system, profilometer, surface tester, ...)
- vendorid FK to vendors (platform)
- modelid FK to models (platform)
- measurementaxes integer (e.g., 3 for a 3-axis CMM)
- accuracyspec text (e.g., "+/-0.5um")
- calibrationintervaldays integer
- lastcalibrationdate date
- nextcalibrationdate date (computed)
- (other domain fields as needed)
measuringtooltypes (lookup, measuringtools plugin)
- measuringtooltypeid, name (CMM, vision system, surface profilometer, gage block, ...)
Future extension: subtype tables for measurement-software integrations (PC-DMIS, Keyence, GenSpec). Same pattern as equipment subtype tables.
Subtype-table pattern (general)
Both plugins use the same pattern for protocol- or software-specific fields:
- Core plugin table carries shared, common fields
- Optional subtype tables (one per protocol or software) hold extension fields
- Each subtype table is keyed by
assetid(PK), one-to-one with the parent - Subtype row exists if and only if the asset uses that protocol or software
- Sister sites add new subtype tables for their own integrations without touching core
Reclassification of legacy data
ADR-001's migration moves all legacy category='Equipment' AND machinenumber IS NOT NULL rows to assets with assettype='Equipment' and into the equipment plugin's equipment table. This includes both manufacturing machinery and measuring tools.
After the equipment migration, when the measuringtools plugin is built:
- Build a mapping table: legacy
machinetypeidvalues that are measuring tools (CMM type, Keyence type, etc.) - Run a reclassification script:
- For each
assetsrow where the originalmachinetypeidis in the measuring-tool mapping - Change
assets.assettypeto'MeasuringTool' - Move the row from
equipmenttomeasuringtools - Map domain fields where they differ (e.g., legacy
axesfield maps tomeasurementaxes)
- For each
- Verify counts pre- and post-reclassification
- Audit log entry per reclassified row
Reclassification is one-shot, run once, archived. Like the original migration script.
Consequences
Positive
- Manufacturing machinery and measuring tools are first-class plugins, each with appropriate domain fields
- Sister sites can install one or both depending on what they track
- Subtype-table pattern is the canonical example for protocol-specific data and extends naturally to other plugins
- Building
measuringtoolsmid-refactor validates the plugin scaffold tooling against a real new plugin
Negative
- Reclassification is a second migration step. Lower risk than the initial migration because it is data-only (no schema change beyond moving rows between two tables that share the same
assetidlink). - Sites that adopt the framework before
measuringtoolsships need to either keep measuring tools inequipment(workable but suboptimal) or wait for the plugin
Neutral
- Legacy
machinetypeidis preserved on the equipment row during migration to enable reclassification
Alternatives considered
- Single equipment plugin with sub-typed assets. Use
equipment.equipmenttypeidto discriminate manufacturing vs metrology. Rejected: domain fields differ enough that a single table is wide and full of NULLs. - Migrate split (build mapping before initial migration). Cleaner end state but requires the
measuringtoolsplugin to exist before the migration runs, which delays Phase 5. Rejected. - JSON blob for protocol data instead of subtype tables. Considered for both plugins. Rejected: weak typing, awkward queries, no schema validation.
References
- ADR-001 (Asset is platform contract)
- ADR-002 (versioning of the surface)
plugins/machines/(equipment plugin, renamed per ADR-011)plugins/computers/(existing example of plugin pattern)