formlab-mcp 0.5.1 → 0.5.2

package/README.md

@@ -40,7 +40,7 @@ Ask Claude (or another MCP client) things like:
 | `list_samples` | Filtered list of physical specimens |
 | `get_sample` | Full record + canonical variant + test reports + blend lineage |
 | `list_test_results` | Filtered list of test reports (by sample, parameter, **measured-value range** (`value_min`/`value_max`), date, or lab) |
-| `get_test_result` | Full record + every measurement value |
+| `get_test_result` | Full report: every measurement's value, spec, and the **resolved instrument** (`instrumentSource`: row / method / run) |
 | `get_doe_matrix` | Pivot matrix (CSV by default) — rows × ingredients × parameters |
 | `find_failures` | Pareto-style: parameters that fail acceptance most often |
 | `get_coverage_matrix` | Which formulations × parameters have been measured |

package/index.js

@@ -114,7 +114,7 @@ const TOOLS = [
 ];
 
 const server = new Server(
-  { name: 'formlab-mcp', version: '0.5.1' },
+  { name: 'formlab-mcp', version: '0.5.2' },
   { capabilities: { tools: {} } }
 );
 

package/package.json

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

package/tools/analytics.js

@@ -9,6 +9,34 @@
 
 import { getStore, resolveById, flattenComposition } from '../data.js';
 
+// Which instrument produced a measurement. Mirrors the app's _trMeasInstrument:
+// a measurement's raw `instrument` is usually EMPTY because blank means inherit,
+// so returning the stored field alone would be near-useless here. Resolve the
+// same cascade the UI shows, and report the source so a consumer can tell a
+// recorded fact from an inherited default:
+//   'row'    — the measurement names its own instrument
+//   'method' — from the parameter's Test Method equipment (the usual case)
+//   'run'    — the report-level default (an assumption, not evidence)
+function _resolveInstrument(m, t, db) {
+  if (m && (m.instrument || m.equipmentId)) {
+    return { instrument: m.instrument || '', equipmentId: m.equipmentId || null, instrumentSource: 'row' };
+  }
+  const params = (db && db.parameters) || [];
+  let pm = null;
+  if (m && m.parameterId) pm = params.find(p => p && p.id === m.parameterId) || null;
+  if (!pm && m) {
+    const nm = String(m.parameter || '').trim().toLowerCase();
+    if (nm) pm = params.find(p => p && String(p.name || '').trim().toLowerCase() === nm) || null;
+  }
+  if (pm && (pm.equipment || pm.equipmentId)) {
+    return { instrument: pm.equipment || '', equipmentId: pm.equipmentId || null, instrumentSource: 'method' };
+  }
+  if (t && (t.instrument || t.equipmentId)) {
+    return { instrument: t.instrument || '', equipmentId: t.equipmentId || null, instrumentSource: 'run' };
+  }
+  return { instrument: '', equipmentId: null, instrumentSource: null };
+}
+
 function _trimTest(t, samplesById) {
   if (!t) return null;
   const s = t.sampleId ? samplesById.get(t.sampleId) : null;
@@ -20,12 +48,16 @@ function _trimTest(t, samplesById) {
     testDate: t.testDate || '',
     performedBy: t.performedBy || '',
     lab: t.lab || '',
+    instrument: t.instrument || '',          // run-level default; measurements may override
+    equipmentId: t.equipmentId || null,
+    controlSample: !!t.controlSample,        // a re-measured reference — the valid basis for drift
     measurementCount: (t.measurements || []).length,
     parameters: [...new Set((t.measurements || []).map(m => m.parameter).filter(Boolean))],
   };
 }
 
-function _trimMeasurement(m) {
+function _trimMeasurement(m, t, db) {
+  const ins = _resolveInstrument(m, t, db);
   return {
     parameter: m.parameter || '',
     value: m.value ?? null,
@@ -34,13 +66,14 @@ function _trimMeasurement(m) {
     pointCount: Array.isArray(m.points) ? m.points.length : 0,
     binCount: Array.isArray(m.bins) ? m.bins.length : 0,
     acceptanceCriteria: m.acceptanceCriteria || null,
+    ...ins,                                   // instrument, equipmentId, instrumentSource
   };
 }
 
 const list_test_results = {
   definition: {
     name: 'list_test_results',
-    description: 'List test result reports, optionally filtered by sample, parameter, measured-value range, date range, or lab. Combine parameter + value_min/value_max to find reports whose measurement is in range (the "find by results" query, e.g. parameter="Viscosity", value_min=800, value_max=3000). Returns metadata + parameters tested; use get_test_result for full measurement values.',
+    description: 'List test result reports, optionally filtered by sample, parameter, measured-value range, date range, or lab. Combine parameter + value_min/value_max to find reports whose measurement is in range (the "find by results" query, e.g. parameter="Viscosity", value_min=800, value_max=3000). Returns metadata (incl. the run-level instrument and controlSample flag) + parameters tested; use get_test_result for per-measurement values and their resolved instruments.',
     inputSchema: {
       type: 'object',
       properties: {
@@ -99,7 +132,7 @@ const list_test_results = {
 const get_test_result = {
   definition: {
     name: 'get_test_result',
-    description: 'Get full details for a single test result report including every measurement\'s value, unit, type, and acceptance criteria. Accepts internal id or UID.',
+    description: 'Get full details for a single test result report: every measurement\'s value, unit, type, acceptance criteria, and the INSTRUMENT that produced it. instrument is RESOLVED (measurement override → the parameter\'s Test Method equipment → the report default) with instrumentSource telling you which — treat source "run" as an inherited assumption, not evidence. Accepts internal id or UID.',
     inputSchema: {
       type: 'object',
       properties: {
@@ -115,7 +148,7 @@ const get_test_result = {
     return {
       ..._trimTest(t, indexes.samplesById),
       notes: t.notes || '',
-      measurements: (t.measurements || []).map(_trimMeasurement),
+      measurements: (t.measurements || []).map(m => _trimMeasurement(m, t, getStore().db)),
     };
   },
 };