formlab-mcp 0.6.55 → 0.6.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formlab-mcp",
-  "version": "0.6.55",
+  "version": "0.6.56",
   "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.55",
+  "version": "0.6.56",
   "websiteUrl": "https://formvix.com/mcp",
   "repository": {
     "url": "https://github.com/juliu1980/FormLab",
@@ -13,7 +13,7 @@
     {
       "registryType": "npm",
       "identifier": "formlab-mcp",
-      "version": "0.6.55",
+      "version": "0.6.56",
       "runtimeHint": "npx",
       "transport": {
         "type": "stdio"

package/vendor/cost.js

@@ -138,28 +138,39 @@ function getAllUnits() {
   const custom = Object.keys((typeof db !== 'undefined' && db?.customUnits) || {});
   return [...new Set([...builtin, ...custom])];
 }
+// The units people reach for first, in that order (22x). Every list puts these ahead of the
+// rest of their group (the picker groups by Mass / Volume / …), so a list opens on g, kg, mg —
+// not on µg, ug, mcg, the size order the conversion tables are written in. Everything else,
+// custom units included, keeps its place after them.
+const _UNITS_COMMON_FIRST = ['wt%', 'vol%', 'g', 'kg', 'mg', 'µg', 'lb', 'oz', 't', 'tonne', 'ton',
+  'mL', 'L', 'µL', 'gal', 'qt', 'pt', 'fl_oz', 'm³', 'mm', 'cm', 'm', 'in', 'ft', 'units', 'each'];
+function unitsCommonFirst(units) {
+  const rank = new Map(_UNITS_COMMON_FIRST.map((u, i) => [u, i]));
+  return units.map((u, i) => [u, rank.has(u) ? rank.get(u) : 1000 + i]).sort((a, b) => a[1] - b[1]).map(x => x[0]);
+}
 function ensureUnitDatalists() {
   if (typeof document === 'undefined' || !document.body) return;
   const q = (s) => String(s).replace(/"/g, '"');
   const make = (id, units) => {
     let dl = document.getElementById(id);
     if (!dl) { dl = document.createElement('datalist'); dl.id = id; document.body.appendChild(dl); }
-    dl.innerHTML = units.map((u) => `<option value="${q(u)}"></option>`).join('');
+    dl.innerHTML = unitsCommonFirst(units).map((u) => `<option value="${q(u)}"></option>`).join('');
   };
   make('fl-units-all', getAllUnits());   // composition / batch quantity
   make('fl-units-cost', getCostUnits());  // ingredient set-price (mass/vol/length/each)
-  make('fl-units-qty', getQuantityUnits()); // physical quantity made (mass/vol/count, no fractions)
+  make('fl-units-qty', getQuantityUnits()); // an amount made: batch target, sample amount (mass/vol/count)
+  make('fl-units-vol', Object.keys(getVolUnits())); // a measured volume (22w)
 }
 
-// Units for a physical quantity made (sample / batch yield): mass, volume,
-// count — NOT fractions (wt%/ppm), which only make sense in a recipe ratio.
-// Mirrors the curated set the old <select> used (`_quantityUnitOptions`).
+// Units for an amount made — a batch's target quantity and a sample's amount (22w: one list
+// for both; the batch had borrowed the composition list, wt% / ppm / lengths / mol included,
+// while samples lacked tonne, bbl, m³…): every mass and volume unit (your custom ones
+// included), plus a count. NOT fractions (wt% / ppm), which only make sense in a recipe ratio,
+// and not lengths.
 function getQuantityUnits() {
-  const mass  = ['mg', 'g', 'kg', 'ton', 'lb', 'oz'];
-  const vol   = ['µL', 'mL', 'L', 'tsp', 'tbsp', 'cup', 'fl_oz', 'pt', 'qt', 'gal', 'drum'];
-  const count = ['units', 'each'];
-  const custom = Object.keys((typeof db !== 'undefined' && db?.customUnits) || {});
-  return [...new Set([...mass, ...vol, ...count, ...custom])];
+  const customCount = Object.entries((typeof db !== 'undefined' && db?.customUnits) || {})
+    .filter(([_, v]) => v?.dimension === 'count').map(([k]) => k);
+  return [...new Set([...Object.keys(getMassUnits()), ...Object.keys(getVolUnits()), 'units', 'each', ...customCount])];
 }
 
 // ============================================================
@@ -309,9 +320,25 @@ function getQuantityUnits() {
   }
 
   document.addEventListener('focusin', function (e) { if (isCombo(e.target) && !refocusing) open(e.target); });
+  // The ▾ drawn at the right end (css input.fl-unit-combo) acts like a ▾ button, as
+  // js/combo.js's fields do (22v): a hand over it, and a click there closes an OPEN list.
+  // "Open" is judged at mousedown: a click into an unfocused field opens it on focusin, and
+  // that same click must not close it again.
+  var ARROW_W = 28, openAtDown = false;
+  function onArrow(el, e) { var r = el.getBoundingClientRect(); return e.clientX >= r.right - ARROW_W; }
+  document.addEventListener('mousemove', function (e) {
+    if (!isCombo(e.target)) return;
+    var c = onArrow(e.target, e) ? 'pointer' : '';
+    if (e.target.style.cursor !== c) e.target.style.cursor = c;
+  });
+  document.addEventListener('mouseout', function (e) { if (isCombo(e.target)) e.target.style.cursor = ''; });
   // A click on the field reopens the list after a pick (the field kept focus,
   // so no focusin fires). Capture phase: dialogs stop click propagation.
-  document.addEventListener('click', function (e) { if (isCombo(e.target) && !isOpen()) open(e.target); }, true);
+  document.addEventListener('click', function (e) {
+    if (!isCombo(e.target)) return;
+    if (openAtDown && onArrow(e.target, e)) { openAtDown = false; hide(); return; }
+    if (!isOpen()) open(e.target);
+  }, true);
   // Typing directly in the field filters too (only matters when there's no
   // search box — i.e. short lists; otherwise focus is in the search box).
   document.addEventListener('input', function (e) {
@@ -322,6 +349,7 @@ function getQuantityUnits() {
   document.addEventListener('keydown', function (e) { if (isCombo(e.target)) navKeydown(e); });
   // mousedown (capture) so a click on a suggestion wins over the input's blur.
   document.addEventListener('mousedown', function (e) {
+    if (isCombo(e.target)) openAtDown = isOpen() && activeInput === e.target;
     if (!isOpen()) return;
     var item = e.target.closest && e.target.closest('.fl-unit-combo-item');
     if (item) { e.preventDefault(); choose(item.getAttribute('data-val')); return; }

package/vendor/equipment-calibration.js

@@ -16,6 +16,10 @@
 // ============================================================
 
 const EQ_CAL_SOON_DAYS = 30;
+// The longest interval taken as real (20 years). Anything above, at or below zero, or not a
+// number counts as "no interval": a typo like 1e9 months used to throw in the date maths
+// and take the Equipment list and the dashboard down with it.
+const EQ_CAL_MAX_MONTHS = 240;
 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' },
@@ -30,19 +34,31 @@ function _eqCalToday() {
   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'); }
+// Whole months, 1..EQ_CAL_MAX_MONTHS, else 0.
+function eqCalInterval(e) {
+  const n = Math.round(Number(e && e.calIntervalMonths));
+  return (n >= 1 && n <= EQ_CAL_MAX_MONTHS) ? n : 0;
+}
+const _EQ_CAL_ISO = /^\d{4}-\d{2}-\d{2}$/;
+// Ids go into onclick="fn('…')": escJsAttr (utils.js) also covers the ' that esc() leaves.
+function _eqCalJs(v) { return typeof escJsAttr === 'function' ? escJsAttr(v) : String(v == null ? '' : v).replace(/[^\w-]/g, ''); }
 
-// Newest first; entries without a date last.
+// Newest first; entries without a date last. Two on the same day (a fail, then the
+// adjusted re-calibration) are ordered by when they were logged, the later first.
 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 || '')));
+  const list = (e && Array.isArray(e.calibrations)) ? e.calibrations.filter(c => c && typeof c === 'object') : [];
+  return list.slice().sort((a, b) => String(b.date || '').localeCompare(String(a.date || ''))
+    || String(b.loggedAt || '').localeCompare(String(a.loggedAt || '')));
 }
 
 // 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 '';
+  months = Math.round(Number(months));
+  if (!_EQ_CAL_ISO.test(String(iso || '')) || !(months > 0) || months > EQ_CAL_MAX_MONTHS) return '';
   const [y, m, d] = String(iso).split('-').map(Number);
   const first = new Date(Date.UTC(y, m - 1 + months, 1));
+  if (!isFinite(first.getTime())) return '';
   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);
 }
@@ -61,15 +77,18 @@ function _eqCalDays(fromIso, toIso) {
 //   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 interval = eqCalInterval(e);
   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 };
+  // Results are written lower-case; an imported "FAIL" is still a fail.
+  const result = last ? String(last.result || '').trim().toLowerCase() : '';
+  const base = { state: 'none', due: '', last: last ? (last.date || '') : '', lastResult: 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) || '';
+  if (result === 'fail') return { ...base, state: 'failed' };
+  // A next due that is not a date (an import's "soon") falls back to the interval.
+  const due = (_EQ_CAL_ISO.test(String(last.nextDue || '')) ? 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';
@@ -118,12 +137,12 @@ function eqCalCardHtml(e) {
       </div></div>`;
   }
   const st = eqCalStatus(e);
-  const interval = Number(e.calIntervalMonths) || 0;
+  const interval = eqCalInterval(e);
   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>
+      <button class="btn btn-secondary btn-sm" onclick="openEqCalIntervalModal('${_eqCalJs(e.id)}')">${interval ? 'Every ' + interval + ' mo' : 'Set interval'}</button>
+      <button class="btn btn-primary btn-sm" onclick="openEqCalLogModal('${_eqCalJs(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>`
@@ -138,9 +157,9 @@ function eqCalCardHtml(e) {
       <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>${c.certificateId && certName(c.certificateId) ? `<a style="color:var(--primary);cursor:pointer" onclick="attachOpenInTab('${_eqCalJs(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>
+      <td style="text-align:right;white-space:nowrap">${on ? `<button class="btn btn-secondary btn-sm" onclick="openEqCalLogModal('${_eqCalJs(e.id)}','${_eqCalJs(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>
@@ -158,12 +177,13 @@ function openEqCalIntervalModal(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="display:flex;align-items:center;gap:8px"><input id="eq-cal-interval" type="number" min="0" step="1" style="width:110px" value="${esc(eqCalInterval(e) || '')}" placeholder="12" max="${EQ_CAL_MAX_MONTHS}"> <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; }
+    if (n > EQ_CAL_MAX_MONTHS) { toast(`Up to ${EQ_CAL_MAX_MONTHS} months (20 years).`); return false; }
     updateEquipment(eqId, { calIntervalMonths: n || null });
     if (typeof renderEquipmentDetail === 'function') renderEquipmentDetail(eqId);
     return true;
@@ -179,13 +199,13 @@ function openEqCalLogModal(eqId, calId) {
   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 interval = eqCalInterval(e);
   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>Date calibrated *</label><input id="eq-cal-date" type="date" value="${esc(date)}" max="${_eqCalToday()}" 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>
@@ -211,9 +231,13 @@ function openEqCalLogModal(eqId, calId) {
       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.date > _eqCalToday()) { toast('The calibration date is in the future. Log it once it is done.'); 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);
+    // The record as it is NOW: a calibration synced in from another device while this
+    // dialog was open must not be dropped by a list read when it opened.
+    const cur = (typeof getEquipment === 'function' ? getEquipment(eqId) : null) || e;
+    const list = (cur.calibrations || []).filter(x => x && x.id !== rec.id);
     list.push(rec);
     const patch = { calibrations: list };
     updateEquipment(eqId, patch);
@@ -225,7 +249,7 @@ function openEqCalLogModal(eqId, calId) {
     // 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>`);
+      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('${_eqCalJs(eqId)}','${_eqCalJs(c.id)}')">Delete</button>`);
     }, 0);
   }
 }