fm-bench 0.7.0 → 0.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fm-bench",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Dynamic benchmark CLI for Apple's fm command on macOS 27+.",
   "type": "module",
   "bin": {
@@ -21,7 +21,7 @@
     "release:patch": "npm version patch && git push --follow-tags",
     "release:minor": "npm version minor && git push --follow-tags",
     "release:major": "npm version major && git push --follow-tags",
-    "publish:dry-run": "npm publish --dry-run --access public",
+    "publish:dry-run": "node scripts/publish-dry-run.mjs",
     "check:pack": "node scripts/check-package.mjs"
   },
   "keywords": [

package/src/bench.js

@@ -1,13 +1,13 @@
 import crypto from 'node:crypto';
 import { detectFmCapabilities } from './capabilities.js';
-import { checkModelAvailability, collectEnvironment, countTokens, getQuotaUsage, respond } from './fm.js';
+import { checkModelAvailability, collectEnvironment, countTokens, fmBinaryFromOptions, getQuotaUsage, respond } from './fm.js';
 import { metricAvailability } from './metrics.js';
 import { loadPrompts } from './prompts.js';
 import { finalizeReportPayload } from './schema.js';
 import { summarizeByModel } from './stats.js';
 
 export async function inspectModels(options = {}) {
-  const fmBin = options.fmBin || process.env.FM_BIN || 'fm';
+  const fmBin = fmBinaryFromOptions(options);
   const capabilities = options.capabilities ?? await detectFmCapabilities(fmBin, options);
   const discovered = {
     fmBin,
@@ -52,7 +52,7 @@ export async function inspectModels(options = {}) {
 
 export async function runBenchmark(options = {}) {
   const startedAt = new Date().toISOString();
-  const fmBin = options.fmBin || process.env.FM_BIN || 'fm';
+  const fmBin = fmBinaryFromOptions(options);
 
   notify(options, { type: 'phase', phase: 'capabilities', message: 'probing fm capabilities' });
   const capabilities = options.capabilities ?? await detectFmCapabilities(fmBin, options);

package/src/capabilities.js

@@ -9,7 +9,7 @@
 
 import crypto from 'node:crypto';
 import { stripAnsi } from './ansi.js';
-import { parseModelsFromHelp } from './fm-help.js';
+import { parseAvailabilityList, parseModelsFromHelp } from './fm-help.js';
 import { runProcess } from './process.js';
 
 const SECTION_HEADER = /^\s*[A-Z][A-Z0-9 /-]+\s*$/;
@@ -179,16 +179,8 @@ async function discoverModelsFromAvailability(fmBin, options = {}) {
     env: options.env ?? process.env
   });
   if (result.error) return [];
-  const text = stripAnsi(`${result.stdout}${result.stderr}`);
-  const models = new Map();
-  for (const line of text.split(/\r?\n/)) {
-    const match = line.match(/^\s*([A-Za-z0-9._-]+)(?:\s+model)?\s+(?:is\s+)?(available|unavailable|not available)\b/i);
-    if (!match) continue;
-    const name = match[1].toLowerCase();
-    if (['the', 'no', 'model', 'system'].includes(name) && name !== 'system') continue;
-    models.set(name, { name, description: '' });
-  }
-  return [...models.values()];
+  return parseAvailabilityList(`${result.stdout}${result.stderr}`)
+    .map((model) => ({ name: model.name, description: '' }));
 }
 
 function escapeRegExp(value) {

package/src/fm.js

@@ -25,22 +25,6 @@ export async function getFmHelp(fmBin, timeoutMs = 10_000) {
   };
 }
 
-/**
- * Discover models, preferring an already-detected capability probe so a run
- * does not spawn `fm --help` more than once.
- * @param {Record<string, any>} options
- */
-export async function discoverModels(options = {}) {
-  const fmBin = fmBinaryFromOptions(options);
-  const capabilities = options.capabilities ?? await detectFmCapabilities(fmBin, options);
-  return {
-    fmBin,
-    models: capabilities.models,
-    help: capabilities.help,
-    capabilities
-  };
-}
-
 /**
  * Check one model against the detected `fm` build.
  *

package/src/metrics.js

@@ -192,15 +192,6 @@ export function metricAvailability(capabilities = {}, options = {}) {
   return metrics;
 }
 
-export function metricDefinition(key) {
-  const definition = DEFINITIONS.find((item) => item.key === key);
-  return definition ? { ...definition, requires: [...definition.requires] } : null;
-}
-
-export function metricDefinitions() {
-  return DEFINITIONS.map((definition) => ({ ...definition, requires: [...definition.requires] }));
-}
-
 /** Short human line for CLI output, e.g. "token counting: yes, quota: no". */
 export function formatCapabilitySummary(capabilities = {}) {
   const features = capabilities.features ?? {};