The docs lived on one lineage and the fleet code on another. That is why six pages described a shared fleet key as how an agent authenticates, why COLLECTOR-AUTH had to warn that the per-PC credential code was not in the repository it sat in, and why ADR-019 recorded a decision whose implementation was somewhere else. Documentation that cannot see the code it documents goes stale by construction, and no amount of editing fixes that. So the corpus moves here: 84 files, 56 pages, 20 ADRs, the proposals, INDEX.md, llms.txt and both gates. Filenames are unchanged, because a wiki page name is derived from the filename and a rename breaks every link anybody saved. THE POINT OF THE MOVE IS THE CORRECTION IT ENABLES. Every caveat that said "not in this tree" was false the moment the files landed beside the code, so each was rewritten from what is actually here: - COLLECTOR-AUTH gained the real enroll request body, the two bounds on the unauthenticated route (per-IP rate limit, pending cap with stale rows dropped before a real PC is refused), and the rejected pending reason that binds to the endpoint identity rather than the nonce. - ADR-019 now describes an implementation that is present, including its tests, and says plainly that what remains is the FLEET migration, not the code. - proposals/device-identity claimed phase 1 was unbuilt. plugins/computers declares deviceid on the collector schema and prefers it over the older fallbacks. Corrected in the page, its summary and the index. WINDOWS/IIS IS NOW DOCUMENTED AS THE LEGACY PATH, per the product decision, and carefully: it is what production runs today. Every Windows page opens by saying it is supported, not for a new site, and where a new site should go instead. No procedure was cut - an operator on an IIS box at 2am needs these pages to work exactly as well tomorrow. MIGRATE-TOPOLOGY stops being a footnote and becomes the off-ramp, which is why it nearly doubled: what was there did not match how the Docker stack really works here. The Docker material that already lived on this line was kept and given ownership rather than buried under the ported Windows-centric prose: DEPLOY now describes the four services, the migrate service that runs the upgrade chain before api starts, TLS terminated by nginx, and the plugin count corrected from thirteen to seventeen - a number both lineages had wrong. ROADMAP is rewritten from evidence rather than memory: what has shipped, read out of the changelog, the ADRs and the manifests, and ahead of it exactly two items - finalize a distributed release and polish the setup wizard. PROJECT-MAP is generated and was stale; the GENERATOR was what was wrong. --check passes now. API-REFERENCE is retired to a pointer. /api/docs serves 573 operations with derived auth, query parameters and harvested examples, and a hand-written page competing with that is a liability. The file stays so its wiki page and its inbound links survive. AND THE MOVE TURNED ON A SCRUB THAT HAD NEVER RUN HERE. test_docs_publishable keys on docs/*.md, which this line did not have, so it skipped - its own comment predicted what would surface. Porting the corpus activated it and it found 48 lines that must not reach a published wiki: branch names abbreviating the site, assistant-tooling paths, the site name in two deployment pages, and an employee ID in a Windows path that the scrub does not even look for.
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)