fm-bench 0.5.1 → 0.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fm-bench",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Dynamic benchmark CLI for Apple's fm command on macOS 27+.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -6,6 +6,7 @@ import { loadHistory, renderHistoryReport } from './history.js';
 import { runProcess } from './process.js';
 import { createProgress } from './progress.js';
 import { flattenResults, toCsv, writeReport } from './report.js';
+import { parseBatteryOutput, parseThermalOutput } from './system.js';
 import { legendEntries, renderBenchmarkReport, renderLatencyHistogram, renderLegend, renderModelsTable } from './table.js';
 
 const require = createRequire(import.meta.url);
@@ -473,21 +474,23 @@ async function runDoctor(options) {
   }
 
   const thermalResult = await runProcess('pmset', ['-g', 'therm'], { timeoutMs: 5_000 });
-  const thermalOut = (thermalResult.stdout || thermalResult.stderr || '').trim();
-  const thermalMatch = thermalOut.match(/CPU_Scheduler_Limit\s*=\s*(\d+)/);
-  if (thermalMatch) {
-    const limit = Number.parseInt(thermalMatch[1], 10);
+  const thermal = parseThermalOutput(`${thermalResult.stdout || ''}${thermalResult.stderr || ''}`);
+  if (thermal.available && thermal.schedulerLimit != null) {
+    const limit = thermal.schedulerLimit;
     checks.push(['thermal limit', `${limit}%`, limit >= 100]);
+  } else if (thermal.available && thermal.healthyIdle) {
+    checks.push(['thermal', 'no thermal pressure', true]);
+  } else if (!thermal.available) {
+    checks.push(['thermal', 'unavailable', true]);
   }
 
   const batteryResult = await runProcess('pmset', ['-g', 'batt'], { timeoutMs: 5_000 });
-  const batteryOut = (batteryResult.stdout || '').trim();
-  const batteryLine = batteryOut.split('\n').find((line) => line.includes('%'));
-  if (batteryLine) {
-    const pctMatch = batteryLine.match(/(\d+)%/);
-    const charging = /charging|AC Power|charged/i.test(batteryLine);
-    const pct = pctMatch ? `${pctMatch[1]}%` : '?%';
-    checks.push(['battery', `${pct}${charging ? ' (charging/AC)' : ' (battery)'}`, charging || Number.parseInt(pctMatch?.[1], 10) >= 20]);
+  const battery = parseBatteryOutput(`${batteryResult.stdout || ''}${batteryResult.stderr || ''}`);
+  if (battery.present) {
+    const pct = battery.pct != null ? `${battery.pct}%` : '?%';
+    const source = battery.onAC ? 'charging/AC' : 'battery';
+    const ok = battery.onAC || (battery.pct != null && battery.pct >= 20);
+    checks.push(['battery', `${pct} (${source})`, ok]);
   }
 
   const inspection = await inspectModels(options);

package/src/system.js

@@ -0,0 +1,65 @@
+// Parsers for macOS system probes used by `fm-bench doctor`.
+//
+// macOS 27 changed the text emitted by `pmset -g therm` and `pmset -g batt`.
+// These helpers accept the raw stdout/stderr of those commands and return
+// structured values so the doctor command and its tests are not coupled to
+// the exact wording of any one macOS release.
+
+export function parseThermalOutput(output = '') {
+  const text = String(output).trim();
+  if (!text) {
+    return { available: false, schedulerLimit: null, raw: '' };
+  }
+
+  const limitMatch = text.match(/CPU_Scheduler_Limit\s*=\s*(-?\d+)/);
+  if (limitMatch) {
+    const schedulerLimit = Number.parseInt(limitMatch[1], 10);
+    return {
+      available: true,
+      schedulerLimit,
+      raw: text
+    };
+  }
+
+  // macOS 27 (and recent releases) prints these informational "Note:" lines
+  // when the system is NOT under thermal pressure. Treat that as a healthy,
+  // explicitly-reported state rather than silently dropping the check.
+  const hasNote = /^Note:/m.test(text);
+  if (hasNote) {
+    return {
+      available: true,
+      schedulerLimit: null,
+      raw: text,
+      healthyIdle: true
+    };
+  }
+
+  return { available: false, schedulerLimit: null, raw: text };
+}
+
+export function parseBatteryOutput(output = '') {
+  const text = String(output).trim();
+  if (!text) {
+    return { present: false, pct: null, onAC: false, raw: '' };
+  }
+
+  const lines = text.split(/\r?\n/);
+  const batteryLine = lines.find((line) => line.includes('%')) || '';
+  const pctMatch = batteryLine.match(/(\d+)%/);
+  const pct = pctMatch ? Number.parseInt(pctMatch[1], 10) : null;
+
+  // macOS 27 writes "Now drawing from 'AC Power'" on its own line and
+  // "AC attached" on the battery line. Older releases used "AC Power" in
+  // the battery line itself. Accept either form.
+  const onAC = /AC Power|AC attached|AC attached;/i.test(text)
+    || /;\s*charging\b/i.test(batteryLine);
+
+  const present = /InternalBattery|present:\s*true/i.test(text);
+
+  return {
+    present: present || pct != null,
+    pct,
+    onAC,
+    raw: text
+  };
+}