formlab-mcp 0.6.16 → 0.6.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formlab-mcp",
-  "version": "0.6.16",
+  "version": "0.6.17",
   "mcpName": "io.github.juliu1980/formlab-mcp",
   "description": "Read-only Model Context Protocol server for FormLab — 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.16",
+  "version": "0.6.17",
   "websiteUrl": "https://formvix.com/mcp",
   "repository": {
     "url": "https://github.com/juliu1980/FormLab",
@@ -13,7 +13,7 @@
     {
       "registryType": "npm",
       "identifier": "formlab-mcp",
-      "version": "0.6.16",
+      "version": "0.6.17",
       "runtimeHint": "npx",
       "transport": {
         "type": "stdio"

package/tools/batch-analyze.js

@@ -10,7 +10,7 @@
 // ============================================================
 
 import { getStore, resolveById, flattenComposition } from '../data.js';
-import { _batchActualMassKg, _massToKg } from './lab.js';
+import { _batchActualMassKg, _massToKg, _batchUnitMassKg } from './lab.js';
 import { _costPerKg } from './ingredients.js';
 
 // ---- shared compute (mirrors _bcActualPctMap / _bcProposedPctMap / _bcSpreadLevel) ----
@@ -43,7 +43,7 @@ function _amountMap(b) {
   return out;
 }
 
-function _targetKg(b) { const q = parseFloat(b.targetQuantity); return isFinite(q) ? _massToKg(q, b.unit) : null; }
+function _targetKg(b) { const q = parseFloat(b.targetQuantity); if (!isFinite(q)) return null; const mk = _massToKg(q, b.unit); if (mk != null) return mk; const umk = _batchUnitMassKg(b); return umk != null ? q * umk : null; }
 function _yieldPct(b) { const tk = _targetKg(b), mk = _batchActualMassKg(b); return (tk && tk > 0 && mk != null) ? +(mk / tk * 100).toFixed(1) : null; }
 
 // Blend cost per kg = Σ ingredient costPerKg × weightFraction over the flattened

package/tools/lab.js

@@ -18,9 +18,19 @@ const _MASS_TO_KG = { mg: 1e-6, cg: 1e-5, dg: 1e-4, g: 1e-3, hg: 0.1, kg: 1, oz:
 const _VOL_TO_L = { 'µl': 1e-6, ul: 1e-6, ml: 1e-3, cl: 1e-2, dl: 0.1, l: 1, gal: 3.78541, fl_oz: 0.0295735, floz: 0.0295735, pt: 0.473176, qt: 0.946353, tsp: 0.00492892, tbsp: 0.0147868, cup: 0.236588 };
 function _massToKg(v, u) { const f = _MASS_TO_KG[String(u || '').trim().toLowerCase()]; return (f != null && isFinite(v)) ? v * f : null; }
 function _volToL(v, u) { const f = _VOL_TO_L[String(u || '').trim().toLowerCase()]; return (f != null && isFinite(v)) ? v * f : null; }
+// Mass (kg) of one count-unit (tablet/capsule/…) from b.unitMass {value, unit};
+// null when unset. Lets dose-form batches derive a total mass (count × unit mass).
+function _batchUnitMassKg(b) {
+  if (!b || !b.unitMass) return null;
+  const v = parseFloat(b.unitMass.value);
+  return (isFinite(v) && v > 0) ? _massToKg(v, b.unitMass.unit) : null;
+}
 function _batchActualMassKg(b) {
   const y = parseFloat(b.actualYield);
-  if (isFinite(y)) { const kg = _massToKg(y, b.unit); if (kg != null) return kg; }
+  if (isFinite(y)) {
+    const kg = _massToKg(y, b.unit); if (kg != null) return kg;
+    const umk = _batchUnitMassKg(b); if (umk != null) return y * umk;   // count unit × per-unit mass
+  }
   if (Array.isArray(b.actualComposition)) {
     let t = 0, any = false;
     for (const c of b.actualComposition) { const kg = _massToKg(parseFloat(c.amount), c.unit); if (kg != null) { t += kg; any = true; } }
@@ -68,6 +78,9 @@ function _trimBatch(b, formulationsById) {
     status: b.status || '',
     targetQuantity: b.targetQuantity ?? null,
     unit: b.unit || '',
+    // Per-count-unit mass for dose-form batches (tablet/capsule) — lets a count
+    // batch derive a total mass (count × unit mass) for cost / yield.
+    unitMass: (b.unitMass && b.unitMass.value != null) ? { value: b.unitMass.value, unit: b.unitMass.unit || 'mg' } : null,
     actualYield: b.actualYield ?? null,
     // Finished-product density (g/mL === kg/L), measured on the blend, + the
     // derived/measured actual VOLUME (mass is the additive quantity; volume is
@@ -303,4 +316,4 @@ const get_sample = {
 export const tools = { list_batches, get_batch, list_samples, get_sample };
 
 // Exported for the batch-analyze tools so they reuse the SAME mass logic.
-export { _batchActualMassKg, _massToKg };
+export { _batchActualMassKg, _massToKg, _batchUnitMassKg };