formlab-mcp 0.6.34 → 0.6.35

package/package.json

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

package/tools/analytics.js

@@ -226,7 +226,7 @@ const get_test_result = {
 const get_doe_matrix = {
   definition: {
     name: 'get_doe_matrix',
-    description: 'Build a Design-of-Experiments style pivot matrix: rows = formulations (or samples / batches / tests), columns = composition wt-% per ingredient + aggregated test-parameter values. Same shape as the FormLab DOE Matrix view. A parameter measured under two or more RUN CONDITIONS (e.g. storage 25 °C vs 40 °C) is one column per condition — "pH · 40 °C" — and the bare parameter column is the base arm (readings with no condition, else the condition with the most readings); they are different responses, never averaged together. Returns CSV when format=csv (default) for compact LLM consumption, or structured JSON when format=json.',
+    description: 'Build a Design-of-Experiments style pivot matrix: rows = formulations (or samples / batches / tests), columns = composition wt-% per ingredient + aggregated test-parameter values. Same shape as the FormLab DOE Matrix view. A parameter measured under two or more RUN CONDITIONS (e.g. storage 25 °C vs 40 °C) is one column per condition — "pH · 40 °C" — and the bare parameter column is the base arm (readings with no condition, else the condition with the most readings, on a tie the one declared as the default on the Test Method / Test Panel); they are different responses, never averaged together. Returns CSV when format=csv (default) for compact LLM consumption, or structured JSON when format=json.',
     inputSchema: {
       type: 'object',
       properties: {
@@ -453,7 +453,34 @@ function _mcpCondTags(conds) {
   const lead = tags.map(t => t.split(/\s+[\/·]\s+/)[0]);
   return (new Set(lead).size === lead.length) ? lead : tags;
 }
-// items: [{ parameter, m }] → Map(parameter → Map(condSig → column name)),
+// Is this reading taken under the DEFAULT run condition its Test Method or
+// Test Panel declares? Port of the app's flCondDefaultScore (js/utils.js):
+// the tiebreak for the primary arm when two arms have equally long records,
+// instead of the condition's name ("25 °C" sorting before "40 °C").
+function _mcpCondDefaultScore(m, t, db) {
+  const c = m && m.conditions;
+  if (!c || typeof c !== 'object') return 0;
+  const decls = [];
+  const ps = db.parameters || [];
+  const nm = String(m.parameter || '').trim().toLowerCase();
+  const method = (m.parameterId && ps.find(p => p && p.id === m.parameterId)) || (nm ? ps.find(p => p && String(p.name || '').trim().toLowerCase() === nm) : null);
+  if (method && Array.isArray(method.conditions)) decls.push(...method.conditions);
+  const tmpl = t && t.templateId ? (db.templates || []).find(x => x && x.id === t.templateId) : null;
+  if (tmpl && Array.isArray(tmpl.conditions)) decls.push(...tmpl.conditions);
+  const lc = {};
+  Object.keys(c).forEach(k => { lc[k.toLowerCase()] = c[k]; });
+  let matched = 0;
+  for (const d of decls) {
+    if (!d || !d.key || d.default == null || d.default === '') continue;
+    const v = lc[String(d.key).toLowerCase()];
+    if (v == null || v === '') continue;
+    if (String(v).trim() !== String(d.default).trim()) return 0;
+    matched++;
+  }
+  return matched ? 1 : 0;
+}
+
+// items: [{ parameter, m, test? }] → Map(parameter → Map(condSig → column name)),
 // only for parameters with two or more arms.
 function _mcpArmNames(items) {
   const arms = new Map();
@@ -461,14 +488,26 @@ function _mcpArmNames(items) {
     const sig = _mcpCondSig(it.m);
     if (!arms.has(it.parameter)) arms.set(it.parameter, new Map());
     const a = arms.get(it.parameter);
-    const cur = a.get(sig) || { n: 0, m: it.m };
+    const cur = a.get(sig) || { n: 0, m: it.m, t: it.test || null };
     cur.n++; a.set(sig, cur);
   }
   const out = new Map();
+  let testOf = null;   // measurement → its report, built only if a tie needs a panel default
+  const score = (arm) => {
+    const { db } = getStore();
+    let t = arm.t;
+    if (!t) {
+      if (!testOf) { testOf = new Map(); (db.testResults || []).forEach(r => (r.measurements || []).forEach(x => testOf.set(x, r))); }
+      t = testOf.get(arm.m) || null;
+    }
+    return _mcpCondDefaultScore(arm.m, t, db);
+  };
   arms.forEach((a, param) => {
     if (a.size < 2) return;
     const keys = [...a.keys()];
-    const base = a.has('') ? '' : keys.slice().sort((x, y) => (a.get(y).n - a.get(x).n) || x.localeCompare(y))[0];
+    // No condition wins outright; among conditioned arms, most readings, then
+    // the declared default condition, then by name — as in the app.
+    const base = a.has('') ? '' : keys.slice().sort((x, y) => (a.get(y).n - a.get(x).n) || (score(a.get(y)) - score(a.get(x))) || x.localeCompare(y))[0];
     const ordered = [base, ...keys.filter(k => k !== base).sort((x, y) => x.localeCompare(y))];
     const tags = _mcpCondTags(ordered.map(k => k ? _mcpCondLabel(a.get(k).m) : ''));
     out.set(param, new Map(ordered.map((k, i) => [k, i === 0 ? param : `${param} · ${tags[i]}`])));
@@ -1243,7 +1282,7 @@ const get_stability = {
   },
 };
 
-export { _evalPassFail, _resolveSpec, _shelfLife, _shelfLifeAssess, _mcpCondTags, _mcpArmNames };
+export { _evalPassFail, _resolveSpec, _shelfLife, _shelfLifeAssess, _mcpCondTags, _mcpArmNames, _mcpCondDefaultScore };
 export const tools = {
   list_test_results,
   get_test_result,