formlab-mcp 0.6.53 → 0.6.55

package/README.md

@@ -58,8 +58,8 @@ Ask Claude (or another MCP client) things like:
 | `list_doe_designs` | Saved DOE designs — the *recipe* behind each batch of runs: design type, factors + ranges, constraints, run count, D-efficiency. Filters: `project`, `design_type`, `constrained_only`, `name_contains` |
 | `get_doe_design` | One design in full: constraints in plain language, the model it was optimised for, generation settings (run budget, replicates, centre points, seed) and the complete run matrix with the formulation each run became |
 | `find_by_smarts` | SMARTS-pattern substructure search across every ingredient with a SMILES; peptides that only store a sequence are searched with the structure derived from it, as the app draws them (`smilesDerived: true`). Requires `@rdkit/rdkit` (optional dependency — install with `npm install @rdkit/rdkit` in `mcp/` if you get a "not installed" error). Examples: `c1ccccc1` (any aromatic 6-ring), `[OX2H1]` (any hydroxyl), `C(=O)O` (carboxylic acid), `[F,Cl,Br,I]` (any halogen). |
-| `list_equipment` | Filtered list of the Equipment registry (mixers, ovens, viscometers, balances…). Filters: `category`, `status`, `manufacturer`, `name_contains` |
-| `get_equipment` | Full equipment record + `usedIn` (panels, step presets, test methods, formula steps, batches, testReports resolved to it), `usage` (reports / formulas / batches / samples / pass rate / top formulas) and `measured` (per parameter: mean here vs mean on other instruments, biasPct) |
+| `list_equipment` | Filtered list of the Equipment registry (mixers, ovens, viscometers, balances…), with each tracked instrument's `calibration` (state ok / soon / overdue / failed / never, next due, last calibrated, interval). Filters: `category`, `status`, `manufacturer`, `name_contains`, `calibration` (`due` = overdue + failed + never + due within 30 days, most urgent first) |
+| `get_equipment` | Full equipment record + its `calibration` and `calibrationHistory` (date, by, result, next due, certificate, notes) + `usedIn` (panels, step presets, test methods, formula steps, batches, testReports resolved to it), `usage` (reports / formulas / batches / samples / pass rate / top formulas) and `measured` (per parameter: mean here vs mean on other instruments, biasPct) |
 | `list_test_methods` | Filtered list of Test Methods (the parameter library). Filter by `analyte` (the property measured, e.g. `Viscosity` — finds every method for it), `category`, `name_contains`, `include_retired` |
 | `get_test_method` | One Test Method: full definition, run conditions, analyte siblings, using panels, plus `usage`, `valueSummary` (mean / sd / min / max) and `byInstrument` |
 | `list_step_presets` | Filtered list of Step Presets (reusable procedure steps: duration / temp / RPM / equipment). Filters: `industry`, `name_contains` |

package/calibration.js

@@ -0,0 +1,30 @@
+// =====================================================================
+// Equipment calibration state for the MCP server: the app's own rule, not a
+// port. mcp/vendor/equipment-calibration.js is an exact copy of
+// js/equipment-calibration.js (test/equipment-calibration.test.js keeps them
+// identical), so get_equipment / list_equipment report the same OK / due soon /
+// overdue / failed / never the Equipment page shows. Only its pure status
+// functions run, in a prototype-less node:vm with no host objects.
+// =====================================================================
+import { readFileSync } from 'node:fs';
+import vm from 'node:vm';
+
+let _ctx = null;
+function ctx() {
+  if (_ctx) return _ctx;
+  const src = readFileSync(new URL('./vendor/equipment-calibration.js', import.meta.url), 'utf8');
+  const sandbox = Object.create(null);
+  vm.createContext(sandbox);
+  vm.runInContext(src + `
+;function __calStatus(json, today) { return JSON.stringify(eqCalStatus(JSON.parse(json), today)); }
+;function __calHistory(json) { return JSON.stringify(eqCalHistory(JSON.parse(json))); }`, sandbox, { timeout: 1000 });
+  _ctx = sandbox;
+  return _ctx;
+}
+const _today = () => { const d = new Date(); return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`; };
+const _slim = (e) => JSON.stringify({ status: e.status || '', calIntervalMonths: e.calIntervalMonths || null, calibrations: Array.isArray(e.calibrations) ? e.calibrations : [] });
+
+// { state, due, last, lastResult, interval, daysToDue, count } — state: ok | soon | overdue | failed | never | none
+export function calibrationStatus(e, today) { return JSON.parse(ctx().__calStatus(_slim(e), today || _today())); }
+// Newest first.
+export function calibrationHistory(e) { return JSON.parse(ctx().__calHistory(_slim(e))); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formlab-mcp",
-  "version": "0.6.53",
+  "version": "0.6.55",
   "mcpName": "io.github.juliu1980/formlab-mcp",
   "description": "Read-only Model Context Protocol server for FormLab \u2014 lets Claude (and other MCP clients) read and analyze your FormLab data, from a local export file OR your live cloud workspace.",
   "type": "module",

package/server.json

@@ -2,7 +2,7 @@
   "$schema": "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
   "name": "io.github.juliu1980/formlab-mcp",
   "description": "Read-only MCP for FormLab — let Claude query your formulation lab. Free reads a local export; Pro connects to your live cloud workspace with a dedicated read-only token.",
-  "version": "0.6.53",
+  "version": "0.6.55",
   "websiteUrl": "https://formvix.com/mcp",
   "repository": {
     "url": "https://github.com/juliu1980/FormLab",
@@ -13,7 +13,7 @@
     {
       "registryType": "npm",
       "identifier": "formlab-mcp",
-      "version": "0.6.53",
+      "version": "0.6.55",
       "runtimeHint": "npx",
       "transport": {
         "type": "stdio"

package/tools/analytics.js

@@ -1279,6 +1279,16 @@ function _iChart(ys) {
 
 // Shelf life: fit vs elapsed months, extrapolate to the spec limit the trend
 // heads toward. Point-estimate crossing + the conservative 95% CI-bound crossing.
+// One-sided 95% Student t for df = n − 2 (ICH Q1E) — a copy of the app's _stabT95
+// (js/views/stability.js); test/stability-ich-t.test.js holds the two equal.
+const _T95_TABLE = [null, 6.314, 2.920, 2.353, 2.132, 2.015, 1.943, 1.895, 1.860, 1.833, 1.812, 1.796, 1.782, 1.771, 1.761, 1.753, 1.746, 1.740, 1.734, 1.729, 1.725, 1.721, 1.717, 1.714, 1.711, 1.708, 1.706, 1.703, 1.701, 1.699, 1.697];
+function _t95(df) {
+  df = Math.floor(df);
+  if (!(df >= 1)) return Infinity;
+  if (df < _T95_TABLE.length) return _T95_TABLE[df];
+  const z = 1.6448536;
+  return z + (z ** 3 + z) / (4 * df) + (5 * z ** 5 + 16 * z ** 3 + 3 * z) / (96 * df * df);
+}
 function _shelfLife(points, spec) {
   if (!points || points.length < 3 || (spec.min == null && spec.max == null)) return null;
   const t0 = Math.min(...points.map(p => p.date.getTime()));
@@ -1295,7 +1305,7 @@ function _shelfLife(points, spec) {
   const ssX = xs.reduce((a, b) => a + (b - mx) ** 2, 0);
   let ssR = 0; xs.forEach((x, i) => { const pr = fit.intercept + fit.slope * x; ssR += (ys[i] - pr) ** 2; });
   const sResid = Math.sqrt(ssR / Math.max(1, n - 2));
-  const tcrit = n > 30 ? 1.96 : n > 10 ? 2.1 : 2.5;
+  const tcrit = _t95(n - 2);   // ICH Q1E one-sided 95% (app 22t, js/views/stability.js _stabT95)
   const sign = fit.slope < 0 ? -1 : 1;
   const bound = (tt) => fit.intercept + fit.slope * tt + sign * tcrit * sResid * Math.sqrt(1 / n + ((tt - mx) ** 2) / Math.max(1e-9, ssX));
   let ciRemaining = null;

package/tools/library.js

@@ -12,6 +12,7 @@
 // ============================================================
 
 import { getStore, resolveById } from '../data.js';
+import { calibrationStatus, calibrationHistory } from '../calibration.js';
 import { _evalPassFail, _mcpRepNumber, _mcpMeasType, _resolveSpec, _mcpCondSig, _mcpCondLabel, _mcpCondTags, _mcpParamGroupsOf } from './analytics.js';
 
 // ── Usage roll-ups (mirror the Usage tabs on the Panel / Method / Equipment
@@ -91,6 +92,11 @@ function _trimEquipment(e) {
     manufacturer: e.manufacturer || '', location: e.location || '',
     owner: e.owner || '', assetTag: e.assetTag || '',
     ...(e.notes ? { notes: e.notes } : {}),
+    // Calibration (app 22p, the app's own rule via mcp/calibration.js): omitted when not tracked.
+    ...(() => {
+      const st = calibrationStatus(e);
+      return st.state === 'none' ? {} : { calibration: { state: st.state, nextDue: st.due || null, daysToDue: st.daysToDue, lastCalibrated: st.last || null, lastResult: st.lastResult || null, intervalMonths: st.interval || null } };
+    })(),
   };
 }
 
@@ -126,7 +132,7 @@ function _equipUsage(e, db) {
 const list_equipment = {
   definition: {
     name: 'list_equipment',
-    description: 'List equipment / instruments in the FormLab Equipment registry (mixers, ovens, viscometers, balances…), optionally filtered by category, status, manufacturer, or name. Returns metadata; use get_equipment for one record plus where it is used.',
+    description: 'List equipment / instruments in the FormLab Equipment registry (mixers, ovens, viscometers, balances…), optionally filtered by category, status, manufacturer, name, or calibration state. Returns metadata, plus `calibration` (state ok | soon | overdue | failed | never, nextDue, lastCalibrated, intervalMonths) on tracked instruments; for "which instruments are overdue / due for calibration?" pass calibration: "due" (most urgent first). Use get_equipment for one record, its calibration history and where it is used.',
     inputSchema: {
       type: 'object',
       properties: {
@@ -134,6 +140,7 @@ const list_equipment = {
         status: { type: 'string', description: 'Filter by status (e.g. "In service", "Retired"). Case-insensitive substring.' },
         manufacturer: { type: 'string', description: 'Filter by manufacturer. Case-insensitive substring.' },
         name_contains: { type: 'string', description: 'Case-insensitive substring on equipment name / model / serial / asset tag.' },
+        calibration: { type: 'string', enum: ['due', 'overdue', 'soon', 'failed', 'never', 'ok', 'tracked'], description: 'Filter by calibration state: due = overdue + failed + never calibrated + due within 30 days; tracked = any instrument with an interval or a calibration logged. Rows then sort most urgent first.' },
         limit: { type: 'number', description: 'Max rows (default 100, max 1000).' },
       },
     },
@@ -151,8 +158,18 @@ const list_equipment = {
         const hay = [e.name, e.model, e.serial, e.assetTag].map(_norm).join(' ');
         if (!hay.includes(q)) return false;
       }
+      if (args.calibration) {
+        const st = calibrationStatus(e).state;
+        const want = args.calibration;
+        if (want === 'due' ? !['overdue', 'failed', 'never', 'soon'].includes(st) : want === 'tracked' ? st === 'none' : st !== want) return false;
+      }
       return true;
     });
+    if (args.calibration) {
+      const rank = { failed: 0, overdue: 1, never: 2, soon: 3, ok: 4, none: 9 };
+      const key = (e) => { const st = calibrationStatus(e); return [rank[st.state], st.due || '9999']; };
+      filtered.sort((a, b) => { const x = key(a), y = key(b); return (x[0] - y[0]) || x[1].localeCompare(y[1]); });
+    }
     return {
       totalMatching: filtered.length,
       returned: Math.min(filtered.length, limit),
@@ -164,7 +181,7 @@ const list_equipment = {
 const get_equipment = {
   definition: {
     name: 'get_equipment',
-    description: 'Get one equipment record by UID (e.g. EQP-001) or id, including `usedIn` (everywhere its DEFINITION is referenced: test panels, step presets, test methods, formula steps, batches, plus testReports = reports with a measurement resolved to it), `usage` (those reports: totals, last used, distinct formulas/batches/samples, pass rate, top formulas) and `measured` (per parameter: readings and mean on this unit vs readings/mean on all OTHER instruments, with biasPct — the calibration question). Instrument resolution follows the app: named on the measurement → the Test Method\'s equipment → the report\'s run default.',
+    description: 'Get one equipment record by UID (e.g. EQP-001) or id, including `usedIn` (everywhere its DEFINITION is referenced: test panels, step presets, test methods, formula steps, batches, plus testReports = reports with a measurement resolved to it), `usage` (those reports: totals, last used, distinct formulas/batches/samples, pass rate, top formulas) and `measured` (per parameter: readings and mean on this unit vs readings/mean on all OTHER instruments, with biasPct — the calibration question). Instrument resolution follows the app: named on the measurement → the Test Method\'s equipment → the report\'s run default. `calibration` (state ok | soon (≤30 days) | overdue | failed | never, nextDue, lastCalibrated, intervalMonths) and `calibrationHistory` (newest first: date, by, result pass | adjusted | fail, nextDue, certificate, notes) when the instrument is tracked.',
     inputSchema: {
       type: 'object',
       properties: { id: { type: 'string', description: 'Equipment UID or internal id.' } },
@@ -207,7 +224,8 @@ const get_equipment = {
       });
     const usedIn = _equipUsage(e, db);
     usedIn.testReports = tests.length;
-    return { ...(_trimEquipment(e)), usedIn, usage: _usageRollup(db, tests, mine), measured };
+    const calHistory = calibrationHistory(e).map(c => ({ date: c.date || null, by: c.by || '', result: c.result || '', nextDue: c.nextDue || null, ...(c.certificateRef ? { certificate: c.certificateRef } : {}), ...(c.certificateId ? { certificateFile: ((e.fileAttachments || []).find(a => a && a.id === c.certificateId) || {}).name || c.certificateId } : {}), ...(c.notes ? { notes: c.notes } : {}) }));
+    return { ...(_trimEquipment(e)), ...(calHistory.length ? { calibrationHistory: calHistory } : {}), usedIn, usage: _usageRollup(db, tests, mine), measured };
   },
 };
 

package/vendor/README.md

@@ -9,10 +9,11 @@ reach files outside `mcp/`):
 | `cost.js` | `js/cost.js` |
 | `nesting.js` | `js/nesting.js` |
 | `theoretical-params.js` | `js/views/theoretical-params.js` |
+| `equipment-calibration.js` | `js/equipment-calibration.js` (calibration due state, `mcp/calibration.js`) |
 
 Edit the source, then copy it over:
 
-    cp js/cost.js js/nesting.js js/views/theoretical-params.js mcp/vendor/
+    cp js/cost.js js/nesting.js js/views/theoretical-params.js js/equipment-calibration.js mcp/vendor/
 
 The pre-commit hook (`scripts/hooks/pre-commit`) refreshes them when a commit touches a source; `test/mcp-theoretical.test.js` fails while a copy differs. `mcp/theoretical.js`
 runs them in a `node:vm` context holding only a JSON copy of the data.

package/vendor/equipment-calibration.js

@@ -0,0 +1,268 @@
+// ============================================================
+// EQUIPMENT CALIBRATION (Pro: equipment.calibration, build 22p)
+// ------------------------------------------------------------
+// Capture + due state for each instrument: how often it is calibrated
+// (calIntervalMonths), a history of calibrations (calibrations[]: date, by,
+// result, next due, certificate, notes), and what follows from them — OK /
+// due soon / overdue / failed — on the equipment page, the Equipment list,
+// Needs Attention, smart search, the AI and MCP.
+//
+// ENFORCEMENT is not here: flagging or blocking data recorded on an overdue
+// or out-of-service instrument, and qualification records with review, are the
+// Team slice (equipment.calibrationOps, features.js).
+//
+// Both fields ride the equipment record (the full record syncs as JSONB, so no
+// migration). Free keeps the data and shows it read-only, as Regulatory does.
+// ============================================================
+
+const EQ_CAL_SOON_DAYS = 30;
+const EQ_CAL_RESULTS = [
+  { value: 'pass',     label: 'Pass',                 hint: 'within tolerance as found' },
+  { value: 'adjusted', label: 'Adjusted, then pass',  hint: 'out of tolerance as found, adjusted and verified' },
+  { value: 'fail',     label: 'Fail',                 hint: 'out of tolerance; take it out of service' },
+];
+const _EQ_CAL_RESULT_LABEL = Object.fromEntries(EQ_CAL_RESULTS.map(r => [r.value, r.label]));
+
+// Today in LOCAL time (flTodayIso when utils.js is loaded; the MCP copy passes its own).
+function _eqCalToday() {
+  if (typeof flTodayIso === 'function') return flTodayIso();
+  const d = new Date();
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+}
+function eqCalOn() { return typeof hasFeature !== 'function' || hasFeature('equipment.calibration'); }
+
+// Newest first; entries without a date last.
+function eqCalHistory(e) {
+  const list = (e && Array.isArray(e.calibrations)) ? e.calibrations.filter(Boolean) : [];
+  return list.slice().sort((a, b) => String(b.date || '').localeCompare(String(a.date || '')));
+}
+
+// Calendar months, clamped to the month's last day (Jan 31 + 1 mo = Feb 28/29), as
+// flDateAddIso (utils.js) — kept here so the MCP server's vendored copy needs nothing else.
+function _eqCalAddMonths(iso, months) {
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(String(iso || '')) || !(months > 0)) return '';
+  const [y, m, d] = String(iso).split('-').map(Number);
+  const first = new Date(Date.UTC(y, m - 1 + months, 1));
+  const last = new Date(Date.UTC(first.getUTCFullYear(), first.getUTCMonth() + 1, 0)).getUTCDate();
+  return new Date(Date.UTC(first.getUTCFullYear(), first.getUTCMonth(), Math.min(d, last))).toISOString().slice(0, 10);
+}
+function _eqCalDays(fromIso, toIso) {
+  const a = Date.parse(fromIso + 'T00:00:00Z'), b = Date.parse(toIso + 'T00:00:00Z');
+  return (isFinite(a) && isFinite(b)) ? Math.round((b - a) / 864e5) : null;
+}
+
+// The calibration state of one instrument, as of `todayIso` (default today).
+//   state: 'none'    — not tracked (no interval, no history), or Retired
+//          'never'   — an interval is set but it has never been calibrated
+//          'failed'  — the latest calibration failed
+//          'overdue' — past its due date
+//          'soon'    — due within EQ_CAL_SOON_DAYS
+//          'ok'
+//   due: the next due date (the latest entry's own nextDue, else its date + the interval)
+function eqCalStatus(e, todayIso) {
+  const today = todayIso || _eqCalToday();
+  const interval = Number(e && e.calIntervalMonths) || 0;
+  const hist = eqCalHistory(e);
+  const last = hist[0] || null;
+  const base = { state: 'none', due: '', last: last ? (last.date || '') : '', lastResult: last ? (last.result || '') : '', interval, daysToDue: null, count: hist.length };
+  if (!e || e.status === 'Retired') return base;
+  if (!last) return interval ? { ...base, state: 'never' } : base;
+  // A failed instrument has no next due date: it needs a passing calibration first.
+  if (last.result === 'fail') return { ...base, state: 'failed' };
+  const due = last.nextDue || _eqCalAddMonths(last.date, interval) || '';
+  const days = due ? _eqCalDays(today, due) : null;
+  if (!due) return { ...base, state: 'ok' };
+  const state = days < 0 ? 'overdue' : days <= EQ_CAL_SOON_DAYS ? 'soon' : 'ok';
+  return { ...base, state, due, daysToDue: days };
+}
+
+const _EQ_CAL_TONE = {
+  ok:      'background:var(--dk-green-bg, #dcfce7);color:var(--dk-green-fg, #166534)',
+  soon:    'background:var(--dk-amber-bg2, #fef3c7);color:var(--dk-amber-fg, #92400e)',
+  overdue: 'background:var(--dk-red-bg, #fee2e2);color:var(--dk-red-fg, #b91c1c)',
+  failed:  'background:var(--dk-red-bg, #fee2e2);color:var(--dk-red-fg, #b91c1c)',
+  never:   'background:var(--dk-amber-bg2, #fef3c7);color:var(--dk-amber-fg, #92400e)',
+};
+// One line: what the instrument's calibration says right now.
+function eqCalStatusText(st) {
+  if (!st || st.state === 'none') return '';
+  const d = st.daysToDue;
+  if (st.state === 'never') return 'Never calibrated';
+  if (st.state === 'failed') return 'Failed calibration';
+  if (st.state === 'overdue') return `Overdue ${-d} d · due ${st.due}`;
+  if (st.state === 'soon') return d === 0 ? `Due today` : `Due in ${d} d · ${st.due}`;
+  return st.due ? `OK · due ${st.due}` : 'OK';
+}
+function eqCalChipHtml(st) {
+  if (!st || st.state === 'none') return '<span style="color:var(--dk-dim, #cbd5e1)">—</span>';
+  return `<span class="badge eq-cal-chip" style="${_EQ_CAL_TONE[st.state] || ''};font-size:11px" title="${esc(st.last ? `Last calibrated ${st.last}${st.lastResult ? ' (' + (_EQ_CAL_RESULT_LABEL[st.lastResult] || st.lastResult) + ')' : ''}` : 'No calibration logged yet')}">${esc(eqCalStatusText(st))}</span>`;
+}
+// Sort key for the list column: most urgent first when ascending.
+function eqCalSortKey(e) {
+  const st = eqCalStatus(e);
+  const rank = { failed: 0, overdue: 1, never: 2, soon: 3, ok: 4, none: 9 }[st.state];
+  return `${rank}|${st.due || '9999'}`;
+}
+
+// ---- The Calibration card on the equipment page ----
+function eqCalCardHtml(e) {
+  const on = eqCalOn();
+  const hist = eqCalHistory(e);
+  if (!on && !hist.length && !e.calIntervalMonths) {
+    return `<div class="card" style="margin-top:16px"><div class="card-header"><h2>Calibration</h2></div>
+      <div class="card-body" style="text-align:center;padding:20px 18px">
+        <div style="font-size:22px;line-height:1"><span class="fl-pro" aria-hidden="true"></span></div>
+        <div style="margin-top:8px;font-weight:700;font-size:14px;color:var(--dk-blue-fg, #2563eb)">Calibration tracking is a Pro feature</div>
+        <div style="margin:8px auto 14px;max-width:360px;font-size:12.5px;color:var(--text-muted);line-height:1.55">Set how often this instrument is calibrated, log each calibration with its certificate, and see what is due or overdue across the lab.</div>
+        <button class="btn btn-primary btn-sm" onclick="proUpsell('equipment.calibration')">What's in Pro?</button>
+      </div></div>`;
+  }
+  const st = eqCalStatus(e);
+  const interval = Number(e.calIntervalMonths) || 0;
+  const files = Array.isArray(e.fileAttachments) ? e.fileAttachments : [];
+  const certName = (id) => { const f = files.find(a => a && a.id === id); return f ? (f.name || f.title || f.url || 'Certificate') : ''; };
+  const editBtns = on ? `<div style="display:flex;gap:6px">
+      <button class="btn btn-secondary btn-sm" onclick="openEqCalIntervalModal('${e.id}')">${interval ? 'Every ' + interval + ' mo' : 'Set interval'}</button>
+      <button class="btn btn-primary btn-sm" onclick="openEqCalLogModal('${e.id}')">+ Log calibration</button>
+    </div>` : `<button class="btn btn-secondary btn-sm" onclick="proUpsell('equipment.calibration')"><span class="fl-pro" aria-hidden="true"></span> Pro</button>`;
+  const summary = st.state === 'none'
+    ? `<div style="color:var(--text-muted);font-size:13px">Not tracked yet. Set how often it is calibrated, or log its last calibration.</div>`
+    : `<div style="display:flex;flex-wrap:wrap;gap:10px 22px;align-items:center;font-size:13px">
+        ${eqCalChipHtml(st)}
+        <span><span style="color:var(--text-muted)">Last</span> <strong>${esc(st.last || '—')}</strong>${st.lastResult ? ` · ${esc(_EQ_CAL_RESULT_LABEL[st.lastResult] || st.lastResult)}` : ''}</span>
+        <span><span style="color:var(--text-muted)">Next due</span> <strong>${esc(st.due || '—')}</strong></span>
+        <span><span style="color:var(--text-muted)">Interval</span> <strong>${interval ? interval + ' month' + (interval === 1 ? '' : 's') : '—'}</strong></span>
+      </div>${st.state === 'failed' && e.status !== 'Out of service' ? `<div style="margin-top:10px;font-size:12.5px;color:var(--dk-red-fg, #b91c1c)">The latest calibration failed. Set the instrument <strong>Out of service</strong> (Edit) until it passes again.</div>` : ''}`;
+  const rows = hist.map(c => `<tr>
+      <td style="font-variant-numeric:tabular-nums">${esc(c.date || '—')}</td>
+      <td>${esc(c.by || '—')}</td>
+      <td>${c.result ? `<span class="badge" style="${_EQ_CAL_TONE[c.result === 'fail' ? 'failed' : c.result === 'adjusted' ? 'soon' : 'ok']};font-size:11px">${esc(_EQ_CAL_RESULT_LABEL[c.result] || c.result)}</span>` : '—'}</td>
+      <td style="font-variant-numeric:tabular-nums">${esc(c.nextDue || '—')}</td>
+      <td>${c.certificateId && certName(c.certificateId) ? `<a style="color:var(--primary);cursor:pointer" onclick="attachOpenInTab('${esc(c.certificateId)}')">${esc(certName(c.certificateId))}</a>` : (c.certificateRef ? esc(c.certificateRef) : '<span style="color:var(--dk-dim, #cbd5e1)">—</span>')}</td>
+      <td style="color:var(--text-muted);max-width:260px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap" title="${esc(c.notes || '')}">${esc(c.notes || '')}</td>
+      <td style="text-align:right;white-space:nowrap">${on ? `<button class="btn btn-secondary btn-sm" onclick="openEqCalLogModal('${e.id}','${esc(c.id)}')" title="Edit this calibration">${typeof ICON !== 'undefined' && ICON.edit ? ICON.edit : 'Edit'}</button>` : ''}</td>
+    </tr>`).join('');
+  const table = hist.length ? `<div class="table-wrap" style="margin-top:14px"><table class="eq-cal-table">
+      <thead><tr><th>Date</th><th>Performed by</th><th>Result</th><th>Next due</th><th>Certificate</th><th>Notes</th><th></th></tr></thead>
+      <tbody>${rows}</tbody></table></div>` : '';
+  const freeNote = on ? '' : `<div style="margin-top:10px;font-size:12px;color:var(--text-muted)">Read-only on Free: your calibration records are kept. Logging and due-date alerts are Pro.</div>`;
+  return `<div class="card" id="eq-cal-card" style="margin-top:16px">
+    <div class="card-header" style="display:flex;justify-content:space-between;align-items:center;gap:10px;flex-wrap:wrap"><h2>Calibration</h2>${editBtns}</div>
+    <div class="card-body">${summary}${table}${freeNote}</div></div>`;
+}
+
+// ---- Interval ----
+function openEqCalIntervalModal(eqId) {
+  if (!eqCalOn()) { proUpsell('equipment.calibration'); return; }
+  const e = typeof getEquipment === 'function' ? getEquipment(eqId) : (db.equipment || []).find(x => x.id === eqId);
+  if (!e) return;
+  showModal('Calibration interval', `
+    <div class="form-group"><label>Calibrate every</label>
+      <div style="display:flex;align-items:center;gap:8px"><input id="eq-cal-interval" type="number" min="0" step="1" style="width:110px" value="${esc(e.calIntervalMonths || '')}" placeholder="12"> <span>months</span></div>
+      <div style="font-size:12px;color:var(--text-muted);margin-top:6px">Sets the next due date from each calibration's date. Leave empty to stop tracking a due date (the history stays).</div>
+    </div>`, () => {
+    const raw = (document.getElementById('eq-cal-interval') || {}).value;
+    const n = raw === '' ? null : Math.round(Number(raw));
+    if (n != null && !(n >= 0)) { toast('Enter a number of months.'); return false; }
+    updateEquipment(eqId, { calIntervalMonths: n || null });
+    if (typeof renderEquipmentDetail === 'function') renderEquipmentDetail(eqId);
+    return true;
+  }, false, null, 'Save');
+}
+
+// ---- Log / edit a calibration ----
+function _eqCalMe() {
+  try { const p = (typeof window !== 'undefined') ? window.__pro : null; const me = (p && p.getCurrentUser) ? p.getCurrentUser() : null; return me ? (me.displayName || me.email || '') : ''; } catch (_) { return ''; }
+}
+function openEqCalLogModal(eqId, calId) {
+  if (!eqCalOn()) { proUpsell('equipment.calibration'); return; }
+  const e = typeof getEquipment === 'function' ? getEquipment(eqId) : (db.equipment || []).find(x => x.id === eqId);
+  if (!e) return;
+  const c = calId ? (e.calibrations || []).find(x => x && x.id === calId) : null;
+  const interval = Number(e.calIntervalMonths) || 0;
+  const date = c ? (c.date || '') : _eqCalToday();
+  const files = Array.isArray(e.fileAttachments) ? e.fileAttachments : [];
+  const certOpts = `<option value="">— None —</option>` + files.map(a => `<option value="${esc(a.id)}"${c && c.certificateId === a.id ? ' selected' : ''}>${esc(a.name || a.title || a.url || a.id)}</option>`).join('');
+  const hint = (t) => `<div style="font-size:11.5px;color:var(--text-muted);margin-top:4px;line-height:1.4">${t}</div>`;
+  const body = `<div class="form-grid">
+    <div class="form-group"><label>Date calibrated *</label><input id="eq-cal-date" type="date" value="${esc(date)}" onchange="_eqCalAutoDue(${interval})"></div>
+    <div class="form-group"><label>Performed by</label><input id="eq-cal-by" value="${esc(c ? (c.by || '') : _eqCalMe())}" placeholder="Name, or the service provider" data-fl-person="equipment.calibrations[].by testResults.performedBy equipment.owner"></div>
+    <div class="form-group span-2"><label>Result *</label>
+      <select id="eq-cal-result">${EQ_CAL_RESULTS.map(r => `<option value="${r.value}"${(c ? c.result : 'pass') === r.value ? ' selected' : ''}>${esc(r.label)} — ${esc(r.hint)}</option>`).join('')}</select>
+    </div>
+    <div class="form-group"><label>Next due ${typeof flDateQuickHtml === 'function' ? flDateQuickHtml('eq-cal-due', { from: 'eq-cal-date', fromLabel: 'calibration date', add: [[6, 'm'], [1, 'y'], [2, 'y']] }) : ''}</label>
+      <input id="eq-cal-due" type="date" value="${esc(c ? (c.nextDue || '') : _eqCalAddMonths(date, interval))}" data-auto="${c && c.nextDue ? '0' : '1'}" oninput="this.dataset.auto='0'">
+      ${hint(interval ? `From the interval (every ${interval} month${interval === 1 ? '' : 's'}); change it for this one if needed.` : 'No interval set: enter it here, or set one on the Calibration card.')}
+    </div>
+    <div class="form-group"><label>Certificate</label>
+      ${files.length ? `<select id="eq-cal-cert">${certOpts}</select>` : `<input id="eq-cal-certref" value="${esc(c ? (c.certificateRef || '') : '')}" placeholder="Certificate no.">`}
+      ${hint(files.length ? 'One of this instrument\'s files. Upload more on its Attachments card.' : 'Or upload the certificate on this instrument\'s Attachments card to pick it here.')}
+    </div>
+    <div class="form-group span-2"><label>Notes</label><textarea id="eq-cal-notes" style="min-height:56px" placeholder="As-found / as-left readings, standards used, provider…">${esc(c ? (c.notes || '') : '')}</textarea></div>
+  </div>`;
+  showModal(c ? 'Edit calibration' : 'Log calibration', body, () => {
+    const v = (id) => ((document.getElementById(id) || {}).value || '').trim();
+    const rec = {
+      id: c ? c.id : (typeof uid === 'function' ? uid() : 'cal' + Date.now()),
+      date: v('eq-cal-date'), by: v('eq-cal-by'), result: v('eq-cal-result') || 'pass',
+      nextDue: v('eq-cal-due'), notes: v('eq-cal-notes'),
+      certificateId: v('eq-cal-cert') || undefined, certificateRef: v('eq-cal-certref') || undefined,
+      loggedAt: c ? (c.loggedAt || new Date().toISOString()) : new Date().toISOString(),
+      loggedBy: c ? (c.loggedBy || '') : _eqCalMe(),
+    };
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(rec.date)) { toast('Enter the date it was calibrated.'); return false; }
+    if (rec.nextDue && rec.nextDue < rec.date) { toast('Next due is before the calibration date.'); return false; }
+    Object.keys(rec).forEach(k => rec[k] === undefined && delete rec[k]);
+    const list = (e.calibrations || []).filter(x => x && x.id !== rec.id);
+    list.push(rec);
+    const patch = { calibrations: list };
+    updateEquipment(eqId, patch);
+    if (typeof renderEquipmentDetail === 'function' && typeof currentView !== 'undefined' && currentView === 'equipment-detail') renderEquipmentDetail(eqId);
+    toast(c ? 'Calibration updated.' : (rec.result === 'fail' ? 'Calibration logged as failed. Set the instrument Out of service until it passes.' : 'Calibration logged.'));
+    return true;
+  }, true, null, c ? 'Save' : 'Log calibration');
+  if (c) {
+    // Delete sits in the dialog's footer, left of the buttons.
+    setTimeout(() => {
+      const foot = document.querySelector('#modal-backdrop .modal-footer');
+      if (foot && !foot.querySelector('.eq-cal-del')) foot.insertAdjacentHTML('afterbegin', `<button class="btn btn-danger btn-sm eq-cal-del" style="margin-right:auto" onclick="deleteEqCal('${eqId}','${esc(c.id)}')">Delete</button>`);
+    }, 0);
+  }
+}
+// Keep "Next due" following the date while it hasn't been typed over.
+function _eqCalAutoDue(interval) {
+  const due = document.getElementById('eq-cal-due'), d = document.getElementById('eq-cal-date');
+  if (!due || !d || due.dataset.auto !== '1' || !interval) return;
+  due.value = _eqCalAddMonths(d.value, interval);
+}
+function deleteEqCal(eqId, calId) {
+  const e = typeof getEquipment === 'function' ? getEquipment(eqId) : null;
+  if (!e) return;
+  const c = (e.calibrations || []).find(x => x && x.id === calId);
+  if (!c) return;
+  const go = () => {
+    updateEquipment(eqId, { calibrations: (e.calibrations || []).filter(x => x && x.id !== calId) });
+    if (typeof renderEquipmentDetail === 'function') renderEquipmentDetail(eqId);
+    toast('Calibration deleted.');
+  };
+  if (typeof closeModal === 'function') closeModal();
+  if (typeof confirmDataAction !== 'function') { go(); return; }
+  confirmDataAction({
+    title: 'Delete this calibration?',
+    message: `The calibration of <strong>${esc(c.date || 'this date')}</strong>${c.by ? ' by ' + esc(c.by) : ''} is removed from the history. The record's audit log keeps the change.`,
+    confirmLabel: 'Delete', danger: true, onConfirm: go,
+  });
+}
+
+// ---- Needs Attention (dashboard.js) ----
+// Instruments failed, overdue, never calibrated (with an interval) or due within 30 days.
+function eqCalAttentionRows(todayIso) {
+  if (!eqCalOn()) return [];
+  const rows = [];
+  (db.equipment || []).forEach(e => {
+    const st = eqCalStatus(e, todayIso);
+    if (['failed', 'overdue', 'never', 'soon'].includes(st.state)) rows.push({ e, st });
+  });
+  const rank = { failed: 0, overdue: 1, never: 2, soon: 3 };
+  return rows.sort((a, b) => (rank[a.st.state] - rank[b.st.state]) || ((a.st.daysToDue ?? -1e9) - (b.st.daysToDue ?? -1e9)));
+}